Guest nicks, MODE.

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

24 files changed, 70 insertions, 70 deletions

diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 34aa254b2..9c70fabe7 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -452,7 +452,7 @@ CUMode myCumodes[128] = {
 
 
 
-void BahamutIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
+void BahamutIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	if (ircdcap->tsmode && (uplink_capab & ircdcap->tsmode)) send_cmd(source, "MODE %s 0 %s", dest, buf);
@@ -488,7 +488,7 @@ void BahamutIRCdProto::SendSVSMode_chan(const char *name, const char *mode, cons
 
 void BahamutIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-	anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+	anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 /* EVENT: SJOIN */
@@ -993,7 +993,7 @@ void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const ch
 	cmd_sqline(nick, "Reserved for services");
 }
 
-void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void BahamutIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
 }
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index eaf1e97ea..fc99b0640 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -66,8 +66,8 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
-		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
-		void cmd_mode(const char *, const char *, const char *);
+		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
+		void SendMode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index d4b1d990e..b2344d3fb 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1040,7 +1040,7 @@ void CharybdisProto::cmd_numeric(const char *source, int numeric, const char *de
 	send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
 }
 
-void CharybdisProto::cmd_mode(const char *source, const char *dest, const char *buf)
+void CharybdisProto::SendMode(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	if (source) {
@@ -1089,7 +1089,7 @@ void CharybdisProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 		Uid *u = find_uid(nick);
 		charybdis_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
 	}
-	else anope_cmd_mode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
+	else anope_SendMode(ServerName, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 /* QUIT */
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index ba54fffe9..bdea064b2 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -53,7 +53,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
-		void cmd_mode(const char *, const char *, const char *);
+		void SendMode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index e29dba262..8a7fee850 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -565,12 +565,12 @@ void InspIRCdProto::cmd_numeric(const char *source, int numeric, const char *des
 	send_cmd(source, "PUSH %s ::%s %03d %s %s", dest, source, numeric, dest, buf);
 }
 
-void InspIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void InspIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
 }
 
-void InspIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
+void InspIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	Channel *c = findchan(dest);
@@ -736,7 +736,7 @@ void InspIRCdProto::cmd_notice_ops(const char *source, const char *dest, const c
 
 void InspIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-	anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
+	anope_SendMode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
 }
 
 /* PROTOCTL */
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 409962001..6797f5783 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -71,8 +71,8 @@ class InspIRCdProto : public IRCDProto {
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
-		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
-		void cmd_mode(const char *, const char *, const char *);
+		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
+		void SendMode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index bab8a26d1..2392a73c3 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1125,7 +1125,7 @@ void hybrid_cmd_211(const char *buf)
     send_cmd(NULL, "211 %s", buf);
 }
 
-void hybrid_cmd_mode(const char *source, const char *dest, const char *buf)
+void hybrid_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1162,7 +1162,7 @@ void hybrid_cmd_notice_ops(const char *source, const char *dest, const char *buf
 
 void hybrid_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+    anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 /* QUIT */
@@ -1273,7 +1273,7 @@ void hybrid_cmd_svsnick(const char *nick, const char *newnick, time_t when)
     /* Not Supported by this IRCD */
 }
 
-void hybrid_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
+void hybrid_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
                            const char *modes)
 {
     send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
@@ -1463,8 +1463,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(hybrid_cmd_375);
     pmodule_cmd_376(hybrid_cmd_376);
     pmodule_cmd_nick(hybrid_cmd_nick);
-    pmodule_cmd_guest_nick(hybrid_cmd_guest_nick);
-    pmodule_cmd_mode(hybrid_cmd_mode);
+    pmodule_SendGuestNick(hybrid_cmd_guest_nick);
+    pmodule_SendMode(hybrid_cmd_mode);
     pmodule_cmd_bot_nick(hybrid_cmd_bot_nick);
     pmodule_cmd_kick(hybrid_cmd_kick);
     pmodule_cmd_notice_ops(hybrid_cmd_notice_ops);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 25c0350d6..b87aacbae 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -54,8 +54,8 @@ void hybrid_cmd_372_error(const char *source);
 void hybrid_cmd_375(const char *source);
 void hybrid_cmd_376(const char *source);
 void hybrid_cmd_nick(const char *nick, const char *name, const char *modes);
-void hybrid_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void hybrid_cmd_mode(const char *source, const char *dest, const char *buf);
+void hybrid_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void hybrid_SendMode(const char *source, const char *dest, const char *buf);
 void hybrid_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void hybrid_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void hybrid_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 28d5d7583..095c92189 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1311,7 +1311,7 @@ plexus_cmd_211 (const char *buf)
 }
 
 void
