moduleAddVersion -> Module::SetVersion

moduleAddAuthor -> Module::SetAuthor


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

151 files changed, 318 insertions, 337 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 324c10778..162d321ad 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -25,8 +25,8 @@ class BSAct : public Module
 	{
 	    Command *c;
 
-	    moduleAddAuthor("Anope");
-	    moduleAddVersion("$Id$");
+	    this->SetAuthor("Anope");
+	    this->SetVersion("$Id$");
 	    this->SetType(CORE);
 	    c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1);
 	    moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index c9519ceff..b28542141 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -25,8 +25,8 @@ class BSAssign : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 4322944c1..c5b13e436 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -28,8 +28,8 @@ class BSBadwords : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1, -1, -1, -1);
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index c85a94ac4..3ec37f0a6 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -25,8 +25,8 @@ class BSBot : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("BOT", do_bot, is_services_admin, -1, -1, -1,	BOT_SERVADMIN_HELP_BOT, BOT_SERVADMIN_HELP_BOT);
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 93aabdfe7..51a65866c 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -25,8 +25,8 @@ class BSBotList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index 2c9b116a6..20e7aaeb7 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -24,8 +24,8 @@ class BSFantasy : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
 		this->AddEventHook(hook);
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index dcb8c70f4..e1e92e161 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -24,8 +24,8 @@ class BSFantasyKick : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index 156edd78d..b0514ff84 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -24,8 +24,8 @@ class BSFantasyKickBan : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index 21e86cee9..3501f6c08 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -24,8 +24,8 @@ class BSFantasyOwner : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		/* No need to load of we don't support owner */
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index a561ad4e6..5173a7695 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -24,8 +24,8 @@ class BSFantasySeen : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 522217dfc..2243cfbe1 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -24,8 +24,8 @@ class BSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index 38d348694..3be046b0f 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -26,8 +26,8 @@ class BSInfo : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index e6df8200e..fcb76b4c6 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -26,8 +26,8 @@ class BSKick : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("KICK", do_kickcmd, NULL, BOT_HELP_KICK, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 157e10c79..ae0081365 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -25,8 +25,8 @@ class BSSay : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index ef26e6eee..01919b71b 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -25,8 +25,8 @@ class BSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", do_set, NULL, BOT_HELP_SET, -1, -1, BOT_SERVADMIN_HELP_SET, BOT_SERVADMIN_HELP_SET);
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index d54687fbe..fd2708b93 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -25,8 +25,8 @@ class BSUnassign : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1, -1, -1, -1);
 		moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index bea907e51..1852fbdf0 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -28,8 +28,8 @@ class CSAccess : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion
