--- a/lm_message_handler.c	Mon Feb 23 19:19:13 2009 +0200
+++ b/lm_message_handler.c	Sun Mar 08 00:48:19 2009 +0200
@@ -17,13 +17,13 @@
 /// handlers should be called.
 /// A: lm connection object, lm message object
 /// R: boolean
-LmHandlerResult llm_message_handler_callback (LmMessageHandler *handler, LmConnection *connection, LmMessage *message, llm_callback_t *cb)
+LmHandlerResult callback_lm_handler (LmMessageHandler *handler, LmConnection *connection, LmMessage *message, llm_callback_t *cb)
 {
 	int ret;
 	lua_rawgeti (cb->L, LUA_REGISTRYINDEX, cb->reference);
-	llm_connection_bless (cb->L, connection);
+	bless_lm_connection (cb->L, connection);
 	// XXX lm_connection_unref (connection);
-	llm_message_bless (cb->L, message);
+	bless_lm_message (cb->L, message);
 	// XXX lm_message_unref (message);
 	if (lua_pcall (cb->L, 2, 1, 0)) {
 		W ("Message handler callback error: %s", lua_tostring (cb->L, -1));
@@ -42,7 +42,7 @@
 /// Creates new message handler object.
 /// A: message handler callback function
 /// R: lm message handler object
-static int llm_message_handler_new (lua_State *L)
+static int new_lm_handler (lua_State *L)
 {
 	llm_callback_t *cb;
 	LmMessageHandler *handler;
@@ -52,9 +52,9 @@
 	cb->reference = luaL_ref (L, LUA_REGISTRYINDEX);
 	cb->L         = L;
 
-	handler = lm_message_handler_new ((LmHandleMessageFunction)llm_message_handler_callback,
+	handler = lm_message_handler_new ((LmHandleMessageFunction)callback_lm_handler,
 					cb, (GDestroyNotify)llm_callback_destroy);
-	llm_message_handler_bless (L, handler);
+	bless_lm_handler (L, handler);
 	lm_message_handler_unref (handler); // XXX
 	D ("Message handler %X created", (int) handler);
 	return 1;
@@ -64,10 +64,10 @@
 /// Blesses given pointer to lm message handler object.
 /// A: lightuserdata (C lm message handler object)
 /// R: lm message handler object
-static int llm_message_handler_bless_lua (lua_State *L)
+static int bless_lua_lm_handler (lua_State *L)
 {
 	luaL_argcheck (L, lua_islightuserdata (L, 1), 1, "loudmouth message handler pointer expected");
-	llm_message_handler_bless (L, lua_touserdata (L, 1));
+	bless_lm_handler (L, lua_touserdata (L, 1));
 	return 1;
 }
 
@@ -75,52 +75,52 @@
 /// message_handler:invalidate
 /// Invalidates handler.
 /// R: lm message handler object
-static int llm_message_handler_invalidate (lua_State *L)
+static int invalidate_lm_handler (lua_State *L)
 {
-	llm_message_handler_t *object = luaL_checklm_message_handler (L, 1);
-	lm_message_handler_invalidate (object->message_handler);
+	llm_handler_t *object = luaL_checklm_handler (L, 1);
+	lm_message_handler_invalidate (object->handler);
 	return 1;
 }
 
 /// message_handler:valid
 /// Returns true if message handler is still valid.
 /// R: boolean
-static int llm_message_handler_valid (lua_State *L)
+static int valid_lm_handler (lua_State *L)
 {
-	llm_message_handler_t *object = luaL_checklm_message_handler (L, 1);
-	lua_pushboolean (L, lm_message_handler_is_valid (object->message_handler));
+	llm_handler_t *object = luaL_checklm_handler (L, 1);
+	lua_pushboolean (L, lm_message_handler_is_valid (object->handler));
 	return 1;
 }
 
 /// message_handler:pointer
 /// Returns pointer to underlying C loudmouth structure.
 /// R: lightuserdata
-static int llm_message_handler_pointer (lua_State *L)
+static int pointer_lm_handler (lua_State *L)
 {
-	llm_message_handler_t *object = luaL_checklm_message_handler (L, 1);
-	lua_pushlightuserdata (L, object->message_handler);
+	llm_handler_t *object = luaL_checklm_handler (L, 1);
+	lua_pushlightuserdata (L, object->handler);
 	return 1;
 }
 
-static int llm_message_handler_gc (lua_State *L)
+static int gc_lm_handler (lua_State *L)
 {
-	llm_message_handler_t *object = luaL_checklm_message_handler (L, 1);
+	llm_handler_t *object = luaL_checklm_handler (L, 1);
 	D ("Message handler %X gc called", (int) object);
-	lm_message_handler_unref (object->message_handler);
+	lm_message_handler_unref (object->handler);
 	return 0;
 }
 
-static const luaL_Reg llm_message_handler_reg_f[] = {
-	{ "new",   llm_message_handler_new       },
-	{ "bless", llm_message_handler_bless_lua },
+static const luaL_Reg reg_f_lm_handler[] = {
+	{ "new",   new_lm_handler       },
+	{ "bless", bless_lua_lm_handler },
 	{ NULL,    NULL                          },
 };
 
-static const luaL_Reg llm_message_handler_reg_m[] = {
-	{ "invalidate", llm_message_handler_invalidate },
-	{ "valid",      llm_message_handler_valid      },
-	{ "pointer",    llm_message_handler_pointer    },
-	{ "__gc",       llm_message_handler_gc         },
+static const luaL_Reg reg_m_lm_handler[] = {
+	{ "invalidate", invalidate_lm_handler },
+	{ "valid",      valid_lm_handler      },
+	{ "pointer",    pointer_lm_handler    },
+	{ "__gc",       gc_lm_handler         },
 	{ NULL,         NULL                           },
 };
 
@@ -130,9 +130,9 @@
 	lua_pushstring (L, "__index");
 	lua_pushvalue (L, -2);
 	lua_settable (L, -3);
-	luaL_register (L, NULL, llm_message_handler_reg_m);
+	luaL_register (L, NULL, reg_m_lm_handler);
 	lua_pop (L, 1);
-	luaL_register (L, "lm.message_handler", llm_message_handler_reg_f);
+	luaL_register (L, "lm.message_handler", reg_f_lm_handler);
 	return 1;
 }