Convert SWhois, SERVER, EOB..

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

29 files changed, 117 insertions, 116 deletions

diff --git a/include/extern.h b/include/extern.h
index 575de3d86..6f735c800 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1165,12 +1165,12 @@ E void anope_SendForceNickChange(const char *nick,const char *newnick, time_t wh
 E void anope_SendSVSNOOP(const char *server, int set);			  	  		  /* SVSNOOP */
 E void anope_SendSVSO(const char *source,const char *nick, const char *flag);          	  		  /* SVSO   */
 E void anope_SendSVSPart(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_SendSWhois(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_SendSGLineDel(const char *mask);				  	  		  /* UNSGLINE */
 E void anope_SendSQLineDel(const char *user);                               	  		  /* UNSQLINE */
 E void anope_SendSZLineDel(const char *mask);				  	  		  /* UNSZLINE */
-E void anope_cmd_eob();									  /* EOB - end of burst */
+E void anope_SendEOB();									  /* 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);
 E void anope_SendCTCP(const char *source, const char *dest,  const char *fmt, ...);   	  		  /* CTCP */
@@ -1251,7 +1251,7 @@ E void anope_SendSVID3(User *u, const char *ts);
 E void anope_SendUnregisteredNick(User *u);
 E int anope_flood_mode_check(const char *value);
 
-E void anope_cmd_jupe(const char *jserver, const char *who, const char *reason);
+E void anope_SendJupe(const char *jserver, const char *who, const char *reason);
 
 E int anope_valid_nick(const char *nick);
 E int anope_valid_chan(const char *chan);
diff --git a/include/services.h b/include/services.h
index 0d595d1a1..9e46b88c5 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1335,15 +1335,16 @@ class IRCDProto {
 		}
 		virtual void SendSVSJoin(const char *, const char *, const char *, const char *) { }
 		virtual void SendSVSPart(const char *, const char *, const char *) { }
-		virtual void cmd_swhois(const char *, const char *, const char *) { }
-		virtual void cmd_eob() { }
-		virtual void cmd_server(const char *, int, const char *) = 0;
-		virtual void cmd_jupe(const char *jserver, const char *who, const char *reason)
+		virtual void SendSWhois(const char *, const char *, const char *) { }
+		virtual void SendEOB() { }
+		virtual void SendServer(const char *, int, const char *) = 0;
+		virtual void SendJupe(const char *jserver, const char *who, const char *reason)
 		{
+			// XXX: this should NOT be done here. protocol modules are *only* for protocol. -- w00t
 			char rbuf[256];
 			snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, reason ? ": " : "", reason ? reason : "");
 			if (findserver(servlist, jserver)) SendSquit(jserver, rbuf);
-			cmd_server(jserver, 2, rbuf);
+			SendServer(jserver, 2, rbuf);
 			new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 		}
 		virtual void set_umode(User *, int, const char **) = 0;
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index be0d0bb50..928da7ef9 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -77,7 +77,7 @@ int do_jupe(User * u)
         if (!isValidHost(jserver, 3)) {
             notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
         } else {
-            anope_cmd_jupe(jserver, u->nick, reason);
+            anope_SendJupe(jserver, u->nick, reason);
 
             if (WallOSJupe)
                 anope_SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2",
diff --git a/src/init.c b/src/init.c
index 09cb8168d..01ebf6c1e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -739,7 +739,7 @@ int init_secondary(int ac, char **av)
         anope_SendJoin(s_GlobalNoticer, LogChannel, time(NULL));
     }
 
-    anope_cmd_eob();
+    anope_SendEOB();
 
     /**
       * Load our delayed modeles - modules that are planing on making clients need to wait till now
diff --git a/src/ircd.c b/src/ircd.c
index 9ae954329..75fe8a3d7 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -352,14 +352,14 @@ void anope_SendSVSPart(const char *source, const char *nick, const char *chan)
 	ircdproto->SendSVSPart(source, nick, chan);
 }
 
-void anope_cmd_swhois(const char *source, const char *who, const char *mask)
+void anope_SendSWhois(const char *source, const char *who, const char *mask)
 {
-	ircdproto->cmd_swhois(source, who, mask);
+	ircdproto->SendSWhois(source, who, mask);
 }
 
-void anope_cmd_eob()
+void anope_SendEOB()
 {
-	ircdproto->cmd_eob();
+	ircdproto->SendEOB();
 }
 
 int anope_flood_mode_check(const char *value)
@@ -367,9 +367,9 @@ int anope_flood_mode_check(const char *value)
 	return ircdproto->flood_mode_check(value);
 }
 
-void anope_cmd_jupe(const char *jserver, const char *who, const char *reason)
+void anope_SendJupe(const char *jserver, const char *who, const char *reason)
 {
-	ircdproto->cmd_jupe(jserver, who, reason);
+	ircdproto->SendJupe(jserver, who, reason);
 }
 
 int anope_valid_nick(const char *nick)
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index f41f0e8d4..a9f326f72 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -802,7 +802,7 @@ void bahamut_cmd_pass(const char *pass)
 }
 
 /* SERVER */
-void BahamutIRCdProto::cmd_server(const char *servname, int hop, const char *descript)
+void BahamutIRCdProto::SendServer(const char *servname, int hop, const char *descript)
 {
 	send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -821,7 +821,7 @@ void BahamutIRCdProto::SendConnect()
 	else if (servernum == 2) bahamut_cmd_pass(RemotePassword2);
 	else if (servernum == 3) bahamut_cmd_pass(RemotePassword3);
 	bahamut_cmd_capab();
-	cmd_server(ServerName, 1, ServerDesc);
+	SendServer(ServerName, 1, ServerDesc);
 	bahamut_cmd_svinfo();
 	bahamut_cmd_burst();
 }
@@ -1050,7 +1050,7 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void BahamutIRCdProto::cmd_eob()
+void BahamutIRCdProto::SendEOB()
 {
 	send_cmd(NULL, "BURST 0");
 }
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 25e0f972c..954a48c1a 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -87,8 +87,8 @@ class BahamutIRCdProto : public IRCDProto {
 		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 SendEOB();
+		void SendServer(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
 		int flood_mode_check(const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 8858c392a..1bcad6fec 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -840,7 +840,7 @@ void charybdis_cmd_pass(const char *pass)
 }
 
 /* SERVER name hop descript */
-void CharybdisProto::cmd_server(const char *servname, int hop, const char *descript)
+void CharybdisProto::SendServer(const char *servname, int hop, const char *descript)
 {
 	send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -854,7 +854,7 @@ void CharybdisProto::SendConnect()
 	else if (servernum == 2) charybdis_cmd_pass(RemotePassword2);
 	else if (servernum == 3) charybdis_cmd_pass(RemotePassword3);
 	charybdis_cmd_capab();
-	cmd_server(ServerName, 1, ServerDesc);
+	SendServer(ServerName, 1, ServerDesc);
 	charybdis_cmd_svinfo();
 }
 
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index d820b120a..8165ca681 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -73,7 +73,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendSVSHOLDDel(const char *);
 		void SendSGLineDel(const char *);
 		void SendSGLine(const char *, const char *);
-		void cmd_server(const char *, int, const char *);
+		void SendServer(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
 		int valid_nick(const char *);
 		int flood_mode_check(const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 2dee0c55f..8d107e0b6 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -753,7 +753,7 @@ void inspircd_cmd_pass(const char *pass)
 }
 
 /* SERVER services-dev.chatspike.net password 0 :Description here */
-void InspIRCdProto::cmd_server(const char *servname, int hop, const char *descript)
+void InspIRCdProto::SendServer(const char *servname, int hop, const char *descript)
 {
 	send_cmd(ServerName, "SERVER %s %s %d :%s", servname, currentpass, hop, descript);
 }
@@ -812,7 +812,7 @@ void InspIRCdProto::SendConnect()
 	if (servernum == 1) inspircd_cmd_pass(RemotePassword);
 	else if (servernum == 2) inspircd_cmd_pass(RemotePassword2);
 	else if (servernum == 3) inspircd_cmd_pass(RemotePassword3);
-	cmd_server(ServerName, 0, ServerDesc);
+	SendServer(ServerName, 0, ServerDesc);
 	send_cmd(NULL, "BURST");
 	send_cmd(ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, EncModule, version_build);
 	me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
@@ -1325,7 +1325,7 @@ void InspIRCdProto::SendSVSPart(const char *source, const char *nick, const char
 	send_cmd(source, "SVSPART %s %s", nick, chan);
 }
 
-void InspIRCdProto::cmd_eob()
+void InspIRCdProto::SendEOB()
 {
 	send_cmd(NULL, "ENDBURST");
 }
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 6cabfed2c..bb0f25960 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -91,8 +91,8 @@ class InspIRCdProto : public IRCDProto {
 		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 SendEOB();
+		void SendServer(const char *, int, const char *);
 		void set_umode(User *, int, const char **);
 		int flood_mode_check(const char *);
 		void cmd_numeric(const char *, int, const char *, const char *);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 8f2b5a2da..c1addb408 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -811,7 +811,7 @@ void hybrid_cmd_pass(const char *pass)
 }
 
 /* SERVER name hop descript */
-void hybrid_cmd_server(const char *servname, int hop, const char *descript)
+void hybrid_SendServer(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -828,7 +828,7 @@ void hybrid_SendConnect(int servernum)
         hybrid_cmd_pass(RemotePassword3);
 
     hybrid_cmd_capab();
-    hybrid_cmd_server(ServerName, 1, ServerDesc);
+    hybrid_SendServer(ServerName, 1, ServerDesc);
     hybrid_cmd_svinfo();
 }
 
@@ -906,7 +906,7 @@ int anope_event_eob(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void hybrid_cmd_eob()
+void hybrid_SendEOB()
 {
 /*    send_cmd(ServerName, "EOB"); */
 }
@@ -1363,7 +1363,7 @@ void hybrid_SendSVSPart(const char *source, const char *nick, const char *chan)
     /* Not Supported by this IRCD */
 }
 
-void hybrid_cmd_swhois(const char *source, const char *who, const char *mask)
+void hybrid_SendSWhois(const char *source, const char *who, const char *mask)
 {
     /* not supported */
 }
@@ -1398,7 +1398,7 @@ int anope_event_error(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason)
+void hybrid_SendJupe(const char *jserver, const char *who, const char *reason)
 {
     char rbuf[256];
 
@@ -1407,7 +1407,7 @@ void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason)
 
     if (findserver(servlist, jserver))
         hybrid_SendSquit(jserver, rbuf);
-    hybrid_cmd_server(jserver, 2, rbuf);
+    hybrid_SendServer(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
@@ -1517,10 +1517,10 @@ void moduleAddAnopeCmds()
     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_SendSWhois(hybrid_cmd_swhois);
+    pmodule_SendEOB(hybrid_cmd_eob);
     pmodule_flood_mode_check(hybrid_flood_mode_check);
-    pmodule_cmd_jupe(hybrid_cmd_jupe);
+    pmodule_SendJupe(hybrid_cmd_jupe);
     pmodule_valid_nick(hybrid_valid_nick);
     pmodule_valid_chan(hybrid_valid_chan);
     pmodule_SendCTCP(hybrid_cmd_ctcp);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index ad00289d9..ab20b2881 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -106,9 +106,9 @@ 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();
+void hybrid_SendEOB();
 int hybrid_flood_mode_check(const char *value);
-void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason);
+void hybrid_SendJupe(const char *jserver, const char *who, const char *reason);
 int hybrid_valid_nick(const char *nick);
 void hybrid_SendCTCP(const char *source, const char *dest, const char *buf);
 
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index c1bedc9be..66c48e101 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -938,7 +938,7 @@ plexus_cmd_pass (const char *pass)
 
 /* SERVER name hop descript */
 void
-plexus_cmd_server (const char *servname, int hop, const char *descript)
+plexus_SendServer (const char *servname, int hop, const char *descript)
 {
   send_cmd (NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -956,7 +956,7 @@ plexus_SendConnect (int servernum)
     plexus_cmd_pass (RemotePassword3);
 
   plexus_cmd_capab ();
-  plexus_cmd_server (ServerName, 1, ServerDesc);
+  plexus_SendServer (ServerName, 1, ServerDesc);
   plexus_cmd_svinfo ();
 }
 
@@ -1049,7 +1049,7 @@ anope_event_eob (const char *source, int ac, const char **av)
 }
 
 void
-plexus_cmd_eob ()
+plexus_SendEOB ()
 {
   send_cmd (ServerName, "EOB");
 }
@@ -1632,7 +1632,7 @@ plexus_SendSVSPart (const char *source, const char *nick, const char *chan)
 }
 
 void
-plexus_cmd_swhois (const char *source, const char *who, const char *mask)
+plexus_SendSWhois (const char *source, const char *who, const char *mask)
 {
   /* not supported */
 }
@@ -1675,7 +1675,7 @@ anope_event_error (const char *source, int ac, const char **av)
 }
 
 void
-plexus_cmd_jupe (const char *jserver, const char *who, const char *reason)
+plexus_SendJupe (const char *jserver, const char *who, const char *reason)
 {
   char rbuf[256];
 
@@ -1684,7 +1684,7 @@ plexus_cmd_jupe (const char *jserver, const char *who, const char *reason)
 
   if (findserver(servlist, jserver))
     plexus_SendSquit (jserver, rbuf);
-  plexus_cmd_server (jserver, 2, rbuf);
+  plexus_SendServer (jserver, 2, rbuf);
   new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
@@ -1801,10 +1801,10 @@ moduleAddAnopeCmds ()
   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_SendSWhois (plexus_cmd_swhois);
+  pmodule_SendEOB (plexus_cmd_eob);
   pmodule_flood_mode_check (plexus_flood_mode_check);
-  pmodule_cmd_jupe (plexus_cmd_jupe);
+  pmodule_SendJupe (plexus_cmd_jupe);
   pmodule_valid_nick (plexus_valid_nick);
   pmodule_valid_chan (plexus_valid_chan);
   pmodule_SendCTCP (plexus_cmd_ctcp);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index c01df7f0a..624c4f643 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -102,9 +102,9 @@ 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();
+void plexus_SendEOB();
 int plexus_flood_mode_check(const char *value);
-void plexus_cmd_jupe(const char *jserver, const char *who, const char *reason);
+void plexus_SendJupe(const char *jserver, const char *who, const char *reason);
 int plexus_valid_nick(const char *nick);
 void plexus_SendCTCP(const char *source, const char *dest, const char *buf);
 
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index 0b6fc578e..1f93ad462 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -856,7 +856,7 @@ void ptlink_cmd_capab()
 }
 
 
-void ptlink_cmd_server(const char *servname, int hop, const char *descript)
+void ptlink_SendServer(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d Anope.Services%s :%s", servname, hop,
              version_number_dotted, descript);
@@ -874,7 +874,7 @@ void ptlink_SendConnect(int servernum)
         ptlink_cmd_pass(RemotePassword3);
 
     ptlink_cmd_capab();
-    ptlink_cmd_server(ServerName, 1, ServerDesc);
+    ptlink_SendServer(ServerName, 1, ServerDesc);
     ptlink_cmd_svinfo();
     ptlink_cmd_svsinfo();
 }
@@ -1567,7 +1567,7 @@ void ptlink_SendSVSPart(const char *source, const char *nick, const char *chan)
     send_cmd(source, "SVSPART %s :%s", nick, chan);
 }
 
-void ptlink_cmd_swhois(const char *source, const char *who, const char *mask)
+void ptlink_SendSWhois(const char *source, const char *who, const char *mask)
 {
     /* not supported */
 }
@@ -1616,12 +1616,12 @@ int ptlink_flood_mode_check(const char *value)
     }
 }
 