+		this->SetAuthor("Anope");
+		this->SetVersion
 		("$Id$");
 		this->SetType(CORE);
 
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index eba591674..6685f8704 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -27,8 +27,8 @@ class CSAKick : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1);
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index ff45639bd..3b09dbe06 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -26,8 +26,8 @@ class CSBan : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1);
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 3d3e62802..87dbd358e 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -25,8 +25,8 @@ class CSClear : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1);
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index d262a617f..364895814 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -25,8 +25,8 @@ class CSDrop : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1, CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP);
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index f0f32a300..0a2791d24 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -25,8 +25,8 @@ class CSForbid : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_FORBID, CHAN_SERVADMIN_HELP_FORBID);
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index d219e2c74..1ded60092 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -25,8 +25,8 @@ class CSGetKey : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1);
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 111500582..b45c9aa1e 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -25,8 +25,8 @@ class CSGetPass : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_GETPASS, CHAN_SERVADMIN_HELP_GETPASS);
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 14b4ebf84..abc9ff42b 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -24,8 +24,8 @@ class CSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 20addcb01..51ff9568b 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -25,8 +25,8 @@ class CSIdentify : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1);
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 9fda8d7a7..1b97e8a61 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -25,8 +25,8 @@ class CSInfo : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO);
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 8575b79f5..786360f55 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -25,8 +25,8 @@ class CSInvite : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1);
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index b2c7caf50..7e913ff53 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -25,8 +25,8 @@ class CSKick : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1);
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index f205a673d..bacedbe53 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -25,8 +25,8 @@ class CSList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST);
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 79716b382..f07e5c0d0 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -26,8 +26,8 @@ class CSLogout : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT);
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 3c658042a..2069dc796 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -35,8 +35,8 @@ class CSModes : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1);
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 72be9c21d..62bd8f572 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -25,8 +25,8 @@ class CSRegister : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER, -1, -1, -1, -1);
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index ae2ebb1a6..241ad9691 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -26,8 +26,8 @@ class CSSendPass : public Module
 
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS,
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 7e0af68c8..97550542c 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -47,8 +47,8 @@ class CSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1, CHAN_SERVADMIN_HELP_SET, CHAN_SERVADMIN_HELP_SET);
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 0bfece60c..ec21364a2 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -25,8 +25,8 @@ class CSStatus : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_STATUS, CHAN_SERVADMIN_HELP_STATUS);
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index ed0e8ad9b..b5126d241 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -26,8 +26,8 @@ class CSSuspend : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_SUSPEND, CHAN_SERVADMIN_HELP_SUSPEND);
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 254afa0c3..ea36d09a3 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -25,8 +25,8 @@ class CSTopic : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1);
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 22e66365a..899d9e39b 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -89,8 +89,8 @@ class CSXOP : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index bc8df660a..d3f304487 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -388,8 +388,8 @@ class EMD5 : public Module
  public:
 	EMD5(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(ENCRYPTION);
 
 		encmodule_encrypt(md5_encrypt);
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index 4ad78e24b..16a4a812b 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -20,8 +20,8 @@ class ENone : public Module
  public:
 	ENone(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(ENCRYPTION);
 
 		encmodule_encrypt(plain_encrypt);
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index fbddf94b3..2fe9ac2d5 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -415,8 +415,8 @@ class EOld : public Module
  public:
 	EOld(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(ENCRYPTION);
 
 		encmodule_encrypt(old_encrypt);
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index 94820f0fe..1c35519fa 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -253,8 +253,8 @@ class ESHA1 : public Module
  public:
 	ESHA1(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(ENCRYPTION);
 
 		encmodule_encrypt(sha1_encrypt);
diff --git a/src/core/he_help.c b/src/core/he_help.c
index 864f4ced9..064c3424f 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -24,8 +24,8 @@ class HEHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index d372b57cd..222d355da 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -25,8 +25,8 @@ class HSDel : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1);
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 2de0360af..02e6d673f 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -25,8 +25,8 @@ class HSDelAll : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1);
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 6f2c740a1..061b5c3f3 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -28,8 +28,8 @@ class HSGroup : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1);
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index ba082af83..1ad004acc 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -24,8 +24,8 @@ class HSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 94b243bbb..967afb203 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -25,8 +25,8 @@ class HSList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("LIST", listOut, is_services_oper, -1, -1, HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST);
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 30657d850..ab0c01aa9 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -25,8 +25,8 @@ class HSOff : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1);
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 67936b3f2..b96ef6894 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -25,8 +25,8 @@ class HSOn : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1);
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 509c5ed0c..3b988a929 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -25,8 +25,8 @@ class HSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 5fbd16859..14ae197dd 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -27,8 +27,8 @@ class HSSetAll : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1);
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 5dc632019..6d86b7908 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -25,8 +25,8 @@ class MSCancel : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index ed7939125..cab1b7eae 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -25,8 +25,8 @@ class MSCheck : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index a65866c47..b6ac6261f 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -26,8 +26,8 @@ class MSDel : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index c494db1cf..1fb2847af 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -24,8 +24,8 @@ class MSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index bd4942df5..8dc4b4a4d 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -25,8 +25,8 @@ class MSInfo : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("INFO", do_info, NULL, -1, MEMO_HELP_INFO, -1, MEMO_SERVADMIN_HELP_INFO, MEMO_SERVADMIN_HELP_INFO);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 502086370..d395922c0 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -26,8 +26,8 @@ class MSList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index e4a61ff79..fc5d52ba4 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -29,8 +29,8 @@ class MSRead : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index f2e9f7e11..af61dd436 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -25,8 +25,8 @@ class MSRSend : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index c7262e76b..57b002ed8 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -25,8 +25,8 @@ class MSSend : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1, -1);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 197e21383..de0b67f07 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -25,8 +25,8 @@ class MSSendAll : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1, MEMO_HELP_SENDALL, MEMO_HELP_SENDALL);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index af3715bf1..863648a02 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -27,8 +27,8 @@ class MSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", do_set, NULL, MEMO_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 2d21fb439..b1fdd4596 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -25,8 +25,8 @@ class MSStaff : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("STAFF", do_staff, is_services_oper, -1, -1, MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF);
 		moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 886526738..19f2c1a86 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -25,8 +25,8 @@ class NSAccess : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1);
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index 19bc1dcc8..88d099430 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -25,8 +25,8 @@ class NSAList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, NICK_SERVADMIN_HELP_ALIST, NICK_SERVADMIN_HELP_ALIST);
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 0134a2b25..b34803737 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -26,8 +26,8 @@ class NSDrop : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1, NICK_SERVADMIN_HELP_DROP, NICK_SERVADMIN_HELP_DROP);
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 6252a4def..735a46dd1 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -26,8 +26,8 @@ class NSForbid : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_FORBID, NICK_SERVADMIN_HELP_FORBID);
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 089df6d6e..ff940212b 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -30,8 +30,8 @@ class NSGetEMail : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETEMAIL, NICK_SERVADMIN_HELP_GETEMAIL);
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 4112551ce..1598168ab 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -25,8 +25,8 @@ class NSGetPass : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETPASS, NICK_SERVADMIN_HELP_GETPASS);
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 5a69dac2c..c54555ff1 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -25,8 +25,8 @@ class NSGhost : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1);
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 0cf4856ce..5cec02bdf 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -32,8 +32,8 @@ class NSGroup : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, -1);
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index d363e30a6..1af5c50c4 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -24,8 +24,8 @@ class NSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 0ce50d1c4..d42da95c1 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -29,8 +29,8 @@ class NSIdentify : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1);
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index a24758919..bc32df65f 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -25,8 +25,8 @@ class NSInfo : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion
+		this->SetAuthor("Anope");
+		this->SetVersion
 		("$Id$");
 		this->SetType(CORE);
 
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index f0b60b87e..2e285fab6 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -25,8 +25,8 @@ class NSList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST);
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 414727ae2..ac448a740 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -28,8 +28,8 @@ class NSLogout : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, NICK_SERVADMIN_HELP_LOGOUT, NICK_SERVADMIN_HELP_LOGOUT);
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 4750fff95..4447df152 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -26,8 +26,8 @@ class NSRecover : public Module
  public:
 	NSRecover(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 0daf85a0e..21842bdab 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -32,8 +32,8 @@ class NSRegister : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, -1, -1, -1, -1);
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 281d3f0cd..3d2af837e 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -26,8 +26,8 @@ class NSRelease : public Module
  public:
 	NSRelease(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 4a1f0a043..9631025a6 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -40,8 +40,8 @@ class NSSASet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $");
 		this->SetType(CORE);
 
 		c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, NICK_HELP_SASET, NICK_HELP_SASET);
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 2df8b3c54..8336e9345 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -26,8 +26,8 @@ class NSSendPass : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1);
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 48dd44763..d6bd54d76 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -39,8 +39,8 @@ class NSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 09b11f3e7..a297d6ea5 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -25,8 +25,8 @@ class NSStatus : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1);
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 46f7850b4..600e362c7 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -26,8 +26,8 @@ class NSSuspend : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_SUSPEND, NICK_SERVADMIN_HELP_SUSPEND);
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index f5e880611..0588131f2 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -25,8 +25,8 @@ class NSUpdate : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1);
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 2fee6d780..bf5e982fb 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -28,8 +28,8 @@ class OSAdmin : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("ADMIN", do_admin, NULL, OPER_HELP_ADMIN, -1, -1, -1, -1);
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index ee11de529..f17cb8d5a 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -31,8 +31,8 @@ class OSAKill : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL, -1, -1, -1, -1);
 		moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 61b76c1b3..2070f2091 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -25,8 +25,8 @@ class OSChanKill : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("CHANKILL", do_chankill, is_services_admin, OPER_HELP_CHANKILL, -1, -1, -1, -1);
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index d0f386fc0..cb172fd0c 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -28,8 +28,8 @@ class OSChanList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("CHANLIST", do_chanlist, is_services_oper, OPER_HELP_CHANLIST, -1, -1, -1, -1);
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 82bfd9af1..343e03fc7 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -25,8 +25,8 @@ class OSClearModes : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion
+		this->SetAuthor("Anope");
+		this->SetVersion
 		("$Id$");
 		this->SetType(CORE);
 
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 2e9df1d9c..610310146 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -31,8 +31,8 @@ class OSDEFCON : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("DEFCON", do_defcon, is_services_admin, OPER_HELP_DEFCON, -1, -1, -1, -1);
diff --git a/src/core/os_global.c b/src/core/os_global.c
index 14829f3e8..77d42362e 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -25,8 +25,8 @@ class OSGlobal : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1);
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 4b874da4f..27e41db14 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -24,8 +24,8 @@ class OSHelp : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
 		moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index ec0e5f430..2289b5afe 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -26,8 +26,8 @@ class OSIgnore : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("IGNORE", do_ignoreuser, is_services_admin, OPER_HELP_IGNORE, -1, -1, -1, -1);
 		moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 436265f08..3a9eb2622 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -25,8 +25,8 @@ class OSJupe : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE, -1, -1, -1, -1);
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index ea94fe39b..e688d96b8 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -25,8 +25,8 @@ class OSKick : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK, -1, -1, -1, -1);
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index aa3ef2c85..e19047835 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -29,8 +29,8 @@ class OSLogonNews : public Module
 		EvtHook *hook;
 		char buf[BUFSIZE];
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		/** 
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 1153610bc..e9d6a0193 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -25,8 +25,8 @@ class OSMode : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE, -1, -1, -1, -1);
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 2a5bcd53b..946317e47 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -27,8 +27,8 @@ class OSModInfo : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1, OPER_HELP_MODINFO);
 		moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
@@ -71,8 +71,8 @@ int do_modinfo(User * u)
         strftime_lang(timebuf, sizeof(timebuf), u,
                       STRFTIME_DATE_TIME_FORMAT, &tm);
         notice_lang(s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(),
-                    m->version ? m->version : "?",
-                    m->author ? m->author : "?", timebuf);
+                    !m->version.empty() ? m->version.c_str() : "?",
+                    !m->author.empty() ? m->author.c_str() : "?", timebuf);
         for (idx = 0; idx < MAX_CMD_HASH; idx++) {
             showModuleCmdLoaded(HOSTSERV[idx], m->name.c_str(), u);
             showModuleCmdLoaded(OPERSERV[idx], m->name.c_str(), u);
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index e8786a126..5ab560982 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -25,8 +25,8 @@ class OSModList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1, OPER_HELP_MODLIST);
@@ -127,28 +127,28 @@ int do_modlist(User * u)
             case CORE:
                 if (showCore) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version, core);
+                                current->name, current->m->version.c_str(), core);
                     count++;
                 }
                 break;
             case THIRD:
                 if (showThird) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version, third);
+                                current->name, current->m->version.c_str(), third);
                     count++;
                 }
                 break;
             case PROTOCOL:
                 if (showProto) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version, proto);
+                                current->name, current->m->version.c_str(), proto);
                     count++;
                 }
                 break;
             case SUPPORTED:
                 if (showSupported) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version,
+                                current->name, current->m->version.c_str(),
                                 supported);
                     count++;
                 }
@@ -156,14 +156,14 @@ int do_modlist(User * u)
             case QATESTED:
                 if (showQA) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version, qa);
+                                current->name, current->m->version.c_str(), qa);
                     count++;
                 }
                 break;
             case ENCRYPTION:
                 if (showEnc) {
                     notice_lang(s_OperServ, u, OPER_MODULE_LIST,
-                                current->name, current->m->version, enc);
+                                current->name, current->m->version.c_str(), enc);
                     count++;
                 }
                 break;
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index dbf37ed65..41b180d04 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -25,8 +25,8 @@ class OSModLoad : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODLOAD);
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 295eea0f1..35910056d 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -26,8 +26,8 @@ class OSModUnLoad : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODUNLOAD);
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index e7a03d8cb..0c43d5b8c 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -25,8 +25,8 @@ class OSNOOP : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP, -1, -1, -1, -1);
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 04f06a228..feb2be5b6 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -25,8 +25,8 @@ class OSOLine : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("OLINE", do_operoline, is_services_root, OPER_HELP_OLINE, -1, -1, -1, -1);
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 3f353d038..7cd128719 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -28,8 +28,8 @@ class OSOper : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("OPER", do_oper, NULL, OPER_HELP_OPER, -1, -1, -1, -1);
 		c->help_param1 = s_NickServ;
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 9eb7e5081..b1b9f4483 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -29,8 +29,8 @@ class OSOperNews : public Module
 		EvtHook *hook;
 		char buf[BUFSIZE];
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		/** XXX: For some unknown reason, do_opernews is actaully defined in news.c
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 111ca19e7..5d2819ac0 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -25,8 +25,8 @@ class OSQuit : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1);
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index da64204cd..ed646ac78 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -24,8 +24,8 @@ class OSRandomNews : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion
+		this->SetAuthor("Anope");
+		this->SetVersion
 		("$Id$");
 		this->SetType(CORE);
 
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index c8ac778aa..15096bf02 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -24,8 +24,8 @@ class OSRaw : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(THIRD);
 
 		c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1, -1, -1, -1);
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index 5ef31daca..e9548c1f4 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -25,8 +25,8 @@ class OSReload : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1);
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 932bb277d..29968e3d4 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -30,8 +30,8 @@ class OSRestart : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1);
 		moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
diff --git a/src/core/os_session.c b/src/core/os_session.c
index ebc97b4c0..98b734879 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -24,8 +24,8 @@ class OSSession : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		/**
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 9664b490e..eaf2f1339 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -25,8 +25,8 @@ class OSSet : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 4de74b815..e08b91f6e 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -32,8 +32,8 @@ class OSSGLine : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SGLINE", do_sgline, is_services_oper,
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index c396c25dd..317965ba0 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -25,8 +25,8 @@ class OSShutdown : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1);
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index 2746a06a2..7d2b7f0fe 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -32,8 +32,8 @@ class OSSQLine : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SQLINE", do_sqline, is_services_oper,
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index d2fc90931..ba94e8d1a 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -28,8 +28,8 @@ class OSStaff : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1, -1, -1);
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 2d653b202..23349729a 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -28,8 +28,8 @@ class OSStats : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1);
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 9f6a1fa48..c5733aa65 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -25,8 +25,8 @@ class OSSVSNick : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SVSNICK", do_svsnick, is_services_root,
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index 472d55103..deee225a8 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -31,8 +31,8 @@ class OSSZLine : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("SZLINE", do_szline, is_services_oper,
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 1b3d14ea0..100642adc 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -25,8 +25,8 @@ class OSUMode : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("UMODE", do_operumodes, is_services_root, OPER_HELP_UMODE, -1, -1, -1, -1);
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 54fa1cdba..570b605c8 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -25,8 +25,8 @@ class OSUpdate : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1);
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index fb6231dc3..06d356858 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -30,8 +30,8 @@ class OSUserList : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1);
diff --git a/src/modules.c b/src/modules.c
index 0d964b155..891389739 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -344,8 +344,6 @@ void modules_unload_all(bool fini, bool unload_proto)
 Module::Module(const std::string &mname, const std::string &creator)
 {
 	this->name = mname;				/* Our name */
