Convert a bunch more protocol stuff.

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

31 files changed, 242 insertions, 242 deletions

diff --git a/include/depricated.h b/include/depricated.h
index 45b4263b7..d1b745475 100644
--- a/include/depricated.h
+++ b/include/depricated.h
@@ -32,11 +32,11 @@
 
 #define s_sqline(mask, reason) anope_SendSQLine(mask, reason)
 
-#define s_sgline(mask, reason) anope_cmd_sgline(mask, reason)
-#define s_szline(mask, reason) anope_cmd_szline(mask, reason)
-#define s_unsgline(mask) anope_cmd_unsgline(mask)
+#define s_sgline(mask, reason) anope_SendSGLine(mask, reason)
+#define s_szline(mask, reason) anope_SendSZLine(mask, reason)
+#define s_unsgline(mask) anope_SendSGLineDel(mask)
 #define s_unsqline(mask) anope_SendSQLineDel(mask)
-#define s_unszline(mask) anope_cmd_unszline(mask)
+#define s_unszline(mask) anope_SendSZLineDel(mask)
 
 #define s_rakill(user, host) anope_SendAkillDel(user, host)
 
diff --git a/include/extern.h b/include/extern.h
index cafc7c729..52213884f 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1121,7 +1121,7 @@ E void anope_cmd_chghost(const char *nick, const char *vhost);
 E void anope_cmd_chgident(const char *nick, const char *vIdent);                 			  /* CHGIDENT */
 E void anope_SendVhost(const char *nick, const char *vIdent, const char *vhost);    			  /* CHGHOST + CHGIDENT */
 E void anope_SendVhostDel(User *u);
-E void anope_cmd_connect();                             	           	  /* Connect */
+E void anope_SendConnect();                             	           	  /* Connect */
 E void anope_cmd_ea();									  /* EA      */
 E void anope_SendGlobops(const char *source, const char *fmt, ...);         	  		  /* GLOBOPS */
 E void anope_SendInvite(const char *source, const char *chan, const char *nick);       	  		  /* INVITE */
@@ -1148,14 +1148,14 @@ E void anope_SendGlobalPrivmsg(const char *source, const char *dest, const char
 E void anope_cmd_protoctl();                                         			  /* PROTOCTL */
 E void anope_SendQuit(const char *source, const char *fmt, ...);           	  		  /* QUIT */
 E void anope_SendAkillDel(const char *user, const char *host);			  		  /* RAKILL */
-E void anope_cmd_sgline(const char *mask, const char *reason);			  	  		  /* SGLINE */
+E void anope_SendSGLine(const char *mask, const char *reason);			  	  		  /* SGLINE */
 E void anope_SendSQLine(const char *mask, const char *reason);                   	  		  /* SQLINE */
-E void anope_cmd_szline(const char *mask, const char *reason, const char *whom);				  /* SZLINE */
+E void anope_SendSZLine(const char *mask, const char *reason, const char *whom);				  /* SZLINE */
 E void anope_SendSquit(const char *servname, const char *message);               	  		  /* SQUIT  */
 E void anope_cmd_svinfo();						  	  		  /* SVINFO */
 E void anope_cmd_svsadmin(const char *server, int set);						  /* SVSADMIN */
-E void anope_cmd_svshold(const char *nick);				  	  		  /* SVSHOLD */
-E void anope_cmd_release_svshold(const char *nick);				  		  /* SVSHOLD */
+E void anope_SendSVSHOLD(const char *nick);				  	  		  /* SVSHOLD */
+E void anope_SendSVSHOLDDel(const char *nick);				  		  /* SVSHOLD */
 E void anope_cmd_svsinfo();								  /* SVSINFO */
 E void anope_cmd_svsjoin(const char *source, const char *nick,const char *chan, const char *param);          	  /* SVSJOIN */
 E void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...);     		  /* SVSKILL */
@@ -1167,9 +1167,9 @@ E void anope_SendSVSO(const char *source,const char *nick, const char *flag);
 E void anope_cmd_svspart(const char *source, const char *nick,const char *chan);          	  		  /* SVSPART   */
 E void anope_cmd_swhois(const char *source, const char *who, const char *mask);	  	  		  /* SWHOIS */
 E void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when); /* TOPIC */