-plexus_cmd_mode (const char *source, const char *dest, const char *buf)
+plexus_SendMode (const char *source, const char *dest, const char *buf)
 {
   if (!buf)
     {
@@ -1358,7 +1358,7 @@ plexus_cmd_notice_ops (const char *source, const char *dest, const char *buf)
 void
 plexus_cmd_bot_chan_mode (const char *nick, const char *chan)
 {
-  anope_cmd_mode (nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
+  anope_SendMode (nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
 }
 
 /* QUIT */
@@ -1511,7 +1511,7 @@ plexus_cmd_svsnick (const char *nick, const char *newnick, time_t when)
 }
 
 void
-plexus_cmd_guest_nick (const char *nick, const char *user, const char *host, const char *real,
+plexus_SendGuestNick (const char *nick, const char *user, const char *host, const char *real,
 		       const char *modes)
 {
   send_cmd (ServerName, "NICK %s 1 %ld %s %s %s %s 0 %s :%s", nick,
@@ -1747,8 +1747,8 @@ moduleAddAnopeCmds ()
   pmodule_cmd_375 (plexus_cmd_375);
   pmodule_cmd_376 (plexus_cmd_376);
   pmodule_cmd_nick (plexus_cmd_nick);
-  pmodule_cmd_guest_nick (plexus_cmd_guest_nick);
-  pmodule_cmd_mode (plexus_cmd_mode);
+  pmodule_SendGuestNick (plexus_cmd_guest_nick);
+  pmodule_SendMode (plexus_cmd_mode);
   pmodule_cmd_bot_nick (plexus_cmd_bot_nick);
   pmodule_cmd_kick (plexus_cmd_kick);
   pmodule_cmd_notice_ops (plexus_cmd_notice_ops);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index 0e07c4d24..71cc057ef 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -50,8 +50,8 @@ void plexus_cmd_372_error(const char *source);
 void plexus_cmd_375(const char *source);
 void plexus_cmd_376(const char *source);
 void plexus_cmd_nick(const char *nick, const char *name, const char *modes);
-void plexus_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void plexus_cmd_mode(const char *source, const char *dest, const char *buf);
+void plexus_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void plexus_SendMode(const char *source, const char *dest, const char *buf);
 void plexus_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void plexus_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void plexus_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index e27c072d8..a91c21753 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -387,7 +387,7 @@ CUMode myCumodes[128] = {
 
 void ptlink_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(s_ChanServ, chan, "%s %s %s", ircd->botchanumode, nick,
+    anope_SendMode(s_ChanServ, chan, "%s %s %s", ircd->botchanumode, nick,
                    nick);
 }
 
@@ -1178,7 +1178,7 @@ void ptlink_cmd_211(const char *buf)
     send_cmd(NULL, "211 %s", buf);
 }
 
-void ptlink_cmd_mode(const char *source, const char *dest, const char *buf)
+void ptlink_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1474,7 +1474,7 @@ void ptlink_cmd_svsnick(const char *source, const char *guest, time_t when)
     send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
 }
 
-void ptlink_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
+void ptlink_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
                            const char *modes)
 {
     send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick,
@@ -1692,8 +1692,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ptlink_cmd_375);
     pmodule_cmd_376(ptlink_cmd_376);
     pmodule_cmd_nick(ptlink_cmd_nick);
-    pmodule_cmd_guest_nick(ptlink_cmd_guest_nick);
-    pmodule_cmd_mode(ptlink_cmd_mode);
+    pmodule_SendGuestNick(ptlink_cmd_guest_nick);
+    pmodule_SendMode(ptlink_cmd_mode);
     pmodule_cmd_bot_nick(ptlink_cmd_bot_nick);
     pmodule_cmd_kick(ptlink_cmd_kick);
     pmodule_cmd_notice_ops(ptlink_cmd_notice_ops);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 8ef520d45..44d448e92 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -89,8 +89,8 @@ void ptlink_cmd_372_error(const char *source);
 void ptlink_cmd_375(const char *source);
 void ptlink_cmd_376(const char *source);
 void ptlink_cmd_nick(const char *nick, const char *name, const char *modes);
-void ptlink_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void ptlink_cmd_mode(const char *source, const char *dest, const char *buf);
+void ptlink_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void ptlink_SendMode(const char *source, const char *dest, const char *buf);
 void ptlink_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void ptlink_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void ptlink_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 42d8145f7..4f6cee8a3 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -937,7 +937,7 @@ void rageircd_cmd_351(const char *source)
              EncModule, version_build);
 }
 
-void rageircd_cmd_mode(const char *source, const char *dest, const char *buf)
+void rageircd_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1212,7 +1212,7 @@ void rageircd_SendSVSMode_chan(const char *name, const char *mode, const char *n
 
 void rageircd_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+    anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 int anope_event_server(const char *source, int ac, const char **av)
@@ -1351,7 +1351,7 @@ void rageircd_cmd_svsnick(const char *source, const char *guest, time_t when)
     send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
 }
 
-void rageircd_cmd_guest_nick(const char *nick, const char *user, const char *host,
+void rageircd_SendGuestNick(const char *nick, const char *user, const char *host,
                              const char *real, const char *modes)
 {
     send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick,
@@ -1572,8 +1572,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(rageircd_cmd_375);
     pmodule_cmd_376(rageircd_cmd_376);
     pmodule_cmd_nick(rageircd_cmd_nick);
-    pmodule_cmd_guest_nick(rageircd_cmd_guest_nick);
-    pmodule_cmd_mode(rageircd_cmd_mode);
+    pmodule_SendGuestNick(rageircd_cmd_guest_nick);
+    pmodule_SendMode(rageircd_cmd_mode);
     pmodule_cmd_bot_nick(rageircd_cmd_bot_nick);
     pmodule_cmd_kick(rageircd_cmd_kick);
     pmodule_cmd_notice_ops(rageircd_cmd_notice_ops);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 48780bc22..8a05ac1c7 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -52,8 +52,8 @@ void rageircd_cmd_372_error(const char *source);
 void rageircd_cmd_375(const char *source);
 void rageircd_cmd_376(const char *source);
 void rageircd_cmd_nick(const char *nick, const char *name, const char *modes);
-void rageircd_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void rageircd_cmd_mode(const char *source, const char *dest, const char *buf);
+void rageircd_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void rageircd_SendMode(const char *source, const char *dest, const char *buf);
 void rageircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void rageircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void rageircd_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index ae805e49d..92ee049e8 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -480,7 +480,7 @@ CUMode myCumodes[128] = {
     {0}, {0}, {0}, {0}, {0}
 };
 
-void solidircd_cmd_mode(const char *source, const char *dest, const char *buf)
+void solidircd_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -530,7 +530,7 @@ void solidircd_SendSVSMode_chan(const char *name, const char *mode, const char *
 
 void solidircd_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+    anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 /* EVENT: SJOIN */
@@ -1356,7 +1356,7 @@ void solidircd_cmd_svsnick(const char *source, const char *guest, time_t when)
     send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
 }
 
-void solidircd_cmd_guest_nick(const char *nick, const char *user, const char *host,
+void solidircd_SendGuestNick(const char *nick, const char *user, const char *host,
                               const char *real, const char *modes)
 {
     send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
@@ -1605,8 +1605,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(solidircd_cmd_375);
     pmodule_cmd_376(solidircd_cmd_376);
     pmodule_cmd_nick(solidircd_cmd_nick);
-    pmodule_cmd_guest_nick(solidircd_cmd_guest_nick);
-    pmodule_cmd_mode(solidircd_cmd_mode);
+    pmodule_SendGuestNick(solidircd_cmd_guest_nick);
+    pmodule_SendMode(solidircd_cmd_mode);
     pmodule_cmd_bot_nick(solidircd_cmd_bot_nick);
     pmodule_cmd_kick(solidircd_cmd_kick);
     pmodule_cmd_notice_ops(solidircd_cmd_notice_ops);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index ff7852387..d6bb1cd13 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -76,8 +76,8 @@ void solidircd_cmd_372_error(const char *source);
 void solidircd_cmd_375(const char *source);
 void solidircd_cmd_376(const char *source);
 void solidircd_cmd_nick(const char *nick, const char *name, const char *modes);
-void solidircd_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void solidircd_cmd_mode(const char *source, const char *dest, const char *buf);
+void solidircd_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void solidircd_SendMode(const char *source, const char *dest, const char *buf);
 void solidircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void solidircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void solidircd_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index e67bb2691..f62446bb4 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1062,14 +1062,14 @@ void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes)
     ultimate3_cmd_sqline(nick, "Reserved for services");
 }
 
-void ultimate3_cmd_guest_nick(const char *nick, const char *user, const char *host,
+void ultimate3_SendGuestNick(const char *nick, const char *user, const char *host,
                               const char *real, const char *modes)
 {
     send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick,
              (long int) time(NULL), modes, user, host, ServerName, real);
 }
 
-void ultimate3_cmd_mode(const char *source, const char *dest, const char *buf)
+void ultimate3_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1150,7 +1150,7 @@ void ultimate3_cmd_serv_privmsg(const char *source, const char *dest, const char
 
 void ultimate3_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
+    anope_SendMode(nick, chan, "%s %s %s", ircd->botchanumode, nick, nick);
 }
 
 void ultimate3_cmd_351(const char *source)
@@ -1713,8 +1713,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ultimate3_cmd_375);
     pmodule_cmd_376(ultimate3_cmd_376);
     pmodule_cmd_nick(ultimate3_cmd_nick);
-    pmodule_cmd_guest_nick(ultimate3_cmd_guest_nick);
-    pmodule_cmd_mode(ultimate3_cmd_mode);
+    pmodule_SendGuestNick(ultimate3_cmd_guest_nick);
+    pmodule_SendMode(ultimate3_cmd_mode);
     pmodule_cmd_bot_nick(ultimate3_cmd_bot_nick);
     pmodule_cmd_kick(ultimate3_cmd_kick);
     pmodule_cmd_notice_ops(ultimate3_cmd_notice_ops);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index 7ad5fae28..587ee9477 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -62,8 +62,8 @@ void ultimate3_cmd_372_error(const char *source);
 void ultimate3_cmd_375(const char *source);
 void ultimate3_cmd_376(const char *source);
 void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes);
-void ultimate3_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void ultimate3_cmd_mode(const char *source, const char *dest, const char *buf);
+void ultimate3_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void ultimate3_SendMode(const char *source, const char *dest, const char *buf);
 void ultimate3_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void ultimate3_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void ultimate3_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index e3612eeb9..6f1eb9e35 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -865,7 +865,7 @@ void viagra_SendSVSKill(const char *source, const char *user, const char *buf)
     return;
 }
 
-void viagra_cmd_mode(const char *source, const char *dest, const char *buf)
+void viagra_SendMode(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1384,7 +1384,7 @@ void viagra_cmd_invite(const char *source, const char *chan, const char *nick)
 
 void viagra_cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-    anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+    anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 int anope_event_capab(const char *source, int ac, const char **av)
@@ -1414,7 +1414,7 @@ void viagra_cmd_svsnick(const char *source, const char *guest, time_t when)
     send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
 }
 
-void viagra_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
+void viagra_SendGuestNick(const char *nick, const char *user, const char *host, const char *real,
                            const char *modes)
 {
     send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
@@ -1612,8 +1612,8 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(viagra_cmd_375);
     pmodule_cmd_376(viagra_cmd_376);
     pmodule_cmd_nick(viagra_cmd_nick);
-    pmodule_cmd_guest_nick(viagra_cmd_guest_nick);
-    pmodule_cmd_mode(viagra_cmd_mode);
+    pmodule_SendGuestNick(viagra_cmd_guest_nick);
+    pmodule_SendMode(viagra_cmd_mode);
     pmodule_cmd_bot_nick(viagra_cmd_bot_nick);
     pmodule_cmd_kick(viagra_cmd_kick);
     pmodule_cmd_notice_ops(viagra_cmd_notice_ops);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index ff439a4ff..1bf050ffe 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -71,8 +71,8 @@ void viagra_cmd_372_error(const char *source);
 void viagra_cmd_375(const char *source);
 void viagra_cmd_376(const char *source);
 void viagra_cmd_nick(const char *nick, const char *name, const char *modes);
-void viagra_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
-void viagra_cmd_mode(const char *source, const char *dest, const char *buf);
+void viagra_SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+void viagra_SendMode(const char *source, const char *dest, const char *buf);
 void viagra_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void viagra_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
 void viagra_cmd_notice_ops(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 652bcf6c6..b8c468734 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -997,7 +997,7 @@ void RatboxProto::cmd_numeric(const char *source, int numeric, const char *dest,
 	send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
 }
 
-void RatboxProto::cmd_mode(const char *source, const char *dest, const char *buf)
+void RatboxProto::SendMode(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	if (source) {
@@ -1045,7 +1045,7 @@ void RatboxProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 		Uid *u = find_uid(nick);
 		ratbox_cmd_tmode(nick, chan, "%s %s", ircd->botchanumode, u ? u->uid : nick);
 	}
-	else anope_cmd_mode(nick, chan, "%s %s", ircd->botchanumode, nick);
+	else anope_SendMode(nick, chan, "%s %s", ircd->botchanumode, nick);
 }
 
 /* QUIT */
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 280ede400..d8aff4855 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -52,7 +52,7 @@ class RatboxProto : public IRCDProto {
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
-		void cmd_mode(const char *, const char *, const char *);
+		void SendMode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 9664f1dea..d30b82984 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -541,13 +541,13 @@ void UnrealIRCdProto::SendSVSMode(User *u, int ac, const char **av)
 	}
 }
 
-void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void UnrealIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
 		myIrcd->nickip ? " *" : " ", real);
 }
 
-void UnrealIRCdProto::cmd_mode(const char *source, const char *dest, const char *buf)
+void UnrealIRCdProto::SendMode(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	send_cmd(source, "%s %s %s", send_token("MODE", "G"), dest, buf);
@@ -576,7 +576,7 @@ void UnrealIRCdProto::cmd_notice_ops(const char *source, const char *dest, const
 
 void UnrealIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan)
 {
-	anope_cmd_mode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
+	anope_SendMode(nick, chan, "%s %s %s", myIrcd->botchanumode, nick, nick);
 }
 
 /* PROTOCTL */
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 3507c1638..8f190b6c4 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -89,8 +89,8 @@ class UnrealIRCdProto : public IRCDProto {
 		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
-		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
-		void cmd_mode(const char *, const char *, const char *);
+		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
+		void SendMode(const char *, const char *, const char *);
 		void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
 		void cmd_kick(const char *, const char *, const char *, const char *);
 		void cmd_notice_ops(const char *, const char *, const char *);