Moved moduleSet*Help() functions to Module::Set*Help().

Also corrected a few issues with tabs in the help lines for non-core modules caused from the space->tab conversion a while back.

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

114 files changed, 259 insertions, 308 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 87cd3d21d..11ea82071 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -31,7 +31,7 @@ class BSAct : public Module
 		c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 030a3c215..e94e7d0b3 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -31,7 +31,7 @@ class BSAssign : public Module
 		c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 3fce1698e..13f6d19c7 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -35,7 +35,7 @@ class BSBadwords : public Module
 		c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 77e1f712e..2d0b5387b 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -32,7 +32,7 @@ class BSBot : public Module
 		c = createCommand("BOT", do_bot, is_services_admin, -1, -1, -1,	BOT_SERVADMIN_HELP_BOT, BOT_SERVADMIN_HELP_BOT);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 75cbe1a90..f1c50c906 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -31,7 +31,7 @@ class BSBotList : public Module
 		c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index d3590f624..9cc5bed67 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class BSInfo : public Module
 		c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 55d230710..52d1caad1 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -48,7 +48,7 @@ class BSKick : public Module
 		c = createCommand("KICK UNDERLINES", NULL, NULL, BOT_HELP_KICK_UNDERLINES, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index a4f778257..51d654b16 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -31,7 +31,7 @@ class BSSay : public Module
 		c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 4efa9740c..fa0eb3d70 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -49,7 +49,7 @@ class BSSet : public Module
 		BOT_SERVADMIN_HELP_SET_PRIVATE);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 984026c7b..47b2a4ad2 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -31,7 +31,7 @@ class BSUnassign : public Module
 		c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1, -1, -1, -1);
 		this->AddCommand(BOTSERV, c, MOD_UNIQUE);
 
-		moduleSetBotHelp(myBotServHelp);
+		this->SetBotHelp(myBotServHelp);
 	}
 };
 
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 604761d82..5511f5093 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -39,7 +39,7 @@ class CSAccess : public Module
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 		c = createCommand("LEVELS", do_levels, NULL, CHAN_HELP_LEVELS, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index cc90381d9..dc37a500e 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -34,7 +34,7 @@ class CSAKick : public Module
 		c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 77e1b0b9b..8e226a100 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -35,7 +35,7 @@ class CSBan : public Module
 		c = createCommand("UNBAN", do_unban, NULL, CHAN_HELP_UNBAN, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 683468f58..5f730f403 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -32,7 +32,7 @@ class CSClear : public Module
 		c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 03de6f2dd..c7b627448 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -32,7 +32,7 @@ class CSDrop : public Module
 		c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1, CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index dea445073..c748029af 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -32,7 +32,7 @@ class CSForbid : public Module
 		c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_FORBID, CHAN_SERVADMIN_HELP_FORBID);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 7bf86d6d4..bb6f50dc6 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class CSGetKey : public Module
 		c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index a4ed46485..0a769ab74 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -32,7 +32,7 @@ class CSGetPass : public Module
 		c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_GETPASS, CHAN_SERVADMIN_HELP_GETPASS);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index e67b48c39..7bedc315e 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -35,7 +35,7 @@ class CSIdentify : public Module
 		c = createCommand("ID", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index c07d6ebc0..01c2cf856 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class CSInfo : public Module
 		c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index c75afc459..af7c39b53 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -32,7 +32,7 @@ class CSInvite : public Module
 		c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index a8eb7b2b3..c9b591cc9 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -32,7 +32,7 @@ class CSKick : public Module
 		c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index da2732067..967b5f0b9 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -33,7 +33,7 @@ class CSList : public Module
 
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 457fe90e3..5ee22bb34 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -33,7 +33,7 @@ class CSLogout : public Module
 		c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index e84de54bb..488844a27 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -76,7 +76,7 @@ class CSModes : public Module
 			this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 		}
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 44de7947c..4913a2df9 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -33,7 +33,7 @@ class CSRegister : public Module
 		c->help_param1 = s_NickServ;
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index d6cf929f0..8b0b1e062 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -34,7 +34,7 @@ class CSSendPass : public Module
 		-1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 
 		if (!UseMail)
 		{
@@ -101,7 +101,7 @@ int do_sendpass(User * u)
 			fprintf(mail->pipe, getstring2(founder, CHAN_SENDPASS_LINE_5),
 					NetworkName);
 			fprintf(mail->pipe, "\n.\n");
- 
+
 			MailEnd(mail);
 
 			alog("%s: %s!%s@%s used SENDPASS on %s", s_ChanServ, u->nick,
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 2861222fa..dedd4d2b1 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -98,7 +98,7 @@ class CSSet : public Module
 		c = createCommand("SET NOEXPIRE", NULL, NULL, -1, -1, -1, CHAN_SERVADMIN_HELP_SET_NOEXPIRE, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 419688611..18c2682b6 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class CSStatus : public Module
 		c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_STATUS, CHAN_SERVADMIN_HELP_STATUS);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index a1bab7c08..959b8502d 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -35,7 +35,7 @@ class CSSuspend : public Module
 		c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_UNSUSPEND, CHAN_SERVADMIN_HELP_UNSUSPEND);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index fa43bef20..86ef610a3 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -32,7 +32,7 @@ class CSTopic : public Module
 		c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index e7d73d5c7..340faf55a 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -105,7 +105,7 @@ class CSXOP : public Module
 		c = createCommand("VOP", do_vop, NULL, CHAN_HELP_VOP, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_UNIQUE);
 
-		moduleSetChanHelp(myChanServHelp);
+		this->SetChanHelp(myChanServHelp);
 	}
 };
 
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index b4f7449ae..dde6067f9 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class HSDel : public Module
 		c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index ea6b35e62..64361d166 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -32,7 +32,7 @@ class HSDelAll : public Module
 		c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index a8e077639..735ee8622 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -35,7 +35,7 @@ class HSGroup : public Module
 		c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index fe6ed7782..0eca8648a 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -31,7 +31,7 @@ class HSList : public Module
 
 		c = createCommand("LIST", listOut, is_services_oper, -1, -1, HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 0ae8caf30..b73c09301 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -32,7 +32,7 @@ class HSOff : public Module
 		c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 0f558e2dc..906ab90d3 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -32,7 +32,7 @@ class HSOn : public Module
 		c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index ab158dc84..996a0c770 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -32,7 +32,7 @@ class HSSet : public Module
 		c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
 
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 1e865cb58..3ba8139d8 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -33,7 +33,7 @@ class HSSetAll : public Module
 
 		c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1);
 		this->AddCommand(HOSTSERV, c, MOD_UNIQUE);
