Convert all the derived module constructors to take the new parameter (sed must be worshipped). They still call the base constructor the wrong way.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1577 5417fbe8-f217-4b02-8779-1006273d7864

140 files changed, 140 insertions, 140 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 19dd4456d..9aa619a3a 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSAct : public Module
 {
  public:
-	BSAct(const std::string &creator) : Module(creator)
+	BSAct(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 	    Command *c;
 
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index ee2b250e0..a8bc896b6 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSAssign : public Module
 {
  public:
-	BSAssign(const std::string &creator) : Module(creator)
+	BSAssign(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index cc7730bb7..589d37269 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -24,7 +24,7 @@ int badwords_list_callback(User * u, int num, va_list args);
 class BSBadwords : public Module
 {
  public:
-	BSBadwords(const std::string &creator) : Module(creator)
+	BSBadwords(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 11f0dd7a4..48a174cdf 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSBot : public Module
 {
  public:
-	BSBot(const std::string &creator) : Module(creator)
+	BSBot(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 669665923..15d437c7f 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSBotList : public Module
 {
  public:
-	BSBotList(const std::string &creator) : Module(creator)
+	BSBotList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index 07b157af2..0bd9c4b15 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasy : public Module
 {
  public:
-	BSFantasy(const std::string &creator) : Module(creator)
+	BSFantasy(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index 547bcada3..b15068a5a 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasyKick : public Module
 {
  public:
-	BSFantasyKick(const std::string &creator) : Module(creator)
+	BSFantasyKick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index 01b24ff7d..5ce217383 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasyKickBan : public Module
 {
  public:
-	BSFantasyKickBan(const std::string &creator) : Module(creator)
+	BSFantasyKickBan(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index f71ff26a1..4dc459e85 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasyOwner : public Module
 {
  public:
-	BSFantasyOwner(const std::string &creator) : Module(creator)
+	BSFantasyOwner(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index 0098ab4b0..dfdd88d0f 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasySeen : public Module
 {
  public:
-	BSFantasySeen(const std::string &creator) : Module(creator)
+	BSFantasySeen(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 322c05e01..3d05872aa 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class BSHelp : public Module
 {
  public:
-	BSHelp(const std::string &creator) : Module(creator)
+	BSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index 8729fe16e..125fd18e1 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -22,7 +22,7 @@ void myBotServHelp(User * u);
 class BSInfo : public Module
 {
  public:
-	BSInfo(const std::string &creator) : Module(creator)
+	BSInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index f1339e4ab..295f96210 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -22,7 +22,7 @@ void myBotServHelp(User * u);
 class BSKick : public Module
 {
  public:
-	BSKick(const std::string &creator) : Module(creator)
+	BSKick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 540a5547b..335c5d5a5 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSSay : public Module
 {
  public:
-	BSSay(const std::string &creator) : Module(creator)
+	BSSay(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index a98c6efe4..2eaf8a18f 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSSet : public Module
 {
  public:
-	BSSet(const std::string &creator) : Module(creator)
+	BSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 4f921e107..1b77f256c 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -21,7 +21,7 @@ void myBotServHelp(User * u);
 class BSUnassign : public Module
 {
  public:
-	BSUnassign(const std::string &creator) : Module(creator)
+	BSUnassign(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index d89ecfd4e..6adea8cd1 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -24,7 +24,7 @@ void myChanServHelp(User * u);
 class CSAccess : public Module
 {
  public:
-	CSAccess(const std::string &creator) : Module(creator)
+	CSAccess(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index cefd85187..2f442ea3f 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -23,7 +23,7 @@ int get_access_nc(NickCore *nc, ChannelInfo *ci);
 class CSAKick : public Module
 {
  public:
-	CSAKick(const std::string &creator) : Module(creator)
+	CSAKick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index fe02f5115..b02a63876 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -22,7 +22,7 @@ void myChanServHelp(User * u);
 class CSBan : public Module
 {
  public:
-	CSBan(const std::string &creator) : Module(creator)
+	CSBan(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 274056c55..be54d7d9b 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSClear : public Module
 {
  public:
-	CSClear(const std::string &creator) : Module(creator)
+	CSClear(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index ce37b76ce..81319fdae 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSDrop : public Module
 {
  public:
-	CSDrop(const std::string &creator) : Module(creator)
+	CSDrop(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index f8015177e..af1ce6843 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSForbid : public Module
 {
  public:
-	CSForbid(const std::string &creator) : Module(creator)
+	CSForbid(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 846c4146f..3846ff2ed 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSGetKey : public Module
 {
  public:
-	CSGetKey(const std::string &creator) : Module(creator)
+	CSGetKey(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 0275c3516..de727302a 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSGetPass : public Module
 {
  public:
-	CSGetPass(const std::string &creator) : Module(creator)
+	CSGetPass(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index b71b4e204..2aab58a4a 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class CSHelp : public Module
 {
  public:
-	CSHelp(const std::string &creator) : Module(creator)
+	CSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index dbfc0700c..8fdf08816 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSIdentify : public Module
 {
  public:
-	CSIdentify(const std::string &creator) : Module(creator)
+	CSIdentify(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 1ecb46bfb..c84ea13b8 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSInfo : public Module
 {
  public:
-	CSInfo(const std::string &creator) : Module(creator)
+	CSInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index ab70e00d8..c7d5191c6 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -21,7 +21,7 @@ int do_invite(User * u);
 class CSInvite : public Module
 {
  public:
-	CSInvite(const std::string &creator) : Module(creator)
+	CSInvite(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 06e29facc..680eb4d63 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSKick : public Module
 {
  public:
-	CSKick(const std::string &creator) : Module(creator)
+	CSKick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 44d32c9ea..08911b651 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSList : public Module
 {
  public:
-	CSList(const std::string &creator) : Module(creator)
+	CSList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index b785a27c7..8a490fd98 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -22,7 +22,7 @@ void make_unidentified(User * u, ChannelInfo * ci);
 class CSLogout : public Module
 {
  public:
-	CSLogout(const std::string &creator) : Module(creator)
+	CSLogout(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 183b9bde9..fe1530339 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -31,7 +31,7 @@ int do_deowner(User * u);
 class CSModes : public Module
 {
  public:
-	CSModes(const std::string &creator) : Module(creator)
+	CSModes(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 5935c3881..25cbdc535 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSRegister : public Module
 {
  public:
-	CSRegister(const std::string &creator) : Module(creator)
+	CSRegister(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index bd6aa57ec..fea70c1b0 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSSendPass : public Module
 {
  public:
-	CSSendPass(const std::string &creator) : Module(creator)
+	CSSendPass(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 
 		Command *c;
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 4eacd75b2..af259cf77 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -43,7 +43,7 @@ void myChanServHelp(User * u);
 class CSSet : public Module
 {
  public:
-	CSSet(const std::string &creator) : Module(creator)
+	CSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 6eb50155c..dd11e1250 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSStatus : public Module
 {
  public:
-	CSStatus(const std::string &creator) : Module(creator)
+	CSStatus(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 7ca78294f..0a1f2f26c 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -22,7 +22,7 @@ void myChanServHelp(User * u);
 class CSSuspend : public Module
 {
  public:
-	CSSuspend(const std::string &creator) : Module(creator)
+	CSSuspend(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 5596c0d99..8333661f6 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -21,7 +21,7 @@ void myChanServHelp(User * u);
 class CSTopic : public Module
 {
  public:
-	CSTopic(const std::string &creator) : Module(creator)
+	CSTopic(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 55edaba42..beaa1f05c 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -85,7 +85,7 @@ int xop_msgs[4][14] = {
 class CSXOP : public Module
 {
  public:
-	CSXOP(const std::string &creator) : Module(creator)
+	CSXOP(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index b6f51096f..393fdaa9e 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -386,7 +386,7 @@ int md5_check_password(const char *plaintext, const char *password)
 class EMD5 : public Module
 {
  public:
-	EMD5(const std::string &creator) : Module(creator)
+	EMD5(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index 7e087e3aa..f6705b2b4 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -18,7 +18,7 @@ int plain_check_password(const char *plaintext, const char *password);
 class ENone : public Module
 {
  public:
-	ENone(const std::string &creator) : Module(creator)
+	ENone(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index 06eda7ac9..aadd4a5c8 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -413,7 +413,7 @@ int old_decrypt(const char *src, char *dest, int size)
 class EOld : public Module
 {
  public:
-	EOld(const std::string &creator) : Module(creator)
+	EOld(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index 1da6f3c01..af3acd5e8 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -251,7 +251,7 @@ int sha1_check_password(const char *plaintext, const char *password)
 class ESHA1 : public Module
 {
  public:
-	ESHA1(const std::string &creator) : Module(creator)
+	ESHA1(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/he_help.c b/src/core/he_help.c
index 1f172d822..6482bc1bc 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class HEHelp : public Module
 {
  public:
-	HEHelp(const std::string &creator) : Module(creator)
+	HEHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index f548276e5..7c8ff627b 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSDel : public Module
 {
  public:
-	HSDel(const std::string &creator) : Module(creator)
+	HSDel(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 8976b4338..8feb4fa6a 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSDelAll : public Module
 {
  public:
-	HSDelAll(const std::string &creator) : Module(creator)
+	HSDelAll(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 8faf79b58..ca7948eb8 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -24,7 +24,7 @@ extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
 class HSGroup : public Module
 {
  public:
-	HSGroup(const std::string &creator) : Module(creator)
+	HSGroup(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index f666d13cb..5166f0efc 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class HSHelp : public Module
 {
  public:
-	HSHelp(const std::string &creator) : Module(creator)
+	HSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 260604e30..8fd628237 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSList : public Module
 {
  public:
-	HSList(const std::string &creator) : Module(creator)
+	HSList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index c391dd937..caf8fb8cb 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSOff : public Module
 {
  public:
-	HSOff(const std::string &creator) : Module(creator)
+	HSOff(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 4c76cccb3..a6489d693 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSOn : public Module
 {
  public:
-	HSOn(const std::string &creator) : Module(creator)
+	HSOn(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 11ef79544..a2a19ed2b 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -21,7 +21,7 @@ void myHostServHelp(User * u);
 class HSSet : public Module
 {
  public:
-	HSSet(const std::string &creator) : Module(creator)
+	HSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index a9d3b1eba..551eee68d 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -23,7 +23,7 @@ extern int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
 class HSSetAll : public Module
 {
  public:
-	HSSetAll(const std::string &creator) : Module(creator)
+	HSSetAll(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index ac6ea0c43..cfe6872ae 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSCancel : public Module
 {
  public:
-	MSCancel(const std::string &creator) : Module(creator)
+	MSCancel(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index 240d0d92a..928a6a1f4 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSCheck : public Module
 {
  public:
-	MSCheck(const std::string &creator) : Module(creator)
+	MSCheck(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index fcfe4b7bc..beb19cdf3 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -22,7 +22,7 @@ void myMemoServHelp(User * u);
 class MSDel : public Module
 {
  public:
-	MSDel(const std::string &creator) : Module(creator)
+	MSDel(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index 16b3af0e2..73455f033 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class MSHelp : public Module
 {
  public:
-	MSHelp(const std::string &creator) : Module(creator)
+	MSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index b0b58bb51..427d809e3 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSInfo : public Module
 {
  public:
-	MSInfo(const std::string &creator) : Module(creator)
+	MSInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index de5ded4b2..ed6915c31 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -22,7 +22,7 @@ void myMemoServHelp(User * u);
 class MSList : public Module
 {
  public:
-	MSList(const std::string &creator) : Module(creator)
+	MSList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 0e6cb6378..bb92a7c61 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -25,7 +25,7 @@ extern void rsend_notify(User * u, Memo * m, const char *chan);
 class MSRead : public Module
 {
  public:
-	MSRead(const std::string &creator) : Module(creator)
+	MSRead(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 19d690fc3..c9399ce6b 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSRSend : public Module
 {
  public:
-	MSRSend(const std::string &creator) : Module(creator)
+	MSRSend(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 2dfc7255c..8bfd59c7f 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSSend : public Module
 {
  public:
-	MSSend(const std::string &creator) : Module(creator)
+	MSSend(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 39c99bf41..f8dc8f7e5 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSSendAll : public Module
 {
  public:
-	MSSendAll(const std::string &creator) : Module(creator)
+	MSSendAll(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index c18878754..53d64584c 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -23,7 +23,7 @@ void myMemoServHelp(User * u);
 class MSSet : public Module
 {
  public:
-	MSSet(const std::string &creator) : Module(creator)
+	MSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 650992a61..dbb22f90b 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -21,7 +21,7 @@ void myMemoServHelp(User * u);
 class MSStaff : public Module
 {
  public:
-	MSStaff(const std::string &creator) : Module(creator)
+	MSStaff(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index ba24e2a28..2d4184d82 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSAccess : public Module
 {
  public:
-	NSAccess(const std::string &creator) : Module(creator)
+	NSAccess(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index 2eb3c8aab..9671dc8ff 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSAList : public Module
 {
  public:
-	NSAList(const std::string &creator) : Module(creator)
+	NSAList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index d5b75d983..e03f3ed0e 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -22,7 +22,7 @@ void myNickServHelp(User * u);
 class NSDrop : public Module
 {
  public:
-	NSDrop(const std::string &creator) : Module(creator)
+	NSDrop(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index de76ac313..06eb610ca 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -22,7 +22,7 @@ NickAlias *makenick(const char *nick);
 class NSForbid : public Module
 {
  public:
-	NSForbid(const std::string &creator) : Module(creator)
+	NSForbid(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 62af6118a..9da3525c3 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -26,7 +26,7 @@ void myNickServHelp(User * u);
 class NSGetEMail : public Module
 {
  public:
-	NSGetEMail(const std::string &creator) : Module(creator)
+	NSGetEMail(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index ccca44203..b8f256b00 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSGetPass : public Module
 {
  public:
-	NSGetPass(const std::string &creator) : Module(creator)
+	NSGetPass(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 91bfb825f..553a58e2c 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSGhost : public Module
 {
  public:
-	NSGhost(const std::string &creator) : Module(creator)
+	NSGhost(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index f5b70438b..6dae1dd9b 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -28,7 +28,7 @@ int do_link(User * u);
 class NSGroup : public Module
 {
  public:
-	NSGroup(const std::string &creator) : Module(creator)
+	NSGroup(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index dfe9a8412..13cf0e51a 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class NSHelp : public Module
 {
  public:
-	NSHelp(const std::string &creator) : Module(creator)
+	NSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index ec432bee0..c6922109b 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -25,7 +25,7 @@ void myNickServHelp(User * u);
 class NSIdentify : public Module
 {
  public:
-	NSIdentify(const std::string &creator) : Module(creator)
+	NSIdentify(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 29998e369..f93fe47d5 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSInfo : public Module
 {
  public:
-	NSInfo(const std::string &creator) : Module(creator)
+	NSInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 4bc71c47c..fcf3c3de0 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSList : public Module
 {
  public:
-	NSList(const std::string &creator) : Module(creator)
+	NSList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 5d9c358fd..e0b85312d 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -24,7 +24,7 @@ void myNickServHelp(User * u);
 class NSLogout : public Module
 {
  public:
-	NSLogout(const std::string &creator) : Module(creator)
+	NSLogout(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index a4bc90e25..70778a10a 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -24,7 +24,7 @@ int myHelpResonse(User * u);
 class NSRecover : public Module
 {
  public:
-	NSRecover(const std::string &creator) : Module(creator)
+	NSRecover(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 4ca011b3b..865d33158 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -28,7 +28,7 @@ int ns_do_register(User * u);
 class NSRegister : public Module
 {
  public:
-	NSRegister(const std::string &creator) : Module(creator)
+	NSRegister(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 6d6d7fce3..5acfa7ab4 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -24,7 +24,7 @@ int myHelpResonse(User * u);
 class NSRelease : public Module
 {
  public:
-	NSRelease(const std::string &creator) : Module(creator)
+	NSRelease(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 8d59de4ed..a084aefe0 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -36,7 +36,7 @@ void myNickServHelp(User * u);
 class NSSASet : public Module
 {
  public:
-	NSSASet(const std::string &creator) : Module(creator)
+	NSSASet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 9b8623ee6..822efbfad 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -22,7 +22,7 @@ void myNickServHelp(User * u);
 class NSSendPass : public Module
 {
  public:
-	NSSendPass(const std::string &creator) : Module(creator)
+	NSSendPass(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index d9b61d57b..fc8d64e77 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -35,7 +35,7 @@ void myNickServHelp(User * u);
 class NSSet : public Module
 {
  public:
-	NSSet(const std::string &creator) : Module(creator)
+	NSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 0d5e2a6e3..c35584e7c 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSStatus : public Module
 {
  public:
-	NSStatus(const std::string &creator) : Module(creator)
+	NSStatus(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index f16b49c14..ecb8ad3af 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -22,7 +22,7 @@ void myNickServHelp(User * u);
 class NSSuspend : public Module
 {
  public:
-	NSSuspend(const std::string &creator) : Module(creator)
+	NSSuspend(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 0374fafed..d2cdeadd6 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -21,7 +21,7 @@ void myNickServHelp(User * u);
 class NSUpdate : public Module
 {
  public:
-	NSUpdate(const std::string &creator) : Module(creator)
+	NSUpdate(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index b2d9716fc..784592db7 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -24,7 +24,7 @@ void myOperServHelp(User * u);
 class OSAdmin : public Module
 {
  public:
-	OSAdmin(const std::string &creator) : Module(creator)
+	OSAdmin(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 95337366b..33cee3460 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -27,7 +27,7 @@ void myOperServHelp(User * u);
 class OSAKill : public Module
 {
  public:
-	OSAKill(const std::string &creator) : Module(creator)
+	OSAKill(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 87882cff3..c264978ba 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSChanKill : public Module
 {
  public:
-	OSChanKill(const std::string &creator) : Module(creator)
+	OSChanKill(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 63cae7c3e..6ad3e4a38 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -24,7 +24,7 @@ extern MDE int anope_get_private_mode();
 class OSChanList : public Module
 {
  public:
-	OSChanList(const std::string &creator) : Module(creator)
+	OSChanList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 8ad69ba62..1834a7d50 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSClearModes : public Module
 {
  public:
-	OSClearModes(const std::string &creator) : Module(creator)
+	OSClearModes(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 40a734422..907941ad8 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -27,7 +27,7 @@ void myOperServHelp(User * u);
 class OSDEFCON : public Module
 {
  public:
-	OSDEFCON(const std::string &creator) : Module(creator)
+	OSDEFCON(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_global.c b/src/core/os_global.c
index 8f4adeac6..548f84f17 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSGlobal : public Module
 {
  public:
-	OSGlobal(const std::string &creator) : Module(creator)
+	OSGlobal(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 74969421c..7bb8a9087 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -20,7 +20,7 @@ int do_help(User * u);
 class OSHelp : public Module
 {
  public:
-	OSHelp(const std::string &creator) : Module(creator)
+	OSHelp(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index f854217f5..9a1ab8ee9 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -22,7 +22,7 @@ int do_ignoreuser(User * u);
 class OSIgnore : public Module
 {
  public:
-	OSIgnore(const std::string &creator) : Module(creator)
+	OSIgnore(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index a3bebc413..edb9e65ef 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSJupe : public Module
 {
  public:
-	OSJupe(const std::string &creator) : Module(creator)
+	OSJupe(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index cbcc6980b..a838c7ff5 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSKick : public Module
 {
  public:
-	OSKick(const std::string &creator) : Module(creator)
+	OSKick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index 279102e49..28d5ad359 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -24,7 +24,7 @@ int reload_config(int argc, char **argv);
 class OSLogonNews : public Module
 {
  public:
-	OSLogonNews(const std::string &creator) : Module(creator)
+	OSLogonNews(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 		char buf[BUFSIZE];
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index a7fd119a1..4ea52d622 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSMode : public Module
 {
  public:
-	OSMode(const std::string &creator) : Module(creator)
+	OSMode(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 4c3a80d85..27e887b3e 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -23,7 +23,7 @@ int showModuleCmdLoaded(CommandHash * cmdList, char *mod_name, User * u);
 class OSModInfo : public Module
 {
  public:
-	OSModInfo(const std::string &creator) : Module(creator)
+	OSModInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 71291cf8e..02029b2cb 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSModList : public Module
 {
  public:
-	OSModList(const std::string &creator) : Module(creator)
+	OSModList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index ae590e070..688e409fb 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSModLoad : public Module
 {
  public:
-	OSModLoad(const std::string &creator) : Module(creator)
+	OSModLoad(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 3bcc10ef4..a9a98b545 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -22,7 +22,7 @@ void myOperServHelp(User * u);
 class OSModUnLoad : public Module
 {
  public:
-	OSModUnLoad(const std::string &creator) : Module(creator)
+	OSModUnLoad(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index 3efea03f2..0dbaa6a45 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSNOOP : public Module
 {
  public:
-	OSNOOP(const std::string &creator) : Module(creator)
+	OSNOOP(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 2b00b85cf..aba12d027 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSOLine : public Module
 {
  public:
-	OSOLine(const std::string &creator) : Module(creator)
+	OSOLine(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index c161436d5..1a810bc21 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -24,7 +24,7 @@ void myOperServHelp(User * u);
 class OSOper : public Module
 {
  public:
-	OSOper(const std::string &creator) : Module(creator)
+	OSOper(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 53431f603..9e5958dbd 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -24,7 +24,7 @@ int reload_config(int argc, char **argv);
 class OSOperNews : public Module
 {
  public:
-	OSOperNews(const std::string &creator) : Module(creator)
+	OSOperNews(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 		char buf[BUFSIZE];
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 86c34d3f3..57e85ca3d 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSQuit : public Module
 {
  public:
-	OSQuit(const std::string &creator) : Module(creator)
+	OSQuit(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index 442b8d712..4288b4d60 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -20,7 +20,7 @@ void myOperServHelp(User * u);
 class OSRandomNews : public Module
 {
  public:
-	OSRandomNews(const std::string &creator) : Module(creator)
+	OSRandomNews(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index f7ca0116b..4424f1717 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -20,7 +20,7 @@ int do_raw(User * u);
 class OSRaw : public Module
 {
  public:
-	OSRaw(const std::string &creator) : Module(creator)
+	OSRaw(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index e416cb883..ccc67c62e 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSReload : public Module
 {
  public:
-	OSReload(const std::string &creator) : Module(creator)
+	OSReload(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index c6d10270d..6aa508b2b 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -26,7 +26,7 @@ void myOperServHelp(User * u);
 class OSRestart : public Module
 {
  public:
-	OSRestart(const std::string &creator) : Module(creator)
+	OSRestart(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_session.c b/src/core/os_session.c
index d18b28abc..a943c9201 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -20,7 +20,7 @@ void myOperServHelp(User * u);
 class OSSession : public Module
 {
  public:
-	OSSession(const std::string &creator) : Module(creator)
+	OSSession(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 2d4afc1b8..e73f2c9fc 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSSet : public Module
 {
  public:
-	OSSet(const std::string &creator) : Module(creator)
+	OSSet(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index fe5635822..6e3ea9739 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -28,7 +28,7 @@ void myOperServHelp(User * u);
 class OSSGLine : public Module
 {
  public:
-	OSSGLine(const std::string &creator) : Module(creator)
+	OSSGLine(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index c7df991e1..0f920f427 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSShutdown : public Module
 {
  public:
-	OSShutdown(const std::string &creator) : Module(creator)
+	OSShutdown(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index 78c4ad1d8..0cd978f88 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -28,7 +28,7 @@ void myOperServHelp(User * u);
 class OSSQLine : public Module
 {
  public:
-	OSSQLine(const std::string &creator) : Module(creator)
+	OSSQLine(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index cb46f6773..03fa37cef 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -24,7 +24,7 @@ int opers_list(int number, NickCore * nc, User * u, char *level);
 class OSStaff : public Module
 {
  public:
-	OSStaff(const std::string &creator) : Module(creator)
+	OSStaff(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index c4bca5a70..6016878fe 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -24,7 +24,7 @@ void myOperServHelp(User * u);
 class OSStats : public Module
 {
  public:
-	OSStats(const std::string &creator) : Module(creator)
+	OSStats(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 5857067f1..c1fb201d8 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSSVSNick : public Module
 {
  public:
-	OSSVSNick(const std::string &creator) : Module(creator)
+	OSSVSNick(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index f3dc2356b..1e4b0c747 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -27,7 +27,7 @@ int szline_list(int number, SXLine * sx, User * u, int *sent_header);
 class OSSZLine : public Module
 {
  public:
-	OSSZLine(const std::string &creator) : Module(creator)
+	OSSZLine(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index c7046d41c..8064f4c75 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSUMode : public Module
 {
  public:
-	OSUMode(const std::string &creator) : Module(creator)
+	OSUMode(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 657e7b56b..bd9e65e0d 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -21,7 +21,7 @@ void myOperServHelp(User * u);
 class OSUpdate : public Module
 {
  public:
-	OSUpdate(const std::string &creator) : Module(creator)
+	OSUpdate(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index e92ca9307..d1da5e342 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -26,7 +26,7 @@ void myOperServHelp(User * u);
 class OSUserList : public Module
 {
  public:
-	OSUserList(const std::string &creator) : Module(creator)
+	OSUserList(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index c7be90e8a..195edb388 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -20,7 +20,7 @@ int do_fantasy(int argc, char **argv);
 class BSFantasyUnban : public Module
 {
  public:
-	BSFantasyUnban(const std::string &creator) : Module(creator)
+	BSFantasyUnban(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;
 
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 59f815286..b686730eb 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -56,7 +56,7 @@ void my_add_languages(void);
 class CSAppendTopic : public Module
 {
  public:
-	CSAppendTopic(const std::string &creator) : Module(creator)
+	CSAppendTopic(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index c19e44baf..642334fce 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -35,7 +35,7 @@ void my_add_languages(void);
 class CSEnforce : public Module
 {
  public:
-	CSEnforce(const std::string &creator) : Module(creator)
+	CSEnforce(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 729ad4ba1..dfe0a91c3 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -42,7 +42,7 @@ void mAddLanguages(void);
 class CSTBan : public Module
 {
  public:
-	CSTBan(const std::string &creator) : Module(creator)
+	CSTBan(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index f6e10f285..73c8c3285 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -86,7 +86,7 @@ HostCore *hs_request_head;
 class HSRequest : public Module
 {
  public:
-	HSRequest(const std::string &creator) : Module(creator)
+	HSRequest(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 		EvtHook *hook;
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 06daa6f12..a485803c1 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -33,7 +33,7 @@ int NSEmailMax = 0;
 class NSMaxEmail : public Module
 {
  public:
-	NSMaxEmail(const std::string &creator) : Module(creator)
+	NSMaxEmail(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 		EvtHook *evt;
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index 638b3117c..e2a5bc40b 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -62,7 +62,7 @@ void m_AddLanguages(void);
 class NSNOOPConvert : public Module
 {
  public:
-	NSNOOPConvert(const std::string &creator) : Module(creator)
+	NSNOOPConvert(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		NSAutoOPDBName = NULL;
 
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index 076375432..c3301d66c 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -79,7 +79,7 @@ int reload_config(int argc, char **argv);
 class OSIgnoreDB : public Module
 {
  public:
-	OSIgnoreDB(const std::string &creator) : Module(creator)
+	OSIgnoreDB(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hook;

 		IgnoreDB = NULL;

diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 268a3ceb1..f46137a67 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -64,7 +64,7 @@ int mEventReload(int argc, char **argv);
 class OSInfo : public Module
 {
  public:
-	OSInfo(const std::string &creator) : Module(creator)
+	OSInfo(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		Command *c;
 		EvtHook *hook = NULL;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index f14d0be03..5d86c4093 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1045,7 +1045,7 @@ void moduleAddIRCDMsgs(void) {
 class ProtoBahamut : public Module
 {
  public:
-	ProtoBahamut(const std::string &creator) : Module(creator)
+	ProtoBahamut(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 50ca6e07e..119bbfa08 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1298,7 +1298,7 @@ void moduleAddIRCDMsgs(void)
 class ProtoCharybdis : public Module
 {
  public:
-	ProtoCharybdis(const std::string &creator) : Module(creator)
+	ProtoCharybdis(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		EvtHook *hk;
 
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 70bef0c9d..bd8a2b003 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1319,7 +1319,7 @@ void moduleAddIRCDMsgs(void) {
 class ProtoInspIRCd : public Module
 {
  public:
-	ProtoInspIRCd(const std::string &creator) : Module(creator)
+	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 6e368ff40..8132c679d 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -1312,7 +1312,7 @@ void moduleAddIRCDMsgs(void) {
 class ProtoInspIRCd : public Module
 {
  public:
-	ProtoInspIRCd(const std::string &creator) : Module(creator)
+	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index c1fcda452..fbb61a82f 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1172,7 +1172,7 @@ void moduleAddIRCDMsgs(void)
 class ProtoRatbox : public Module
 {
  public:
-	ProtoRatbox(const std::string &creator) : Module(creator)
+	ProtoRatbox(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 57cbb7345..7d77188fa 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1522,7 +1522,7 @@ void moduleAddIRCDMsgs(void) {
 class ProtoUnreal : public Module
 {
  public:
-	ProtoUnreal(const std::string &creator) : Module(creator)
+	ProtoUnreal(const std::string &modname, const std::string &creator) : Module(creator)
 	{
 		moduleAddAuthor("Anope");
 		moduleAddVersion("$Id$");