-void ptlink_cmd_eob()
+void ptlink_SendEOB()
 {
     /* not supported  */
 }
 
-void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason)
+void ptlink_SendJupe(const char *jserver, const char *who, const char *reason)
 {
     char rbuf[256];
 
@@ -1630,7 +1630,7 @@ void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason)
 
     if (findserver(servlist, jserver))
         ptlink_SendSquit(jserver, rbuf);
-    ptlink_cmd_server(jserver, 1, rbuf);
+    ptlink_SendServer(jserver, 1, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
@@ -1746,10 +1746,10 @@ void moduleAddAnopeCmds()
     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_SendSWhois(ptlink_cmd_swhois);
+    pmodule_SendEOB(ptlink_cmd_eob);
     pmodule_flood_mode_check(ptlink_flood_mode_check);
-    pmodule_cmd_jupe(ptlink_cmd_jupe);
+    pmodule_SendJupe(ptlink_cmd_jupe);
     pmodule_valid_nick(ptlink_valid_nick);
     pmodule_valid_chan(ptlink_valid_chan);
     pmodule_SendCTCP(ptlink_cmd_ctcp);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 5e1881bfe..ecabfe150 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -141,9 +141,9 @@ 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();
+void ptlink_SendEOB();
 int ptlink_flood_mode_check(const char *value);
-void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason);
+void ptlink_SendJupe(const char *jserver, const char *who, const char *reason);
 int ptlink_valid_nick(const char *nick);
 void ptlink_SendCTCP(const char *source, const char *dest, const char *buf);
 
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 769c46518..0d9c49ecd 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -742,7 +742,7 @@ void rageircd_cmd_capab()
     send_cmd(NULL, "CAPAB BURST UNCONNECT SSJ3 SN2 VHOST TSMODE");
 }
 
