diff --git a/include/services.h b/include/services.h
index e0ec8a609..a6469419b 100644
--- a/include/services.h
+++ b/include/services.h
@@ -192,11 +192,11 @@ extern int strncasecmp(const char *, const char *, size_t);
  * It defines the class factory and external init_module function.
  */
 #ifdef _WIN32
-	#define MODULE_INIT(x, y) \
+	#define MODULE_INIT(x) \
 		extern "C" DllExport Module *init_module(const std::string &, const std::string &); \
-		extern "C" Module *init_module(const std::string &, const std::string &creator) \
+		extern "C" Module *init_module(const std::string &modname, const std::string &creator) \
 		{ \
-			return new y(x, creator); \
+			return new x(modname, creator); \
 		} \
 		BOOLEAN WINAPI DllMain(HINSTANCE, DWORD nReason, LPVOID) \
 		{ \
@@ -208,19 +208,19 @@ extern int strncasecmp(const char *, const char *, size_t);
 			} \
 			return TRUE; \
 		} \
-		extern "C" DllExport void destroy_module(y *); \
-		extern "C" void destroy_module(y *m) \
+		extern "C" DllExport void destroy_module(x *); \
+		extern "C" void destroy_module(x *m) \
 		{ \
 			delete m; \
 		}
 
 #else
-	#define MODULE_INIT(x, y) \
-		extern "C" DllExport Module *init_module(const std::string &, const std::string &creator) \
+	#define MODULE_INIT(x) \
+		extern "C" DllExport Module *init_module(const std::string &modname, const std::string &creator) \
 		{ \
-			return new y(x, creator); \
+			return new x(modname, creator); \
 		} \
-		extern "C" DllExport void destroy_module(y *m) \
+		extern "C" DllExport void destroy_module(x *m) \
 		{ \
 			delete m; \
 		}
diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 82c893e74..13ef27a23 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -83,4 +83,4 @@ class BSAct : public Module
 	}
 };
 
-MODULE_INIT("bs_act", BSAct)
+MODULE_INIT(BSAct)
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index e54989ac7..1ca280c4c 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -94,4 +94,4 @@ class BSAssign : public Module
 	}
 };
 
-MODULE_INIT("bs_assign", BSAssign)
+MODULE_INIT(BSAssign)
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index b8a022f1b..8c07fb36a 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -354,4 +354,4 @@ int badwords_list_callback(User * u, int num, va_list args)
 	return badwords_list(u, num - 1, ci, sent_header);
 }
 
-MODULE_INIT("bs_badwords", BSBadwords)
+MODULE_INIT(BSBadwords)
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 6cb46f2ba..6c6c83ea1 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -441,4 +441,4 @@ class BSBot : public Module
 	}
 };
 
-MODULE_INIT("bs_bot", BSBot)
+MODULE_INIT(BSBot)
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 71ee10af0..79902a752 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -86,4 +86,4 @@ class BSBotList : public Module
 	}
 };
 
-MODULE_INIT("bs_botlist", BSBotList)
+MODULE_INIT(BSBotList)
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 2fdc9adac..e76943636 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -53,4 +53,4 @@ class BSHelp : public Module
 
 
 
-MODULE_INIT("bs_help", BSHelp)
+MODULE_INIT(BSHelp)
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index 8ebdf6e46..cb1590719 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -264,4 +264,4 @@ class BSInfo : public Module
 	}
 };
 
-MODULE_INIT("bs_info", BSInfo)
+MODULE_INIT(BSInfo)
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 95a0a63b0..38fc51923 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -356,4 +356,4 @@ class BSKick : public Module
 	}
 };
 
-MODULE_INIT("bs_kick", BSKick)
+MODULE_INIT(BSKick)
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 8e2c7710e..577891cd5 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -90,4 +90,4 @@ class BSSay : public Module
 	}
 };
 
-MODULE_INIT("bs_say", BSSay)
+MODULE_INIT(BSSay)
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 74679244b..7c5366003 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -194,4 +194,4 @@ class BSSet : public Module
 	}
 };
 
-MODULE_INIT("bs_set", BSSet)
+MODULE_INIT(BSSet)
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 3662e98b7..af7f9d7d5 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -70,4 +70,4 @@ class BSUnassign : public Module
 	}
 };
 
