14 files changed, 35 insertions, 35 deletions
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index d69ba81d6..2f0c38c6c 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -1415,7 +1415,7 @@ void hybrid_SendJupe(const char *jserver, const char *who, const char *reason)
   1 = valid nick
   0 = nick is in valid
 */
-int hybrid_valid_nick(const char *nick)
+int hybrid_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1425,7 +1425,7 @@ int hybrid_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int hybrid_valid_chan(const char *chan)
+int hybrid_IsChannelValid(const char *chan)
 {
     /* no hard coded invalid chans */
     return 1;
@@ -1521,8 +1521,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(hybrid_cmd_eob);
     pmodule_flood_mode_check(hybrid_flood_mode_check);
     pmodule_SendJupe(hybrid_cmd_jupe);
-    pmodule_valid_nick(hybrid_valid_nick);
-    pmodule_valid_chan(hybrid_valid_chan);
+    pmodule_IsNickValid(hybrid_valid_nick);
+    pmodule_IsChannelValid(hybrid_valid_chan);
     pmodule_SendCTCP(hybrid_cmd_ctcp);
     pmodule_ProcessUsermodes(hybrid_set_umode);
 }
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 5acf25484..d4a55b766 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -109,7 +109,7 @@ void hybrid_SendSVID3(User * u, const char *ts);
 void hybrid_SendEOB();
 int hybrid_flood_mode_check(const char *value);
 void hybrid_SendJupe(const char *jserver, const char *who, const char *reason);
-int hybrid_valid_nick(const char *nick);
+int hybrid_IsNickValid(const char *nick);
 void hybrid_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class HybridIRCdProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 6448c51f6..3498cb6d8 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -1693,7 +1693,7 @@ plexus_SendJupe (const char *jserver, const char *who, const char *reason)
   0 = nick is in valid
 */
 int
-plexus_valid_nick (const char *nick)
+plexus_IsNickValid (const char *nick)
 {
   /* no hard coded invalid nicks */
   return 1;
@@ -1704,7 +1704,7 @@ plexus_valid_nick (const char *nick)
   0 = chan is in valid
 */
 int
-plexus_valid_chan (const char *chan)
+plexus_IsChannelValid (const char *chan)
 {
   /* no hard coded invalid chan */
   return 1;
@@ -1805,8 +1805,8 @@ moduleAddAnopeCmds ()
   pmodule_SendEOB (plexus_cmd_eob);
   pmodule_flood_mode_check (plexus_flood_mode_check);
   pmodule_SendJupe (plexus_cmd_jupe);
-  pmodule_valid_nick (plexus_valid_nick);
-  pmodule_valid_chan (plexus_valid_chan);
+  pmodule_IsNickValid (plexus_valid_nick);
+  pmodule_IsChannelValid (plexus_valid_chan);
   pmodule_SendCTCP (plexus_cmd_ctcp);
   pmodule_ProcessUsermodes (plexus_set_umode);
 }
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index 1530386e3..fed230a66 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -105,7 +105,7 @@ void plexus_SendSVID3(User * u, const char *ts);
 void plexus_SendEOB();
 int plexus_flood_mode_check(const char *value);
 void plexus_SendJupe(const char *jserver, const char *who, const char *reason);
-int plexus_valid_nick(const char *nick);
+int plexus_IsNickValid(const char *nick);
 void plexus_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class PleXusIRCdProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index b4ce28049..f44b3acf0 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1644,7 +1644,7 @@ void ptlink_SendGlobops_legacy(const char *source, const char *fmt)
   1 = valid nick
   0 = nick is in valid
 */
-int ptlink_valid_nick(const char *nick)
+int ptlink_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1654,7 +1654,7 @@ int ptlink_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int ptlink_valid_chan(const char *cahn)
+int ptlink_IsChannelValid(const char *cahn)
 {
     /* no hard coded invalid chan */
     return 1;
@@ -1750,8 +1750,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(ptlink_cmd_eob);
     pmodule_flood_mode_check(ptlink_flood_mode_check);
     pmodule_SendJupe(ptlink_cmd_jupe);
-    pmodule_valid_nick(ptlink_valid_nick);
-    pmodule_valid_chan(ptlink_valid_chan);
+    pmodule_IsNickValid(ptlink_valid_nick);
+    pmodule_IsChannelValid(ptlink_valid_chan);
     pmodule_SendCTCP(ptlink_cmd_ctcp);
     pmodule_ProcessUsermodes(ptlink_set_umode);
 }
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 7b33057f5..b7c05dc07 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -144,7 +144,7 @@ void ptlink_SendSVID3(User * u, const char *ts);
 void ptlink_SendEOB();
 int ptlink_flood_mode_check(const char *value);
 void ptlink_SendJupe(const char *jserver, const char *who, const char *reason);
-int ptlink_valid_nick(const char *nick);
+int ptlink_IsNickValid(const char *nick);
 void ptlink_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class PTlinkProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 87efa1b57..68b79cf1b 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -1524,7 +1524,7 @@ void rageircd_SendGlobops_legacy(const char *source, const char *fmt)
   1 = valid nick
   0 = nick is in valid
 */
-int rageircd_valid_nick(const char *nick)
+int rageircd_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1534,7 +1534,7 @@ int rageircd_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int rageircd_valid_chan(const char *chan)
+int rageircd_IsChannelValid(const char *chan)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1630,8 +1630,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(rageircd_cmd_eob);
     pmodule_flood_mode_check(rageircd_flood_mode_check);
     pmodule_SendJupe(rageircd_cmd_jupe);
-    pmodule_valid_nick(rageircd_valid_nick);
-    pmodule_valid_chan(rageircd_valid_chan);
+    pmodule_IsNickValid(rageircd_valid_nick);
+    pmodule_IsChannelValid(rageircd_valid_chan);
     pmodule_SendCTCP(rageircd_cmd_ctcp);
     pmodule_ProcessUsermodes(rageircd_set_umode);
 }
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 11022d2d7..befa41eaf 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -107,7 +107,7 @@ void rageircd_SendSVID3(User * u, const char *ts);
 void rageircd_SendEOB();
 int rageircd_flood_mode_check(const char *value);
 void rageircd_SendJupe(const char *jserver, const char *who, const char *reason);
