14 files changed, 147 insertions, 147 deletions

diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 8e8c2dd47..cd810f20b 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -661,7 +661,7 @@ void hybrid_SendSQLine(const char *mask, const char *reason)
 
     send_cmd(ServerName, "RESV * %s :%s", mask, reason);
 }
-void hybrid_cmd_unsgline(const char *mask)
+void hybrid_SendSGLineDel(const char *mask)
 {
     if (!mask) {
         return;
@@ -670,11 +670,11 @@ void hybrid_cmd_unsgline(const char *mask)
     send_cmd(ServerName, "UNXLINE * %s", mask);
 }
 
-void hybrid_cmd_unszline(const char *mask)
+void hybrid_SendSZLineDel(const char *mask)
 {
     /* Does not support */
 }
-void hybrid_cmd_szline(const char *mask, const char *reason, const char *whom)
+void hybrid_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     /* Does not support */
 }
@@ -683,7 +683,7 @@ void hybrid_cmd_svsadmin(const char *server, int set)
 {
 }
 
-void hybrid_cmd_sgline(const char *mask, const char *reason)
+void hybrid_SendSGLine(const char *mask, const char *reason)
 {
     if (!mask || !reason) {
         return;
@@ -815,7 +815,7 @@ void hybrid_cmd_server(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
-void hybrid_cmd_connect(int servernum)
+void hybrid_SendConnect(int servernum)
 {
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1256,13 +1256,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSHOLD - set */
-void hybrid_cmd_svshold(const char *nick)
+void hybrid_SendSVSHOLD(const char *nick)
 {
     /* Not supported by this IRCD */
 }
 
 /* SVSHOLD - release */
-void hybrid_cmd_release_svshold(const char *nick)
+void hybrid_SendSVSHOLDDel(const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1502,13 +1502,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(hybrid_cmd_chg_nick);
     pmodule_SendForceNickChange(hybrid_cmd_svsnick);
     pmodule_SendVhost(hybrid_cmd_vhost_on);
-    pmodule_cmd_connect(hybrid_cmd_connect);
-    pmodule_cmd_svshold(hybrid_cmd_svshold);
-    pmodule_cmd_release_svshold(hybrid_cmd_release_svshold);
-    pmodule_cmd_unsgline(hybrid_cmd_unsgline);
-    pmodule_cmd_unszline(hybrid_cmd_unszline);
-    pmodule_cmd_szline(hybrid_cmd_szline);
-    pmodule_cmd_sgline(hybrid_cmd_sgline);
+    pmodule_SendConnect(hybrid_cmd_connect);
+    pmodule_SendSVSHOLD(hybrid_cmd_svshold);
+    pmodule_SendSVSHOLDDel(hybrid_cmd_release_svshold);
+    pmodule_SendSGLineDel(hybrid_cmd_unsgline);
+    pmodule_SendSZLineDel(hybrid_cmd_unszline);
+    pmodule_SendSZLine(hybrid_cmd_szline);
+    pmodule_SendSGLine(hybrid_cmd_sgline);
     pmodule_cmd_unban(hybrid_cmd_unban);
     pmodule_SendSVSMode_chan(hybrid_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(hybrid_cmd_svid_umode);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 99a8885e7..512797bae 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -93,13 +93,13 @@ void hybrid_SendSVSO(const char *source, const char *nick, const char *flag);
 void hybrid_SendChangeBotNick(const char *oldnick, const char *newnick);
 void hybrid_SendForceNickChange(const char *source, const char *guest, time_t when);
 void hybrid_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void hybrid_cmd_connect(int servernum);
-void hybrid_cmd_svshold(const char *nick);
-void hybrid_cmd_release_svshold(const char *nick);
-void hybrid_cmd_unsgline(const char *mask);
-void hybrid_cmd_unszline(const char *mask);
-void hybrid_cmd_szline(const char *mask, const char *reason, const char *whom);
-void hybrid_cmd_sgline(const char *mask, const char *reason);
+void hybrid_SendConnect(int servernum);
+void hybrid_SendSVSHOLD(const char *nick);
+void hybrid_SendSVSHOLDDel(const char *nick);
+void hybrid_SendSGLineDel(const char *mask);
+void hybrid_SendSZLineDel(const char *mask);
+void hybrid_SendSZLine(const char *mask, const char *reason, const char *whom);
+void hybrid_SendSGLine(const char *mask, const char *reason);
 void hybrid_cmd_unban(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);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 6bc5aa3a9..4bc86052d 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -759,19 +759,19 @@ plexus_SendSQLine (const char *mask, const char *reason)
 }
 
 void
-plexus_cmd_unsgline (const char *mask)
+plexus_SendSGLineDel (const char *mask)
 {
   send_cmd (s_OperServ, "UNXLINE * %s", mask);
 }
 
 void
-plexus_cmd_unszline (const char *mask)
+plexus_SendSZLineDel (const char *mask)
 {
   /* Does not support */
 }
 
 void
-plexus_cmd_szline (const char *mask, const char *reason, const char *whom)
+plexus_SendSZLine (const char *mask, const char *reason, const char *whom)
 {
   /* Does not support */
 }
@@ -788,7 +788,7 @@ plexus_cmd_svsadmin (const char *server, int set)
 }
 
 void
-plexus_cmd_sgline (const char *mask, const char *reason)
+plexus_SendSGLine (const char *mask, const char *reason)
 {
   send_cmd (s_OperServ, "XLINE * %s 0 :%s", mask, reason);
 }
@@ -944,7 +944,7 @@ plexus_cmd_server (const char *servname, int hop, const char *descript)
 }
 
 void
-plexus_cmd_connect (int servernum)
+plexus_SendConnect (int servernum)
 {
   me_server = new_server (NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
 
@@ -1481,7 +1481,7 @@ anope_event_capab (const char *source, int ac, const char **av)
 
 /* SVSHOLD - set */
 void
-plexus_cmd_svshold (const char *nick)
+plexus_SendSVSHOLD (const char *nick)
 {
   send_cmd (s_OperServ, "ENCAP * RESV %d %s 0 :%s", NSReleaseTimeout, nick,
 	    "This nick is being held for a registered user. "
@@ -1490,7 +1490,7 @@ plexus_cmd_svshold (const char *nick)
 
 /* SVSHOLD - release */
 void
-plexus_cmd_release_svshold (const char *nick)
+plexus_SendSVSHOLDDel (const char *nick)
 {
   send_cmd (s_OperServ, "UNRESV * %s", nick);
 }
@@ -1786,13 +1786,13 @@ moduleAddAnopeCmds ()
   pmodule_SendChangeBotNick (plexus_cmd_chg_nick);
   pmodule_SendForceNickChange (plexus_cmd_svsnick);
   pmodule_SendVhost (plexus_cmd_vhost_on);
-  pmodule_cmd_connect (plexus_cmd_connect);
-  pmodule_cmd_svshold (plexus_cmd_svshold);
-  pmodule_cmd_release_svshold (plexus_cmd_release_svshold);
-  pmodule_cmd_unsgline (plexus_cmd_unsgline);
-  pmodule_cmd_unszline (plexus_cmd_unszline);
-  pmodule_cmd_szline (plexus_cmd_szline);
-  pmodule_cmd_sgline (plexus_cmd_sgline);
+  pmodule_SendConnect (plexus_cmd_connect);
+  pmodule_SendSVSHOLD (plexus_cmd_svshold);
+  pmodule_SendSVSHOLDDel (plexus_cmd_release_svshold);
+  pmodule_SendSGLineDel (plexus_cmd_unsgline);
+  pmodule_SendSZLineDel (plexus_cmd_unszline);
+  pmodule_SendSZLine (plexus_cmd_szline);
+  pmodule_SendSGLine (plexus_cmd_sgline);
   pmodule_cmd_unban (plexus_cmd_unban);
   pmodule_SendSVSMode_chan (plexus_cmd_svsmode_chan);
   pmodule_cmd_svid_umode (plexus_cmd_svid_umode);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index b3fc7140b..8f67c0a67 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -89,13 +89,13 @@ void plexus_SendSVSO(const char *source, const char *nick, const char *flag);
 void plexus_SendChangeBotNick(const char *oldnick, const char *newnick);
 void plexus_SendForceNickChange(const char *source, const char *guest, time_t when);
 void plexus_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void plexus_cmd_connect(int servernum);
-void plexus_cmd_svshold(const char *nick);
-void plexus_cmd_release_svshold(const char *nick);
-void plexus_cmd_unsgline(const char *mask);
-void plexus_cmd_unszline(const char *mask);
-void plexus_cmd_szline(const char *mask, const char *reason, const char *whom);
-void plexus_cmd_sgline(const char *mask, const char *reason);
+void plexus_SendConnect(int servernum);
+void plexus_SendSVSHOLD(const char *nick);
+void plexus_SendSVSHOLDDel(const char *nick);
+void plexus_SendSGLineDel(const char *mask);
+void plexus_SendSZLineDel(const char *mask);
+void plexus_SendSZLine(const char *mask, const char *reason, const char *whom);
+void plexus_SendSGLine(const char *mask, const char *reason);
 void plexus_cmd_unban(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);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index 1f7360708..c61ce6fb7 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -861,7 +861,7 @@ void ptlink_cmd_server(const char *servname, int hop, const char *descript)
     send_cmd(NULL, "SERVER %s %d Anope.Services%s :%s", servname, hop,
              version_number_dotted, descript);
 }
-void ptlink_cmd_connect(int servernum)
+void ptlink_SendConnect(int servernum)
 {
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1400,13 +1400,13 @@ void ptlink_cmd_351(const char *source)
 }
 
 /* SVSHOLD - set */
-void ptlink_cmd_svshold(const char *nick)
+void ptlink_SendSVSHOLD(const char *nick)
 {
     /* Not supported by this IRCD */
 }
 
 /* SVSHOLD - release */
-void ptlink_cmd_release_svshold(const char *nick)
+void ptlink_SendSVSHOLDDel(const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1416,7 +1416,7 @@ void ptlink_cmd_release_svshold(const char *nick)
 	parv[0] = sender
 	parv[1] = zlined host
 */
-void ptlink_cmd_unszline(const char *mask)
+void ptlink_SendSZLineDel(const char *mask)
 {
     send_cmd(s_OperServ, "UNZLINE %s", mask);
 }
@@ -1428,7 +1428,7 @@ void ptlink_cmd_unszline(const char *mask)
 	parv[2] = time
 	parv[3] = reason
 */
-void ptlink_cmd_szline(const char *mask, const char *reason, const char *whom)
+void ptlink_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     send_cmd(s_OperServ, "ZLINE %s %ld :%s", mask,
              (long int) time(NULL) + 86400 * 2, reason);
@@ -1439,7 +1439,7 @@ void ptlink_cmd_szline(const char *mask, const char *reason, const char *whom)
 	parv[0] = sender
 	parv[1] = info ban mask
 */
-void ptlink_cmd_unsgline(const char *mask)
+void ptlink_SendSGLineDel(const char *mask)
 {
     send_cmd(ServerName, "UNSXLINE :%s", mask);
 }
@@ -1452,7 +1452,7 @@ void ptlink_cmd_unsgline(const char *mask)
  *  	parv[1] = mask length
  *	parv[2] = real name banned mask:reason
  */
-void ptlink_cmd_sgline(const char *mask, const char *reason)
+void ptlink_SendSGLine(const char *mask, const char *reason)
 {
     send_cmd(ServerName, "SXLINE %d :%s:%s", (int) strlen(mask), mask,
              reason);
@@ -1731,13 +1731,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(ptlink_cmd_chg_nick);
     pmodule_SendForceNickChange(ptlink_cmd_svsnick);
     pmodule_SendVhost(ptlink_cmd_vhost_on);
-    pmodule_cmd_connect(ptlink_cmd_connect);
-    pmodule_cmd_svshold(ptlink_cmd_svshold);
-    pmodule_cmd_release_svshold(ptlink_cmd_release_svshold);
-    pmodule_cmd_unsgline(ptlink_cmd_unsgline);
-    pmodule_cmd_unszline(ptlink_cmd_unszline);
-    pmodule_cmd_szline(ptlink_cmd_szline);
-    pmodule_cmd_sgline(ptlink_cmd_sgline);
+    pmodule_SendConnect(ptlink_cmd_connect);
+    pmodule_SendSVSHOLD(ptlink_cmd_svshold);
+    pmodule_SendSVSHOLDDel(ptlink_cmd_release_svshold);
+    pmodule_SendSGLineDel(ptlink_cmd_unsgline);
+    pmodule_SendSZLineDel(ptlink_cmd_unszline);
+    pmodule_SendSZLine(ptlink_cmd_szline);
+    pmodule_SendSGLine(ptlink_cmd_sgline);
     pmodule_cmd_unban(ptlink_cmd_unban);
     pmodule_SendSVSMode_chan(ptlink_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(ptlink_cmd_svid_umode);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 6730b285e..2e13b4e21 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -128,13 +128,13 @@ void ptlink_SendSVSO(const char *source, const char *nick, const char *flag);
 void ptlink_SendChangeBotNick(const char *oldnick, const char *newnick);
 void ptlink_SendForceNickChange(const char *source, const char *guest, time_t when);
 void ptlink_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void ptlink_cmd_connect(int servernum);
-void ptlink_cmd_svshold(const char *nick);
-void ptlink_cmd_release_svshold(const char *nick);
-void ptlink_cmd_unsgline(const char *mask);
-void ptlink_cmd_unszline(const char *mask);
-void ptlink_cmd_szline(const char *mask, const char *reason, const char *whom);
-void ptlink_cmd_sgline(const char *mask, const char *reason);
+void ptlink_SendConnect(int servernum);
+void ptlink_SendSVSHOLD(const char *nick);
+void ptlink_SendSVSHOLDDel(const char *nick);
+void ptlink_SendSGLineDel(const char *mask);
+void ptlink_SendSZLineDel(const char *mask);
+void ptlink_SendSZLine(const char *mask, const char *reason, const char *whom);
+void ptlink_SendSGLine(const char *mask, const char *reason);
 void ptlink_cmd_unban(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);
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index f4348e804..f92f3b4b1 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -605,17 +605,17 @@ void rageircd_SendSQLine(const char *mask, const char *reason)
     send_cmd(NULL, "SQLINE %s :%s", mask, reason);
 }
 
-void rageircd_cmd_unsgline(const char *mask)
+void rageircd_SendSGLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
-void rageircd_cmd_unszline(const char *mask)
+void rageircd_SendSZLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSZLINE 0 %s", mask);
 }
 
-void rageircd_cmd_szline(const char *mask, const char *reason, const char *whom)
+void rageircd_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
@@ -630,7 +630,7 @@ void rageircd_cmd_svsadmin(const char *server, int set)
 	ircd_proto.SendSVSNOOP(server, set);
 }
 
-void rageircd_cmd_sgline(const char *mask, const char *reason)
+void rageircd_SendSGLine(const char *mask, const char *reason)
 {
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 
@@ -758,7 +758,7 @@ void rageircd_cmd_burst()
     send_cmd(NULL, "BURST");
 }
 
-void rageircd_cmd_connect(int servernum)
+void rageircd_SendConnect(int servernum)
 {
     if (Numeric) {
         me_server =
@@ -1331,14 +1331,14 @@ int anope_event_motd(const char *source, int ac, const char **av)
 }
 
 /* SVSHOLD - set */
-void rageircd_cmd_svshold(const char *nick)
+void rageircd_SendSVSHOLD(const char *nick)
 {
     send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout,
              "Being held for registered user");
 }
 
 /* SVSHOLD - release */
-void rageircd_cmd_release_svshold(const char *nick)
+void rageircd_SendSVSHOLDDel(const char *nick)
 {
     send_cmd(ServerName, "SVSHOLD %s 0", nick);
 }
@@ -1611,13 +1611,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(rageircd_cmd_chg_nick);
     pmodule_SendForceNickChange(rageircd_cmd_svsnick);
     pmodule_SendVhost(rageircd_cmd_vhost_on);
-    pmodule_cmd_connect(rageircd_cmd_connect);
-    pmodule_cmd_svshold(rageircd_cmd_svshold);
-    pmodule_cmd_release_svshold(rageircd_cmd_release_svshold);
-    pmodule_cmd_unsgline(rageircd_cmd_unsgline);
-    pmodule_cmd_unszline(rageircd_cmd_unszline);
-    pmodule_cmd_szline(rageircd_cmd_szline);
-    pmodule_cmd_sgline(rageircd_cmd_sgline);
+    pmodule_SendConnect(rageircd_cmd_connect);
+    pmodule_SendSVSHOLD(rageircd_cmd_svshold);
+    pmodule_SendSVSHOLDDel(rageircd_cmd_release_svshold);
+    pmodule_SendSGLineDel(rageircd_cmd_unsgline);
+    pmodule_SendSZLineDel(rageircd_cmd_unszline);
+    pmodule_SendSZLine(rageircd_cmd_szline);
+    pmodule_SendSGLine(rageircd_cmd_sgline);
     pmodule_cmd_unban(rageircd_cmd_unban);
     pmodule_SendSVSMode_chan(rageircd_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(rageircd_cmd_svid_umode);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 7ba3493ce..2b73ed48a 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -91,13 +91,13 @@ void rageircd_SendSVSO(const char *source, const char *nick, const char *flag);
 void rageircd_SendChangeBotNick(const char *oldnick, const char *newnick);
 void rageircd_SendForceNickChange(const char *source, const char *guest, time_t when);
 void rageircd_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void rageircd_cmd_connect(int servernum);
-void rageircd_cmd_svshold(const char *nick);
-void rageircd_cmd_release_svshold(const char *nick);
-void rageircd_cmd_unsgline(const char *mask);
-void rageircd_cmd_unszline(const char *mask);
-void rageircd_cmd_szline(const char *mask, const char *reason, const char *whom);
-void rageircd_cmd_sgline(const char *mask, const char *reason);
+void rageircd_SendConnect(int servernum);
+void rageircd_SendSVSHOLD(const char *nick);
+void rageircd_SendSVSHOLDDel(const char *nick);
+void rageircd_SendSGLineDel(const char *mask);
+void rageircd_SendSZLineDel(const char *mask);
+void rageircd_SendSZLine(const char *mask, const char *reason, const char *whom);
+void rageircd_SendSGLine(const char *mask, const char *reason);
 void rageircd_cmd_unban(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);
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 8b4b006f4..53ecaffae 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -498,14 +498,14 @@ void solidircd_SendMode(const char *source, const char *dest, const char *buf)
 }
 
 /* SVSHOLD - set */
-void solidircd_cmd_svshold(const char *nick)
+void solidircd_SendSVSHOLD(const char *nick)
 {
     send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout,
              "Being held for registered user");
 }
 
 /* SVSHOLD - release */
-void solidircd_cmd_release_svshold(const char *nick)
+void solidircd_SendSVSHOLDDel(const char *nick)
 {
     send_cmd(ServerName, "SVSHOLD %s 0", nick);
 }
@@ -737,19 +737,19 @@ void solidircd_SendSQLine(const char *mask, const char *reason)
 }
 
 /* UNSGLINE */
-void solidircd_cmd_unsgline(const char *mask)
+void solidircd_SendSGLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
 /* UNSZLINE */
-void solidircd_cmd_unszline(const char *mask)
+void solidircd_SendSZLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSZLINE 0 %s", mask);
 }
 
 /* SZLINE */
-void solidircd_cmd_szline(const char *mask, const char *reason, const char *whom)
+void solidircd_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
@@ -766,7 +766,7 @@ void solidircd_cmd_svsadmin(const char *server, int set)
 }
 
 /* SGLINE */
-void solidircd_cmd_sgline(const char *mask, const char *reason)
+void solidircd_SendSGLine(const char *mask, const char *reason)
 {
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 }
@@ -914,7 +914,7 @@ void solidircd_cmd_capab()
     send_cmd(NULL, "CAPAB SSJOIN NOQUIT BURST UNCONNECT NICKIP TSMODE");
 }
 
-void solidircd_cmd_connect(int servernum)
+void solidircd_SendConnect(int servernum)
 {
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1644,13 +1644,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(solidircd_cmd_chg_nick);
     pmodule_SendForceNickChange(solidircd_cmd_svsnick);
     pmodule_SendVhost(solidircd_cmd_vhost_on);
-    pmodule_cmd_connect(solidircd_cmd_connect);
-    pmodule_cmd_svshold(solidircd_cmd_svshold);
-    pmodule_cmd_release_svshold(solidircd_cmd_release_svshold);
-    pmodule_cmd_unsgline(solidircd_cmd_unsgline);
-    pmodule_cmd_unszline(solidircd_cmd_unszline);
-    pmodule_cmd_szline(solidircd_cmd_szline);
-    pmodule_cmd_sgline(solidircd_cmd_sgline);
+    pmodule_SendConnect(solidircd_cmd_connect);
+    pmodule_SendSVSHOLD(solidircd_cmd_svshold);
+    pmodule_SendSVSHOLDDel(solidircd_cmd_release_svshold);
+    pmodule_SendSGLineDel(solidircd_cmd_unsgline);
+    pmodule_SendSZLineDel(solidircd_cmd_unszline);
+    pmodule_SendSZLine(solidircd_cmd_szline);
+    pmodule_SendSGLine(solidircd_cmd_sgline);
     pmodule_cmd_unban(solidircd_cmd_unban);
     pmodule_SendSVSMode_chan(solidircd_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(solidircd_cmd_svid_umode);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index fdccd0876..2e12887f2 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -115,13 +115,13 @@ void solidircd_SendSVSO(const char *source, const char *nick, const char *flag);
 void solidircd_SendChangeBotNick(const char *oldnick, const char *newnick);
 void solidircd_SendForceNickChange(const char *source, const char *guest, time_t when);
 void solidircd_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void solidircd_cmd_connect(int servernum);
-void solidircd_cmd_svshold(const char *nick);
-void solidircd_cmd_release_svshold(const char *nick);
-void solidircd_cmd_unsgline(const char *mask);
-void solidircd_cmd_unszline(const char *mask);
-void solidircd_cmd_szline(const char *mask, const char *reason, const char *whom);
-void solidircd_cmd_sgline(const char *mask, const char *reason);
+void solidircd_SendConnect(int servernum);
+void solidircd_SendSVSHOLD(const char *nick);
+void solidircd_SendSVSHOLDDel(const char *nick);
+void solidircd_SendSGLineDel(const char *mask);
+void solidircd_SendSZLineDel(const char *mask);
+void solidircd_SendSZLine(const char *mask, const char *reason, const char *whom);
+void solidircd_SendSGLine(const char *mask, const char *reason);
 void solidircd_cmd_unban(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);
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index a467d7447..9c162a36e 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -672,12 +672,12 @@ void ultimate3_SendSQLine(const char *mask, const char *reason)
     send_cmd(NULL, "SQLINE %s :%s", mask, reason);
 }
 
-void ultimate3_cmd_unsgline(const char *mask)
+void ultimate3_SendSGLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
-void ultimate3_cmd_unszline(const char *mask)
+void ultimate3_SendSZLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSZLINE 0 %s", mask);
 }
@@ -687,7 +687,7 @@ void ultimate3_cmd_unszline(const char *mask)
    Complete rewrite of the kline/akill/zline system. (s)zlines no longer exist.
    K: lines set on IP addresses without username portions (or *) are treated as Z: lines used to be.
 */
-void ultimate3_cmd_szline(const char *mask, const char *reason, const char *whom)
+void ultimate3_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     send_cmd(NULL, "AKILL %s * %d %s %ld :%s", mask, 86400 * 2, whom,
              (long int) time(NULL), reason);
@@ -705,7 +705,7 @@ void ultimate3_cmd_svsadmin(const char *server, int set)
 	ircd_proto.SendSVSNOOP(server, set);
 }
 