-MODULE_INIT("bs_unassign", BSUnassign)
+MODULE_INIT(BSUnassign)
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 88e7adc3e..59f772dee 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -501,4 +501,4 @@ class CSAccess : public Module
 };
 
 
-MODULE_INIT("cs_access", CSAccess)
+MODULE_INIT(CSAccess)
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 2c18cafcc..bd928b316 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -673,4 +673,4 @@ class CSAKick : public Module
 	}
 };
 
-MODULE_INIT("cs_akick", CSAKick)
+MODULE_INIT(CSAKick)
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 212faee36..bd65f1ac8 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -178,4 +178,4 @@ class CSBan : public Module
 };
 
 
-MODULE_INIT("cs_ban", CSBan)
+MODULE_INIT(CSBan)
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 74a471788..f9e9ab8bd 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -354,4 +354,4 @@ class CSClear : public Module
 	}
 };
 
-MODULE_INIT("cs_clear", CSClear)
+MODULE_INIT(CSClear)
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index a84745edd..13534232d 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -124,4 +124,4 @@ class CSDrop : public Module
 	}
 };
 
-MODULE_INIT("cs_drop", CSDrop)
+MODULE_INIT(CSDrop)
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index b26c46074..c463551dd 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -134,4 +134,4 @@ class CSForbid : public Module
 	}
 };
 
-MODULE_INIT("cs_forbid", CSForbid)
+MODULE_INIT(CSForbid)
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index ddbad80e8..7d1fa8637 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -74,4 +74,4 @@ class CSGetKey : public Module
 	}
 };
 
-MODULE_INIT("cs_getkey", CSGetKey)
+MODULE_INIT(CSGetKey)
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index e492d0007..5a17bdb7b 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -78,4 +78,4 @@ class CSGetPass : public Module
 	}
 };
 
-MODULE_INIT("cs_getpass", CSGetPass)
+MODULE_INIT(CSGetPass)
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index f484c5f7d..21bbc00eb 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -76,4 +76,4 @@ class CSHelp : public Module
 	}
 };
 
-MODULE_INIT("cs_help", CSHelp)
+MODULE_INIT(CSHelp)
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 49d205636..6629e2819 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -102,4 +102,4 @@ class CSIdentify : public Module
 	}
 };
 
-MODULE_INIT("cs_identify", CSIdentify)
+MODULE_INIT(CSIdentify)
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 0f7592f07..77e840d36 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -173,4 +173,4 @@ class CSInfo : public Module
 	}
 };
 
-MODULE_INIT("cs_info", CSInfo)
+MODULE_INIT(CSInfo)
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index cf66c9b04..3198a9785 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -92,4 +92,4 @@ class CSInvite : public Module
 	}
 };
 
-MODULE_INIT("cs_invite", CSInvite)
+MODULE_INIT(CSInvite)
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index d0ce0d30b..8ebe2f06b 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -109,4 +109,4 @@ class CSKick : public Module
 	}
 };
 
-MODULE_INIT("cs_kick", CSKick)
+MODULE_INIT(CSKick)
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index ca43b735b..80d2c4749 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -196,4 +196,4 @@ public:
 	}
 };
 
-MODULE_INIT("cs_list", CSList)
+MODULE_INIT(CSList)
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 5e5504a62..e7c39b329 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -126,4 +126,4 @@ class CSLogout : public Module
 	}
 };
 
-MODULE_INIT("cs_logout", CSLogout)
+MODULE_INIT(CSLogout)
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 855569a6c..13f2f0f82 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -403,4 +403,4 @@ class CSModes : public Module
 };
 
 
-MODULE_INIT("cs_modes", CSModes)
+MODULE_INIT(CSModes)
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 3c9946612..5726859b6 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -155,4 +155,4 @@ class CSRegister : public Module
 	}
 };
 
-MODULE_INIT("cs_register", CSRegister)
+MODULE_INIT(CSRegister)
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index b00607ce8..c9972bfe1 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -106,4 +106,4 @@ class CSSendPass : public Module
 	}
 };
 
-MODULE_INIT("cs_sendpass", CSSendPass)
+MODULE_INIT(CSSendPass)
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 86021d77b..cea7b2924 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -733,4 +733,4 @@ class CSSet : public Module
 	}
 };
 