-void rageircd_cmd_server(const char *servname, int hop, const char *descript)
+void rageircd_SendServer(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -778,7 +778,7 @@ void rageircd_SendConnect(int servernum)
     if (Numeric) {
         send_cmd(NULL, "MYID !%s", Numeric);
     }
-    rageircd_cmd_server(ServerName, 1, ServerDesc);
+    rageircd_SendServer(ServerName, 1, ServerDesc);
     rageircd_cmd_svinfo();
     rageircd_cmd_burst();
 }
@@ -1466,7 +1466,7 @@ void rageircd_SendSVSPart(const char *source, const char *nick, const char *chan
     /* Find no reference to it in the code and docs */
 }
 
-void rageircd_cmd_swhois(const char *source, const char *who, const char *mask)
+void rageircd_SendSWhois(const char *source, const char *who, const char *mask)
 {
     /* not supported */
 }
@@ -1496,12 +1496,12 @@ int rageircd_flood_mode_check(const char *value)
     return 0;
 }
 
-void rageircd_cmd_eob()
+void rageircd_SendEOB()
 {
     send_cmd(NULL, "BURST 0");
 }
 
-void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason)
+void rageircd_SendJupe(const char *jserver, const char *who, const char *reason)
 {
     char rbuf[256];
 
@@ -1510,7 +1510,7 @@ void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason)
 
     if (findserver(servlist, jserver))
         rageircd_SendSquit(jserver, rbuf);