-void ultimate3_cmd_sgline(const char *mask, const char *reason)
+void ultimate3_SendSGLine(const char *mask, const char *reason)
 {
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 }
@@ -1445,7 +1445,7 @@ void ultimate3_cmd_burst()
 }
 
 
-void ultimate3_cmd_connect(int servernum)
+void ultimate3_SendConnect(int servernum)
 {
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1466,13 +1466,13 @@ void ultimate3_cmd_connect(int servernum)
 }
 
 /* SVSHOLD - set */
-void ultimate3_cmd_svshold(const char *nick)
+void ultimate3_SendSVSHOLD(const char *nick)
 {
     /* Not supported by this IRCD */
 }
 
 /* SVSHOLD - release */
-void ultimate3_cmd_release_svshold(const char *nick)
+void ultimate3_SendSVSHOLDDel(const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1752,13 +1752,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(ultimate3_cmd_chg_nick);
     pmodule_SendForceNickChange(ultimate3_cmd_svsnick);
     pmodule_SendVhost(ultimate3_cmd_vhost_on);
-    pmodule_cmd_connect(ultimate3_cmd_connect);
-    pmodule_cmd_svshold(ultimate3_cmd_svshold);
-    pmodule_cmd_release_svshold(ultimate3_cmd_release_svshold);
-    pmodule_cmd_unsgline(ultimate3_cmd_unsgline);
-    pmodule_cmd_unszline(ultimate3_cmd_unszline);
-    pmodule_cmd_szline(ultimate3_cmd_szline);
-    pmodule_cmd_sgline(ultimate3_cmd_sgline);
+    pmodule_SendConnect(ultimate3_cmd_connect);
+    pmodule_SendSVSHOLD(ultimate3_cmd_svshold);
+    pmodule_SendSVSHOLDDel(ultimate3_cmd_release_svshold);
+    pmodule_SendSGLineDel(ultimate3_cmd_unsgline);
+    pmodule_SendSZLineDel(ultimate3_cmd_unszline);
+    pmodule_SendSZLine(ultimate3_cmd_szline);
+    pmodule_SendSGLine(ultimate3_cmd_sgline);
     pmodule_cmd_unban(ultimate3_cmd_unban);
     pmodule_SendSVSMode_chan(ultimate3_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(ultimate3_cmd_svid_umode);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index db9dcae15..18add63ec 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -101,13 +101,13 @@ void ultimate3_SendSVSO(const char *source, const char *nick, const char *flag);
 void ultimate3_SendChangeBotNick(const char *oldnick, const char *newnick);
 void ultimate3_SendForceNickChange(const char *source, const char *guest, time_t when);
 void ultimate3_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void ultimate3_cmd_connect(int servernum);
-void ultimate3_cmd_svshold(const char *nick);
-void ultimate3_cmd_release_svshold(const char *nick);
-void ultimate3_cmd_unsgline(const char *mask);
-void ultimate3_cmd_unszline(const char *mask);
-void ultimate3_cmd_szline(const char *mask, const char *reason, const char *whom);
-void ultimate3_cmd_sgline(const char *mask, const char *reason);
+void ultimate3_SendConnect(int servernum);
+void ultimate3_SendSVSHOLD(const char *nick);
+void ultimate3_SendSVSHOLDDel(const char *nick);
+void ultimate3_SendSGLineDel(const char *mask);
+void ultimate3_SendSZLineDel(const char *mask);
+void ultimate3_SendSZLine(const char *mask, const char *reason, const char *whom);
+void ultimate3_SendSGLine(const char *mask, const char *reason);
 void ultimate3_cmd_unban(const char *name, const char *nick);
 void ultimate3_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
 void ultimate3_cmd_svid_umode(const char *nick, time_t ts);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index bcbd37e14..b110629b2 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -751,17 +751,17 @@ void viagra_SendSQLine(const char *mask, const char *reason)
     send_cmd(NULL, "SQLINE %s :%s", mask, reason);
 }
 
-void viagra_cmd_unsgline(const char *mask)
+void viagra_SendSGLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
-void viagra_cmd_unszline(const char *mask)
+void viagra_SendSZLineDel(const char *mask)
 {
     send_cmd(NULL, "UNSZLINE 0 %s", mask);
 }
 
-void viagra_cmd_szline(const char *mask, const char *reason, const char *whom)
+void viagra_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
@@ -776,7 +776,7 @@ void viagra_cmd_svsadmin(const char *server, int set)
 	ircd_proto.SendSVSNOOP(server, set);
 }
 
