Last bits of renaming protocol.

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

27 files changed, 77 insertions, 77 deletions

diff --git a/src/chanserv.c b/src/chanserv.c
index 686de1dea..e6360e20e 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2160,7 +2160,7 @@ void cs_set_flood(ChannelInfo * ci, const char *value)
         free(ci->mlock_flood);
 
     /* This looks ugly, but it works ;) */
-    if (anope_flood_mode_check(value)) {
+    if (anope_IsFloodModeParamValid(value)) {
         ci->mlock_flood = sstrdup(value);
     } else {
         ci->mlock_on &= ~ircd->chan_fmode;
diff --git a/src/ircd.c b/src/ircd.c
index 3f4afa35c..273c7922a 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -362,9 +362,9 @@ void anope_SendEOB()
 	ircdproto->SendEOB();
 }
 
-int anope_flood_mode_check(const char *value)
+int anope_IsFloodModeParamValid(const char *value)
 {
-	return ircdproto->flood_mode_check(value);
+	return ircdproto->IsFloodModeParamValid(value);
 }
 
 void anope_SendJupe(const char *jserver, const char *who, const char *reason)
@@ -395,7 +395,7 @@ void anope_SendCTCP(const char *source, const char *dest, const char *fmt, ...)
 	ircdproto->SendCTCP(source, dest, buf);
 }
 