-		moduleSetHostHelp(myHostServHelp);
+		this->SetHostHelp(myHostServHelp);
 	}
 };
 
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 715481777..d7b6fe0e7 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSCancel : public Module
 		this->SetType(CORE);
 		c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index e656d5e3b..8d519e84b 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSCheck : public Module
 		this->SetType(CORE);
 		c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 0d0e3fe07..ab504b35e 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -31,7 +31,7 @@ class MSDel : public Module
 		this->SetType(CORE);
 		c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index a519b0beb..81d7edc96 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSInfo : public Module
 		this->SetType(CORE);
 		c = createCommand("INFO", do_info, NULL, -1, MEMO_HELP_INFO, -1, MEMO_SERVADMIN_HELP_INFO, MEMO_SERVADMIN_HELP_INFO);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index c8937134d..67bf0284d 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -31,7 +31,7 @@ class MSList : public Module
 		this->SetType(CORE);
 		c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 2760beec7..32a802d55 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -34,7 +34,7 @@ class MSRead : public Module
 		this->SetType(CORE);
 		c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 2b2f3f985..798727e89 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSRSend : public Module
 		this->SetType(CORE);
 		c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 
 		if (!MSMemoReceipt)
 			throw ModuleException("Don't like memo reciepts, or something.");
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 52d386348..a64a4e642 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSSend : public Module
 		this->SetType(CORE);
 		c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1, -1);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 7668f5009..df07d0584 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSSendAll : public Module
 		this->SetType(CORE);
 		c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1, MEMO_HELP_SENDALL, MEMO_HELP_SENDALL);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index f3d00bf8d..abdca4710 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -41,7 +41,7 @@ class MSSet : public Module
 		c->help_param1 = reinterpret_cast<char *>(static_cast<long>(MSMaxMemos));
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
 
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 3dda46217..721cde826 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -30,7 +30,7 @@ class MSStaff : public Module
 		this->SetType(CORE);
 		c = createCommand("STAFF", do_staff, is_services_oper, -1, -1, MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF);
 		this->AddCommand(MEMOSERV, c, MOD_UNIQUE);
-		moduleSetMemoHelp(myMemoServHelp);
+		this->SetMemoHelp(myMemoServHelp);
 	}
 };
 
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 7fb6ab79b..60136d164 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -32,7 +32,7 @@ class NSAccess : public Module
 		c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index d71e7d1e9..05691a4b3 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class NSAList : public Module
 		c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, NICK_SERVADMIN_HELP_ALIST, NICK_SERVADMIN_HELP_ALIST);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 77721815a..6cad48b23 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -35,7 +35,7 @@ class NSDrop : public Module
 		c = createCommand("UNLINK", do_unlink, NULL, -1, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 427a2db5c..9c838c7af 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -33,7 +33,7 @@ class NSForbid : public Module
 		c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_FORBID, NICK_SERVADMIN_HELP_FORBID);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 3089470b3..136529293 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -6,13 +6,13 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
+ * Based on the original code of Services by Andy Church.
  *
  *
- * A simple call to check for all emails that a user may have registered 
- * with. It returns the nicks that match the email you provide. Wild	 
- * Cards are not excepted. Must use user@email-host.					 
- * 
+ * A simple call to check for all emails that a user may have registered
+ * with. It returns the nicks that match the email you provide. Wild
+ * Cards are not excepted. Must use user@email-host.
+ *
  * $Id$
  *
  */