-    rageircd_cmd_server(jserver, 2, rbuf);
+    rageircd_SendServer(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
@@ -1626,10 +1626,10 @@ void moduleAddAnopeCmds()
     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_SendSWhois(rageircd_cmd_swhois);
+    pmodule_SendEOB(rageircd_cmd_eob);
     pmodule_flood_mode_check(rageircd_flood_mode_check);
-    pmodule_cmd_jupe(rageircd_cmd_jupe);
+    pmodule_SendJupe(rageircd_cmd_jupe);
     pmodule_valid_nick(rageircd_valid_nick);
     pmodule_valid_chan(rageircd_valid_chan);
     pmodule_SendCTCP(rageircd_cmd_ctcp);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 7145e180f..ae8ed9b2c 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -104,9 +104,9 @@ 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();
+void rageircd_SendEOB();
 int rageircd_flood_mode_check(const char *value);
-void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
+void rageircd_SendJupe(const char *jserver, const char *who, const char *reason);
 int rageircd_valid_nick(const char *nick);
 void rageircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index a3540bc11..14e9186bd 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -902,7 +902,7 @@ void solidircd_cmd_pass(const char *pass)
 }
 
 /* SERVER */
-void solidircd_cmd_server(const char *servname, int hop, const char *descript)
+void solidircd_SendServer(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d :%s", servname, hop, ServerDesc);
 }