-void anope_cmd_numeric(const char *source, int numeric, const char *dest, const char *fmt, ...)
+void anope_SendNumeric(const char *source, int numeric, const char *dest, const char *fmt, ...)
 {
 	va_list args;
 	char buf[BUFSIZE] = "";
@@ -404,7 +404,7 @@ void anope_cmd_numeric(const char *source, int numeric, const char *dest, const
 		vsnprintf(buf, BUFSIZE - 1, fmt, args);
 		va_end(args);
 	}
-	ircdproto->cmd_numeric(source, numeric, dest, *buf ? buf : NULL);
+	ircdproto->SendNumeric(source, numeric, dest, *buf ? buf : NULL);
 }
 
 /**
diff --git a/src/messages.c b/src/messages.c
index a46b3834c..a8ceb408b 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -71,7 +71,7 @@ int m_time(const char *source, int ac, const char **av)
     time(&t);
     tm = localtime(&t);
     strftime(buf, sizeof(buf), "%a %b %d %H:%M:%S %Y %Z", tm);
-	anope_cmd_numeric(ServerName, 391, source, "%s :%s", ServerName, buf);
+	anope_SendNumeric(ServerName, 391, source, "%s :%s", ServerName, buf);
     return MOD_CONT;
 }
 
@@ -88,15 +88,15 @@ int m_motd(const char *source)
 
     f = fopen(MOTDFilename, "r");
     if (f) {
-		anope_cmd_numeric(ServerName, 375, source, ":- %s Message of the Day", ServerName);
+		anope_SendNumeric(ServerName, 375, source, ":- %s Message of the Day", ServerName);
         while (fgets(buf, sizeof(buf), f)) {
             buf[strlen(buf) - 1] = 0;
-			anope_cmd_numeric(ServerName, 372, source, ":- %s", buf);
+			anope_SendNumeric(ServerName, 372, source, ":- %s", buf);
         }
         fclose(f);
-		anope_cmd_numeric(ServerName, 376, source, ":End of /MOTD command.");
+		anope_SendNumeric(ServerName, 376, source, ":End of /MOTD command.");
     } else {
-		anope_cmd_numeric(ServerName, 422, source, ":- MOTD file not found!  Please contact your IRC administrator.");
+		anope_SendNumeric(ServerName, 422, source, ":- MOTD file not found!  Please contact your IRC administrator.");
     }
     return MOD_CONT;
 }
@@ -237,54 +237,54 @@ int m_stats(const char *source, int ac, const char **av)
         if (u && is_oper(u)) {
 
             if (servernum == 1) {
-				anope_cmd_numeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
-				anope_cmd_numeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer, write_buffer_len(), total_written, -1, read_buffer_len(),
+				anope_SendNumeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
+				anope_SendNumeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer, write_buffer_len(), total_written, -1, read_buffer_len(),
 					total_read, -1, time(NULL) - start_time);
             } else if (servernum == 2) {
-				anope_cmd_numeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
-				anope_cmd_numeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer2, write_buffer_len(), total_written, -1, read_buffer_len(),
+				anope_SendNumeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
+				anope_SendNumeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer2, write_buffer_len(), total_written, -1, read_buffer_len(),
 					total_read, -1, time(NULL) - start_time);
             } else if (servernum == 3) {
-				anope_cmd_numeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
-				anope_cmd_numeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer3, write_buffer_len(), total_written, -1, read_buffer_len(),
+				anope_SendNumeric(ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
+				anope_SendNumeric(ServerName, 211, source, "%s %d %d %d %d %d %d %ld", RemoteServer3, write_buffer_len(), total_written, -1, read_buffer_len(),
 					total_read, -1, time(NULL) - start_time);
             }
         }
 
-		anope_cmd_numeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
+		anope_SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
         break;
     case 'o':
     case 'O':
 /* Check whether the user is an operator */
         u = finduser(source);
         if (u && !is_oper(u) && HideStatsO) {
-			anope_cmd_numeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
+			anope_SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
         } else {
             for (i = 0; i < RootNumber; i++)
-				anope_cmd_numeric(ServerName, 243, source, "O * * %s Root 0", ServicesRoots[i]);
+				anope_SendNumeric(ServerName, 243, source, "O * * %s Root 0", ServicesRoots[i]);
             for (i = 0; i < servadmins.count && (nc = (NickCore *)servadmins.list[i]);
                  i++)
-				anope_cmd_numeric(ServerName, 243, source, "O * * %s Admin 0", nc->display);
+				anope_SendNumeric(ServerName, 243, source, "O * * %s Admin 0", nc->display);
             for (i = 0; i < servopers.count && (nc = (NickCore *)servopers.list[i]);
                  i++)
-				anope_cmd_numeric(ServerName, 243, source, "O * * %s Oper 0", nc->display);
+				anope_SendNumeric(ServerName, 243, source, "O * * %s Oper 0", nc->display);
 
-			anope_cmd_numeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
+			anope_SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
         }
 
         break;
 
     case 'u':{
             int uptime = time(NULL) - start_time;
-			anope_cmd_numeric(ServerName, 242, source, ":Services up %d day%s, %02d:%02d:%02d", uptime / 86400, uptime / 86400 == 1 ? "" : "s",
+			anope_SendNumeric(ServerName, 242, source, ":Services up %d day%s, %02d:%02d:%02d", uptime / 86400, uptime / 86400 == 1 ? "" : "s",
 				(uptime / 3600) % 24, (uptime / 60) % 60, uptime % 60);
-			anope_cmd_numeric(ServerName, 250, source, ":Current users: %d (%d ops); maximum %d", usercnt, opcnt, maxusercnt);
-			anope_cmd_numeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
+			anope_SendNumeric(ServerName, 250, source, ":Current users: %d (%d ops); maximum %d", usercnt, opcnt, maxusercnt);
+			anope_SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
             break;
         }                       /* case 'u' */
 
     default:
-		anope_cmd_numeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
+		anope_SendNumeric(ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
         break;
     }
     return MOD_CONT;
@@ -294,7 +294,7 @@ int m_stats(const char *source, int ac, const char **av)
 
 int m_version(const char *source, int ac, const char **av)
 {
-	if (source) anope_cmd_numeric(ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags,
+	if (source) anope_SendNumeric(ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags,
 		EncModule, version_build);
 	return MOD_CONT;
 }
@@ -329,11 +329,11 @@ int m_whois(const char *source, const char *who)
             clientdesc = desc_DevNull;
         else if (s_BotServ && (bi = findbot(who))) {
             /* Bots are handled separately */
-			anope_cmd_numeric(ServerName, 311, source, "%s %s %s * :%s", bi->nick, bi->user, bi->host, bi->real);
-			anope_cmd_numeric(ServerName, 307, source, "%s :is a registered nick", bi->nick);
-			anope_cmd_numeric(ServerName, 312, source, "%s %s :%s", bi->nick, ServerName, ServerDesc);
-			anope_cmd_numeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick, time(NULL) - bi->lastmsg, start_time);
-			anope_cmd_numeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
+			anope_SendNumeric(ServerName, 311, source, "%s %s %s * :%s", bi->nick, bi->user, bi->host, bi->real);
+			anope_SendNumeric(ServerName, 307, source, "%s :is a registered nick", bi->nick);
+			anope_SendNumeric(ServerName, 312, source, "%s %s :%s", bi->nick, ServerName, ServerDesc);
+			anope_SendNumeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick, time(NULL) - bi->lastmsg, start_time);
+			anope_SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
             return MOD_CONT;
         } else if (!(ircd->svshold && UseSVSHOLD) && (na = findnick(who))
                    && (na->status & NS_KILL_HELD)) {
@@ -341,18 +341,18 @@ int m_whois(const char *source, const char *who)
              * We can't just say it doesn't exist here, even tho it does for
              * other servers :) -GD
              */