@@ -37,7 +37,7 @@ class NSGetEMail : public Module
 		c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETEMAIL, NICK_SERVADMIN_HELP_GETEMAIL);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 90af1aa5f..e4004ac95 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -32,7 +32,7 @@ class NSGetPass : public Module
 		c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETPASS, NICK_SERVADMIN_HELP_GETPASS);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 4eb825a6f..44218839c 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class NSGhost : public Module
 		c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 10cb9fee8..4dea388cd 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -48,7 +48,7 @@ class NSGroup : public Module
 		c = createCommand("LISTLINKS", do_listlinks, NULL, -1, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 19fc791bf..db70cd19b 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -41,7 +41,7 @@ class NSIdentify : public Module
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 0ce3e0894..45ce1455e 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -33,7 +33,7 @@ class NSInfo : public Module
 		c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1, NICK_HELP_INFO, NICK_SERVADMIN_HELP_INFO, NICK_SERVADMIN_HELP_INFO);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 46863e209..dcaccbcb7 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -33,7 +33,7 @@ class NSList : public Module
 
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index fa7c69d96..6d2d02b07 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -35,7 +35,7 @@ class NSLogout : public Module
 		c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, NICK_SERVADMIN_HELP_LOGOUT, NICK_SERVADMIN_HELP_LOGOUT);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
@@ -106,7 +106,7 @@ int do_logout(User * u)
 		if (u->na->nc->flags & NI_KILLPROTECT) {
 			del_ns_timeout(u->na, TO_COLLIDE);
 		}
-		
+
 		/* Send out an event */
 		send_event(EVENT_NICK_LOGOUT, 1, u2->nick);
 	}
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index c055cbf93..2334025d6 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -34,7 +34,7 @@ class NSRecover : public Module
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 		moduleAddHelp(c, myHelpResonse);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
@@ -58,7 +58,7 @@ int myHelpResonse(User * u)
 
 	/* Convert NSReleaseTimeout seconds to string format */
 	duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
-	
+
 	notice_help(s_NickServ, u, NICK_HELP_RECOVER, relstr);
 	do_help_limited(s_NickServ, u, c);
 
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index bb2e2d741..b304cb6b2 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -46,7 +46,7 @@ class NSRegister : public Module
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 28173ab36..b170e782b 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -34,7 +34,7 @@ class NSRelease : public Module
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 		moduleAddHelp(c, myHelpResonse);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
@@ -60,7 +60,7 @@ int myHelpResonse(User * u)
 
 	/* Convert NSReleaseTimeout seconds to string format */
 	duration(u->na, relstr, sizeof(relstr), NSReleaseTimeout);
-	
+
 	notice_help(s_NickServ, u, NICK_HELP_RELEASE, relstr);
 	do_help_limited(s_NickServ, u, c);
 
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 4bc2eab66..591f23c48 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -75,7 +75,7 @@ class NSSASet : public Module
 		c = createCommand("SASET LANGUAGE", NULL, is_services_oper, -1, -1, -1, -1, NICK_HELP_SASET_LANGUAGE);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index dae1562da..5478679b7 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -33,7 +33,7 @@ class NSSendPass : public Module
 		c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 		if (!UseMail)
 		{
 			throw ModuleException("Not using mail, whut.");
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 221743603..0e047431a 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -70,7 +70,7 @@ class NSSet : public Module
 		c = createCommand("SET AUTOOP", NULL, NULL, NICK_HELP_SET_AUTOOP, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index a67d12c3c..9110c360d 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class NSStatus : public Module
 		c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 4428e710e..cb2a1ad4d 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -35,7 +35,7 @@ class NSSuspend : public Module
 		c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_UNSUSPEND, NICK_SERVADMIN_HELP_UNSUSPEND);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 9c53886c1..63532772f 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -32,7 +32,7 @@ class NSUpdate : public Module
 		c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1);
 		this->AddCommand(NICKSERV, c, MOD_UNIQUE);
 
