--- a/lm_message.c	Mon Feb 23 19:19:13 2009 +0200
+++ b/lm_message.c	Sun Mar 08 00:48:19 2009 +0200
@@ -20,7 +20,7 @@
 /// message type
 /// Message type (root tag type).
 /// G:
-const string2enum_t llm_message_type[] = {
+const string2enum_t type_lm_message[] = {
 	{ "message",         LM_MESSAGE_TYPE_MESSAGE         },
 	{ "presence",        LM_MESSAGE_TYPE_PRESENCE        },
 	{ "iq",              LM_MESSAGE_TYPE_IQ              },
@@ -46,7 +46,7 @@
 /// message sub type
 /// Message subtype, not all combinations of type and subtype are possible.
 /// G:
-const string2enum_t llm_message_sub_type[] = {
+const string2enum_t sub_type_lm_message[] = {
 	{ "not set",       LM_MESSAGE_SUB_TYPE_NOT_SET      },
 	{ "available",     LM_MESSAGE_SUB_TYPE_AVAILABLE    },
 	{ "normal",        LM_MESSAGE_SUB_TYPE_NORMAL       },
@@ -71,17 +71,17 @@
 /// Creates new message object.
 /// A: string (to), message type, message sub type (optional)
 /// R: lm message object
-static int llm_message_new (lua_State *L)
+static int new_lm_message (lua_State *L)
 {
 	const char *to   = luaL_checkstring (L, 1);
-	int         type = luaL_checkenum (L, 2, llm_message_type);
+	int         type = luaL_checkenum (L, 2, type_lm_message);
 	LmMessage *message;
 	if (lua_gettop (L) > 2)
 		message = lm_message_new_with_sub_type (to, type,
-						luaL_checkenum (L, 3, llm_message_sub_type));
+						luaL_checkenum (L, 3, sub_type_lm_message));
 	else
 		message = lm_message_new (to, type);
-	llm_message_bless (L, message);
+	bless_lm_message (L, message);
 	lm_message_unref (message);
 	D ("Message %X created", (int) message);
 	return 1;
@@ -91,21 +91,21 @@
 /// Blesses given pointer to lm message object.
 /// A: lightuserdata (C lm message object)
 /// R: lm message object
-static int llm_message_bless_lua (lua_State *L)
+static int bless_lua_lm_message (lua_State *L)
 {
 	luaL_argcheck (L, lua_islightuserdata (L, 1), 1, "lm message lightuserdata expected");
-	llm_message_bless (L, lua_touserdata (L, 1));
+	bless_lm_message (L, lua_touserdata (L, 1));
 	return 1;
 }
 
 /// message:node
 /// Returns root node object of message.
 /// R: lm message node object
-static int llm_message_node (lua_State *L)
+static int node_lm_message (lua_State *L)
 {
 	llm_message_t *object = luaL_checklm_message (L, 1);
 	LmMessageNode *node = lm_message_get_node (object->message);
-	llm_message_node_bless (L, node);
+	bless_lm_node (L, node);
 	// XXX lm_message_node_unref (node);
 	return 1;
 }
@@ -113,25 +113,25 @@
 /// message:type
 /// Returns two strings: message type and message sub type.
 /// R: message type, message sub type
-static int llm_message_kind (lua_State *L)
+static int kind_lm_message (lua_State *L)
 {
 	llm_message_t *object = luaL_checklm_message (L, 1);
-	luaL_pushenum (L, lm_message_get_type (object->message), llm_message_type);
-	luaL_pushenum (L, lm_message_get_sub_type (object->message), llm_message_sub_type);
+	luaL_pushenum (L, lm_message_get_type (object->message), type_lm_message);
+	luaL_pushenum (L, lm_message_get_sub_type (object->message), sub_type_lm_message);
 	return 2;
 }
 
 /// message:pointer
 /// Returns pointer to underlying C loudmouth structure.
 /// R: lightuserdata
-static int llm_message_pointer (lua_State *L)
+static int pointer_lm_message (lua_State *L)
 {
 	llm_message_t *object = luaL_checklm_message (L, 1);
 	lua_pushlightuserdata (L, object->message);
 	return 1;
 }
 
-static int llm_message_gc (lua_State *L)
+static int gc_lm_message (lua_State *L)
 {
 	llm_message_t *message = luaL_checklm_message (L, 1);
 	D ("Message %X gc called", (int) message);
@@ -139,30 +139,30 @@
 	return 0;
 }
 
-static const luaL_Reg llm_message_reg_f[] = {
-	{ "new",   llm_message_new       },
-	{ "bless", llm_message_bless_lua },
+static const luaL_Reg reg_f_lm_message[] = {
+	{ "new",   new_lm_message       },
+	{ "bless", bless_lua_lm_message },
 	{ NULL,    NULL                  },
 };
 
-static const luaL_Reg llm_message_reg_m[] = {
-	{ "node",       llm_message_node            },
-	{ "type",       llm_message_kind            },
+static const luaL_Reg reg_m_lm_message[] = {
+	{ "node",       node_lm_message            },
+	{ "type",       kind_lm_message            },
 	// These methods are common for message and message node
-	{ "next",       llm_message_node_next       },
-	{ "prev",       llm_message_node_prev       },
-	{ "children",   llm_message_node_children   },
-	{ "parent",     llm_message_node_parent     },
-	{ "value",      llm_message_node_value      },
-	{ "child",      llm_message_node_child      },
-	{ "find_child", llm_message_node_find_child },
-	{ "attribute",  llm_message_node_attribute  },
-	{ "raw",        llm_message_node_raw        },
-	{ "xml",        llm_message_node_xml        },
-	{ "path",       llm_message_node_path       },
+	{ "next",       next_lm_node       },
+	{ "prev",       prev_lm_node       },
+	{ "children",   children_lm_node   },
+	{ "parent",     parent_lm_node     },
+	{ "value",      value_lm_node      },
+	{ "child",      child_lm_node      },
+	{ "find_child", find_child_lm_node },
+	{ "attribute",  attribute_lm_node  },
+	{ "raw",        raw_lm_node        },
+	{ "xml",        xml_lm_node        },
+	{ "path",       path_lm_node       },
 	// End common methods
-	{ "pointer",    llm_message_pointer         },
-	{ "__gc",       llm_message_gc              },
+	{ "pointer",    pointer_lm_message         },
+	{ "__gc",       gc_lm_message              },
 	{ NULL,         NULL                        },
 };
 
@@ -172,9 +172,9 @@
 	lua_pushstring (L, "__index");
 	lua_pushvalue (L, -2);
 	lua_settable (L, -3);
-	luaL_register (L, NULL, llm_message_reg_m);
+	luaL_register (L, NULL, reg_m_lm_message);
 	lua_pop (L, 1);
-	luaL_register (L, "lm.message", llm_message_reg_f);
+	luaL_register (L, "lm.message", reg_f_lm_message);
 	return 1;
 }