-E void anope_cmd_unsgline(const char *mask);				  	  		  /* UNSGLINE */
+E void anope_SendSGLineDel(const char *mask);				  	  		  /* UNSGLINE */
 E void anope_SendSQLineDel(const char *user);                               	  		  /* UNSQLINE */
-E void anope_cmd_unszline(const char *mask);				  	  		  /* UNSZLINE */
+E void anope_SendSZLineDel(const char *mask);				  	  		  /* UNSZLINE */
 E void anope_cmd_eob();									  /* EOB - end of burst */
 E void anope_cmd_burst();									  /* BURST  - use eob to send burst 0 */
 E void anope_cmd_svswatch(const char *sender, const char *nick, const char *parm);
diff --git a/include/services.h b/include/services.h
index 69a9d9407..7b7b70a34 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1313,13 +1313,13 @@ class IRCDProto {
 			send_cmd(NULL, "SVSNICK %s %s :%ld", oldnick, newnick, static_cast<long>(when));
 		}
 		virtual void SendVhost(const char *, const char *, const char *) { }
-		virtual void cmd_connect() = 0;
-		virtual void cmd_svshold(const char *) { }
-		virtual void cmd_release_svshold(const char *) { }
-		virtual void cmd_unsgline(const char *) { }
-		virtual void cmd_unszline(const char *) { }
-		virtual void cmd_szline(const char *, const char *, const char *) { }
-		virtual void cmd_sgline(const char *, const char *) { }
+		virtual void SendConnect() = 0;
+		virtual void SendSVSHOLD(const char *) { }
+		virtual void SendSVSHOLDDel(const char *) { }
+		virtual void SendSGLineDel(const char *) { }
+		virtual void SendSZLineDel(const char *) { }
+		virtual void SendSZLine(const char *, const char *, const char *) { }
+		virtual void SendSGLine(const char *, const char *) { }
 		virtual void cmd_unban(const char *, const char *) { }
 		virtual void SendSVSMode_chan(const char *, const char *, const char *) { }
 		virtual void cmd_svid_umode(const char *, time_t) { }
diff --git a/src/init.c b/src/init.c
index 431e11941..09cb8168d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -712,7 +712,7 @@ int init_secondary(int ac, char **av)
              RemotePort);
     }
 
-    anope_cmd_connect();
+    anope_SendConnect();
     send_event(EVENT_CONNECT, 1, EVENT_STOP);
 
     sgets2(inbuf, sizeof(inbuf), servsock);
diff --git a/src/ircd.c b/src/ircd.c
index 2af496e54..ccd0d9ff8 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -277,39 +277,39 @@ void anope_SendVhost(const char *nick, const char *vIdent, const char *vhost)
 	ircdproto->SendVhost(nick, vIdent, vhost);
 }
 
-void anope_cmd_connect()
+void anope_SendConnect()
 {
-	ircdproto->cmd_connect();
+	ircdproto->SendConnect();
 }
 
-void anope_cmd_svshold(const char *nick)
+void anope_SendSVSHOLD(const char *nick)
 {
-	ircdproto->cmd_svshold(nick);
+	ircdproto->SendSVSHOLD(nick);
 }
 
-void anope_cmd_release_svshold(const char *nick)
+void anope_SendSVSHOLDDel(const char *nick)
 {
-	ircdproto->cmd_release_svshold(nick);
+	ircdproto->SendSVSHOLDDel(nick);
 }
 
-void anope_cmd_unsgline(const char *mask)
+void anope_SendSGLineDel(const char *mask)
 {
-	ircdproto->cmd_unsgline(mask);
+	ircdproto->SendSGLineDel(mask);
 }
 
-void anope_cmd_unszline(const char *mask)
+void anope_SendSZLineDel(const char *mask)
 {
-	ircdproto->cmd_unszline(mask);
+	ircdproto->SendSZLineDel(mask);
 }
 