-MODULE_INIT("cs_set", CSSet)
+MODULE_INIT(CSSet)
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index ed6e2c0df..b1f269cbc 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -75,4 +75,4 @@ class CSStatus : public Module
 	}
 };
 
-MODULE_INIT("cs_status", CSStatus)
+MODULE_INIT(CSStatus)
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 48920d653..ccc722bb3 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -197,4 +197,4 @@ class CSSuspend : public Module
 	}
 };
 
-MODULE_INIT("cs_suspend", CSSuspend)
+MODULE_INIT(CSSuspend)
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index c00c77fbd..47e090d28 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -97,4 +97,4 @@ class CSTopic : public Module
 	}
 };
 
-MODULE_INIT("cs_topic", CSTopic)
+MODULE_INIT(CSTopic)
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 9c0fce211..3c077e1f1 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -580,4 +580,4 @@ int xop_list_callback(User *u, int num, va_list args)
 	return xop_list(u, num - 1, ci, sent_header, xlev, xmsg);
 }
 
-MODULE_INIT("cs_xop", CSXOP)
+MODULE_INIT(CSXOP)
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index 95b7b20c6..00d9a40ae 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -414,4 +414,4 @@ class EMD5 : public Module
 /*************************************************************************/
 
 
-MODULE_INIT("enc_md5", EMD5)
+MODULE_INIT(EMD5)
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index fc70c68c2..7f38d8532 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -70,4 +70,4 @@ class ENone : public Module
 /* EOF */
 
 
-MODULE_INIT("enc_none", ENone)
+MODULE_INIT(ENone)
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index c70ed23b1..3da4e5155 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -421,4 +421,4 @@ class EOld : public Module
 /*************************************************************************/
 
 
-MODULE_INIT("enc_old", EOld)
+MODULE_INIT(EOld)
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index d67fd630e..398b052fb 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -274,4 +274,4 @@ class ESHA1 : public Module
 };
 
 
-MODULE_INIT("enc_sha1", ESHA1)
+MODULE_INIT(ESHA1)
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 991ecb9ea..2b36f6a89 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -71,4 +71,4 @@ class HSDel : public Module
 	}
 };
 
-MODULE_INIT("hs_del", HSDel)
+MODULE_INIT(HSDel)
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 2fe6899e6..678852cf6 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -78,4 +78,4 @@ class HSDelAll : public Module
 	}
 };
 
-MODULE_INIT("hs_delall", HSDelAll)
+MODULE_INIT(HSDelAll)
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 6c538ea40..4e6c8a3f2 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -90,4 +90,4 @@ class HSGroup : public Module
 	}
 };
 
-MODULE_INIT("hs_group", HSGroup)
+MODULE_INIT(HSGroup)
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index 5385790d5..27399726b 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -49,4 +49,4 @@ class HSHelp : public Module
 	}
 };
 
-MODULE_INIT("hs_help", HSHelp)
+MODULE_INIT(HSHelp)
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index c11a6f98a..16fd94341 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -159,4 +159,4 @@ class HSList : public Module
 	}
 };
 
-MODULE_INIT("hs_list", HSList)
+MODULE_INIT(HSList)
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 13a9c98e9..0e5695c4e 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -64,4 +64,4 @@ class HSOff : public Module
 	}
 };
 
-MODULE_INIT("hs_off", HSOff)
+MODULE_INIT(HSOff)
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 42b2d5533..e78e93c68 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -79,4 +79,4 @@ class HSOn : public Module
 	}
 };
 
-MODULE_INIT("hs_on", HSOn)
+MODULE_INIT(HSOn)
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 649115a22..26b6a1146 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -168,4 +168,4 @@ class HSSet : public Module
 	}
 };
 
-MODULE_INIT("hs_set", HSSet)
+MODULE_INIT(HSSet)
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 71ba524b3..e8a9c7dab 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -169,4 +169,4 @@ class HSSetAll : public Module
 	}
 };
 
-MODULE_INIT("hs_setall", HSSetAll)
+MODULE_INIT(HSSetAll)
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index b0450dc87..e52b21651 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -87,4 +87,4 @@ class MSCancel : public Module
 	}
 };
 
