valid_(nick|chan) -> Is(Nick|Chan)Valid

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

28 files changed, 57 insertions, 57 deletions

diff --git a/include/extern.h b/include/extern.h
index e0d02736a..15fb51aa7 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1253,8 +1253,8 @@ E int anope_flood_mode_check(const char *value);
 
 E void anope_SendJupe(const char *jserver, const char *who, const char *reason);
 
-E int anope_valid_nick(const char *nick);
-E int anope_valid_chan(const char *chan);
+E int anope_IsNickValid(const char *nick);
+E int anope_IsChannelValid(const char *chan);
 
 E char *common_get_vident(User *u);
 E char *common_get_vhost(User *u);
diff --git a/include/services.h b/include/services.h
index 674805213..671d12c23 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1348,8 +1348,8 @@ class IRCDProto {
 			new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 		}
 		virtual void ProcessUsermodes(User *, int, const char **) = 0;
-		virtual int valid_nick(const char *) { return 1; }
-		virtual int valid_chan(const char *) { return 1; }
+		virtual int IsNickValid(const char *) { return 1; }
+		virtual int IsChannelValid(const char *) { return 1; }
 		virtual int flood_mode_check(const char *) { return 0; }
 		virtual void cmd_numeric(const char *source, int numeric, const char *dest, const char *buf)
 		{
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 6fc34a6bb..09e9b3860 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -111,7 +111,7 @@ int do_bot(User * u)
             }
 
             /* check for hardcored ircd forbidden nicks */
-            if (!anope_valid_nick(nick)) {
+            if (!anope_IsNickValid(nick)) {
                 notice_lang(s_BotServ, u, BOT_BAD_NICK);
                 return MOD_CONT;
             }
@@ -229,7 +229,7 @@ int do_bot(User * u)
             }
 
             /* check for hardcored ircd forbidden nicks */
-            if (!anope_valid_nick(nick)) {
+            if (!anope_IsNickValid(nick)) {
                 notice_lang(s_BotServ, u, BOT_BAD_NICK);
                 return MOD_CONT;
             }
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 19f0202dc..20209ddce 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -84,7 +84,7 @@ int do_forbid(User * u)
     if (*chan != '#') {
         notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
         return MOD_CONT;
-    } else if (!anope_valid_chan(chan)) {
+    } else if (!anope_IsChannelValid(chan)) {
         notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
         return MOD_CONT;
     }
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 1b5d3ff68..54aa113b6 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -95,7 +95,7 @@ int do_register(User * u)
         notice_lang(s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL);
     } else if (*chan != '#') {
         notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
-    } else if (!anope_valid_chan(chan)) {
+    } else if (!anope_IsChannelValid(chan)) {
         notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
     } else if (!u->na || !(nc = u->na->nc)) {
         notice_lang(s_ChanServ, u, CHAN_MUST_REGISTER_NICK, s_NickServ);
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index a2f68c911..8160b220d 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -85,7 +85,7 @@ int do_forbid(User * u)
 
     if (readonly)
         notice_lang(s_NickServ, u, READ_ONLY_MODE);
-    if (!anope_valid_nick(nick)) {
+    if (!anope_IsNickValid(nick)) {
         notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
         return MOD_CONT;
     }
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index acf89cc2c..7f79b2a3d 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -133,7 +133,7 @@ int do_register(User * u)
         return MOD_CONT;
     }
 
-    if (!anope_valid_nick(u->nick)) {
+    if (!anope_IsNickValid(u->nick)) {
         notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
         return MOD_CONT;
     }
diff --git a/src/ircd.c b/src/ircd.c
index 4b549e132..3f4afa35c 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -372,14 +372,14 @@ void anope_SendJupe(const char *jserver, const char *who, const char *reason)
 	ircdproto->SendJupe(jserver, who, reason);
 }
 
-int anope_valid_nick(const char *nick)
+int anope_IsNickValid(const char *nick)
 {
-	return ircdproto->valid_nick(nick);
+	return ircdproto->IsNickValid(nick);
 }
 
-int anope_valid_chan(const char *chan)
+int anope_IsChannelValid(const char *chan)
 {
-	return ircdproto->valid_chan(chan);
+	return ircdproto->IsChannelValid(chan);
 }
 
 
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 20ad216f2..d1576cab6 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1294,7 +1294,7 @@ int anope_event_error(const char *source, int ac, const char **av)
   1 = valid nick
   0 = nick is in valid
 */
-int CharybdisProto::valid_nick(const char *nick)
+int CharybdisProto::IsNickValid(const char *nick)
 {
 	/* TS6 Save extension -Certus */
 	if (isdigit(*nick)) return 0;
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index a4ae9beb7..a4dbb565f 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -75,7 +75,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendSGLine(const char *, const char *);
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
-		int valid_nick(const char *);
+		int IsNickValid(const char *);
 		int flood_mode_check(const char *);
 		void cmd_numeric(const char *, int, const char *, const char *);
 } ircd_proto;
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 {
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 30f40682a..b1b6b93f6 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1221,7 +1221,7 @@ int anope_event_error(const char *source, int ac, const char **av)
   1 = valid nick
   0 = nick is in valid
 */
-int RatboxProto::valid_nick(const char *nick)
+int RatboxProto::IsNickValid(const char *nick)
 {
 	/* TS6 Save extension -Certus */
 	if (isdigit(*nick)) return 0;
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index f0fa63b7e..cb63669f5 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -74,6 +74,6 @@ class RatboxProto : public IRCDProto {
 		void SendSGLine(const char *, const char *);
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
-		int valid_nick(const char *);
+		int IsNickValid(const char *);
 		void cmd_numeric(const char *, int, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 8d7013546..39cb72996 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1378,13 +1378,13 @@ int UnrealIRCdProto::flood_mode_check(const char *value)
   1 = valid nick
   0 = nick is in valid
 */
-int UnrealIRCdProto::valid_nick(const char *nick)
+int UnrealIRCdProto::IsNickValid(const char *nick)
 {
 	if (!stricmp("ircd", nick) || !stricmp("irc", nick)) return 0;
 	return 1;
 }
 
-int UnrealIRCdProto::valid_chan(const char *chan)
+int UnrealIRCdProto::IsChannelValid(const char *chan)
 {
 	if (strchr(chan, ':')) return 0;
 	return 1;
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index d6b6add29..85ad4fa24 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -119,7 +119,7 @@ class UnrealIRCdProto : public IRCDProto {
 		void SendEOB();
 		void SendServer(const char *, int, const char *);
 		void ProcessUsermodes(User *, int, const char **);
-		int valid_nick(const char *);
-		int valid_chan(const char *);
+		int IsNickValid(const char *);
+		int IsChannelValid(const char *);
 		int flood_mode_check(const char *);
 } ircd_proto;