--- a/lm_types.h	Mon Feb 23 19:19:13 2009 +0200
+++ b/lm_types.h	Sun Mar 08 00:48:19 2009 +0200
@@ -26,8 +26,8 @@
 
 LLM_DECLARE (connection, LmConnection)
 LLM_DECLARE (message, LmMessage)
-LLM_DECLARE (message_handler, LmMessageHandler)
-LLM_DECLARE (message_node, LmMessageNode)
+LLM_DECLARE (handler, LmMessageHandler)
+LLM_DECLARE (node, LmMessageNode)
 LLM_DECLARE (proxy, LmProxy)
 LLM_DECLARE (ssl, LmSSL)