-MODULE_INIT("ms_cancel", MSCancel)
+MODULE_INIT(MSCancel)
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index beb3943d5..5b352deb1 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -104,4 +104,4 @@ class MSCheck : public Module
 	}
 };
 
-MODULE_INIT("ms_check", MSCheck)
+MODULE_INIT(MSCheck)
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index ad34b6bc8..70720c111 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -198,4 +198,4 @@ int del_memo_callback(User *u, int num, va_list args)
 		return 0;
 }
 
-MODULE_INIT("ms_del", MSDel)
+MODULE_INIT(MSDel)
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index e91269553..985558652 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -49,4 +49,4 @@ class MSHelp : public Module
 	}
 };
 
-MODULE_INIT("ms_help", MSHelp)
+MODULE_INIT(MSHelp)
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 6b96cbede..a0077e09b 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -217,4 +217,4 @@ class MSInfo : public Module
 	}
 };
 
-MODULE_INIT("ms_info", MSInfo)
+MODULE_INIT(MSInfo)
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 45ae6206f..950982ffc 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -182,4 +182,4 @@ int list_memo(User *u, int index, MemoInfo *mi, int *sent_header, int newi, cons
 	return 1;
 }
 
-MODULE_INIT("ms_list", MSList)
+MODULE_INIT(MSList)
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 5e548cddf..80af467d9 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -189,4 +189,4 @@ int read_memo(User *u, int index, MemoInfo *mi, const char *chan)
 	return 1;
 }
 
-MODULE_INIT("ms_read", MSRead)
+MODULE_INIT(MSRead)
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index c9c03b9c9..2ccc2d443 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -97,4 +97,4 @@ class MSRSend : public Module
 	}
 };
 
-MODULE_INIT("ms_rsend", MSRSend)
+MODULE_INIT(MSRSend)
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index d77088ee7..84d0141f4 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -59,4 +59,4 @@ class MSSend : public Module
 	}
 };
 
-MODULE_INIT("ms_send", MSSend)
+MODULE_INIT(MSSend)
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 2537b3438..b9636f5fb 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -80,4 +80,4 @@ class MSSendAll : public Module
 	}
 };
 
-MODULE_INIT("ms_sendall", MSSendAll)
+MODULE_INIT(MSSendAll)
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 4882a162c..e941a7f3a 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -268,4 +268,4 @@ class MSSet : public Module
 	}
 };
 
-MODULE_INIT("ms_set", MSSet)
+MODULE_INIT(MSSet)
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index b11a83555..af2e510f4 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -78,4 +78,4 @@ class MSStaff : public Module
 	}
 };
 
-MODULE_INIT("ms_staff", MSStaff)
+MODULE_INIT(MSStaff)
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 7949e3d7f..ecc918ef0 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -188,4 +188,4 @@ class NSAccess : public Module
 	}
 };
 
-MODULE_INIT("ns_access", NSAccess)
+MODULE_INIT(NSAccess)
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index 64bd06107..628b45c42 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -156,4 +156,4 @@ class NSAList : public Module
 	}
 };
 
-MODULE_INIT("ns_alist", NSAList)
+MODULE_INIT(NSAList)
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 6b8f6eeb3..db652b397 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -124,4 +124,4 @@ class NSDrop : public Module
 	}
 };
 
-MODULE_INIT("ns_drop", NSDrop)
+MODULE_INIT(NSDrop)
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 098830002..7e48e767a 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -138,4 +138,4 @@ NickAlias *makenick(const char *nick)
 	return na;
 }
 
-MODULE_INIT("ns_forbid", NSForbid)
+MODULE_INIT(NSForbid)
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 12c116568..c390e9a54 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -85,4 +85,4 @@ class NSGetEMail : public Module
 	}
 };
 
-MODULE_INIT("ns_getemail", NSGetEMail)
+MODULE_INIT(NSGetEMail)
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index c8f26bab8..55ff571bf 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -93,4 +93,4 @@ class NSGetPass : public Module
 	}
 };
 
-MODULE_INIT("ns_getpass", NSGetPass)
+MODULE_INIT(NSGetPass)
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index b17f1f894..19a4c909c 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -103,4 +103,4 @@ class NSGhost : public Module
 	}
 };
 
