--- a/lm_types.c	Mon Feb 23 19:19:13 2009 +0200
+++ b/lm_types.c	Sun Mar 08 00:48:19 2009 +0200
@@ -22,8 +22,8 @@
 	return object;                                                            \
 }
 
-#define LLM_BLESS(WHAT, TYPE)                                                   \
-llm_##WHAT##_t *llm_##WHAT##_bless (lua_State *L, TYPE *WHAT)                   \
+#define LLM_BLESS(WHAT, LWHAT, TYPE)                                                   \
+llm_##WHAT##_t *bless_lm_##WHAT (lua_State *L, TYPE *WHAT)                      \
 {                                                                               \
 	llm_##WHAT##_t *object;                              /* top of stack */ \
 	lua_pushstring (L, LLM_OBJREGISTRY);       /* 1 registry table name  */ \
@@ -33,34 +33,34 @@
 	if (!lua_isnil (L, -1)) {                                /* 2 object */ \
 		lua_remove (L, -2);                              /* 1 object */ \
 		object = lua_touserdata (L, -1);                                \
-		D ("Existing " #WHAT " object %X requested", (int) object);     \
+		D ("Existing " #LWHAT " object %X requested", (int) object);     \
 		return object;                                                  \
 	}                                                                       \
 	                                                            /* 2 nil */ \
 	lua_remove (L, -1);                              /* 1 registry table */ \
 	object = lua_newuserdata (L, sizeof (llm_##WHAT##_t)); /* 2 userdata */ \
-	luaL_getmetatable (L, "loudmouth." #WHAT);            /* 3 metatable */ \
+	luaL_getmetatable (L, "loudmouth." #LWHAT);            /* 3 metatable */ \
 	lua_setmetatable (L, -2);                                /* 2 object */ \
 	lua_pushlightuserdata (L, WHAT);                 /* 3 light userdata */ \
 	lua_pushvalue (L, -2);                                   /* 4 object */ \
 	lua_rawset (L, -4);                                      /* 2 object */ \
 	lua_remove (L, -2);                                      /* 1 object */ \
 	object->WHAT = WHAT;                                                    \
-	lm_##WHAT##_ref (WHAT);                                                 \
-	D ("New " #WHAT " object %X blessed", (int) object);                    \
+	lm_##LWHAT##_ref (WHAT);                                                 \
+	D ("New " #LWHAT " object %X blessed", (int) object);                    \
 	return object;                                                          \
 }
 
-#define LLM_DEFINE(WHAT, TYPE) \
+#define LLM_DEFINE(WHAT, LWHAT, TYPE) \
 LLM_CHECK (WHAT, TYPE)         \
-LLM_BLESS (WHAT, TYPE)
+LLM_BLESS (WHAT, LWHAT, TYPE)
 
-LLM_DEFINE (connection, LmConnection)
-LLM_DEFINE (message, LmMessage)
-LLM_DEFINE (message_handler, LmMessageHandler)
-LLM_DEFINE (message_node, LmMessageNode)
-LLM_DEFINE (proxy, LmProxy)
-LLM_DEFINE (ssl, LmSSL)
+LLM_DEFINE (connection, connection, LmConnection)
+LLM_DEFINE (message, message, LmMessage)
+LLM_DEFINE (handler, message_handler, LmMessageHandler)
+LLM_DEFINE (node, message_node, LmMessageNode)
+LLM_DEFINE (proxy, proxy, LmProxy)
+LLM_DEFINE (ssl, ssl, LmSSL)
 
 LmMessageNode *luaL_checkLmMessageNode (lua_State *L, int index)
 {
@@ -73,7 +73,7 @@
 	if (lua_rawequal (L, -2, -3)) // Message
 		object = (void *) lm_message_get_node (((llm_message_t *) object)->message);
 	else if (lua_rawequal (L, -1, -3)) // Node
-		object = (void *) (((llm_message_node_t *) object)->message_node);
+		object = (void *) (((llm_node_t *) object)->node);
 	else
 		luaL_argerror (L, index, "loudmouth message or message node expected");
 	lua_pop (L, 3);