-void viagra_cmd_sgline(const char *mask, const char *reason)
+void viagra_SendSGLine(const char *mask, const char *reason)
 {
     send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason);
 }
@@ -963,7 +963,7 @@ void viagra_cmd_burst()
     send_cmd(NULL, "BURST");
 }
 
-void viagra_cmd_connect(int servernum)
+void viagra_SendConnect(int servernum)
 {
     me_server =
         new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1394,13 +1394,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSHOLD - set */
-void viagra_cmd_svshold(const char *nick)
+void viagra_SendSVSHOLD(const char *nick)
 {
     /* Not supported by this IRCD */
 }
 
 /* SVSHOLD - release */
-void viagra_cmd_release_svshold(const char *nick)
+void viagra_SendSVSHOLDDel(const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1651,13 +1651,13 @@ void moduleAddAnopeCmds()
     pmodule_SendChangeBotNick(viagra_cmd_chg_nick);
     pmodule_SendForceNickChange(viagra_cmd_svsnick);
     pmodule_SendVhost(viagra_cmd_vhost_on);
-    pmodule_cmd_connect(viagra_cmd_connect);
-    pmodule_cmd_svshold(viagra_cmd_svshold);
-    pmodule_cmd_release_svshold(viagra_cmd_release_svshold);
-    pmodule_cmd_unsgline(viagra_cmd_unsgline);
-    pmodule_cmd_unszline(viagra_cmd_unszline);
-    pmodule_cmd_szline(viagra_cmd_szline);
-    pmodule_cmd_sgline(viagra_cmd_sgline);
+    pmodule_SendConnect(viagra_cmd_connect);
+    pmodule_SendSVSHOLD(viagra_cmd_svshold);
+    pmodule_SendSVSHOLDDel(viagra_cmd_release_svshold);
+    pmodule_SendSGLineDel(viagra_cmd_unsgline);
+    pmodule_SendSZLineDel(viagra_cmd_unszline);
+    pmodule_SendSZLine(viagra_cmd_szline);
+    pmodule_SendSGLine(viagra_cmd_sgline);
     pmodule_cmd_unban(viagra_cmd_unban);
     pmodule_SendSVSMode_chan(viagra_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(viagra_cmd_svid_umode);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index 0a973ba18..a9e12167e 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -110,13 +110,13 @@ void viagra_SendSVSO(const char *source, const char *nick, const char *flag);
 void viagra_SendChangeBotNick(const char *oldnick, const char *newnick);
 void viagra_SendForceNickChange(const char *source, const char *guest, time_t when);
 void viagra_SendVhost(const char *nick, const char *vIdent, const char *vhost);
-void viagra_cmd_connect(int servernum);
-void viagra_cmd_svshold(const char *nick);
-void viagra_cmd_release_svshold(const char *nick);
-void viagra_cmd_unsgline(const char *mask);
-void viagra_cmd_unszline(const char *mask);
-void viagra_cmd_szline(const char *mask, const char *reason, const char *whom);
-void viagra_cmd_sgline(const char *mask, const char *reason);
+void viagra_SendConnect(int servernum);
+void viagra_SendSVSHOLD(const char *nick);
+void viagra_SendSVSHOLDDel(const char *nick);
+void viagra_SendSGLineDel(const char *mask);
+void viagra_SendSZLineDel(const char *mask);
+void viagra_SendSZLine(const char *mask, const char *reason, const char *whom);
+void viagra_SendSGLine(const char *mask, const char *reason);
 void viagra_cmd_unban(const char *name, const char *nick);
 void viagra_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
 void viagra_cmd_svid_umode(const char *nick, time_t ts);