-MODULE_INIT("ns_ghost", NSGhost)
+MODULE_INIT(NSGhost)
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 484a44faf..ad25fc978 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -248,4 +248,4 @@ NickAlias *makealias(const char *nick, NickCore *nc)
 	return na;
 }
 
-MODULE_INIT("ns_group", NSGroup)
+MODULE_INIT(NSGroup)
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index 81d6963d9..164fa0346 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -65,4 +65,4 @@ class NSHelp : public Module
 	}
 };
 
-MODULE_INIT("ns_help", NSHelp)
+MODULE_INIT(NSHelp)
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 8eb9c661c..4025acb16 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -138,4 +138,4 @@ class NSIdentify : public Module
 	}
 };
 
-MODULE_INIT("ns_identify", NSIdentify)
+MODULE_INIT(NSIdentify)
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 6b7ced066..114f6b2e2 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -225,4 +225,4 @@ class NSInfo : public Module
 	}
 };
 
-MODULE_INIT("ns_info", NSInfo)
+MODULE_INIT(NSInfo)
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 24616edf3..77fcdbd16 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -228,4 +228,4 @@ class NSList : public Module
 	}
 };
 
-MODULE_INIT("ns_list", NSList)
+MODULE_INIT(NSList)
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 289fbae92..cb5ce25e0 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -121,4 +121,4 @@ class NSLogout : public Module
 	}
 };
 
-MODULE_INIT("ns_logout", NSLogout)
+MODULE_INIT(NSLogout)
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index bc162ae9e..45bacf206 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -122,4 +122,4 @@ class NSRecover : public Module
 	}
 };
 
-MODULE_INIT("ns_recover", NSRecover)
+MODULE_INIT(NSRecover)
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 7471f7bd9..886c879fa 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -462,4 +462,4 @@ int do_sendregmail(User *u, NickRequest *nr)
 	return 0;
 }
 
-MODULE_INIT("ns_register", NSRegister)
+MODULE_INIT(NSRegister)
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 0d34d755d..75a508aa3 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -104,4 +104,4 @@ class NSRelease : public Module
 	}
 };
 
-MODULE_INIT("ns_release", NSRelease)
+MODULE_INIT(NSRelease)
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 74472fcaa..83b91c0b9 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -591,4 +591,4 @@ public:
 	}
 };
 
-MODULE_INIT("ns_saset", NSSASet)
+MODULE_INIT(NSSASet)
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 70650deed..e8b91f919 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -107,4 +107,4 @@ class NSSendPass : public Module
 	}
 };
 
-MODULE_INIT("ns_sendpass", NSSendPass)
+MODULE_INIT(NSSendPass)
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 41c30d4e8..6b3e39d5b 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -548,4 +548,4 @@ class NSSet : public Module
 	}
 };
 
-MODULE_INIT("ns_set", NSSet)
+MODULE_INIT(NSSet)
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index b6e9f84cb..5a2e56476 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -78,4 +78,4 @@ class NSStatus : public Module
 	}
 };
 
-MODULE_INIT("ns_status", NSStatus)
+MODULE_INIT(NSStatus)
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 1c8df2bfb..3e1b5ba4f 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -192,4 +192,4 @@ class NSSuspend : public Module
 	}
 };
 
-MODULE_INIT("ns_suspend", NSSuspend)
+MODULE_INIT(NSSuspend)
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 3f0433d11..dc2de462c 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -66,4 +66,4 @@ class NSUpdate : public Module
 	}
 };
 
-MODULE_INIT("ns_update", NSUpdate)
+MODULE_INIT(NSUpdate)
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 525a1c2aa..6eb919b8d 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -399,4 +399,4 @@ int akill_list(int number, Akill *ak, User *u, int *sent_header)
 	return 1;
 }
 
-MODULE_INIT("os_akill", OSAKill)
+MODULE_INIT(OSAKill)
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index f6c67478f..42d9d061b 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -117,4 +117,4 @@ class OSChanKill : public Module
 	}
 };
 
-MODULE_INIT("os_chankill", OSChanKill)
+MODULE_INIT(OSChanKill)
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index cc7f470a0..8eb5a5f77 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -94,4 +94,4 @@ class OSChanList : public Module
 	}
 };
 
