Global NOTICE/PRIVMSG, QUIT.

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

25 files changed, 86 insertions, 86 deletions

diff --git a/include/extern.h b/include/extern.h
index a242a5b4f..8a48bf69f 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1138,15 +1138,15 @@ E void anope_SendGuestNick(const char *nick, const char *user,const char *host,c
 E void anope_cmd_message(const char *source, const char *dest, const char *fmt, ...);     		  /* NOTICE */
 E void anope_SendNoticeChanops(const char *source, const char *dest, const char *fmt, ...); 		  /* NOTICE */
 E void anope_cmd_notice(const char *source, const char *dest, const char *msg);		  		  /* NOTICE */
-E void anope_cmd_serv_notice(const char *source, const char *dest, const char *msg);		  		  /* NOTICE */
+E void anope_SendGlobalNotice(const char *source, const char *dest, const char *msg);		  		  /* NOTICE */
 E void anope_cmd_part(const char *nick, const char *chan, const char *fmt, ...); 	  		  /* PART */
 E void anope_cmd_pass(const char *pass);                                   	  		  /* PASS */
 E void anope_cmd_pong(const char *servname, const char *who);                    	  		  /* PONG */
 E void anope_cmd_privmsg(const char *source, const char *dest, const char *fmt, ...);    		  /* PRIVMSG */
 E void anope_cmd_action(const char *source, const char *dest, const char *fmt, ...);    		  /* PRIVMSG */
-E void anope_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);	  		  /* PRIVMSG */
+E void anope_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);	  		  /* PRIVMSG */
 E void anope_cmd_protoctl();                                         			  /* PROTOCTL */
-E void anope_cmd_quit(const char *source, const char *fmt, ...);           	  		  /* QUIT */
+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_cmd_sqline(const char *mask, const char *reason);                   	  		  /* SQLINE */
diff --git a/include/services.h b/include/services.h
index 49a05f1c0..f6feee436 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1259,16 +1259,16 @@ class IRCDProto {
 			if (!buf || !dest) return;
 			send_cmd(source, "PRIVMSG %s :%s", dest, buf);
 		}
-		virtual void cmd_serv_notice(const char *source, const char *dest, const char *msg)
+		virtual void SendGlobalNotice(const char *source, const char *dest, const char *msg)
 		{
 			send_cmd(source, "NOTICE %s%s :%s", ircd->globaltldprefix, dest, msg);
 		}
-		virtual void cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+		virtual void SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 		{
 			send_cmd(source, "PRIVMSG %s%s :%s", ircd->globaltldprefix, dest, msg);
 		}
 		virtual void SendBotOp(const char *, const char *) = 0;
-		virtual void cmd_quit(const char *source, const char *buf)
+		virtual void SendQuit(const char *source, const char *buf)
 		{
 			if (buf) send_cmd(source, "QUIT :%s", buf);
 			else send_cmd(source, "QUIT");
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 1e5251dda..cce84d789 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -297,7 +297,7 @@ int do_bot(User * u)
                 anope_cmd_chg_nick(oldnick, bi->nick);
 				anope_cmd_sqline(bi->nick, "Reserved for services");
             } else {
-                anope_cmd_quit(oldnick, "Quit: Be right back");
+                anope_SendQuit(oldnick, "Quit: Be right back");
 
                 anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
                                    ircd->botserv_bot_mode);
@@ -320,7 +320,7 @@ int do_bot(User * u)
             notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
         else {
             send_event(EVENT_BOT_DEL, 1, bi->nick);
-            anope_cmd_quit(bi->nick,
+            anope_SendQuit(bi->nick,
                            "Quit: Help! I'm being deleted by %s!",
                            u->nick);
             if (ircd->sqline) {
diff --git a/src/ircd.c b/src/ircd.c
index ba84da7c9..4a46b69d8 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -175,14 +175,14 @@ void anope_cmd_privmsg(const char *source, const char *dest, const char *fmt, ..
 	ircdproto->cmd_privmsg(source, dest, buf);
 }
 
-void anope_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void anope_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
-	ircdproto->cmd_serv_notice(source, dest, msg);
+	ircdproto->SendGlobalNotice(source, dest, msg);
 }
 
-void anope_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void anope_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
-	ircdproto->cmd_serv_privmsg(source, dest, msg);
+	ircdproto->SendGlobalPrivmsg(source, dest, msg);
 }
 
 void anope_SendBotOp(const char *nick, const char *chan)
@@ -190,7 +190,7 @@ void anope_SendBotOp(const char *nick, const char *chan)
 	ircdproto->SendBotOp(nick, chan);
 }
 