-int rageircd_valid_nick(const char *nick);
+int rageircd_IsNickValid(const char *nick);
 void rageircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class RageIRCdProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index f0def2059..da10819c2 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1557,7 +1557,7 @@ void solidircd_SendGlobops_legacy(const char *source, const char *fmt)
   1 = valid nick
   0 = nick is in valid
 */
-int solidircd_valid_nick(const char *nick)
+int solidircd_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1567,7 +1567,7 @@ int solidircd_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int solidircd_valid_chan(const char *chan)
+int solidircd_IsChannelValid(const char *chan)
 {
     /* no hard coded invalid chan*/
     return 1;
@@ -1663,8 +1663,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(solidircd_cmd_eob);
     pmodule_flood_mode_check(solidircd_flood_mode_check);
     pmodule_SendJupe(solidircd_cmd_jupe);
-    pmodule_valid_nick(solidircd_valid_nick);
-    pmodule_valid_chan(solidircd_valid_chan);
+    pmodule_IsNickValid(solidircd_valid_nick);
+    pmodule_IsChannelValid(solidircd_valid_chan);
     pmodule_SendCTCP(solidircd_cmd_ctcp);
     pmodule_ProcessUsermodes(solidircd_set_umode);
 }
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index 0f54b371c..eb345b04e 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -131,7 +131,7 @@ void solidircd_SendSVID3(User * u, const char *ts);
 void solidircd_SendEOB();
 int solidircd_flood_mode_check(const char *value);
 void solidircd_SendJupe(const char *jserver, const char *who, const char *reason);
-int solidircd_valid_nick(const char *nick);
+int solidircd_IsNickValid(const char *nick);
 void solidircd_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class SolidIRCdProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index 197944582..2a72bd022 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1665,7 +1665,7 @@ void ultimate3_SendGlobops_legacy(const char *source, const char *fmt)
   1 = valid nick
   0 = nick is in valid
 */
-int ultiamte3_valid_nick(const char *nick)
+int ultiamte3_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1675,7 +1675,7 @@ int ultiamte3_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int ultiamte3_valid_chan(const char *chan)
+int ultiamte3_IsChannelValid(const char *chan)
 {
     /* no hard coded invalid chans */
     return 1;
@@ -1771,8 +1771,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(ultimate3_cmd_eob);
     pmodule_flood_mode_check(ultiamte3_flood_mode_check);
     pmodule_SendJupe(ultimate3_cmd_jupe);
-    pmodule_valid_nick(ultiamte3_valid_nick);
-    pmodule_valid_chan(ultiamte3_valid_chan);
+    pmodule_IsNickValid(ultiamte3_valid_nick);
+    pmodule_IsChannelValid(ultiamte3_valid_chan);
     pmodule_SendCTCP(ultimate3_cmd_ctcp);
     pmodule_ProcessUsermodes(ultimate3_set_umode);
 }
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index d88badf41..052710c93 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -117,7 +117,7 @@ void ultimate3_SendSVID3(User * u, const char *ts);
 void ultimate3_SendEOB();
 int ultimate3_flood_mode_check(const char *value);
 void ultimate3_SendJupe(const char *jserver, const char *who, const char *reason);
-int ultimate3_valid_nick(const char *nick);
+int ultimate3_IsNickValid(const char *nick);
 void ultimate3_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class UltimateIRCdProto : public IRCDProtoNew {
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index e4970ee64..13e2f7ae4 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -1564,7 +1564,7 @@ void viagra_SendGlobops_legacy(const char *source, const char *fmt)
   1 = valid nick
   0 = nick is in valid
 */
-int viagra_valid_nick(const char *nick)
+int viagra_IsNickValid(const char *nick)
 {
     /* no hard coded invalid nicks */
     return 1;
@@ -1574,7 +1574,7 @@ int viagra_valid_nick(const char *nick)
   1 = valid chan
   0 = chan is in valid
 */
-int viagra_valid_chan(const char *chan)
+int viagra_IsChannelValid(const char *chan)
 {
     /* no hard coded invalid chans */
     return 1;
@@ -1670,8 +1670,8 @@ void moduleAddAnopeCmds()
     pmodule_SendEOB(viagra_cmd_eob);
     pmodule_flood_mode_check(viagra_flood_mode_check);
     pmodule_SendJupe(viagra_cmd_jupe);
-    pmodule_valid_nick(viagra_valid_nick);
-    pmodule_valid_chan(viagra_valid_chan);
+    pmodule_IsNickValid(viagra_valid_nick);
+    pmodule_IsChannelValid(viagra_valid_chan);
     pmodule_SendCTCP(viagra_cmd_ctcp);
     pmodule_ProcessUsermodes(viagra_set_umode);
 }
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index 1d0ff7857..6d2723e18 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -126,7 +126,7 @@ void viagra_SendSVID3(User * u, const char *ts);
 void viagra_SendEOB();
 int viagra_flood_mode_check(const char *value);
 void viagra_SendJupe(const char *jserver, const char *who, const char *reason);
-int viagra_valid_nick(const char *nick);
+int viagra_IsNickValid(const char *nick);
 void viagra_SendCTCP(const char *source, const char *dest, const char *buf);
 
 class ViagraIRCdProto : public IRCDProtoNew {