-MODULE_INIT("os_chanlist", OSChanList)
+MODULE_INIT(OSChanList)
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 8d948c9d7..26deb8ce9 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -259,4 +259,4 @@ class OSClearModes : public Module
 	}
 };
 
-MODULE_INIT("os_clearmodes", OSClearModes)
+MODULE_INIT(OSClearModes)
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index f6c0d5df8..4227bc458 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -132,4 +132,4 @@ void defcon_sendlvls(User *u)
 		notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS);
 }
 
-MODULE_INIT("os_defcon", OSDEFCON)
+MODULE_INIT(OSDEFCON)
diff --git a/src/core/os_global.c b/src/core/os_global.c
index c3e143c78..f8074687b 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -61,4 +61,4 @@ class OSGlobal : public Module
 	}
 };
 
-MODULE_INIT("os_global", OSGlobal)
+MODULE_INIT(OSGlobal)
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 30fd51bca..134376576 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -48,4 +48,4 @@ class OSHelp : public Module
 	}
 };
 
-MODULE_INIT("os_help", OSHelp)
+MODULE_INIT(OSHelp)
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 492b7dcde..82fd7762e 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -146,4 +146,4 @@ class OSIgnore : public Module
 	}
 };
 
-MODULE_INIT("os_ignore", OSIgnore)
+MODULE_INIT(OSIgnore)
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 19e5f58ee..f3910dfff 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -75,4 +75,4 @@ class OSJupe : public Module
 	}
 };
 
-MODULE_INIT("os_jupe", OSJupe)
+MODULE_INIT(OSJupe)
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index b20308b80..f56ccf211 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -80,4 +80,4 @@ class OSKick : public Module
 	}
 };
 
-MODULE_INIT("os_kick", OSKick)
+MODULE_INIT(OSKick)
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 0f3b90eb2..9077fd3f0 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -76,4 +76,4 @@ class OSMode : public Module
 	}
 };
 
-MODULE_INIT("os_mode", OSMode)
+MODULE_INIT(OSMode)
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 8ad9c6dea..291b37968 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -101,4 +101,4 @@ int showModuleCmdLoaded(CommandHash *cmdList, const char *mod_name, User *u)
 	return display;
 }
 
-MODULE_INIT("os_modinfo", OSModInfo)
+MODULE_INIT(OSModInfo)
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 4af3f5305..e0062d579 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -185,4 +185,4 @@ class OSModList : public Module
 	}
 };
 
-MODULE_INIT("os_modlist", OSModList)
+MODULE_INIT(OSModList)
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 3544e5ab6..b363a2db8 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -72,4 +72,4 @@ class OSModLoad : public Module
 	}
 };
 
-MODULE_INIT("os_modload", OSModLoad)
+MODULE_INIT(OSModLoad)
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index dd764883a..8b5bf3bf5 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -74,4 +74,4 @@ class OSModUnLoad : public Module
 	}
 };
 
-MODULE_INIT("os_modunload", OSModUnLoad)
+MODULE_INIT(OSModUnLoad)
diff --git a/src/core/os_news.c b/src/core/os_news.c
index 7db5e1103..370b82f31 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -376,4 +376,4 @@ class OSNews : public Module
 	}
 };
 
-MODULE_INIT("os_news", OSNews)
+MODULE_INIT(OSNews)
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index 0b7b02940..210671760 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -88,4 +88,4 @@ class OSNOOP : public Module
 	}
 };
 
-MODULE_INIT("os_noop", OSNOOP)
+MODULE_INIT(OSNOOP)
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 3b54a6892..634eb5327 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -82,4 +82,4 @@ class OSOLine : public Module
 	}
 };
 
-MODULE_INIT("os_oline", OSOLine)
+MODULE_INIT(OSOLine)
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 9ae3ca104..d2e6b0daf 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -64,4 +64,4 @@ class OSQuit : public Module
 	}
 };
 
-MODULE_INIT("os_quit", OSQuit)
+MODULE_INIT(OSQuit)
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index c7bf78615..4dc5eb745 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -63,4 +63,4 @@ class OSReload : public Module
 	}
 };
 
-MODULE_INIT("os_reload", OSReload)
+MODULE_INIT(OSReload)
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 4787e8d1c..c5d27c82a 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -60,4 +60,4 @@ class OSRestart : public Module
 	}
 };
 