-void anope_cmd_quit(const char *source, const char *fmt, ...)
+void anope_SendQuit(const char *source, const char *fmt, ...)
 {
 	va_list args;
 	char buf[BUFSIZE] = "";
@@ -199,7 +199,7 @@ void anope_cmd_quit(const char *source, const char *fmt, ...)
 		vsnprintf(buf, BUFSIZE - 1, fmt, args);
 		va_end(args);
 	}
-	ircdproto->cmd_quit(source, buf);
+	ircdproto->SendQuit(source, buf);
 }
 
 void anope_cmd_pong(const char *servname, const char *who)
diff --git a/src/modules/demos/catserv/ircd_catserv.c b/src/modules/demos/catserv/ircd_catserv.c
index 1bd6be338..13496de03 100644
--- a/src/modules/demos/catserv/ircd_catserv.c
+++ b/src/modules/demos/catserv/ircd_catserv.c
@@ -86,7 +86,7 @@ void addClient(char *nick, char *realname)
 
 void delClient(void)
 {
-    anope_cmd_quit(s_CatServ, "QUIT :Module Unloaded!");
+    anope_SendQuit(s_CatServ, "QUIT :Module Unloaded!");
 }
 
 /*****************************************************************************/
diff --git a/src/nickserv.c b/src/nickserv.c
index 2c4763d2e..7d8ebb6ce 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1561,10 +1561,10 @@ void release(NickAlias * na, int from_timeout)
         if (UseSVSHOLD) {
             anope_cmd_release_svshold(na->nick);
         } else {
-            anope_cmd_quit(na->nick, NULL);
+            anope_SendQuit(na->nick, NULL);
         }
     } else {
-        anope_cmd_quit(na->nick, NULL);
+        anope_SendQuit(na->nick, NULL);
     }
     na->status &= ~NS_KILL_HELD;
 }
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6aed38a48..6eed54868 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1093,7 +1093,7 @@ void CharybdisProto::SendBotOp(const char *nick, const char *chan)
 }
 
 /* QUIT */
-void CharybdisProto::cmd_quit(const char *source, const char *buf)
+void CharybdisProto::SendQuit(const char *source, const char *buf)
 {
 	Uid *ud = find_uid(source);
 	if (buf) send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT :%s", buf);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 1f180f5b4..74dd7309b 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -58,7 +58,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendKick(const char *, const char *, const char *, const char *);
 		void SendNoticeChanops(const char *, const char *, const char *);
 		void SendBotOp(const char *, const char *);
-		void cmd_quit(const char *, const char *);
+		void SendQuit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
 		void cmd_unsqline(const char *);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 947dea98a..53fa68d77 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -493,12 +493,12 @@ void hybrid_cmd_privmsg2(const char *source, const char *dest, const char *msg)
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void hybrid_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void hybrid_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $$%s :%s", dest, msg);
 }
 
-void hybrid_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void hybrid_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $$%s :%s", dest, msg);
 }
@@ -1166,7 +1166,7 @@ void hybrid_SendBotOp(const char *nick, const char *chan)
 }
 
 /* QUIT */