-			anope_cmd_numeric(ServerName, 311, source, "%s %s %s * :Services Enforcer", na->nick, NSEnforcerUser, NSEnforcerHost);
-			anope_cmd_numeric(ServerName, 312, source, "%s %s :%s", na->nick, ServerName, ServerDesc);
-			anope_cmd_numeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
+			anope_SendNumeric(ServerName, 311, source, "%s %s %s * :Services Enforcer", na->nick, NSEnforcerUser, NSEnforcerHost);
+			anope_SendNumeric(ServerName, 312, source, "%s %s :%s", na->nick, ServerName, ServerDesc);
+			anope_SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
             return MOD_CONT;
         } else {
-			anope_cmd_numeric(ServerName, 401, source, "%s :No such service.", who);
+			anope_SendNumeric(ServerName, 401, source, "%s :No such service.", who);
             return MOD_CONT;
         }
-		anope_cmd_numeric(ServerName, 311, source, "%s %s %s * :%s", who, ServiceUser, ServiceHost, clientdesc);
-		anope_cmd_numeric(ServerName, 312, source, "%s %s :%s", who, ServerName, ServerDesc);
-		anope_cmd_numeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", who, time(NULL) - start_time, start_time);
-		anope_cmd_numeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
+		anope_SendNumeric(ServerName, 311, source, "%s %s %s * :%s", who, ServiceUser, ServiceHost, clientdesc);
+		anope_SendNumeric(ServerName, 312, source, "%s %s :%s", who, ServerName, ServerDesc);
+		anope_SendNumeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", who, time(NULL) - start_time, start_time);
+		anope_SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
     }
     return MOD_CONT;
 }
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index c8d40b0bf..c2293a38d 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1093,7 +1093,7 @@ int anope_event_admin(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int BahamutIRCdProto::flood_mode_check(const char *value)
+int BahamutIRCdProto::IsFloodModeParamValid(const char *value)
 {
 	char *dp, *end;
 	if (value && *value != ':' && strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end) return 1;
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index d909e8bf6..bbc0980fa 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -90,5 +90,5 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendEOB();
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
-		int flood_mode_check(const char *);
+		int IsFloodModeParamValid(const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index d1576cab6..2e88e3b6d 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1034,9 +1034,9 @@ int anope_event_quit(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void CharybdisProto::cmd_numeric(const char *source, int numeric, const char *dest, const char *buf)
+void CharybdisProto::SendNumeric(const char *source, int numeric, const char *dest, const char *buf)
 {
-	// This might need to be set in the call to cmd_numeric instead of here, will review later -- CyberBotX
+	// This might need to be set in the call to SendNumeric instead of here, will review later -- CyberBotX
 	send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
 }
 
@@ -1273,7 +1273,7 @@ int anope_event_bmask(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int CharybdisProto::flood_mode_check(const char *value)
+int CharybdisProto::IsFloodModeParamValid(const char *value)
 {
 	char *dp, *end;
 	if (value && *value != ':' && strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end) return 1;
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index a4dbb565f..3d6cd3f90 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -76,6 +76,6 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
 		int IsNickValid(const char *);
-		int flood_mode_check(const char *);
-		void cmd_numeric(const char *, int, const char *, const char *);
+		int IsFloodModeParamValid(const char *);
+		void SendNumeric(const char *, int, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 43a1a59ad..904cc2459 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -560,7 +560,7 @@ void InspIRCdProto::SendSVSMode(User *u, int ac, const char **av)
 	send_cmd(s_NickServ, "MODE %s %s", u->nick, merge_args(ac, av));
 }
 
-void InspIRCdProto::cmd_numeric(const char *source, int numeric, const char *dest, const char *buf)
+void InspIRCdProto::SendNumeric(const char *source, int numeric, const char *dest, const char *buf)
 {
 	send_cmd(source, "PUSH %s ::%s %03d %s %s", dest, source, numeric, dest, buf);
 }
@@ -1346,7 +1346,7 @@ int anope_event_admin(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int InspIRCdProto::flood_mode_check(const char *value)
+int InspIRCdProto::IsFloodModeParamValid(const char *value)
 {
 	char *dp, *end;
 	if (value && *value != ':' && strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end) return 1;
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index ba13a77ee..e57de099e 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -94,6 +94,6 @@ class InspIRCdProto : public IRCDProto {
 		void SendEOB();
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
-		int flood_mode_check(const char *);
-		void cmd_numeric(const char *, int, const char *, const char *);
+		int IsFloodModeParamValid(const char *);
+		void SendNumeric(const char *, int, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 2f0c38c6c..528851f23 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1383,7 +1383,7 @@ int anope_event_invite(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int hybrid_flood_mode_check(const char *value)
+int hybrid_IsFloodModeParamValid(const char *value)
 {
     return 0;
 }
@@ -1519,7 +1519,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(hybrid_cmd_svspart);
     pmodule_SendSWhois(hybrid_cmd_swhois);
     pmodule_SendEOB(hybrid_cmd_eob);
-    pmodule_flood_mode_check(hybrid_flood_mode_check);
+    pmodule_IsFloodModeParamValid(hybrid_flood_mode_check);
     pmodule_SendJupe(hybrid_cmd_jupe);
     pmodule_IsNickValid(hybrid_valid_nick);
     pmodule_IsChannelValid(hybrid_valid_chan);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index d4a55b766..3d58695d4 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -107,7 +107,7 @@ void hybrid_SendUnregisteredNick(User * u);
 void hybrid_SendSVID2(User * u, const char *ts);
 void hybrid_SendSVID3(User * u, const char *ts);
 void hybrid_SendEOB();
-int hybrid_flood_mode_check(const char *value);
+int hybrid_IsFloodModeParamValid(const char *value);
 void hybrid_SendJupe(const char *jserver, const char *who, const char *reason);
 int hybrid_IsNickValid(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 3498cb6d8..1b79e4e48 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1656,7 +1656,7 @@ anope_event_invite (const char *source, int ac, const char **av)
 }
 
 int
-plexus_flood_mode_check (const char *value)
+plexus_IsFloodModeParamValid (const char *value)
 {
   return 0;
 }
@@ -1803,7 +1803,7 @@ moduleAddAnopeCmds ()
   pmodule_SendSVSPart (plexus_cmd_svspart);
   pmodule_SendSWhois (plexus_cmd_swhois);
   pmodule_SendEOB (plexus_cmd_eob);
-  pmodule_flood_mode_check (plexus_flood_mode_check);
+  pmodule_IsFloodModeParamValid (plexus_flood_mode_check);
   pmodule_SendJupe (plexus_cmd_jupe);
   pmodule_IsNickValid (plexus_valid_nick);
   pmodule_IsChannelValid (plexus_valid_chan);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index fed230a66..bf78c28c4 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -103,7 +103,7 @@ void plexus_SendUnregisteredNick(User * u);
 void plexus_SendSVID2(User * u, const char *ts);
 void plexus_SendSVID3(User * u, const char *ts);
 void plexus_SendEOB();
-int plexus_flood_mode_check(const char *value);
+int plexus_IsFloodModeParamValid(const char *value);
 void plexus_SendJupe(const char *jserver, const char *who, const char *reason);
 int plexus_IsNickValid(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 f44b3acf0..3085f1337 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1602,7 +1602,7 @@ int anope_event_invite(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int ptlink_flood_mode_check(const char *value)
+int ptlink_IsFloodModeParamValid(const char *value)
 {
     char *dp, *end;
 
@@ -1748,7 +1748,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(ptlink_cmd_svspart);
     pmodule_SendSWhois(ptlink_cmd_swhois);
     pmodule_SendEOB(ptlink_cmd_eob);
-    pmodule_flood_mode_check(ptlink_flood_mode_check);
+    pmodule_IsFloodModeParamValid(ptlink_flood_mode_check);
     pmodule_SendJupe(ptlink_cmd_jupe);
     pmodule_IsNickValid(ptlink_valid_nick);
     pmodule_IsChannelValid(ptlink_valid_chan);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index b7c05dc07..8e7b893cf 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -142,7 +142,7 @@ void ptlink_SendUnregisteredNick(User * u);
 void ptlink_SendSVID2(User * u, const char *ts);
 void ptlink_SendSVID3(User * u, const char *ts);
 void ptlink_SendEOB();
-int ptlink_flood_mode_check(const char *value);
+int ptlink_IsFloodModeParamValid(const char *value);
 void ptlink_SendJupe(const char *jserver, const char *who, const char *reason);
 int ptlink_IsNickValid(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 68b79cf1b..b1e4c0320 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -1491,7 +1491,7 @@ int anope_event_globops(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int rageircd_flood_mode_check(const char *value)
+int rageircd_IsFloodModeParamValid(const char *value)
 {
     return 0;
 }
@@ -1628,7 +1628,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(rageircd_cmd_svspart);
     pmodule_SendSWhois(rageircd_cmd_swhois);
     pmodule_SendEOB(rageircd_cmd_eob);
-    pmodule_flood_mode_check(rageircd_flood_mode_check);
+    pmodule_IsFloodModeParamValid(rageircd_flood_mode_check);
     pmodule_SendJupe(rageircd_cmd_jupe);
     pmodule_IsNickValid(rageircd_valid_nick);
     pmodule_IsChannelValid(rageircd_valid_chan);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index befa41eaf..12aab63dc 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -105,7 +105,7 @@ void rageircd_SendUnregisteredNick(User * u);
 void rageircd_SendSVID2(User * u, const char *ts);
 void rageircd_SendSVID3(User * u, const char *ts);
 void rageircd_SendEOB();
-int rageircd_flood_mode_check(const char *value);
+int rageircd_IsFloodModeParamValid(const char *value);
 void rageircd_SendJupe(const char *jserver, const char *who, const char *reason);
 int rageircd_IsNickValid(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 da10819c2..75cefd70a 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1520,7 +1520,7 @@ int anope_event_admin(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int solidircd_flood_mode_check(const char *value)
+int solidircd_IsFloodModeParamValid(const char *value)
 {
     char *dp, *end;
 
@@ -1661,7 +1661,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(solidircd_cmd_svspart);
     pmodule_SendSWhois(solidircd_cmd_swhois);
     pmodule_SendEOB(solidircd_cmd_eob);
-    pmodule_flood_mode_check(solidircd_flood_mode_check);
+    pmodule_IsFloodModeParamValid(solidircd_flood_mode_check);
     pmodule_SendJupe(solidircd_cmd_jupe);
     pmodule_IsNickValid(solidircd_valid_nick);
     pmodule_IsChannelValid(solidircd_valid_chan);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index eb345b04e..23812ffc1 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -129,7 +129,7 @@ void solidircd_SendUnregisteredNick(User * u);
 void solidircd_SendSVID2(User * u, const char *ts);
 void solidircd_SendSVID3(User * u, const char *ts);
 void solidircd_SendEOB();
-int solidircd_flood_mode_check(const char *value);
+int solidircd_IsFloodModeParamValid(const char *value);
 void solidircd_SendJupe(const char *jserver, const char *who, const char *reason);
 int solidircd_IsNickValid(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 2a72bd022..8243af1a0 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1637,7 +1637,7 @@ int anope_event_invite(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-int ultiamte3_flood_mode_check(const char *value)
+int ultiamte3_IsFloodModeParamValid(const char *value)
 {
     return 0;
 }
@@ -1769,7 +1769,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(ultimate3_cmd_svspart);
     pmodule_SendSWhois(ultimate3_cmd_swhois);
     pmodule_SendEOB(ultimate3_cmd_eob);
-    pmodule_flood_mode_check(ultiamte3_flood_mode_check);
+    pmodule_IsFloodModeParamValid(ultiamte3_flood_mode_check);
     pmodule_SendJupe(ultimate3_cmd_jupe);
     pmodule_IsNickValid(ultiamte3_valid_nick);
     pmodule_IsChannelValid(ultiamte3_valid_chan);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index 052710c93..a67dc8e5f 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -115,7 +115,7 @@ void ultimate3_SendUnregisteredNick(User * u);
 void ultimate3_SendSVID2(User * u, const char *ts);
 void ultimate3_SendSVID3(User * u, const char *ts);
 void ultimate3_SendEOB();
-int ultimate3_flood_mode_check(const char *value);
+int ultimate3_IsFloodModeParamValid(const char *value);
 void ultimate3_SendJupe(const char *jserver, const char *who, const char *reason);
 int ultimate3_IsNickValid(const char *nick);
 void ultimate3_SendCTCP(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index 13e2f7ae4..a1fdcf066 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -1511,7 +1511,7 @@ void viagra_SendSWhois(const char *source, const char *who, const char *mask)
     /* not supported */
 }
 
-int viagra_flood_mode_check(const char *value)
+int viagra_IsFloodModeParamValid(const char *value)
 {
     return 0;
 }
@@ -1668,7 +1668,7 @@ void moduleAddAnopeCmds()
     pmodule_SendSVSPart(viagra_cmd_svspart);
     pmodule_SendSWhois(viagra_cmd_swhois);
     pmodule_SendEOB(viagra_cmd_eob);
-    pmodule_flood_mode_check(viagra_flood_mode_check);
+    pmodule_IsFloodModeParamValid(viagra_flood_mode_check);
     pmodule_SendJupe(viagra_cmd_jupe);
     pmodule_IsNickValid(viagra_valid_nick);
     pmodule_IsChannelValid(viagra_valid_chan);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index 6d2723e18..30927f39d 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -124,7 +124,7 @@ void viagra_SendUnregisteredNick(User * u);
 void viagra_SendSVID2(User * u, const char *ts);
 void viagra_SendSVID3(User * u, const char *ts);
 void viagra_SendEOB();
-int viagra_flood_mode_check(const char *value);
+int viagra_IsFloodModeParamValid(const char *value);
 void viagra_SendJupe(const char *jserver, const char *who, const char *reason);
 int viagra_IsNickValid(const char *nick);
 void viagra_SendCTCP(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b1b6b93f6..dd07cc436 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -991,9 +991,9 @@ int anope_event_quit(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void RatboxProto::cmd_numeric(const char *source, int numeric, const char *dest, const char *buf)
+void RatboxProto::SendNumeric(const char *source, int numeric, const char *dest, const char *buf)
 {
-	// This might need to be set in the call to cmd_numeric instead of here, will review later -- CyberBotX
+	// This might need to be set in the call to SendNumeric instead of here, will review later -- CyberBotX
 	send_cmd(UseTS6 ? TS6SID : source, "%03d %s %s", numeric, dest, buf);
 }
 
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index cb63669f5..d9d87cfd7 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -75,5 +75,5 @@ class RatboxProto : public IRCDProto {
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
 		int IsNickValid(const char *);
-		void cmd_numeric(const char *, int, const char *, const char *);
+		void SendNumeric(const char *, int, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 39cb72996..5fb0548d3 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1345,7 +1345,7 @@ void unreal_cmd_svswatch(const char *sender, const char *nick, const char *parm)
 
 /* check if +f mode is valid for the ircd */
 /* borrowed part of the new check from channels.c in Unreal */
-int UnrealIRCdProto::flood_mode_check(const char *value)
+int UnrealIRCdProto::IsFloodModeParamValid(const char *value)
 {
 	char *dp, *end;
 	/* NEW +F */
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 85ad4fa24..c5ed93ca4 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -121,5 +121,5 @@ class UnrealIRCdProto : public IRCDProto {
 		void ProcessUsermodes(User *, int, const char **);
 		int IsNickValid(const char *);
 		int IsChannelValid(const char *);
-		int flood_mode_check(const char *);
+		int IsFloodModeParamValid(const char *);
 } ircd_proto;