-MODULE_INIT("os_restart", OSRestart)
+MODULE_INIT(OSRestart)
diff --git a/src/core/os_session.c b/src/core/os_session.c
index 31371811c..3c8d3963f 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -469,4 +469,4 @@ class OSSession : public Module
 	}
 };
 
-MODULE_INIT("os_session", OSSession)
+MODULE_INIT(OSSession)
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 4cca7f685..c74c275c9 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -307,4 +307,4 @@ class OSSet : public Module
 	}
 };
 
-MODULE_INIT("os_set", OSSet)
+MODULE_INIT(OSSet)
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 5d4293066..a6fac789c 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -397,4 +397,4 @@ int sgline_list_callback(SList *slist, int number, void *item, va_list args)
 	return sgline_list(number, static_cast<SXLine *>(item), u, sent_header);
 }
 
-MODULE_INIT("os_sgline", OSSGLine)
+MODULE_INIT(OSSGLine)
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index cae062ea3..05697ac37 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -65,4 +65,4 @@ class OSShutdown : public Module
 	}
 };
 
-MODULE_INIT("os_shutdown", OSShutdown)
+MODULE_INIT(OSShutdown)
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index e3d229837..da652bd42 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -382,4 +382,4 @@ int sqline_list_callback(SList *slist, int number, void *item, va_list args)
 	return sqline_list(number, static_cast<SXLine *>(item), u, sent_header);
 }
 
-MODULE_INIT("os_sqline", OSSQLine)
+MODULE_INIT(OSSQLine)
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index b8744edbc..a705ba9f0 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -91,4 +91,4 @@ class OSStaff : public Module
 	}
 };
 
-MODULE_INIT("os_staff", OSStaff)
+MODULE_INIT(OSStaff)
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index ec32e3c87..cd3d41a34 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -403,4 +403,4 @@ void get_operserv_stats(long *nrec, long *memuse)
 	*memuse = mem;
 }
 
-MODULE_INIT("os_stats", OSStats)
+MODULE_INIT(OSStats)
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index f38772593..a80eff44d 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -101,4 +101,4 @@ class OSSVSNick : public Module
 	}
 };
 
-MODULE_INIT("os_svsnick", OSSVSNick)
+MODULE_INIT(OSSVSNick)
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index cb60937f9..3b65a017e 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -381,4 +381,4 @@ int szline_list(int number, SXLine *sx, User *u, int *sent_header)
 	return 1;
 }
 
-MODULE_INIT("os_szline", OSSZLine)
+MODULE_INIT(OSSZLine)
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index edce7fbf2..48f859a68 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -87,4 +87,4 @@ class OSUMode : public Module
 	}
 };
 
-MODULE_INIT("os_umode", OSUMode)
+MODULE_INIT(OSUMode)
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 73237be86..f447cf199 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -53,4 +53,4 @@ class OSUpdate : public Module
 	}
 };
 
-MODULE_INIT("os_update", OSUpdate)
+MODULE_INIT(OSUpdate)
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 6ec8d113b..9b1e9ffe6 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -99,4 +99,4 @@ class OSUserList : public Module
 	}
 };
 
-MODULE_INIT("os_userlist", OSUserList)
+MODULE_INIT(OSUserList)
diff --git a/src/core/ss_main.c b/src/core/ss_main.c
index 7096385e1..39b98e6da 100644
--- a/src/core/ss_main.c
+++ b/src/core/ss_main.c
@@ -84,4 +84,4 @@ class SSMain : public Module
 	}
 };
 
-MODULE_INIT("ss_main", SSMain)
+MODULE_INIT(SSMain)
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index ec8bf35d3..887820ead 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -137,7 +137,7 @@ TYPE function_cast(ano_module_t symbol)
 int ModuleManager::LoadModule(const std::string &modname, User * u)
 {
 	const char *err;
-	Module *(*func)(const std::string &);
+	Module *(*func)(const std::string &, const std::string &);
 	int ret = 0;
 
 	if (modname.empty())
@@ -181,7 +181,7 @@ int ModuleManager::LoadModule(const std::string &modname, User * u)
 	}
 
 	ano_modclearerr();