-void hybrid_cmd_quit(const char *source, const char *buf)
+void hybrid_SendQuit(const char *source, const char *buf)
 {
     if (buf) {
         send_cmd(source, "QUIT :%s", buf);
@@ -1472,11 +1472,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(hybrid_cmd_notice2);
     pmodule_cmd_privmsg(hybrid_cmd_privmsg);
     pmodule_cmd_privmsg2(hybrid_cmd_privmsg2);
-    pmodule_cmd_serv_notice(hybrid_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(hybrid_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(hybrid_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(hybrid_cmd_serv_privmsg);
     pmodule_SendBotOp(hybrid_cmd_bot_chan_mode);
     pmodule_cmd_351(hybrid_cmd_351);
-    pmodule_cmd_quit(hybrid_cmd_quit);
+    pmodule_SendQuit(hybrid_cmd_quit);
     pmodule_cmd_pong(hybrid_cmd_pong);
     pmodule_cmd_join(hybrid_cmd_join);
     pmodule_cmd_unsqline(hybrid_cmd_unsqline);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 9bd6603e4..7f404ece8 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -63,11 +63,11 @@ void hybrid_cmd_notice(const char *source, const char *dest, const char *buf);
 void hybrid_cmd_notice2(const char *source, const char *dest, const char *msg);
 void hybrid_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void hybrid_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void hybrid_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void hybrid_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void hybrid_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void hybrid_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void hybrid_SendBotOp(const char *nick, const char *chan);
 void hybrid_cmd_351(const char *source);
-void hybrid_cmd_quit(const char *source, const char *buf);
+void hybrid_SendQuit(const char *source, const char *buf);
 void hybrid_cmd_pong(const char *servname, const char *who);
 void hybrid_cmd_join(const char *user, const char *channel, time_t chantime);
 void hybrid_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index a507e1777..998bde4f9 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -517,13 +517,13 @@ plexus_cmd_privmsg2 (const char *source, const char *dest, const char *msg)
 }
 
 void
-plexus_cmd_serv_notice (const char *source, const char *dest, const char *msg)
+plexus_SendGlobalNotice (const char *source, const char *dest, const char *msg)
 {
   send_cmd (source, "NOTICE $$%s :%s", dest, msg);
 }
 
 void
-plexus_cmd_serv_privmsg (const char *source, const char *dest, const char *msg)
+plexus_SendGlobalPrivmsg (const char *source, const char *dest, const char *msg)
 {
   send_cmd (source, "PRIVMSG $$%s :%s", dest, msg);
 }
@@ -1363,7 +1363,7 @@ plexus_SendBotOp (const char *nick, const char *chan)
 
 /* QUIT */
 void
-plexus_cmd_quit (const char *source, const char *buf)
+plexus_SendQuit (const char *source, const char *buf)
 {
   if (buf)
     {
@@ -1756,11 +1756,11 @@ moduleAddAnopeCmds ()
   pmodule_cmd_notice2 (plexus_cmd_notice2);
   pmodule_cmd_privmsg (plexus_cmd_privmsg);
   pmodule_cmd_privmsg2 (plexus_cmd_privmsg2);
-  pmodule_cmd_serv_notice (plexus_cmd_serv_notice);
-  pmodule_cmd_serv_privmsg (plexus_cmd_serv_privmsg);
+  pmodule_SendGlobalNotice (plexus_cmd_serv_notice);
+  pmodule_SendGlobalPrivmsg (plexus_cmd_serv_privmsg);
   pmodule_SendBotOp (plexus_cmd_bot_chan_mode);
   pmodule_cmd_351 (plexus_cmd_351);
-  pmodule_cmd_quit (plexus_cmd_quit);
+  pmodule_SendQuit (plexus_cmd_quit);
   pmodule_cmd_pong (plexus_cmd_pong);
   pmodule_cmd_join (plexus_cmd_join);
   pmodule_cmd_unsqline (plexus_cmd_unsqline);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index 5ec2f0703..3c687c341 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -59,11 +59,11 @@ void plexus_cmd_notice(const char *source, const char *dest, const char *buf);
 void plexus_cmd_notice2(const char *source, const char *dest, const char *msg);
 void plexus_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void plexus_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void plexus_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void plexus_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void plexus_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void plexus_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void plexus_SendBotOp(const char *nick, const char *chan);
 void plexus_cmd_351(const char *source);
-void plexus_cmd_quit(const char *source, const char *buf);
+void plexus_SendQuit(const char *source, const char *buf);
 void plexus_cmd_pong(const char *servname, const char *who);
 void plexus_cmd_join(const char *user, const char *channel, time_t chantime);
 void plexus_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index e9877cb2c..146f2bf98 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1035,12 +1035,12 @@ void ptlink_cmd_privmsg2(const char *source, const char *dest, const char *msg)
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void ptlink_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void ptlink_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
-void ptlink_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void ptlink_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
@@ -1222,7 +1222,7 @@ void ptlink_SendKick(const char *source, const char *chan, const char *user, con
 }
 
 /* QUIT */
-void ptlink_cmd_quit(const char *source, const char *buf)
+void ptlink_SendQuit(const char *source, const char *buf)
 {
     if (buf) {
         send_cmd(source, "QUIT :%s", buf);
@@ -1701,11 +1701,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(ptlink_cmd_notice2);
     pmodule_cmd_privmsg(ptlink_cmd_privmsg);
     pmodule_cmd_privmsg2(ptlink_cmd_privmsg2);
-    pmodule_cmd_serv_notice(ptlink_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(ptlink_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(ptlink_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(ptlink_cmd_serv_privmsg);
     pmodule_SendBotOp(ptlink_cmd_bot_chan_mode);
     pmodule_cmd_351(ptlink_cmd_351);
-    pmodule_cmd_quit(ptlink_cmd_quit);
+    pmodule_SendQuit(ptlink_cmd_quit);
     pmodule_cmd_pong(ptlink_cmd_pong);
     pmodule_cmd_join(ptlink_cmd_join);
     pmodule_cmd_unsqline(ptlink_cmd_unsqline);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 87383cb8e..d230a2a6c 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -98,11 +98,11 @@ void ptlink_cmd_notice(const char *source, const char *dest, const char *buf);
 void ptlink_cmd_notice2(const char *source, const char *dest, const char *msg);
 void ptlink_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void ptlink_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void ptlink_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void ptlink_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void ptlink_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void ptlink_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void ptlink_SendBotOp(const char *nick, const char *chan);
 void ptlink_cmd_351(const char *source);
-void ptlink_cmd_quit(const char *source, const char *buf);
+void ptlink_SendQuit(const char *source, const char *buf);
 void ptlink_cmd_pong(const char *servname, const char *who);
 void ptlink_cmd_join(const char *user, const char *channel, time_t chantime);
 void ptlink_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 6ae30fe5a..581f4c786 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -903,12 +903,12 @@ void rageircd_cmd_privmsg2(const char *source, const char *dest, const char *msg
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void rageircd_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void rageircd_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
-void rageircd_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void rageircd_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
@@ -1174,7 +1174,7 @@ int anope_event_cs(const char *source, int ac, const char **av)
 }
 
 /* QUIT */
-void rageircd_cmd_quit(const char *source, const char *buf)
+void rageircd_SendQuit(const char *source, const char *buf)
 {
     if (buf) {
         send_cmd(source, "QUIT :%s", buf);
@@ -1581,11 +1581,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(rageircd_cmd_notice2);
     pmodule_cmd_privmsg(rageircd_cmd_privmsg);
     pmodule_cmd_privmsg2(rageircd_cmd_privmsg2);
-    pmodule_cmd_serv_notice(rageircd_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(rageircd_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(rageircd_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(rageircd_cmd_serv_privmsg);
     pmodule_SendBotOp(rageircd_cmd_bot_chan_mode);
     pmodule_cmd_351(rageircd_cmd_351);
-    pmodule_cmd_quit(rageircd_cmd_quit);
+    pmodule_SendQuit(rageircd_cmd_quit);
     pmodule_cmd_pong(rageircd_cmd_pong);
     pmodule_cmd_join(rageircd_cmd_join);
     pmodule_cmd_unsqline(rageircd_cmd_unsqline);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 96b9fc38c..44637e0e7 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -61,11 +61,11 @@ void rageircd_cmd_notice(const char *source, const char *dest, const char *buf);
 void rageircd_cmd_notice2(const char *source, const char *dest, const char *msg);
 void rageircd_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void rageircd_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void rageircd_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void rageircd_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void rageircd_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void rageircd_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void rageircd_SendBotOp(const char *nick, const char *chan);
 void rageircd_cmd_351(const char *source);
-void rageircd_cmd_quit(const char *source, const char *buf);
+void rageircd_SendQuit(const char *source, const char *buf);
 void rageircd_cmd_pong(const char *servname, const char *who);
 void rageircd_cmd_join(const char *user, const char *channel, time_t chantime);
 void rageircd_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 20e4ddae0..18890dc5a 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1103,12 +1103,12 @@ void solidircd_cmd_privmsg2(const char *source, const char *dest, const char *ms
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void solidircd_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void solidircd_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
-void solidircd_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void solidircd_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
@@ -1297,7 +1297,7 @@ void solidircd_cmd_invite(const char *source, const char *chan, const char *nick
 }
 
 /* QUIT */
-void solidircd_cmd_quit(const char *source, const char *buf)
+void solidircd_SendQuit(const char *source, const char *buf)
 {
 
     if (buf) {
@@ -1614,11 +1614,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(solidircd_cmd_notice2);
     pmodule_cmd_privmsg(solidircd_cmd_privmsg);
     pmodule_cmd_privmsg2(solidircd_cmd_privmsg2);
-    pmodule_cmd_serv_notice(solidircd_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(solidircd_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(solidircd_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(solidircd_cmd_serv_privmsg);
     pmodule_SendBotOp(solidircd_cmd_bot_chan_mode);
     pmodule_cmd_351(solidircd_cmd_351);
-    pmodule_cmd_quit(solidircd_cmd_quit);
+    pmodule_SendQuit(solidircd_cmd_quit);
     pmodule_cmd_pong(solidircd_cmd_pong);
     pmodule_cmd_join(solidircd_cmd_join);
     pmodule_cmd_unsqline(solidircd_cmd_unsqline);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index ffb4f9530..f25dff8ca 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -85,11 +85,11 @@ void solidircd_cmd_notice(const char *source, const char *dest, const char *buf)
 void solidircd_cmd_notice2(const char *source, const char *dest, const char *msg);
 void solidircd_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void solidircd_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void solidircd_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void solidircd_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void solidircd_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void solidircd_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void solidircd_SendBotOp(const char *nick, const char *chan);
 void solidircd_cmd_351(const char *source);
-void solidircd_cmd_quit(const char *source, const char *buf);
+void solidircd_SendQuit(const char *source, const char *buf);
 void solidircd_cmd_pong(const char *servname, const char *who);
 void solidircd_cmd_join(const char *user, const char *channel, time_t chantime);
 void solidircd_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index 2cf8c1ab2..65a240d82 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1138,12 +1138,12 @@ void ultimate3_cmd_privmsg2(const char *source, const char *dest, const char *ms
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void ultimate3_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void ultimate3_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
-void ultimate3_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void ultimate3_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
@@ -1162,7 +1162,7 @@ void ultimate3_cmd_351(const char *source)
 }
 
 /* QUIT */
-void ultimate3_cmd_quit(const char *source, const char *buf)
+void ultimate3_SendQuit(const char *source, const char *buf)
 {
     if (!buf) {
         return;
@@ -1722,11 +1722,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(ultimate3_cmd_notice2);
     pmodule_cmd_privmsg(ultimate3_cmd_privmsg);
     pmodule_cmd_privmsg2(ultimate3_cmd_privmsg2);
-    pmodule_cmd_serv_notice(ultimate3_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(ultimate3_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(ultimate3_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(ultimate3_cmd_serv_privmsg);
     pmodule_SendBotOp(ultimate3_cmd_bot_chan_mode);
     pmodule_cmd_351(ultimate3_cmd_351);
-    pmodule_cmd_quit(ultimate3_cmd_quit);
+    pmodule_SendQuit(ultimate3_cmd_quit);
     pmodule_cmd_pong(ultimate3_cmd_pong);
     pmodule_cmd_join(ultimate3_cmd_join);
     pmodule_cmd_unsqline(ultimate3_cmd_unsqline);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index 1e793b113..f9f544713 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -71,11 +71,11 @@ void ultimate3_cmd_notice(const char *source, const char *dest, const char *buf)
 void ultimate3_cmd_notice2(const char *source, const char *dest, const char *msg);
 void ultimate3_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void ultimate3_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void ultimate3_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void ultimate3_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void ultimate3_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void ultimate3_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void ultimate3_SendBotOp(const char *nick, const char *chan);
 void ultimate3_cmd_351(const char *source);
-void ultimate3_cmd_quit(const char *source, const char *buf);
+void ultimate3_SendQuit(const char *source, const char *buf);
 void ultimate3_cmd_pong(const char *servname, const char *who);
 void ultimate3_cmd_join(const char *user, const char *channel, time_t chantime);
 void ultimate3_cmd_unsqline(const char *user);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index 574a16c69..d7c43e5be 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -883,7 +883,7 @@ void viagra_SendMode(const char *source, const char *dest, const char *buf)
 }
 
 /* QUIT */
-void viagra_cmd_quit(const char *source, const char *buf)
+void viagra_SendQuit(const char *source, const char *buf)
 {
     if (buf) {
         send_cmd(source, "QUIT :%s", buf);
@@ -1173,12 +1173,12 @@ void viagra_cmd_privmsg2(const char *source, const char *dest, const char *msg)
     send_cmd(source, "PRIVMSG %s :%s", dest, msg);
 }
 
-void viagra_cmd_serv_notice(const char *source, const char *dest, const char *msg)
+void viagra_SendGlobalNotice(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "NOTICE $%s :%s", dest, msg);
 }
 
-void viagra_cmd_serv_privmsg(const char *source, const char *dest, const char *msg)
+void viagra_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg)
 {
     send_cmd(source, "PRIVMSG $%s :%s", dest, msg);
 }
@@ -1621,11 +1621,11 @@ void moduleAddAnopeCmds()
     pmodule_cmd_notice2(viagra_cmd_notice2);
     pmodule_cmd_privmsg(viagra_cmd_privmsg);
     pmodule_cmd_privmsg2(viagra_cmd_privmsg2);
-    pmodule_cmd_serv_notice(viagra_cmd_serv_notice);
-    pmodule_cmd_serv_privmsg(viagra_cmd_serv_privmsg);
+    pmodule_SendGlobalNotice(viagra_cmd_serv_notice);
+    pmodule_SendGlobalPrivmsg(viagra_cmd_serv_privmsg);
     pmodule_SendBotOp(viagra_cmd_bot_chan_mode);
     pmodule_cmd_351(viagra_cmd_351);
-    pmodule_cmd_quit(viagra_cmd_quit);
+    pmodule_SendQuit(viagra_cmd_quit);
     pmodule_cmd_pong(viagra_cmd_pong);
     pmodule_cmd_join(viagra_cmd_join);
     pmodule_cmd_unsqline(viagra_cmd_unsqline);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index 1f049ab96..af90798bb 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -80,11 +80,11 @@ void viagra_cmd_notice(const char *source, const char *dest, const char *buf);
 void viagra_cmd_notice2(const char *source, const char *dest, const char *msg);
 void viagra_cmd_privmsg(const char *source, const char *dest, const char *buf);
 void viagra_cmd_privmsg2(const char *source, const char *dest, const char *msg);
-void viagra_cmd_serv_notice(const char *source, const char *dest, const char *msg);
-void viagra_cmd_serv_privmsg(const char *source, const char *dest, const char *msg);
+void viagra_SendGlobalNotice(const char *source, const char *dest, const char *msg);
+void viagra_SendGlobalPrivmsg(const char *source, const char *dest, const char *msg);
 void viagra_SendBotOp(const char *nick, const char *chan);
 void viagra_cmd_351(const char *source);
-void viagra_cmd_quit(const char *source, const char *buf);
+void viagra_SendQuit(const char *source, const char *buf);
 void viagra_cmd_pong(const char *servname, const char *who);
 void viagra_cmd_join(const char *user, const char *channel, time_t chantime);
 void viagra_cmd_unsqline(const char *user);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index be66a5e67..73bcd2e0c 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1049,7 +1049,7 @@ void RatboxProto::SendBotOp(const char *nick, const char *chan)
 }
 
 /* QUIT */
-void RatboxProto::cmd_quit(const char *source, const char *buf)
+void RatboxProto::SendQuit(const char *source, const char *buf)
 {
 	Uid *ud = find_uid(source);
 	if (buf) send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "QUIT :%s", buf);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index d3b788e42..699a05e23 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -60,7 +60,7 @@ class RatboxProto : public IRCDProto {
 		void cmd_notice(const char *, const char *, const char *);
 		void cmd_privmsg(const char *, const char *, const char *);
 		void SendBotOp(const char *, const char *);
-		void cmd_quit(const char *, const char *);
+		void SendQuit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
 		void cmd_unsqline(const char *);
diff --git a/src/send.c b/src/send.c
index 4f4a9aeb1..79e8f5e68 100644
--- a/src/send.c
+++ b/src/send.c
@@ -72,9 +72,9 @@ void notice_server(char *source, Server * s, char *fmt, ...)
         vsnprintf(buf, BUFSIZE - 1, fmt, args);
 
         if (NSDefFlags & NI_MSG) {
-            anope_cmd_serv_privmsg(source, s->name, buf);
+            anope_SendGlobalPrivmsg(source, s->name, buf);
         } else {
-            anope_cmd_serv_notice(source, s->name, buf);
+            anope_SendGlobalNotice(source, s->name, buf);
         }
         va_end(args);
     }