@@ -927,7 +927,7 @@ void solidircd_SendConnect(int servernum)
         solidircd_cmd_pass(RemotePassword3);
     }
     solidircd_cmd_capab();
-    solidircd_cmd_server(ServerName, 1, ServerDesc);
+    solidircd_SendServer(ServerName, 1, ServerDesc);
     solidircd_cmd_svinfo();
     solidircd_cmd_burst();
 }
@@ -1472,12 +1472,12 @@ void solidircd_SendSVSPart(const char *source, const char *nick, const char *cha
     /* Can not find any reference to these in Bahamut */
 }
 
-void solidircd_cmd_swhois(const char *source, const char *who, const char *mask)
+void solidircd_SendSWhois(const char *source, const char *who, const char *mask)
 {
     /* not supported */
 }
 
-void solidircd_cmd_eob()
+void solidircd_SendEOB()
 {
     send_cmd(NULL, "BURST 0");
 }
@@ -1534,7 +1534,7 @@ int solidircd_flood_mode_check(const char *value)
     }
 }
 
-void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason)
+void solidircd_SendJupe(const char *jserver, const char *who, const char *reason)
 {
     char rbuf[256];
 
@@ -1543,7 +1543,7 @@ void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason
 
     if (findserver(servlist, jserver))
         solidircd_SendSquit(jserver, rbuf);
-    solidircd_cmd_server(jserver, 2, rbuf);
+    solidircd_SendServer(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
 
@@ -1659,10 +1659,10 @@ void moduleAddAnopeCmds()
     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_SendSWhois(solidircd_cmd_swhois);
+    pmodule_SendEOB(solidircd_cmd_eob);
     pmodule_flood_mode_check(solidircd_flood_mode_check);
-    pmodule_cmd_jupe(solidircd_cmd_jupe);
+    pmodule_SendJupe(solidircd_cmd_jupe);
     pmodule_valid_nick(solidircd_valid_nick);
     pmodule_valid_chan(solidircd_valid_chan);
     pmodule_SendCTCP(solidircd_cmd_ctcp);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index b8e5d4dae..7ec3109c8 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -128,9 +128,9 @@ 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();
+void solidircd_SendEOB();
 int solidircd_flood_mode_check(const char *value);
-void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
+void solidircd_SendJupe(const char *jserver, const char *who, const char *reason);
 int solidircd_valid_nick(const char *nick);
 void solidircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index 8f39d80d3..bb12a1dce 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1190,7 +1190,7 @@ void ultimate3_cmd_pass(const char *pass)
 
 /* SERVER name hop descript */
 /* Unreal 3.2 actually sends some info about itself in the descript area */
-void ultimate3_cmd_server(const char *servname, int hop, const char *descript)
+void ultimate3_SendServer(const char *servname, int hop, const char *descript)
 {
     send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
 }
@@ -1460,7 +1460,7 @@ void ultimate3_SendConnect(int servernum)
         ultimate3_cmd_pass(RemotePassword3);
     }
     ultimate3_cmd_capab();
-    ultimate3_cmd_server(ServerName, 1, ServerDesc);
+    ultimate3_SendServer(ServerName, 1, ServerDesc);
     ultimate3_cmd_svinfo();
     ultimate3_cmd_burst();
 }
@@ -1554,13 +1554,13 @@ void ultimate3_SendSVSPart(const char *source, const char *nick, const char *cha
     /* Not Supported by this IRCD */
 }
 
-void ultimate3_cmd_swhois(const char *source, const char *who, const char *mask)
+void ultimate3_SendSWhois(const char *source, const char *who, const char *mask)
 {
     /* not supported */
 }