--- a/lua.c	Wed Nov 28 04:27:33 2012 +0200
+++ b/lua.c	Wed Nov 28 18:38:52 2012 +0200
@@ -49,15 +49,9 @@
 /// Module provides embedded lua environment with some accessors to
 /// mcabber functionality.
 
-//
-//  options
-//
-
 /// Options
 /// * lua_init_filename - lua script, that will be loaded at startup
 /// * lua_lm_debug      - if lm log handler is enabled, this option controls, whether lm log messages are dropped or passed to mcabber logging facility
-#define OPT_MLUA_RC       "lua_init_filename"
-#define OPT_MLUA_LM_DEBUG "lua_lm_debug"
 
 //
 //  module description
@@ -68,17 +62,17 @@
 
 #ifdef LLM_LOG_HANDLER
 #define DESCRIPTION ( \
-	"Lua scripting interface\n" \
+	LUA_RELEASE " scripting interface\n" \
 	"Options: " OPT_MLUA_RC ", " OPT_MLUA_LM_DEBUG "\n" \
-	"Command: /lua" )
+	"Command: /" MLUA_COMMAND_NAME )
 #else
 #define DESCRIPTION ( \
-	"Lua scripting interface\n" \
+	LUA_RELEASE " scripting interface\n" \
 	"Options: " OPT_MLUA_RC "\n" \
-	"Command: /lua" )
+	"Command: /" MLUA_COMMAND_NAME )
 #endif
 
-module_info_t info_lua = {
+module_info_t info_lua5_2 = {
 	.branch      = MCABBER_BRANCH,
 	.api         = MCABBER_API_VERSION,
 	.version     = PROJECT_VERSION,
@@ -1805,9 +1799,13 @@
 	}
 
 #ifdef MCABBER_API_HAVE_CMD_ID
-	lua_cmdid = cmd_add ("lua", "Evaluate lua string", 0, 0, (void (*) (char *p)) do_lua, lua);
+	lua_cmdid = cmd_add (MLUA_COMMAND_NAME, "Evaluate lua string", 0, 0, (void (*) (char *p)) do_lua, lua);
 #else
-	cmd_add ("lua", "Evaluate lua string", 0, 0, (void (*) (char *p)) do_lua, lua);
+	cmd_add (MLUA_COMMAND_NAME, "Evaluate lua string", 0, 0, (void (*) (char *p)) do_lua, lua);
+#endif
+
+#ifdef ENABLE_LUA_ALIAS
+	settings_set(SETTINGS_TYPE_ALIAS, "lua", MLUA_COMMAND_NAME);
 #endif
 
 #ifdef LLM_LOG_HANDLER
@@ -1907,7 +1905,7 @@
 		cmd_del (lua_cmdid);
 		lua_cmdid = NULL;
 #else
-		cmd_del ("lua");
+		cmd_del (MLUA_COMMAND_NAME);
 #endif
 
 		lua_close (lua);