-	func = function_cast<Module *(*)(const std::string &)>(dlsym(handle, "init_module"));
+	func = function_cast<Module *(*)(const std::string &, const std::string &)>(dlsym(handle, "init_module"));
 	if (func == NULL && (err = dlerror()) != NULL)
 	{
 		alog("No magical init function found, not an Anope module");
@@ -205,7 +205,7 @@ int ModuleManager::LoadModule(const std::string &modname, User * u)
 
 	try
 	{
-		m = func(nick);
+		m = func(modname, nick);
 	}
 	catch (ModuleException &ex)
 	{
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index c91d57e2e..5eda7bce6 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -231,4 +231,4 @@ class CSAppendTopic : public Module
 	}
 };
 
-MODULE_INIT("cs_appendtopic", CSAppendTopic)
+MODULE_INIT(CSAppendTopic)
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index b8bd07102..2c3a09dea 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -475,4 +475,4 @@ class CSEnforce : public Module
 	}
 };
 
-MODULE_INIT("cs_enforce", CSEnforce)
+MODULE_INIT(CSEnforce)
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 1bce0bb30..78b1b5fbf 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -224,4 +224,4 @@ int canBanUser(Channel * c, User * u, User * u2)
 	return ok;
 }
 
-MODULE_INIT("cs_tban", CSTBan)
+MODULE_INIT(CSTBan)
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index d6ecb4889..30949d9e7 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -953,4 +953,4 @@ void my_load_config()
 		alog("debug: [hs_request] Set config vars: MemoUser=%d MemoOper=%d MemoSetters=%d DBName='%s'", HSRequestMemoUser, HSRequestMemoOper, HSRequestMemoSetters, HSRequestDBName);
 }
 
-MODULE_INIT("hs_request", HSRequest)
+MODULE_INIT(HSRequest)
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 819f48265..a60db4ad7 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -171,4 +171,4 @@ void my_load_config()
 		alog("debug: [ns_maxemail] NSEmailMax set to %d", NSEmailMax);
 }
 
-MODULE_INIT("ns_maxemail", NSMaxEmail)
+MODULE_INIT(NSMaxEmail)
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index 2ff03548c..ae0127b97 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -152,4 +152,4 @@ int mLoadConfig(int argc, char **argv)
 
 /* EOF */
 
-MODULE_INIT("ns_noop_convert", NSNOOPConvert)
+MODULE_INIT(NSNOOPConvert)
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index c45b8d529..b393e5cd1 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -487,4 +487,4 @@ void fill_db_ptr(DBFile *dbptr, int version, int core_version,
 	return;
 }
 
-MODULE_INIT("os_ignore_db", OSIgnoreDB)
+MODULE_INIT(OSIgnoreDB)
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index d521bdfe3..c839e8635 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -707,4 +707,4 @@ int mLoadConfig()
 
 /*************************************************************************/
 
-MODULE_INIT("os_info", OSInfo)
+MODULE_INIT(OSInfo)
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 050d37fb0..ecbb2c530 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1087,4 +1087,4 @@ class ProtoBahamut : public Module
 
 };
 
-MODULE_INIT("bahamut", ProtoBahamut)
+MODULE_INIT(ProtoBahamut)
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 977f05f1e..38de551bf 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1406,4 +1406,4 @@ class ProtoInspIRCd : public Module
 
 };
 
-MODULE_INIT("inspircd11", ProtoInspIRCd)
+MODULE_INIT(ProtoInspIRCd)
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 517505b8e..338097f1c 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -1502,4 +1502,4 @@ class ProtoInspIRCd : public Module
 	}
 };
 
-MODULE_INIT("inspircd12", ProtoInspIRCd)
+MODULE_INIT(ProtoInspIRCd)
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index d338277e9..271ab036c 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1217,4 +1217,4 @@ class ProtoRatbox : public Module
 
 };
 
-MODULE_INIT("ratbox", ProtoRatbox)
+MODULE_INIT(ProtoRatbox)
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 6bad8959e..9adbf0ffd 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1562,4 +1562,4 @@ class ProtoUnreal : public Module
 
 };
 
-MODULE_INIT("unreal32", ProtoUnreal)
+MODULE_INIT(ProtoUnreal)