KICK, notice ops.

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

24 files changed, 62 insertions, 62 deletions

diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 5b80a8522..adf4957f1 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -957,13 +957,13 @@ int anope_event_motd(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void BahamutIRCdProto::cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void BahamutIRCdProto::SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	send_cmd(NULL, "NOTICE @%s :%s", dest, buf);
 }
 
-void BahamutIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void BahamutIRCdProto::SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	if (buf) send_cmd(source, "KICK %s %s :%s", chan, user, buf);
 	else send_cmd(source, "KICK %s %s", chan, user);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 2895d3a4b..c39e8e705 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -69,8 +69,8 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
 		void SendClientIntroduction(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 *);
+		void SendKick(const char *, const char *, const char *, const char *);
+		void SendNoticeChanops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
 		void cmd_unsqline(const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 8c6ef6b39..a821320a0 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1068,7 +1068,7 @@ void charybdis_cmd_tmode(const char *source, const char *dest, const char *fmt,
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void CharybdisProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void CharybdisProto::SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	Uid *ud = find_uid(source);
 	User *u = finduser(user);
@@ -1076,7 +1076,7 @@ void CharybdisProto::cmd_kick(const char *source, const char *chan, const char *
 	else send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KICK %s %s", chan, UseTS6 ? (u ? u->uid : user) : user);
 }
 
-void CharybdisProto::cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void CharybdisProto::SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	Uid *ud = find_uid(source);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 522c12365..fb8a27b40 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -55,8 +55,8 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendSVSMode(User *, int, const char **);
 		void SendMode(const char *, const char *, const char *);
 		void SendClientIntroduction(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 *);
+		void SendKick(const char *, const char *, const char *, const char *);
+		void SendNoticeChanops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
 		void cmd_pong(const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 8b267d1ba..7cbc2c446 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -722,13 +722,13 @@ void InspIRCdProto::SendClientIntroduction(const char *nick, const char *user, c
 	send_cmd(nick, "OPERTYPE Service");
 }
 
-void InspIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void InspIRCdProto::SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	if (buf) send_cmd(source, "KICK %s %s :%s", chan, user, buf);
 	else send_cmd(source, "KICK %s %s :%s", chan, user, user);
 }
 
-void InspIRCdProto::cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void InspIRCdProto::SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	send_cmd(ServerName, "NOTICE @%s :%s", dest, buf);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index f1357ab74..90699610f 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -74,8 +74,8 @@ class InspIRCdProto : public IRCDProto {
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
 		void SendClientIntroduction(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 *);
+		void SendKick(const char *, const char *, const char *, const char *);
+		void SendNoticeChanops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(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 6d8f6ef38..79bbf3f09 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1142,7 +1142,7 @@ void hybrid_cmd_nick(const char *nick, const char *name, const char *mode)
              ServerName, (name));
 }
 
-void hybrid_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void hybrid_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (buf) {
         send_cmd(source, "KICK %s %s :%s", chan, user, buf);
@@ -1151,7 +1151,7 @@ void hybrid_cmd_kick(const char *source, const char *chan, const char *user, con
     }
 }
 
-void hybrid_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void hybrid_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1466,8 +1466,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(hybrid_cmd_guest_nick);
     pmodule_SendMode(hybrid_cmd_mode);
     pmodule_SendClientIntroduction(hybrid_cmd_bot_nick);
-    pmodule_cmd_kick(hybrid_cmd_kick);
-    pmodule_cmd_notice_ops(hybrid_cmd_notice_ops);
+    pmodule_SendKick(hybrid_cmd_kick);
+    pmodule_SendNoticeChanops(hybrid_cmd_notice_ops);
     pmodule_cmd_notice(hybrid_cmd_notice);
     pmodule_cmd_notice2(hybrid_cmd_notice2);
     pmodule_cmd_privmsg(hybrid_cmd_privmsg);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index a88b5bab9..a03247c42 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -57,8 +57,8 @@ void hybrid_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void hybrid_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void hybrid_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index a94a142dc..5d7a262e3 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1332,7 +1332,7 @@ plexus_cmd_nick (const char *nick, const char *name, const char *mode)
 }
 
 void
-plexus_cmd_kick (const char *source, const char *chan, const char *user, const char *buf)
+plexus_SendKick (const char *source, const char *chan, const char *user, const char *buf)
 {
   if (buf)
     {
@@ -1345,7 +1345,7 @@ plexus_cmd_kick (const char *source, const char *chan, const char *user, const c
 }
 
 void
-plexus_cmd_notice_ops (const char *source, const char *dest, const char *buf)
+plexus_SendNoticeChanops (const char *source, const char *dest, const char *buf)
 {
   if (!buf)
     {
@@ -1750,8 +1750,8 @@ moduleAddAnopeCmds ()
   pmodule_SendGuestNick (plexus_cmd_guest_nick);
   pmodule_SendMode (plexus_cmd_mode);
   pmodule_SendClientIntroduction (plexus_cmd_bot_nick);
-  pmodule_cmd_kick (plexus_cmd_kick);
-  pmodule_cmd_notice_ops (plexus_cmd_notice_ops);
+  pmodule_SendKick (plexus_cmd_kick);
+  pmodule_SendNoticeChanops (plexus_cmd_notice_ops);
   pmodule_cmd_notice (plexus_cmd_notice);
   pmodule_cmd_notice2 (plexus_cmd_notice2);
   pmodule_cmd_privmsg (plexus_cmd_privmsg);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index 6914c749c..03433b63d 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -53,8 +53,8 @@ void plexus_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void plexus_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void plexus_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index 6bcd16ae2..c35a029bf 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -993,7 +993,7 @@ int anope_event_motd(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void ptlink_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void ptlink_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1208,7 +1208,7 @@ void ptlink_cmd_nick(const char *nick, const char *name, const char *mode)
     ptlink_cmd_sqline(nick, "Reserved for services");
 }
 
-void ptlink_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void ptlink_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (!buf) {
         return;
@@ -1695,8 +1695,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(ptlink_cmd_guest_nick);
     pmodule_SendMode(ptlink_cmd_mode);
     pmodule_SendClientIntroduction(ptlink_cmd_bot_nick);
-    pmodule_cmd_kick(ptlink_cmd_kick);
-    pmodule_cmd_notice_ops(ptlink_cmd_notice_ops);
+    pmodule_SendKick(ptlink_cmd_kick);
+    pmodule_SendNoticeChanops(ptlink_cmd_notice_ops);
     pmodule_cmd_notice(ptlink_cmd_notice);
     pmodule_cmd_notice2(ptlink_cmd_notice2);
     pmodule_cmd_privmsg(ptlink_cmd_privmsg);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index c9671217a..cd0d865db 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -92,8 +92,8 @@ void ptlink_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void ptlink_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void ptlink_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index d9cdff64c..2658bca4e 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -861,7 +861,7 @@ void rageircd_cmd_global(const char *source, const char *buf)
     send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf);
 }
 
-void rageircd_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void rageircd_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -955,7 +955,7 @@ void rageircd_SendMode(const char *source, const char *dest, const char *buf)
 }
 
 
-void rageircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void rageircd_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (buf) {
         send_cmd(source, "KICK %s %s :%s", chan, user, buf);
@@ -1575,8 +1575,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(rageircd_cmd_guest_nick);
     pmodule_SendMode(rageircd_cmd_mode);
     pmodule_SendClientIntroduction(rageircd_cmd_bot_nick);
-    pmodule_cmd_kick(rageircd_cmd_kick);
-    pmodule_cmd_notice_ops(rageircd_cmd_notice_ops);
+    pmodule_SendKick(rageircd_cmd_kick);
+    pmodule_SendNoticeChanops(rageircd_cmd_notice_ops);
     pmodule_cmd_notice(rageircd_cmd_notice);
     pmodule_cmd_notice2(rageircd_cmd_notice2);
     pmodule_cmd_privmsg(rageircd_cmd_privmsg);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index a3b38b2fb..23136f532 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -55,8 +55,8 @@ void rageircd_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void rageircd_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void rageircd_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 26579951b..bcbecf2eb 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1061,7 +1061,7 @@ int anope_event_motd(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void solidircd_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void solidircd_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 
     if (!buf) {
@@ -1255,7 +1255,7 @@ void solidircd_cmd_nick(const char *nick, const char *name, const char *modes)
     solidircd_cmd_sqline(nick, "Reserved for services");
 }
 
-void solidircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void solidircd_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (buf) {
         send_cmd(source, "KICK %s %s :%s", chan, user, buf);
@@ -1608,8 +1608,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(solidircd_cmd_guest_nick);
     pmodule_SendMode(solidircd_cmd_mode);
     pmodule_SendClientIntroduction(solidircd_cmd_bot_nick);
-    pmodule_cmd_kick(solidircd_cmd_kick);
-    pmodule_cmd_notice_ops(solidircd_cmd_notice_ops);
+    pmodule_SendKick(solidircd_cmd_kick);
+    pmodule_SendNoticeChanops(solidircd_cmd_notice_ops);
     pmodule_cmd_notice(solidircd_cmd_notice);
     pmodule_cmd_notice2(solidircd_cmd_notice2);
     pmodule_cmd_privmsg(solidircd_cmd_privmsg);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index 8afde2a39..b8426ce13 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -79,8 +79,8 @@ void solidircd_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void solidircd_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void solidircd_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index abe77e230..d9f015f71 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1087,7 +1087,7 @@ void ultimate3_SendClientIntroduction(const char *nick, const char *user, const
     ultimate3_cmd_sqline(nick, "Reserved for services");
 }
 
-void ultimate3_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void ultimate3_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (buf) {
         send_cmd(source, "KICK %s %s :%s", chan, user, buf);
@@ -1096,7 +1096,7 @@ void ultimate3_cmd_kick(const char *source, const char *chan, const char *user,
     }
 }
 
-void ultimate3_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void ultimate3_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
     if (!buf) {
         return;
@@ -1716,8 +1716,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(ultimate3_cmd_guest_nick);
     pmodule_SendMode(ultimate3_cmd_mode);
     pmodule_SendClientIntroduction(ultimate3_cmd_bot_nick);
-    pmodule_cmd_kick(ultimate3_cmd_kick);
-    pmodule_cmd_notice_ops(ultimate3_cmd_notice_ops);
+    pmodule_SendKick(ultimate3_cmd_kick);
+    pmodule_SendNoticeChanops(ultimate3_cmd_notice_ops);
     pmodule_cmd_notice(ultimate3_cmd_notice);
     pmodule_cmd_notice2(ultimate3_cmd_notice2);
     pmodule_cmd_privmsg(ultimate3_cmd_privmsg);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index 124ec01dd..10962bae9 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -65,8 +65,8 @@ void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void ultimate3_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void ultimate3_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index dfc4d1c4c..3be971183 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -1133,7 +1133,7 @@ int anope_event_motd(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void viagra_cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void viagra_SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
     if (buf) {
         send_cmd(NULL, "NOTICE @%s :%s", dest, buf);
@@ -1332,7 +1332,7 @@ void viagra_SendClientIntroduction(const char *nick, const char *user, const cha
     viagra_cmd_sqline(nick, "Reserved for services");
 }
 
-void viagra_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void viagra_SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
     if (buf) {
         send_cmd(source, "KICK %s %s :%s", chan, user, buf);
@@ -1615,8 +1615,8 @@ void moduleAddAnopeCmds()
     pmodule_SendGuestNick(viagra_cmd_guest_nick);
     pmodule_SendMode(viagra_cmd_mode);
     pmodule_SendClientIntroduction(viagra_cmd_bot_nick);
-    pmodule_cmd_kick(viagra_cmd_kick);
-    pmodule_cmd_notice_ops(viagra_cmd_notice_ops);
+    pmodule_SendKick(viagra_cmd_kick);
+    pmodule_SendNoticeChanops(viagra_cmd_notice_ops);
     pmodule_cmd_notice(viagra_cmd_notice);
     pmodule_cmd_notice2(viagra_cmd_notice2);
     pmodule_cmd_privmsg(viagra_cmd_privmsg);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index c73362c36..b91a960fb 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -74,8 +74,8 @@ void viagra_cmd_nick(const char *nick, const char *name, const char *modes);
 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_SendClientIntroduction(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);
+void viagra_SendKick(const char *source, const char *chan, const char *user, const char *buf);
+void viagra_SendNoticeChanops(const char *source, const char *dest, const char *buf);
 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);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b03205592..e30b66fc5 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1025,7 +1025,7 @@ void ratbox_cmd_tmode(const char *source, const char *dest, const char *fmt, ...
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void RatboxProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void RatboxProto::SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	Uid *ud = find_uid(source);
 	User *u = finduser(user);
@@ -1033,7 +1033,7 @@ void RatboxProto::cmd_kick(const char *source, const char *chan, const char *use
 	else send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KICK %s %s", chan, UseTS6 ? (u ? u->uid : user) : user);
 }
 
-void RatboxProto::cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void RatboxProto::SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	send_cmd(NULL, "NOTICE @%s :%s", dest, buf);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index e2501ab26..0b42a9aaa 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -54,8 +54,8 @@ class RatboxProto : public IRCDProto {
 		void SendSVSMode(User *, int, const char **);
 		void SendMode(const char *, const char *, const char *);
 		void SendClientIntroduction(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 *);
+		void SendKick(const char *, const char *, const char *, const char *);
+		void SendNoticeChanops(const char *, const char *, const char *);
 		void cmd_message(const char *, const char *, const char *);
 		void cmd_notice(const char *, const char *, const char *);
 		void cmd_privmsg(const char *, const char *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 545e311af..dd05d1e5f 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -561,13 +561,13 @@ void UnrealIRCdProto::SendClientIntroduction(const char *nick, const char *user,
 	cmd_sqline(nick, "Reserved for services");
 }
 
-void UnrealIRCdProto::cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
+void UnrealIRCdProto::SendKick(const char *source, const char *chan, const char *user, const char *buf)
 {
 	if (buf) send_cmd(source, "%s %s %s :%s", send_token("KICK", "H"), chan, user, buf);
 	else send_cmd(source, "%s %s %s", send_token("KICK", "H"), chan, user);
 }
 
-void UnrealIRCdProto::cmd_notice_ops(const char *source, const char *dest, const char *buf)
+void UnrealIRCdProto::SendNoticeChanops(const char *source, const char *dest, const char *buf)
 {
 	if (!buf) return;
 	send_cmd(source, "%s @%s :%s", send_token("NOTICE", "B"), dest, buf);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 3a1bcf25e..7b73842dd 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -92,8 +92,8 @@ class UnrealIRCdProto : public IRCDProto {
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
 		void SendClientIntroduction(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 *);
+		void SendKick(const char *, const char *, const char *, const char *);
+		void SendNoticeChanops(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_join(const char *, const char *, time_t);
 		void cmd_unsqline(const char *);