-		moduleSetNickHelp(myNickServHelp);
+		this->SetNickHelp(myNickServHelp);
 	}
 };
 
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 21905e3b5..685f5b064 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -36,7 +36,7 @@ class OSAdmin : public Module
 		c->help_param1 = s_NickServ;
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index c2c6a2d64..be8fd5695 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -37,7 +37,7 @@ class OSAKill : public Module
 		c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index a69f1c6ec..e3fc11c7a 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -32,7 +32,7 @@ class OSChanKill : public Module
 		c = createCommand("CHANKILL", do_chankill, is_services_admin, OPER_HELP_CHANKILL, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index c51d87385..41e241a21 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -35,7 +35,7 @@ class OSChanList : public Module
 		c = createCommand("CHANLIST", do_chanlist, is_services_oper, OPER_HELP_CHANLIST, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index fce9efc57..1dfb84060 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -33,7 +33,7 @@ class OSClearModes : public Module
 		c = createCommand("CLEARMODES", do_clearmodes, is_services_oper, OPER_HELP_CLEARMODES, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 69afa7bf2..96d5f9398 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -38,7 +38,7 @@ class OSDEFCON : public Module
 		c = createCommand("DEFCON", do_defcon, is_services_admin, OPER_HELP_DEFCON, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_global.c b/src/core/os_global.c
index c538d26bd..8673416b4 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -32,7 +32,7 @@ class OSGlobal : public Module
 		c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1);
 		c->help_param1 = s_GlobalNoticer;
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 088f51061..0e24325a0 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class OSIgnore : public Module
 		c = createCommand("IGNORE", do_ignoreuser, is_services_admin, OPER_HELP_IGNORE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 079ff4be1..d46cb8852 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -32,7 +32,7 @@ class OSJupe : public Module
 		c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index 26a2e7abc..e980d10d6 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -32,7 +32,7 @@ class OSKick : public Module
 		c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index 6588362de..cfde08637 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -43,7 +43,7 @@ class OSLogonNews : public Module
 		c->help_param1 = sstrdup(buf);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 
 		hook = createEventHook(EVENT_RELOAD, reload_config);
 		if (this->AddEventHook(hook) != MOD_ERR_OK)
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index b004a826e..9502af7c6 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -32,7 +32,7 @@ class OSMode : public Module
 		c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 93100c3f1..19e6b5bec 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class OSModInfo : public Module
 		c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1, OPER_HELP_MODINFO);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 85f1fe936..9e5baaded 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class OSModList : public Module
 		c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1, OPER_HELP_MODLIST);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index c48135901..69c390bf2 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class OSModLoad : public Module
 		c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODLOAD);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 6fede733b..a8943cd27 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -34,7 +34,7 @@ class OSModUnLoad : public Module
 		c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODUNLOAD);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index a5f66a747..befaf28da 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -32,7 +32,7 @@ class OSNOOP : public Module
 		c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 5f9f65fd1..f67715338 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -32,7 +32,7 @@ class OSOLine : public Module
 		c = createCommand("OLINE", do_operoline, is_services_root, OPER_HELP_OLINE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 
 		if (!ircd->omode)
 			throw ModuleException("Your IRCd does not support OMODE.");
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 6586ceae7..2228c8314 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -35,7 +35,7 @@ class OSOper : public Module
 		c->help_param1 = s_NickServ;
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 69550267e..82a93b88e 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -41,7 +41,7 @@ class OSOperNews : public Module
 		c->help_param1 = sstrdup(buf);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 
 		hook = createEventHook(EVENT_RELOAD, reload_config);
 		if (this->AddEventHook(hook) != MOD_ERR_OK)
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 9ae6b05be..8eaefbd53 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -32,7 +32,7 @@ class OSQuit : public Module
 		c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index d20b1b1fd..8023729cf 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -35,7 +35,7 @@ class OSRandomNews : public Module
 		c = createCommand("RANDOMNEWS", do_randomnews, is_services_admin, NEWS_HELP_RANDOM, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index e31c1207c..fa3fdfdfd 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -32,7 +32,7 @@ class OSReload : public Module
 		c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 537db5d3a..cf85f7b0e 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -36,7 +36,7 @@ class OSRestart : public Module
 		c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_session.c b/src/core/os_session.c
index 9a8bad41c..b3cf3a922 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -36,7 +36,7 @@ class OSSession : public Module
 		c = createCommand("EXCEPTION", do_exception, is_services_oper, OPER_HELP_EXCEPTION, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_set.c b/src/core/os_set.c
index ade3442d9..0809b02a2 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -46,7 +46,7 @@ class OSSet : public Module
 		c = createCommand("SET SUPERADMIN", NULL, NULL, OPER_HELP_SET_SUPERADMIN, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 934a8abf5..ae90d87ad 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -40,7 +40,7 @@ class OSSGLine : public Module
 		OPER_HELP_SGLINE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 
 		if (!ircd->sgline)
 			throw ModuleException("Your IRCd does not support SGLine");
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 5fa4080a6..1506ad7bc 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -32,7 +32,7 @@ class OSShutdown : public Module
 		c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index 822334f36..177def9ab 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -40,7 +40,7 @@ class OSSQLine : public Module
 		OPER_HELP_SQLINE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 		if (!ircd->sqline)
 			throw ModuleException("Your IRCd does not support QLines.");
 	}
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index c5a58121e..3dfff729f 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -35,7 +35,7 @@ class OSStaff : public Module
 		c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index d4dc8b085..b232dce77 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -37,7 +37,7 @@ class OSStats : public Module
 		c = createCommand("UPTIME", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 244500b2a..a5c644566 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -33,7 +33,7 @@ class OSSVSNick : public Module
 		OPER_HELP_SVSNICK, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 		if (!ircd->svsnick)
 			throw ModuleException("Your IRCd does not support SVSNICK");
 	}
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index b9181c135..12a83c03e 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -39,7 +39,7 @@ class OSSZLine : public Module
 		OPER_HELP_SZLINE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 		if (!ircd->szline)
 			throw ModuleException("Your IRCd does not support ZLINEs");
 	}
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index a2420fbe4..13b735e83 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -32,7 +32,7 @@ class OSUMode : public Module
 		c = createCommand("UMODE", do_operumodes, is_services_root, OPER_HELP_UMODE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 
 		if (!ircd->umode)
 			throw ModuleException("Your IRCd does not support setting umodes");
diff --git a/src/core/os_update.c b/src/core/os_update.c
index bcd20ee24..4f562f2cd 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -32,7 +32,7 @@ class OSUpdate : public Module
 		c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 318f95870..a33ce50bb 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -37,7 +37,7 @@ class OSUserList : public Module
 		c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1);
 		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
 
-		moduleSetOperHelp(myOperServHelp);
+		this->SetOperHelp(myOperServHelp);
 	}
 };
 
diff --git a/src/modules.c b/src/modules.c
index 085f77d91..64817b52b 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -991,88 +991,39 @@ int moduleAddHelp(Command * c, int (*func) (User * u))
 	return MOD_CONT;
 }
 
