SVSJOIN, SVSPART, CTCP, svid_umode*, unregistered nickchange func renames

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

20 files changed, 157 insertions, 157 deletions

diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 641b500d1..f41f0e8d4 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1000,7 +1000,7 @@ void BahamutIRCdProto::SendGuestNick(const char *nick, const char *user, const c
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts)
+void BahamutIRCdProto::SendSVID(const char *nick, time_t ts)
 {
 	send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, static_cast<unsigned long>(ts));
 }
@@ -1008,12 +1008,12 @@ void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts)
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void BahamutIRCdProto::cmd_nc_change(User *u)
+void BahamutIRCdProto::SendUnregisteredNick(User *u)
 {
 	common_svsmode(u, "+d", "1");
 }
 
-void BahamutIRCdProto::cmd_svid_umode3(User *u, const char *ts)
+void BahamutIRCdProto::SendSVID3(User *u, const char *ts)
 {
 	if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts);
 	else common_svsmode(u, "+r", NULL);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 84045c69f..25e0f972c 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -84,9 +84,9 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendSGLine(const char *, const char *);
 		void SendBanDel(const char *, const char *);
 		void SendSVSMode_chan(const char *, const char *, const char *);
-		void cmd_svid_umode(const char *, time_t);
-		void cmd_nc_change(User *);
-		void cmd_svid_umode3(User *, const char *);
+		void SendSVID(const char *, time_t);
+		void SendUnregisteredNick(User *);
+		void SendSVID3(User *, const char *);
 		void cmd_eob();
 		void cmd_server(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 77d84eb93..2dee0c55f 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1304,23 +1304,23 @@ void InspIRCdProto::SendSZLine(const char *mask, const char *reason, const char
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void InspIRCdProto::cmd_nc_change(User *u)
+void InspIRCdProto::SendUnregisteredNick(User *u)
 {
 	common_svsmode(u, "-r", NULL);
 }
 
 /* SVSMODE +r */
-void InspIRCdProto::cmd_svid_umode2(User *u, const char *ts)
+void InspIRCdProto::SendSVID2(User *u, const char *ts)
 {
 	common_svsmode(u, "+r", NULL);
 }
 
-void InspIRCdProto::cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void InspIRCdProto::SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
 	send_cmd(source, "SVSJOIN %s %s", nick, chan);
 }
 
-void InspIRCdProto::cmd_svspart(const char *source, const char *nick, const char *chan)
+void InspIRCdProto::SendSVSPart(const char *source, const char *nick, const char *chan)
 {
 	send_cmd(source, "SVSPART %s %s", nick, chan);
 }
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index dca5c1e6e..6cabfed2c 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -87,10 +87,10 @@ class InspIRCdProto : public IRCDProto {
 		void SendSVSHOLDDel(const char *);
 		void SendSZLineDel(const char *);
 		void SendSZLine(const char *, const char *, const char *);
-		void cmd_nc_change(User *);
-		void cmd_svid_umode2(User *, const char *);
-		void cmd_svsjoin(const char *, const char *, const char *, const char *);
-		void cmd_svspart(const char *, const char *, const char *);
+		void SendUnregisteredNick(User *);
+		void SendSVID2(User *, const char *);
+		void SendSVSJoin(const char *, const char *, const char *, const char *);
+		void SendSVSPart(const char *, const char *, const char *);
 		void cmd_eob();
 		void cmd_server(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 7e312c2fa..8f2b5a2da 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1299,26 +1299,26 @@ void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nic
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void hybrid_cmd_svid_umode(const char *nick, time_t ts)
+void hybrid_SendSVID(const char *nick, time_t ts)
 {
     send_cmd(ServerName, "SVSMODE %s +d 1", nick);
 }
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void hybrid_cmd_nc_change(User * u)
+void hybrid_SendUnregisteredNick(User * u)
 {
     /* not used */
 }
 
 /* SVSMODE +d */
-void hybrid_cmd_svid_umode2(User * u, const char *ts)
+void hybrid_SendSVID2(User * u, const char *ts)
 {
     /* not used */
 }
 
 
-void hybrid_cmd_svid_umode3(User * u, const char *ts)
+void hybrid_SendSVID3(User * u, const char *ts)
 {
     /* not used */
 }
@@ -1353,12 +1353,12 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void hybrid_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void hybrid_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
     /* Not Supported by this IRCD */
 }
 
-void hybrid_cmd_svspart(const char *source, const char *nick, const char *chan)
+void hybrid_SendSVSPart(const char *source, const char *nick, const char *chan)
 {
     /* Not Supported by this IRCD */
 }
@@ -1432,7 +1432,7 @@ int hybrid_valid_chan(const char *chan)
 }
 
 
-void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf)
+void hybrid_SendCTCP(const char *source, const char *dest, const char *buf)
 {
     char *s;
 
@@ -1511,19 +1511,19 @@ void moduleAddAnopeCmds()
     pmodule_SendSGLine(hybrid_cmd_sgline);
     pmodule_SendBanDel(hybrid_cmd_unban);
     pmodule_SendSVSMode_chan(hybrid_cmd_svsmode_chan);
-    pmodule_cmd_svid_umode(hybrid_cmd_svid_umode);
-    pmodule_cmd_nc_change(hybrid_cmd_nc_change);
-    pmodule_cmd_svid_umode2(hybrid_cmd_svid_umode2);
-    pmodule_cmd_svid_umode3(hybrid_cmd_svid_umode3);
-    pmodule_cmd_svsjoin(hybrid_cmd_svsjoin);
-    pmodule_cmd_svspart(hybrid_cmd_svspart);
+    pmodule_SendSVID(hybrid_cmd_svid_umode);
+    pmodule_SendUnregisteredNick(hybrid_cmd_nc_change);
+    pmodule_SendSVID2(hybrid_cmd_svid_umode2);
+    pmodule_SendSVID3(hybrid_cmd_svid_umode3);
+    pmodule_SendSVSJoin(hybrid_cmd_svsjoin);
+    pmodule_SendSVSPart(hybrid_cmd_svspart);
     pmodule_cmd_swhois(hybrid_cmd_swhois);
     pmodule_cmd_eob(hybrid_cmd_eob);
     pmodule_flood_mode_check(hybrid_flood_mode_check);
     pmodule_cmd_jupe(hybrid_cmd_jupe);
     pmodule_valid_nick(hybrid_valid_nick);
     pmodule_valid_chan(hybrid_valid_chan);
-    pmodule_cmd_ctcp(hybrid_cmd_ctcp);
+    pmodule_SendCTCP(hybrid_cmd_ctcp);
     pmodule_set_umode(hybrid_set_umode);
 }
 
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 3269a70e9..ad00289d9 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -102,15 +102,15 @@ void hybrid_SendSZLine(const char *mask, const char *reason, const char *whom);
 void hybrid_SendSGLine(const char *mask, const char *reason);
 void hybrid_SendBanDel(const char *name, const char *nick);
 void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