-	this->version = NULL;
-	this->author = NULL;
 	this->nickHelp = NULL;
 	this->chanHelp = NULL;
 	this->memoHelp = NULL;
@@ -376,11 +374,6 @@ Module::~Module()
 		free(this->filename);
 	}
 
-	if (this->author)
-		free(this->author);
-	if (this->version)
-		free(this->version);
-
 	if (this->handle)
 	{
 		if ((ano_modclose(this->handle)) != 0)
@@ -398,6 +391,16 @@ void Module::SetType(MODType type)
 	this->type = type;
 }
 
+void Module::SetVersion(const std::string &version)
+{
+	this->version = version;
+}
+
+void Module::SetAuthor(const std::string &author)
+{
+	this->author = author;
+}
+
 void Module::InsertLanguage(int langNumber, int ac, const char **av)
 {
     int i;
@@ -1602,28 +1605,6 @@ int destroyMessage(Message * m)
     return MOD_ERR_OK;
 }
 
-/**
- * Add the modules version info.
- * @param version the version of the current module
- **/
-void moduleAddVersion(const char *version)
-{
-    if (mod_current_module && version) {
-        mod_current_module->version = sstrdup(version);
-    }
-}
-
-/**
- * Add the modules author info
- * @param author the author of the module
- **/
-void moduleAddAuthor(const char *author)
-{
-    if (mod_current_module && author) {
-        mod_current_module->author = sstrdup(author);
-    }
-}
-
 /*******************************************************************************
  * Module Callback Functions
  *******************************************************************************/
diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index 6efa267de..b7ce00ebf 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -24,8 +24,8 @@ class BSFantasyUnban : public Module
 	{
 		EvtHook *hook;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 38c81987d..5737bdb4c 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -60,8 +60,8 @@ class CSAppendTopic : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1);
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 95805b6b9..adc79d2e3 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -39,8 +39,8 @@ class CSEnforce : public Module
 	{
 		Command *c;
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		c = createCommand("ENFORCE", my_cs_enforce, NULL, -1, -1, -1, -1, -1);
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 2ca1fa08b..f8fdb6502 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -51,8 +51,8 @@ class CSTBan : public Module
 		moduleAddHelp(c, myFullHelp);
 		moduleAddCommand(CHANSERV, c, MOD_HEAD);
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		const char* langtable_en_us[] = {
diff --git a/src/modules/demos/catserv/ircd_catserv.c b/src/modules/demos/catserv/ircd_catserv.c
index 13496de03..763ae9cec 100644
--- a/src/modules/demos/catserv/ircd_catserv.c
+++ b/src/modules/demos/catserv/ircd_catserv.c
@@ -38,8 +38,8 @@ int AnopeInit(int argc, char **argv)
         addClient(s_CatServ, "meow!");
         addMessageList();
     }
-    moduleAddAuthor(AUTHOR);
-    moduleAddVersion(VERSION);
+    this->SetAuthor(AUTHOR);
+    this->SetVersion(VERSION);
     alog("ircd_catserv.so: loaded, message status [%d]", status);
     return MOD_CONT;
 }