-/**
-  * Add output to nickserv help.
-  * when doing a /msg nickserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetNickHelp(void (*func) (User * u))
+void Module::SetNickHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->nickHelp = func;
-	}
+	this->nickHelp = func;
 }
 
-/**
-  * Add output to chanserv help.
-  * when doing a /msg chanserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetChanHelp(void (*func) (User * u))
+void Module::SetChanHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->chanHelp = func;
-	}
+	this->chanHelp = func;
 }
 
-/**
-  * Add output to memoserv help.
-  * when doing a /msg memoserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetMemoHelp(void (*func) (User * u))
+void Module::SetMemoHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->memoHelp = func;
-	}
+	this->memoHelp = func;
 }
 
-/**
-  * Add output to botserv help.
-  * when doing a /msg botserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetBotHelp(void (*func) (User * u))
+void Module::SetBotHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->botHelp = func;
-	}
+	this->botHelp = func;
 }
 
-/**
-  * Add output to operserv help.
-  * when doing a /msg operserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetOperHelp(void (*func) (User * u))
+void Module::SetOperHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->operHelp = func;
-	}
+	this->operHelp = func;
 }
 
-/**
-  * Add output to hostserv help.
-  * when doing a /msg hostserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetHostHelp(void (*func) (User * u))
+void Module::SetHostHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->hostHelp = func;
-	}
+	this->hostHelp = func;
 }
 
-/**
-  * Add output to helpserv help.
-  * when doing a /msg helpserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-  * @param func a pointer to the function which will display the code
-  **/
-void moduleSetHelpHelp(void (*func) (User * u))
+void Module::SetHelpHelp(void (*func)(User *))
 {
-	if (mod_current_module) {
-		mod_current_module->helpHelp = func;
-	}
+	this->helpHelp = func;
 }
 
 /**
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index cd8255500..8acd538e8 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -71,12 +71,12 @@ class CSAppendTopic : public Module
 		c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1);
 		this->AddCommand(CHANSERV, c, MOD_HEAD);
 		moduleAddHelp(c, my_cs_help_appendtopic);
-		moduleSetChanHelp(my_cs_help);
+		this->SetChanHelp(my_cs_help);
 
 		/* English (US) */
 		const char* langtable_en_us[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Add text to a channels topic",
+		"   APPENDTOPIC Add text to a channels topic",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"This command allows users to append text to a currently set\n"
 		"channel topic. When TOPICLOCK is on, the topic is updated and\n"
@@ -88,7 +88,7 @@ class CSAppendTopic : public Module
 		/* Dutch (NL) */
 		const char* langtable_nl[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Voeg tekst aan een kanaal onderwerp toe",
+		"   APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"Dit command stelt gebruikers in staat om text toe te voegen\n"
 		"achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n"
@@ -101,7 +101,7 @@ class CSAppendTopic : public Module
 		/* German (DE) */
 		const char* langtable_de[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Fьgt einen Text zu einem Channel-Topic hinzu.",
+		"   APPENDTOPIC Fьgt einen Text zu einem Channel-Topic hinzu.",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n"
 		"hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n"
@@ -113,7 +113,7 @@ class CSAppendTopic : public Module
 		/* Portuguese (PT) */
 		const char* langtable_pt[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Adiciona texto ao tуpico de um canal",
+		"   APPENDTOPIC Adiciona texto ao tуpico de um canal",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"Este comando permite aos usuбrios anexar texto a um tуpico de canal\n"
 		"jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n"
@@ -125,7 +125,7 @@ class CSAppendTopic : public Module
 		/* Russian (RU) */
 		const char* langtable_ru[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Добавляет текст к топику канала",
+		"   APPENDTOPIC Добавляет текст к топику канала",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"Данная команда позволяет добавить текст к топику, который установлен на указанном\n"
 		"канале. Если активирован режим TOPICLOCK, топик будет обновлен и заблокирован.\n"
@@ -137,7 +137,7 @@ class CSAppendTopic : public Module
 		/* Italian (IT) */
 		const char* langtable_it[] = {
 		/* LNG_CHAN_HELP */
-		"	 APPENDTOPIC   Aggiunge del testo al topic di un canale",
+		"   APPENDTOPIC Aggiunge del testo al topic di un canale",
 		/* LNG_CHAN_HELP_APPENDTOPIC */
 		"Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n"
 		"giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo topic\n"
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 6fa941df4..e12f0a8f3 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -51,12 +51,12 @@ class CSEnforce : public Module
 		this->AddCommand(CHANSERV, c, MOD_HEAD);
 
 		moduleAddHelp(c, my_cs_help_enforce);
-		moduleSetChanHelp(my_cs_help);
+		this->SetChanHelp(my_cs_help);
 
 		/* English (US) */
 		const char* langtable_en_us[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE	Enforce various channel modes and set options",
+		"    ENFORCE    Enforce various channel modes and set options",
 		/* LNG_ENFORCE_SYNTAX */
 		"Syntax: \002ENFORCE \037channel\037 [\037what\037]\002",
 		/* LNG_CHAN_HELP_ENFORCE */
@@ -90,7 +90,7 @@ class CSEnforce : public Module
 		/* Dutch (NL) */
 		const char* langtable_nl[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE	Forceer enkele kanaalmodes en set-opties",
+		"    ENFORCE    Forceer enkele kanaalmodes en set-opties",
 		/* LNG_ENFORCE_SYNTAX */
 		"Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002",
 		/* LNG_CHAN_HELP_ENFORCE */
@@ -126,7 +126,7 @@ class CSEnforce : public Module
 		/* German (DE) */
 		const char* langtable_de[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE   Erzwingt verschieden Modes und SET Optionen",
+		"    ENFORCE    Erzwingt verschieden Modes und SET Optionen",
 		/* LNG_ENFORCE_SYNTAX */
 		"Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002",
 		/* LNG_CHAN_HELP_ENFORCE */
@@ -159,7 +159,7 @@ class CSEnforce : public Module
 		/* Portuguese (PT) */
 		const char* langtable_pt[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE	Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas",
+		"    ENFORCE    Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas",
 		/* LNG_ENFORCE_SYNTAX */
 		"Sintaxe: \002ENFORCE \037canal\037 [\037opзгo\037]\002",
 		/* LNG_CHAN_HELP_ENFORCE */
@@ -192,7 +192,7 @@ class CSEnforce : public Module
 		/* Russian (RU) */
 		const char* langtable_ru[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE	Перепроверка и установка различных режимов и опций канала",
+		"    ENFORCE    Перепроверка и установка различных режимов и опций канала",
 		/* LNG_ENFORCE_SYNTAX */
 		"Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002",
 		/* LNG_CHAN_HELP_ENFORCE */
@@ -224,7 +224,7 @@ class CSEnforce : public Module
 		/* Italian (IT) */
 		const char* langtable_it[] = {
 		/* LNG_CHAN_HELP */
-		"	ENFORCE	Forza diversi modi di canale ed opzioni SET",
+		"    ENFORCE    Forza diversi modi di canale ed opzioni SET",
 		/* LNG_ENFORCE_SYNTAX */
 		"Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002",
 		/* LNG_CHAN_HELP_ENFORCE */
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 864f9de40..3fe294700 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -50,7 +50,7 @@ class CSTBan : public Module
 
 		me = this;
 
-		moduleSetChanHelp(myHelp);
+		this->SetChanHelp(myHelp);
 		c = createCommand("TBAN", do_tban, NULL, -1, -1, -1, -1, -1);
 		moduleAddHelp(c, myFullHelp);
 		this->AddCommand(CHANSERV, c, MOD_HEAD);
@@ -60,7 +60,7 @@ class CSTBan : public Module
 		this->SetType(SUPPORTED);
 
 		const char* langtable_en_us[] = {
-		"	TBAN	   Bans the user for a given length of time",
+		"    TBAN       Bans the user for a given length of time",
 		"Syntax: TBAN channel nick time",
 		"Bans the given user from a channel for a specified length of\n"
 		"time. If the ban is removed before by hand, it will NOT be replaced.",
@@ -68,7 +68,7 @@ class CSTBan : public Module
 		};
 
 		const char* langtable_nl[] = {
-		"	TBAN	   Verban een gebruiker voor een bepaalde tijd",
+		"    TBAN       Verban een gebruiker voor een bepaalde tijd",
 		"Syntax: TBAN kanaal nick tijd",
 		"Verbant de gegeven gebruiken van het gegeven kanaal voor de\n"
 		"gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n"
@@ -77,7 +77,7 @@ class CSTBan : public Module
 		};
 
 		const char* langtable_de[] = {
-		"	TBAN	   Bant ein User fьr eine bestimmte Zeit aus ein Channel",
+		"    TBAN       Bant ein User fьr eine bestimmte Zeit aus ein Channel",
 		"Syntax: TBAN Channel Nickname Zeit",
 		"Bant ein User fьr eine bestimmte Zeit aus ein Channel\n"
 		"Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt.",
@@ -85,7 +85,7 @@ class CSTBan : public Module
 		};
 
 		const char* langtable_pt[] = {
-		"	TBAN	   Bane o usuбrio por um determinado perнodo de tempo",
+		"    TBAN       Bane o usuбrio por um determinado perнodo de tempo",
 		"Sintaxe: TBAN canal nick tempo",
 		"Bane de um canal o usuбrio especificado por um determinado perнodo de\n"
 		"tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб recolocado.",
@@ -93,7 +93,7 @@ class CSTBan : public Module
 		};
 
 		const char* langtable_ru[] = {
-		"	TBAN	   Банит пользователя на указанный промежуток времени",
+		"    TBAN       Банит пользователя на указанный промежуток времени",
 		"Синтаксис: TBAN #канал ник время",
 		"Банит пользователя на указанный промежуток времени в секундах\n"
 		"Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n"
@@ -102,7 +102,7 @@ class CSTBan : public Module
 		};
 
 		const char* langtable_it[] = {
-		"	TBAN	   Banna l'utente per un periodo di tempo specificato",
+		"    TBAN       Banna l'utente per un periodo di tempo specificato",
 		"Sintassi: TBAN canale nick tempo",
 		"Banna l'utente specificato da un canale per un periodo di tempo\n"
 		"specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа rimpiazzato.",
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index f3046eb81..69b290eab 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -123,7 +123,7 @@ class HSRequest : public Module
 		hook = createEventHook(EVENT_DB_BACKUP, hsreqevt_db_backup);
 		this->AddEventHook(hook);
 
-		moduleSetHostHelp(hs_help);
+		this->SetHostHelp(hs_help);
 		this->SetAuthor(AUTHOR);
 		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
@@ -159,11 +159,11 @@ class HSRequest : public Module
 		/* LNG_NO_REQUEST */
 		"No request for nick %s found.",
 		/* LNG_HELP */
-		"	REQUEST	 Request a vHost for your nick",
+		"    REQUEST     Request a vHost for your nick",
 		/* LNG_HELP_SETTER */
-		"	ACTIVATE	Approve the requested vHost of a user\n"
-		"	REJECT	  Reject the requested vHost of a user\n"
-		"	WAITING	 Convenience command for LIST +req",
+		"    ACTIVATE    Approve the requested vHost of a user\n"
+		"    REJECT      Reject the requested vHost of a user\n"
+		"    WAITING     Convenience command for LIST +req",
 		/* LNG_HELP_REQUEST */
 		"Request the given vHost to be actived for your nick by the\n"
 		"network administrators. Please be patient while your request\n"
@@ -209,11 +209,11 @@ class HSRequest : public Module
 		/* LNG_NO_REQUEST */
 		"Geen aanvraag voor nick %s gevonden.",
 		/* LNG_HELP */
-		"	REQUEST	 Vraag een vHost aan voor je nick",
+		"    REQUEST     Vraag een vHost aan voor je nick",
 		/* LNG_HELP_SETTER */
-		"	ACTIVATE	Activeer de aangevraagde vHost voor een gebruiker\n"
-		"	REJECT	  Keur de aangevraagde vHost voor een gebruiker af\n"
-		"	WAITING	 Snelkoppeling naar LIST +req",
+		"    ACTIVATE    Activeer de aangevraagde vHost voor een gebruiker\n"
+		"    REJECT      Keur de aangevraagde vHost voor een gebruiker af\n"
+		"    WAITING     Snelkoppeling naar LIST +req",
 		/* LNG_HELP_REQUEST */
 		"Verzoek de gegeven vHost te activeren voor jouw nick bij de\n"
 		"netwerk beheerders. Het kan even duren voordat je aanvraag\n"
@@ -259,11 +259,11 @@ class HSRequest : public Module
 		/* LNG_NO_REQUEST */
 		"Nenhum pedido encontrado para o nick %s.",
 		/* LNG_HELP */
-		"	REQUEST	 Request a vHost for your nick",
+		"    REQUEST     Request a vHost for your nick",
 		/* LNG_HELP_SETTER */
-		"	ACTIVATE	Aprova o pedido de vHost de um usuбrio\n"
-		"	REJECT	  Recusa o pedido de vHost de um usuбrio\n"
-		"	WAITING	 Comando para LISTAR +req",
+		"    ACTIVATE    Aprova o pedido de vHost de um usuбrio\n"
+		"    REJECT      Recusa o pedido de vHost de um usuбrio\n"
+		"    WAITING     Comando para LISTAR +req",
 		/* LNG_HELP_REQUEST */
 		"Solicita a ativaзгo do vHost fornecido em seu nick pelos\n"
 		"administradores da rede. Por favor, tenha paciкncia\n"
@@ -309,11 +309,11 @@ class HSRequest : public Module
 		/* LNG_NO_REQUEST */
 		"Запрос на vHost для ника %s не найден.",
 		/* LNG_HELP */
-		"	REQUEST	 Запрос на vHost для вашего текущего ника",
+		"    REQUEST     Запрос на vHost для вашего текущего ника",
 		/* LNG_HELP_SETTER */
-		"	ACTIVATE	Утвердить запрашиваемый пользователем  vHost\n"
-		"	REJECT	  Отклонить запрашиваемый пользователем  vHost\n"
-		"	WAITING	 Список запросов ожидающих обработки (аналог LIST +req)",
+		"    ACTIVATE    Утвердить запрашиваемый пользователем  vHost\n"
+		"    REJECT      Отклонить запрашиваемый пользователем  vHost\n"
+		"    WAITING     Список запросов ожидающих обработки (аналог LIST +req)",
 		/* LNG_HELP_REQUEST */
 		"Отправляет запрос на активацию vHost, который будет рассмотрен одним из\n"
 		"администраторов сети. Просьба проявить терпение, пока запрос\n"
@@ -359,11 +359,11 @@ class HSRequest : public Module
 		/* LNG_NO_REQUEST */
 		"Nessuna richiesta trovata per il nick %s.",
 		/* LNG_HELP */
-		"	REQUEST	 Richiede un vHost per il tuo nick",
+		"    REQUEST     Richiede un vHost per il tuo nick",
 		/* LNG_HELP_SETTER */
-		"	ACTIVATE	Approva il vHost richiesto di un utente\n"
-		"	REJECT	  Rifiuta il vHost richiesto di un utente\n"
-		"	WAITING	 Comando per LIST +req",
+		"    ACTIVATE    Approva il vHost richiesto di un utente\n"
+		"    REJECT      Rifiuta il vHost richiesto di un utente\n"
+		"    WAITING     Comando per LIST +req",
 		/* LNG_HELP_REQUEST */
 		"Richiede l'attivazione del vHost specificato per il tuo nick da parte\n"
 		"degli amministratori di rete. Sei pregato di pazientare finchи la tua\n"
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index b99c4a96a..2ca248774 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -105,8 +105,8 @@ class OSInfo : public Module
 		hook = createEventHook(EVENT_RELOAD, mEventReload);
 		status = this->AddEventHook(hook);
 
-		moduleSetNickHelp(mMainNickHelp);
-		moduleSetChanHelp(mMainChanHelp);
+		this->SetNickHelp(mMainNickHelp);
+		this->SetChanHelp(mMainChanHelp);
 
 		mLoadData();
 
@@ -134,9 +134,9 @@ class OSInfo : public Module
 		"This will show up when any oper /cs info's the channel.\n"
 		"and can be used for 'tagging' channels etc....",
 		/* OINFO_HELP_CMD */
-		"	OINFO		 Add / Del an OperInfo line to a nick",
+		"    OINFO      Add / Del an OperInfo line to a nick",
 		/* OCINFO_HELP_CMD */
-		"	OINFO		 Add / Del an OperInfo line to a channel"
+		"    OINFO      Add / Del an OperInfo line to a channel"
 		};
 
 		const char* langtable_es[] = {
@@ -163,9 +163,9 @@ class OSInfo : public Module
 		"Esto se mostrara cuando cualquier operador haga /cs info canal\n"
 		"y puede ser usado para 'marcado' de canales, etc....",
 		/* OINFO_HELP_CMD */
-		"	OINFO		 Agrega / Elimina una linea OperInfo al nick",
+		"    OINFO      Agrega / Elimina una linea OperInfo al nick",
 		/* OCINFO_HELP_CMD */
-		"	OINFO		 Agrega / Elimina una linea OperInfo al canal"
+		"    OINFO      Agrega / Elimina una linea OperInfo al canal"
 		};
 
 		const char* langtable_nl[] = {
@@ -194,9 +194,9 @@ class OSInfo : public Module
 		"een oper /cs info kanaal doet voor dit kanaal, en kan worden\n"
 		"gebruikt om een kanaal te 'markeren' etc...",
 		/* OINFO_HELP_CMD */
-		"	OINFO		 Voeg een OperInfo regel toe aan een nick of verwijder deze",
+		"    OINFO      Voeg een OperInfo regel toe aan een nick of verwijder deze",
 		/* OCINFO_HELP_CMD */
-		"	OINFO		 Voeg een OperInfo regel toe aan een kanaal of verwijder deze"
+		"    OINFO         Voeg een OperInfo regel toe aan een kanaal of verwijder deze"
 		};
 
 		const char* langtable_de[] = {
@@ -223,9 +223,9 @@ class OSInfo : public Module
 		"Channel.Sie wird angezeigt wenn ein Oper mit /cs info sich\n"
 		"ьber den Channel informiert.",
 		/* OINFO_HELP_CMD */
-		"	OINFO		 Addiert / Lцscht eine OperInfo Linie zu / von einen Nicknamen",
+		"    OINFO      Addiert / Lцscht eine OperInfo Linie zu / von einen Nicknamen",
 		/* OCINFO_HELP_CMD */
-		"	OINFO		 Addiert / Lцscht eine OperInfo Linie zu / von einen Channel"
+		"    OINFO      Addiert / Lцscht eine OperInfo Linie zu / von einen Channel"
 		};
 
 		const char* langtable_pt[] = {
@@ -252,9 +252,9 @@ class OSInfo : public Module
 		"Isto serб mostrado quando qualquer Operador usar /cs info canal\n"
 		"e pode ser usado para 'etiquetar' canais etc...",
 		/* OINFO_HELP_CMD */
-		"	OINFO	  Adiciona ou Apaga a linha OperInfo para um nick",
+		"    OINFO      Adiciona ou Apaga a linha OperInfo para um nick",
 		/* OCINFO_HELP_CMD */
-		"	OINFO	  Adiciona ou Apaga a linha OperInfo para um canal"
+		"    OINFO      Adiciona ou Apaga a linha OperInfo para um canal"
 		};
 
 		const char* langtable_ru[] = {
@@ -281,9 +281,9 @@ class OSInfo : public Module
 		"которая будет показана любому оператору, запрашивающему INFO канала.\n"
 		"Может быть использована для 'пометки' каналов и т. д...",
 		/* OINFO_HELP_CMD */
-		"	OINFO	  Добавляет/Удаляет опер-инфо для ника",
+		"    OINFO      Добавляет/Удаляет опер-инфо для ника",
 		/* OCINFO_HELP_CMD */
-		"	OINFO	  Добавляет/Удаляет опер-инфо для канала"
+		"    OINFO      Добавляет/Удаляет опер-инфо для канала"
 		};
 
 		const char* langtable_it[] = {
@@ -310,9 +310,9 @@ class OSInfo : public Module
 		"Queste vengono mostrate quando un oper esegue il comando /cs info <canale>\n"
 		"e possono essere utilizzate per 'marchiare' i canali ecc...",
 		/* OINFO_HELP_CMD */
-		"	OINFO		 Aggiunge/Rimuove una linea OperInfo ad/da un nick",
+		"    OINFO      Aggiunge/Rimuove una linea OperInfo ad/da un nick",
 		/* OCINFO_HELP_CMD */
-		"	OINFO		 Aggiunge/Rimuove una linea OperInfo ad/da un canale"
+		"    OINFO      Aggiunge/Rimuove una linea OperInfo ad/da un canale"
 		};
 
 		this->InsertLanguage(LANG_EN_US, LANG_NUM_STRINGS, langtable_en_us);