-void hybrid_cmd_svid_umode(const char *nick, time_t ts);
-void hybrid_cmd_nc_change(User * u);
-void hybrid_cmd_svid_umode2(User * u, const char *ts);
-void hybrid_cmd_svid_umode3(User * u, const char *ts);
+void hybrid_SendSVID(const char *nick, time_t ts);
+void hybrid_SendUnregisteredNick(User * u);
+void hybrid_SendSVID2(User * u, const char *ts);
+void hybrid_SendSVID3(User * u, const char *ts);
 void hybrid_cmd_eob();
 int hybrid_flood_mode_check(const char *value);
 void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int hybrid_valid_nick(const char *nick);
-void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf);
+void hybrid_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class HybridIRCdProto : public IRCDProtoNew {
 	public:
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 69732bdb6..c1bedc9be 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1542,7 +1542,7 @@ plexus_SendSVSMode_chan (const char *name, const char *mode, const char *nick)
 /* SVSMODE +d */
 /* sent if svid is something weird */
 void
-plexus_cmd_svid_umode (const char *nick, time_t ts)
+plexus_SendSVID (const char *nick, time_t ts)
 {
   send_cmd (ServerName, "ENCAP * SVSMODE %s %lu +d 1", nick,
 	    (unsigned long int) ts);
@@ -1551,20 +1551,20 @@ plexus_cmd_svid_umode (const char *nick, time_t ts)
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
 void
-plexus_cmd_nc_change (User * u)
+plexus_SendUnregisteredNick (User * u)
 {
   common_svsmode (u, "+d", "1");
 }
 
 /* SVSMODE +d */
 void
-plexus_cmd_svid_umode2 (User * u, const char *ts)
+plexus_SendSVID2 (User * u, const char *ts)
 {
   /* not used */
 }
 
 void
-plexus_cmd_svid_umode3 (User * u, const char *ts)
+plexus_SendSVID3 (User * u, const char *ts)
 {
   char modes[512];
 
@@ -1620,13 +1620,13 @@ anope_event_pass (const char *source, int ac, const char **av)
 }
 
 void
-plexus_cmd_svsjoin (const char *source, const char *nick, const char *chan, const char *param)
+plexus_SendSVSJoin (const char *source, const char *nick, const char *chan, const char *param)
 {
   send_cmd(ServerName, "ENCAP * SVSJOIN %s %s", nick, chan);
 }
 
 void
-plexus_cmd_svspart (const char *source, const char *nick, const char *chan)
+plexus_SendSVSPart (const char *source, const char *nick, const char *chan)
 {
   send_cmd(ServerName, "ENCAP * SVSPART %s %s", nick, chan);
 }
@@ -1712,7 +1712,7 @@ plexus_valid_chan (const char *chan)
 
 
 void
-plexus_cmd_ctcp (const char *source, const char *dest, const char *buf)
+plexus_SendCTCP (const char *source, const char *dest, const char *buf)
 {
   char *s;
 
@@ -1795,19 +1795,19 @@ moduleAddAnopeCmds ()
   pmodule_SendSGLine (plexus_cmd_sgline);
   pmodule_SendBanDel (plexus_cmd_unban);
   pmodule_SendSVSMode_chan (plexus_cmd_svsmode_chan);
-  pmodule_cmd_svid_umode (plexus_cmd_svid_umode);
-  pmodule_cmd_nc_change (plexus_cmd_nc_change);
-  pmodule_cmd_svid_umode2 (plexus_cmd_svid_umode2);
-  pmodule_cmd_svid_umode3 (plexus_cmd_svid_umode3);
-  pmodule_cmd_svsjoin (plexus_cmd_svsjoin);
-  pmodule_cmd_svspart (plexus_cmd_svspart);
+  pmodule_SendSVID (plexus_cmd_svid_umode);
+  pmodule_SendUnregisteredNick (plexus_cmd_nc_change);
+  pmodule_SendSVID2 (plexus_cmd_svid_umode2);
+  pmodule_SendSVID3 (plexus_cmd_svid_umode3);
+  pmodule_SendSVSJoin (plexus_cmd_svsjoin);
+  pmodule_SendSVSPart (plexus_cmd_svspart);
   pmodule_cmd_swhois (plexus_cmd_swhois);
   pmodule_cmd_eob (plexus_cmd_eob);
   pmodule_flood_mode_check (plexus_flood_mode_check);
   pmodule_cmd_jupe (plexus_cmd_jupe);
   pmodule_valid_nick (plexus_valid_nick);
   pmodule_valid_chan (plexus_valid_chan);
-  pmodule_cmd_ctcp (plexus_cmd_ctcp);
+  pmodule_SendCTCP (plexus_cmd_ctcp);
   pmodule_set_umode (plexus_set_umode);
 }
 
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index fdc6b2d2b..c01df7f0a 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -98,15 +98,15 @@ void plexus_SendSZLine(const char *mask, const char *reason, const char *whom);
 void plexus_SendSGLine(const char *mask, const char *reason);
 void plexus_SendBanDel(const char *name, const char *nick);
 void plexus_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
-void plexus_cmd_svid_umode(const char *nick, time_t ts);
-void plexus_cmd_nc_change(User * u);
-void plexus_cmd_svid_umode2(User * u, const char *ts);
-void plexus_cmd_svid_umode3(User * u, const char *ts);
+void plexus_SendSVID(const char *nick, time_t ts);
+void plexus_SendUnregisteredNick(User * u);
+void plexus_SendSVID2(User * u, const char *ts);
+void plexus_SendSVID3(User * u, const char *ts);
 void plexus_cmd_eob();
 int plexus_flood_mode_check(const char *value);
 void plexus_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int plexus_valid_nick(const char *nick);
-void plexus_cmd_ctcp(const char *source, const char *dest, const char *buf);
+void plexus_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class PleXusIRCdProto : public IRCDProtoNew {
 	public:
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index 4b84ceed4..0b6fc578e 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1503,26 +1503,26 @@ void ptlink_SendSVSO(const char *source, const char *nick, const char *flag)
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void ptlink_cmd_svid_umode(const char *nick, time_t ts)
+void ptlink_SendSVID(const char *nick, time_t ts)
 {
     /* Not Supported by this ircd */
 }
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void ptlink_cmd_nc_change(User * u)
+void ptlink_SendUnregisteredNick(User * u)
 {
     /* Not Supported by this ircd */
 }
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void ptlink_cmd_svid_umode2(User * u, const char *ts)
+void ptlink_SendSVID2(User * u, const char *ts)
 {
     common_svsmode(u, "+r", NULL);
 }
 
-void ptlink_cmd_svid_umode3(User * u, const char *ts)
+void ptlink_SendSVID3(User * u, const char *ts)
 {
     /* Bahamuts have this extra one, since they can check on even nick changes */
 }
@@ -1550,7 +1550,7 @@ void ptlink_SendChangeBotNick(const char *oldnick, const char *newnick)
 	parv[2] = channels list
   	:OperServ SVSJOIN Trystan #Admin
 */
-void ptlink_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void ptlink_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
     send_cmd(source, "SVSJOIN %s %s", nick, chan);
 }
@@ -1562,7 +1562,7 @@ void ptlink_cmd_svsjoin(const char *source, const char *nick, const char *chan,
 	parv[2] = channels list
   e.g.:	:ChanServ SVSPART mynick 4163321 #Chan1,#Chan2
 */
-void ptlink_cmd_svspart(const char *source, const char *nick, const char *chan)
+void ptlink_SendSVSPart(const char *source, const char *nick, const char *chan)
 {
     send_cmd(source, "SVSPART %s :%s", nick, chan);
 }
@@ -1661,7 +1661,7 @@ int ptlink_valid_chan(const char *cahn)
 }
 
 
-void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf)
+void ptlink_SendCTCP(const char *source, const char *dest, const char *buf)
 {
     char *s;
 
@@ -1740,19 +1740,19 @@ void moduleAddAnopeCmds()
     pmodule_SendSGLine(ptlink_cmd_sgline);
     pmodule_SendBanDel(ptlink_cmd_unban);
     pmodule_SendSVSMode_chan(ptlink_cmd_svsmode_chan);
-    pmodule_cmd_svid_umode(ptlink_cmd_svid_umode);
-    pmodule_cmd_nc_change(ptlink_cmd_nc_change);
-    pmodule_cmd_svid_umode2(ptlink_cmd_svid_umode2);
-    pmodule_cmd_svid_umode3(ptlink_cmd_svid_umode3);
-    pmodule_cmd_svsjoin(ptlink_cmd_svsjoin);
-    pmodule_cmd_svspart(ptlink_cmd_svspart);
+    pmodule_SendSVID(ptlink_cmd_svid_umode);
+    pmodule_SendUnregisteredNick(ptlink_cmd_nc_change);
+    pmodule_SendSVID2(ptlink_cmd_svid_umode2);
+    pmodule_SendSVID3(ptlink_cmd_svid_umode3);
+    pmodule_SendSVSJoin(ptlink_cmd_svsjoin);
+    pmodule_SendSVSPart(ptlink_cmd_svspart);
     pmodule_cmd_swhois(ptlink_cmd_swhois);
     pmodule_cmd_eob(ptlink_cmd_eob);
     pmodule_flood_mode_check(ptlink_flood_mode_check);
     pmodule_cmd_jupe(ptlink_cmd_jupe);
     pmodule_valid_nick(ptlink_valid_nick);
     pmodule_valid_chan(ptlink_valid_chan);
-    pmodule_cmd_ctcp(ptlink_cmd_ctcp);
+    pmodule_SendCTCP(ptlink_cmd_ctcp);
     pmodule_set_umode(ptlink_set_umode);
 }
 
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 6393f3605..5e1881bfe 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -137,15 +137,15 @@ void ptlink_SendSZLine(const char *mask, const char *reason, const char *whom);
 void ptlink_SendSGLine(const char *mask, const char *reason);
 void ptlink_SendBanDel(const char *name, const char *nick);
 void ptlink_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
-void ptlink_cmd_svid_umode(const char *nick, time_t ts);
-void ptlink_cmd_nc_change(User * u);
-void ptlink_cmd_svid_umode2(User * u, const char *ts);
-void ptlink_cmd_svid_umode3(User * u, const char *ts);
+void ptlink_SendSVID(const char *nick, time_t ts);
+void ptlink_SendUnregisteredNick(User * u);
+void ptlink_SendSVID2(User * u, const char *ts);
+void ptlink_SendSVID3(User * u, const char *ts);
 void ptlink_cmd_eob();
 int ptlink_flood_mode_check(const char *value);
 void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int ptlink_valid_nick(const char *nick);
-void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf);
+void ptlink_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class PTlinkProto : public IRCDProtoNew {
 	public:
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 7ba0fbb79..769c46518 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -1367,7 +1367,7 @@ void rageircd_SendSVSO(const char *source, const char *nick, const char *flag)
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void rageircd_cmd_svid_umode(const char *nick, time_t ts)
+void rageircd_SendSVID(const char *nick, time_t ts)
 {
     send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
              (unsigned long int) ts);
@@ -1375,18 +1375,18 @@ void rageircd_cmd_svid_umode(const char *nick, time_t ts)
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void rageircd_cmd_nc_change(User * u)
+void rageircd_SendUnregisteredNick(User * u)
 {
     common_svsmode(u, "+d", "1");
 }
 
 /* SVSMODE +d */
-void rageircd_cmd_svid_umode2(User * u, const char *ts)
+void rageircd_SendSVID2(User * u, const char *ts)
 {
     /* not used by bahamut ircds */
 }
 
-void rageircd_cmd_svid_umode3(User * u, const char *ts)
+void rageircd_SendSVID3(User * u, const char *ts)
 {
     if (u->svid != u->timestamp) {
         common_svsmode(u, "+rd", ts);
@@ -1456,12 +1456,12 @@ int anope_event_sqline(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void rageircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void rageircd_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
     /* Find no reference to it in the code and docs */
 }
 
-void rageircd_cmd_svspart(const char *source, const char *nick, const char *chan)
+void rageircd_SendSVSPart(const char *source, const char *nick, const char *chan)
 {
     /* Find no reference to it in the code and docs */
 }
@@ -1541,7 +1541,7 @@ int rageircd_valid_chan(const char *chan)
 }
 
 
-void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
+void rageircd_SendCTCP(const char *source, const char *dest, const char *buf)
 {
     char *s;
 
@@ -1620,19 +1620,19 @@ void moduleAddAnopeCmds()
     pmodule_SendSGLine(rageircd_cmd_sgline);
     pmodule_SendBanDel(rageircd_cmd_unban);
     pmodule_SendSVSMode_chan(rageircd_cmd_svsmode_chan);
-    pmodule_cmd_svid_umode(rageircd_cmd_svid_umode);
-    pmodule_cmd_nc_change(rageircd_cmd_nc_change);
-    pmodule_cmd_svid_umode2(rageircd_cmd_svid_umode2);
-    pmodule_cmd_svid_umode3(rageircd_cmd_svid_umode3);
-    pmodule_cmd_svsjoin(rageircd_cmd_svsjoin);
-    pmodule_cmd_svspart(rageircd_cmd_svspart);
+    pmodule_SendSVID(rageircd_cmd_svid_umode);
+    pmodule_SendUnregisteredNick(rageircd_cmd_nc_change);
+    pmodule_SendSVID2(rageircd_cmd_svid_umode2);
+    pmodule_SendSVID3(rageircd_cmd_svid_umode3);
+    pmodule_SendSVSJoin(rageircd_cmd_svsjoin);
+    pmodule_SendSVSPart(rageircd_cmd_svspart);
     pmodule_cmd_swhois(rageircd_cmd_swhois);
     pmodule_cmd_eob(rageircd_cmd_eob);
     pmodule_flood_mode_check(rageircd_flood_mode_check);
     pmodule_cmd_jupe(rageircd_cmd_jupe);
     pmodule_valid_nick(rageircd_valid_nick);
     pmodule_valid_chan(rageircd_valid_chan);
-    pmodule_cmd_ctcp(rageircd_cmd_ctcp);
+    pmodule_SendCTCP(rageircd_cmd_ctcp);
     pmodule_set_umode(rageircd_set_umode);
 }
 
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index ade24afd3..7145e180f 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -100,15 +100,15 @@ void rageircd_SendSZLine(const char *mask, const char *reason, const char *whom)
 void rageircd_SendSGLine(const char *mask, const char *reason);
 void rageircd_SendBanDel(const char *name, const char *nick);
 void rageircd_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
-void rageircd_cmd_svid_umode(const char *nick, time_t ts);
-void rageircd_cmd_nc_change(User * u);
-void rageircd_cmd_svid_umode2(User * u, const char *ts);
-void rageircd_cmd_svid_umode3(User * u, const char *ts);
+void rageircd_SendSVID(const char *nick, time_t ts);
+void rageircd_SendUnregisteredNick(User * u);
+void rageircd_SendSVID2(User * u, const char *ts);
+void rageircd_SendSVID3(User * u, const char *ts);
 void rageircd_cmd_eob();
 int rageircd_flood_mode_check(const char *value);
 void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int rageircd_valid_nick(const char *nick);
-void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf);
+void rageircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class RageIRCdProto : public IRCDProtoNew {
 	public:
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 60b198601..a3540bc11 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1391,7 +1391,7 @@ void solidircd_SendVhostDel(User * u)
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void solidircd_cmd_svid_umode(const char *nick, time_t ts)
+void solidircd_SendSVID(const char *nick, time_t ts)
 {
     send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
              (unsigned long int) ts);
@@ -1400,19 +1400,19 @@ void solidircd_cmd_svid_umode(const char *nick, time_t ts)
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void solidircd_cmd_nc_change(User * u)
+void solidircd_SendUnregisteredNick(User * u)
 {
     common_svsmode(u, "+d", "1");
 }
 
 /* SVSMODE +d */
-void solidircd_cmd_svid_umode2(User * u, const char *ts)
+void solidircd_SendSVID2(User * u, const char *ts)
 {
     /* not used by bahamut ircds */
 }
 
 
-void solidircd_cmd_svid_umode3(User * u, const char *ts)
+void solidircd_SendSVID3(User * u, const char *ts)
 {
     if (u->svid != u->timestamp) {
         common_svsmode(u, "+rd", ts);
@@ -1462,12 +1462,12 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void solidircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void solidircd_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
     /* Can not find any reference to these in Bahamut */
 }
 
-void solidircd_cmd_svspart(const char *source, const char *nick, const char *chan)
+void solidircd_SendSVSPart(const char *source, const char *nick, const char *chan)
 {
     /* Can not find any reference to these in Bahamut */
 }
@@ -1574,7 +1574,7 @@ int solidircd_valid_chan(const char *chan)
 }
 
 
-void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
+void solidircd_SendCTCP(const char *source, const char *dest, const char *buf)
 {
     char *s;
 
@@ -1653,19 +1653,19 @@ void moduleAddAnopeCmds()
     pmodule_SendSGLine(solidircd_cmd_sgline);
     pmodule_SendBanDel(solidircd_cmd_unban);
     pmodule_SendSVSMode_chan(solidircd_cmd_svsmode_chan);
-    pmodule_cmd_svid_umode(solidircd_cmd_svid_umode);
-    pmodule_cmd_nc_change(solidircd_cmd_nc_change);
-    pmodule_cmd_svid_umode2(solidircd_cmd_svid_umode2);
-    pmodule_cmd_svid_umode3(solidircd_cmd_svid_umode3);
-    pmodule_cmd_svsjoin(solidircd_cmd_svsjoin);
-    pmodule_cmd_svspart(solidircd_cmd_svspart);
+    pmodule_SendSVID(solidircd_cmd_svid_umode);
+    pmodule_SendUnregisteredNick(solidircd_cmd_nc_change);
+    pmodule_SendSVID2(solidircd_cmd_svid_umode2);
+    pmodule_SendSVID3(solidircd_cmd_svid_umode3);
+    pmodule_SendSVSJoin(solidircd_cmd_svsjoin);
+    pmodule_SendSVSPart(solidircd_cmd_svspart);
     pmodule_cmd_swhois(solidircd_cmd_swhois);
     pmodule_cmd_eob(solidircd_cmd_eob);
     pmodule_flood_mode_check(solidircd_flood_mode_check);
     pmodule_cmd_jupe(solidircd_cmd_jupe);
     pmodule_valid_nick(solidircd_valid_nick);
     pmodule_valid_chan(solidircd_valid_chan);
-    pmodule_cmd_ctcp(solidircd_cmd_ctcp);
+    pmodule_SendCTCP(solidircd_cmd_ctcp);
     pmodule_set_umode(solidircd_set_umode);
 }
 
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index ea770c259..b8e5d4dae 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -124,15 +124,15 @@ void solidircd_SendSZLine(const char *mask, const char *reason, const char *whom
 void solidircd_SendSGLine(const char *mask, const char *reason);
 void solidircd_SendBanDel(const char *name, const char *nick);
 void solidircd_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
-void solidircd_cmd_svid_umode(const char *nick, time_t ts);
-void solidircd_cmd_nc_change(User * u);
-void solidircd_cmd_svid_umode2(User * u, const char *ts);
-void solidircd_cmd_svid_umode3(User * u, const char *ts);
+void solidircd_SendSVID(const char *nick, time_t ts);
+void solidircd_SendUnregisteredNick(User * u);
+void solidircd_SendSVID2(User * u, const char *ts);
+void solidircd_SendSVID3(User * u, const char *ts);
 void solidircd_cmd_eob();
 int solidircd_flood_mode_check(const char *value);
 void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int solidircd_valid_nick(const char *nick);
-void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf);
+void solidircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class SolidIRCdProto : public IRCDProtoNew {
 	public:
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index b35f6e14e..8f39d80d3 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1479,7 +1479,7 @@ void ultimate3_SendSVSHOLDDel(const char *nick)
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void ultimate3_cmd_svid_umode(const char *nick, time_t ts)
+void ultimate3_SendSVID(const char *nick, time_t ts)
 {
     send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
              (unsigned long int) ts);
@@ -1487,18 +1487,18 @@ void ultimate3_cmd_svid_umode(const char *nick, time_t ts)
 
 /* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
-void ultimate3_cmd_nc_change(User * u)
+void ultimate3_SendUnregisteredNick(User * u)
 {
     common_svsmode(u, "+d", "1");
 }
 
 /* SVSMODE +d */
-void ultimate3_cmd_svid_umode2(User * u, const char *ts)
+void ultimate3_SendSVID2(User * u, const char *ts)
 {
     /* not used by bahamut ircds */
 }
 
-void ultimate3_cmd_svid_umode3(User * u, const char *ts)
+void ultimate3_SendSVID3(User * u, const char *ts)
 {
     if (u->svid != u->timestamp) {
         common_svsmode(u, "+rd", ts);
@@ -1544,12 +1544,12 @@ int anope_event_sqline(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void ultimate3_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
+void ultimate3_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param)
 {
     /* Not Supported by this IRCD */
 }
 
-void ultimate3_cmd_svspart(const char *source, const char *nick, const char *chan)
+void ultimate3_SendSVSPart(const char *source, const char *nick, const char *chan)
 {
     /* Not Supported by this IRCD */
 }
@@ -1682,7 +1682,7 @@ int ultiamte3_valid_chan(const char *chan)
 }
 
 
-void ultimate3_cmd_ctcp(const char *source, const char *dest, const char *buf)
+void ultimate3_SendCTCP(const char *source, const char *dest, const char *buf)
 {
     char *s;
 
@@ -1761,19 +1761,19 @@ void moduleAddAnopeCmds()
     pmodule_SendSGLine(ultimate3_cmd_sgline);
     pmodule_SendBanDel(ultimate3_cmd_unban);
     pmodule_SendSVSMode_chan(ultimate3_cmd_svsmode_chan);
-    pmodule_cmd_svid_umode(ultimate3_cmd_svid_umode);
-    pmodule_cmd_nc_change(ultimate3_cmd_nc_change);
-    pmodule_cmd_svid_umode2(ultimate3_cmd_svid_umode2);
-    pmodule_cmd_svid_umode3(ultimate3_cmd_svid_umode3);
-    pmodule_cmd_svsjoin(ultimate3_cmd_svsjoin);
-    pmodule_cmd_svspart(ultimate3_cmd_svspart);
+    pmodule_SendSVID(ultimate3_cmd_svid_umode);
+    pmodule_SendUnregisteredNick(ultimate3_cmd_nc_change);
+    pmodule_SendSVID2(ultimate3_cmd_svid_umode2);
+    pmodule_SendSVID3(ultimate3_cmd_svid_umode3);
+    pmodule_SendSVSJoin(ultimate3_cmd_svsjoin);
+    pmodule_SendSVSPart(ultimate3_cmd_svspart);
     pmodule_cmd_swhois(ultimate3_cmd_swhois);
     pmodule_cmd_eob(ultimate3_cmd_eob);
     pmodule_flood_mode_check(ultiamte3_flood_mode_check);
     pmodule_cmd_jupe(ultimate3_cmd_jupe);
     pmodule_valid_nick(ultiamte3_valid_nick);
     pmodule_valid_chan(ultiamte3_valid_chan);
-    pmodule_cmd_ctcp(ultimate3_cmd_ctcp);
+    pmodule_SendCTCP(ultimate3_cmd_ctcp);
     pmodule_set_umode(ultimate3_set_umode);
 }
 
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index a1c0815da..aadb88dfb 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -110,15 +110,15 @@ void ultimate3_SendSZLine(const char *mask, const char *reason, const char *whom
 void ultimate3_SendSGLine(const char *mask, const char *reason);
 void ultimate3_SendBanDel(const char *name, const char *nick);