-void anope_cmd_szline(const char *mask, const char *reason, const char *whom)
+void anope_SendSZLine(const char *mask, const char *reason, const char *whom)
 {
-	ircdproto->cmd_szline(mask, reason, whom);
+	ircdproto->SendSZLine(mask, reason, whom);
 }
 
-void anope_cmd_sgline(const char *mask, const char *reason)
+void anope_SendSGLine(const char *mask, const char *reason)
 {
-	ircdproto->cmd_sgline(mask, reason);
+	ircdproto->SendSGLine(mask, reason);
 }
 
 void anope_cmd_unban(const char *name, const char *nick)
diff --git a/src/nickserv.c b/src/nickserv.c
index 1d60aa5ab..85ae521f1 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -935,7 +935,7 @@ void cancel_user(User * u)
         if (na->status & NS_GUESTED) {
             if (ircd->svshold) {
                 if (UseSVSHOLD) {
-                    anope_cmd_svshold(na->nick);
+                    anope_SendSVSHOLD(na->nick);
                 } else {
                     if (ircd->svsnick) {
                         anope_SendGuestNick(u->nick, NSEnforcerUser,
@@ -1559,7 +1559,7 @@ void release(NickAlias * na, int from_timeout)
         del_ns_timeout(na, TO_RELEASE);
     if (ircd->svshold) {
         if (UseSVSHOLD) {
-            anope_cmd_release_svshold(na->nick);
+            anope_SendSVSHOLDDel(na->nick);
         } else {
             anope_SendQuit(na->nick, NULL);
         }
diff --git a/src/operserv.c b/src/operserv.c
index e5849423c..90e00f553 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -1032,7 +1032,7 @@ int add_sgline(User * u, char *mask, const char *by, const time_t expires,
 
     slist_add(&sglines, entry);
 
-    anope_cmd_sgline(entry->mask, entry->reason);
+    anope_SendSGLine(entry->mask, entry->reason);
 
     if (KillonSGline && !ircd->sglineenforce) {
         snprintf(buf, (BUFSIZE - 1), "G-Lined: %s", entry->reason);
@@ -1066,7 +1066,7 @@ int check_sgline(const char *nick, const char *realname)
             continue;
 
         if (match_wild_nocase(sx->mask, realname)) {
-            anope_cmd_sgline(sx->mask, sx->reason);
+            anope_SendSGLine(sx->mask, sx->reason);
             /* We kill nick since s_sgline can't */
             anope_SendSVSKill(ServerName, nick, "G-Lined: %s", sx->reason);
             return 1;
@@ -1102,7 +1102,7 @@ static void free_sgline_entry(SList * slist, void *item)
     SXLine *sx = (SXLine *)item;
 
     /* Remove the SGLINE from all the servers */
-    anope_cmd_unsgline(sx->mask);
+    anope_SendSGLineDel(sx->mask);
 
     /* Free the structure */
     free(sx->mask);
@@ -1430,7 +1430,7 @@ int add_szline(User * u, char *mask, const char *by, const time_t expires,
     entry->expires = expires;
 
     slist_add(&szlines, entry);
-    anope_cmd_szline(entry->mask, entry->reason, entry->by);
+    anope_SendSZLine(entry->mask, entry->reason, entry->by);
 
     return deleted;
 }
@@ -1456,7 +1456,7 @@ int check_szline(const char *nick, char *ip)
         }
 
         if (match_wild_nocase(sx->mask, ip)) {
-            anope_cmd_szline(sx->mask, sx->reason, sx->by);
+            anope_SendSZLine(sx->mask, sx->reason, sx->by);
             return 1;
         }
     }
@@ -1491,7 +1491,7 @@ static void free_szline_entry(SList * slist, void *item)
     SXLine *sx = (SXLine *)item;
 
     /* Remove the SZLINE from all the servers */
-    anope_cmd_unszline(sx->mask);
+    anope_SendSZLineDel(sx->mask);
 
     /* Free the structure */
     free(sx->mask);
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 86b3115de..cc81848db 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -460,13 +460,13 @@ void BahamutIRCdProto::SendMode(const char *source, const char *dest, const char
 }
 
 /* SVSHOLD - set */
-void BahamutIRCdProto::cmd_svshold(const char *nick)
+void BahamutIRCdProto::SendSVSHOLD(const char *nick)
 {
 	send_cmd(ServerName, "SVSHOLD %s %d :%s", nick, NSReleaseTimeout, "Being held for registered user");
 }
 
 /* SVSHOLD - release */
-void BahamutIRCdProto::cmd_release_svshold(const char *nick)
+void BahamutIRCdProto::SendSVSHOLDDel(const char *nick)
 {
 	send_cmd(ServerName, "SVSHOLD %s 0", nick);
 }
@@ -670,13 +670,13 @@ void BahamutIRCdProto::SendSQLine(const char *mask, const char *reason)
 }
 
 /* UNSGLINE */
-void BahamutIRCdProto::cmd_unsgline(const char *mask)
+void BahamutIRCdProto::SendSGLineDel(const char *mask)
 {
 	send_cmd(NULL, "UNSGLINE 0 :%s", mask);
 }
 
 /* UNSZLINE */
-void BahamutIRCdProto::cmd_unszline(const char *mask)
+void BahamutIRCdProto::SendSZLineDel(const char *mask)
 {
 	/* this will likely fail so its only here for legacy */
 	send_cmd(NULL, "UNSZLINE 0 %s", mask);
@@ -685,7 +685,7 @@ void BahamutIRCdProto::cmd_unszline(const char *mask)
 }
 
 /* SZLINE */
-void BahamutIRCdProto::cmd_szline(const char *mask, const char *reason, const char *whom)
+void BahamutIRCdProto::SendSZLine(const char *mask, const char *reason, const char *whom)
 {
 	/* this will likely fail so its only here for legacy */
 	send_cmd(NULL, "SZLINE %s :%s", mask, reason);
@@ -705,7 +705,7 @@ void bahamut_cmd_svsadmin(const char *server, int set)
 }
 
 /* SGLINE */
-void BahamutIRCdProto::cmd_sgline(const char *mask, const char *reason)
+void BahamutIRCdProto::SendSGLine(const char *mask, const char *reason)
 {
 	send_cmd(NULL, "SGLINE %d :%s:%s", static_cast<int>(strlen(mask)), mask, reason);
 }
@@ -814,7 +814,7 @@ void bahamut_cmd_capab()
              "CAPAB SSJOIN NOQUIT BURST UNCONNECT NICKIP TSMODE TS3");
 }
 
-void BahamutIRCdProto::cmd_connect()
+void BahamutIRCdProto::SendConnect()
 {
 	me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
 	if (servernum == 1) bahamut_cmd_pass(RemotePassword);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index a97e92af3..02c740ac3 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -75,13 +75,13 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendJoin(const char *, const char *, time_t);
 		void SendSQLineDel(const char *);
 		void SendSQLine(const char *, const char *);
-		void cmd_connect();
-		void cmd_svshold(const char *);
-		void cmd_release_svshold(const char *);
-		void cmd_unsgline(const char *);
-		void cmd_unszline(const char *);
-		void cmd_szline(const char *, const char *, const char *);
-		void cmd_sgline(const char *, const char *);
+		void SendConnect();
+		void SendSVSHOLD(const char *);
+		void SendSVSHOLDDel(const char *);
+		void SendSGLineDel(const char *);
+		void SendSZLineDel(const char *);
+		void SendSZLine(const char *, const char *, const char *);
+		void SendSGLine(const char *, const char *);
 		void cmd_unban(const char *, const char *);
 		void SendSVSMode_chan(const char *, const char *, const char *);
 		void cmd_svid_umode(const char *, time_t);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 42c283592..8858c392a 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -713,7 +713,7 @@ void CharybdisProto::SendSQLine(const char *mask, const char *reason)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason);
 }
 
-void CharybdisProto::cmd_unsgline(const char *mask)
+void CharybdisProto::SendSGLineDel(const char *mask)
 {
 	Uid *ud = find_uid(s_OperServ);
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNXLINE * %s", mask);
@@ -723,7 +723,7 @@ void charybdis_cmd_svsadmin(const char *server, int set)
 {
 }
 
-void CharybdisProto::cmd_sgline(const char *mask, const char *reason)
+void CharybdisProto::SendSGLine(const char *mask, const char *reason)
 {
 	Uid *ud = find_uid(s_OperServ);
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "XLINE * %s 0 :%s", mask, reason);
@@ -845,7 +845,7 @@ void CharybdisProto::cmd_server(const char *servname, int hop, const char *descr
 	send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
 
-void CharybdisProto::cmd_connect()
+void CharybdisProto::SendConnect()
 {
 	/* Make myself known to myself in the serverlist */
 	if (UseTS6) me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
@@ -1183,13 +1183,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSHOLD - set */
-void CharybdisProto::cmd_svshold(const char *nick)
+void CharybdisProto::SendSVSHOLD(const char *nick)
 {
 	send_cmd(NULL, "ENCAP * NICKDELAY 300 %s", nick);
 }
 
 /* SVSHOLD - release */
-void CharybdisProto::cmd_release_svshold(const char *nick)
+void CharybdisProto::SendSVSHOLDDel(const char *nick)
 {
 	send_cmd(NULL, "ENCAP * NICKDELAY 0 %s", nick);
 }
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index c8151a419..d820b120a 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -68,11 +68,11 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendSQLine(const char *, const char *);
 		void SendForceNickChange(const char *, const char *, time_t);
 		void SendVhost(const char *, const char *, const char *);
-		void cmd_connect();
-		void cmd_svshold(const char *);
-		void cmd_release_svshold(const char *);
-		void cmd_unsgline(const char *);
-		void cmd_sgline(const char *, const char *);
+		void SendConnect();
+		void SendSVSHOLD(const char *);
+		void SendSVSHOLDDel(const char *);
+		void SendSGLineDel(const char *);
+		void SendSGLine(const char *, const char *);
 		void cmd_server(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
 		int valid_nick(const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 48063295d..77d84eb93 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -807,7 +807,7 @@ void InspIRCdProto::SendVhost(const char *nick, const char *vIdent, const char *
 	inspircd_cmd_chghost(nick, vhost);
 }
 
-void InspIRCdProto::cmd_connect()
+void InspIRCdProto::SendConnect()
 {
 	if (servernum == 1) inspircd_cmd_pass(RemotePassword);
 	else if (servernum == 2) inspircd_cmd_pass(RemotePassword2);
@@ -1279,25 +1279,25 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSHOLD - set */
-void InspIRCdProto::cmd_svshold(const char *nick)
+void InspIRCdProto::SendSVSHOLD(const char *nick)
 {
 	send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, NSReleaseTimeout, "Being held for registered user");
 }
 
 /* SVSHOLD - release */
-void InspIRCdProto::cmd_release_svshold(const char *nick)
+void InspIRCdProto::SendSVSHOLDDel(const char *nick)
 {
 	send_cmd(s_OperServ, "SVSHOLD %s", nick);
 }
 
 /* UNSZLINE */
-void InspIRCdProto::cmd_unszline(const char *mask)
+void InspIRCdProto::SendSZLineDel(const char *mask)
 {
 	send_cmd(s_OperServ, "ZLINE %s", mask);
 }
 
 /* SZLINE */
-void InspIRCdProto::cmd_szline(const char *mask, const char *reason, const char *whom)
+void InspIRCdProto::SendSZLine(const char *mask, const char *reason, const char *whom)
 {
 	send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason);
 }
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index cfa75fb26..dca5c1e6e 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -82,11 +82,11 @@ class InspIRCdProto : public IRCDProto {
 		void SendSQLine(const char *, const char *);
 		void SendSquit(const char *, const char *);
 		void SendVhost(const char *, const char *, const char *);
-		void cmd_connect();
-		void cmd_svshold(const char *);
-		void cmd_release_svshold(const char *);
-		void cmd_unszline(const char *);
-		void cmd_szline(const char *, const char *, const char *);
+		void SendConnect();
+		void SendSVSHOLD(const char *);
+		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 *);
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)
 }