diff --git a/src/modules/demos/events.c b/src/modules/demos/events.c
index ba80cf03e..25dd79fb9 100644
--- a/src/modules/demos/events.c
+++ b/src/modules/demos/events.c
@@ -30,8 +30,8 @@ int AnopeInit(int argc, char **argv)
     hook = createEventHook(EVENT_BOT_FANTASY, do_moo);
     status = this->AddEventHook(hook);
     
-    moduleAddAuthor(AUTHOR);
-    moduleAddVersion(VERSION);
+    this->SetAuthor(AUTHOR);
+    this->SetVersion(VERSION);
     return MOD_CONT;
 }
 
diff --git a/src/modules/demos/hs_moo.c b/src/modules/demos/hs_moo.c
index b65e83bb6..aa8e41f7c 100644
--- a/src/modules/demos/hs_moo.c
+++ b/src/modules/demos/hs_moo.c
@@ -50,8 +50,8 @@ int AnopeInit(int argc, char **argv)							/* This will be executed when the mod
          
     moduleAddCallback("test",time(NULL)+dotime("15s"),test,0,NULL);		/* set a call-back function to exec in 3 mins time */
     moduleDelCallback("test");
-    moduleAddAuthor(AUTHOR);								/* tell Anope about the author */
-    moduleAddVersion(VERSION);								/* Tell Anope about the verison */
+    this->SetAuthor(AUTHOR);								/* tell Anope about the author */
+    this->SetVersion(VERSION);								/* Tell Anope about the verison */
 
     if(status!=MOD_ERR_OK) {
 	return MOD_STOP;
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index cd3672ef1..ad8d3b4be 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -120,8 +120,8 @@ class HSRequest : public Module
 		this->AddEventHook(hook);
 
 		moduleSetHostHelp(hs_help);
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		my_load_config();
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 20d63eb67..862bf6ab1 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -39,8 +39,8 @@ class NSMaxEmail : public Module
 		EvtHook *evt;
 		int status;
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		c = createCommand("REGISTER", my_ns_register, NULL, -1, -1, -1, -1, -1);
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index ef71a5be8..a4ccea7d0 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -66,8 +66,8 @@ class NSNOOPConvert : public Module
 	{
 		NSAutoOPDBName = NULL;
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		if (mLoadConfig(0, NULL))
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index 580129065..1d6d11ece 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -84,8 +84,8 @@ class OSIgnoreDB : public Module
 		EvtHook *hook;

 		IgnoreDB = NULL;

 

-		moduleAddAuthor(AUTHOR);

-		moduleAddVersion(VERSION);

+		this->SetAuthor(AUTHOR);

+		this->SetVersion(VERSION);

 		this->SetType(SUPPORTED);

 

 		hook = createEventHook(EVENT_RELOAD, reload_config);

diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index e36c04075..e7f46c55e 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -71,8 +71,8 @@ class OSInfo : public Module
 
 		int status;
 
-		moduleAddAuthor(AUTHOR);
-		moduleAddVersion(VERSION);
+		this->SetAuthor(AUTHOR);
+		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		if (mLoadConfig())
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index a8c03a2a4..6db1ca2bf 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1047,8 +1047,8 @@ class ProtoBahamut : public Module
  public:
 	ProtoBahamut(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 44f87da00..88a2dafbd 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1302,8 +1302,8 @@ class ProtoCharybdis : public Module
 	{
 		EvtHook *hk;
 
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id: charybdis.c 953 2006-01-14 11:36:29Z certus $");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id: charybdis.c 953 2006-01-14 11:36:29Z certus $");
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("Charybdis 1.0/1.1+");
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 3e9600c9b..34a54c6bd 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1321,8 +1321,8 @@ class ProtoInspIRCd : public Module
  public:
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("inspircdIRCd 1.1");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index dad4ccf71..8d6a43b73 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -1314,8 +1314,8 @@ class ProtoInspIRCd : public Module
  public:
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(PROTOCOL);
 
 		TS6SID = sstrdup(Numeric);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 185e68583..f9e9e7c0d 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1533,8 +1533,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    this->SetAuthor("Anope");
+    this->SetVersion("$Id$");
     this->SetType(PROTOCOL);
 
     pmodule_ircd_version("Hybrid IRCd 7.0");
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 1b79e4e48..99025bc5b 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1818,8 +1818,8 @@ int
 AnopeInit (int argc, char **argv)
 {
 
-  moduleAddAuthor ("Anope");
-  moduleAddVersion ("$Id: plexus.c 995 2006-03-01 20:19:11Z rob $");
+  this->SetAuthor ("Anope");
+  this->SetVersion ("$Id: plexus.c 995 2006-03-01 20:19:11Z rob $");
   moduleSetType (PROTOCOL);
 
   pmodule_ircd_version ("hybrid-7.2.1+plexus-3.0.0+");
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index 1fe8717e3..ffc7915e0 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1762,8 +1762,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion
+    this->SetAuthor("Anope");
+    this->SetVersion
         ("$Id$");
     this->SetType(PROTOCOL);
 
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 012d2eac9..1dd12910b 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -1642,8 +1642,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion
+    this->SetAuthor("Anope");
+    this->SetVersion
         ("$Id$");
     this->SetType(PROTOCOL);
 
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 4f77d13ae..d5947a4b4 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1675,8 +1675,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion
+    this->SetAuthor("Anope");
+    this->SetVersion
         ("$Id$");
     this->SetType(PROTOCOL);
 
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index e502b7d6b..7201096b7 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1783,8 +1783,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion
+    this->SetAuthor("Anope");
+    this->SetVersion
         ("$Id$");
     this->SetType(PROTOCOL);
 
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index 6db3598a9..eaacb2c21 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -1682,8 +1682,8 @@ void moduleAddAnopeCmds()
 int AnopeInit(int argc, char **argv)
 {
 
-    moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    this->SetAuthor("Anope");
+    this->SetVersion("$Id$");
     this->SetType(PROTOCOL);
 
     pmodule_ircd_version("ViagraIRCd 1.3.x");
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index f37ce1b92..ea29408ed 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1174,8 +1174,8 @@ class ProtoRatbox : public Module
  public:
 	ProtoRatbox(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(PROTOCOL);
 
 		if (UseTS6)
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 0bdfa9d7a..c3f0c9dfd 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1524,8 +1524,8 @@ class ProtoUnreal : public Module
  public:
 	ProtoUnreal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
-		moduleAddAuthor("Anope");
-		moduleAddVersion("$Id$");
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("UnrealIRCd 3.2+");