AKILL, SVSMODE

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

32 files changed, 123 insertions, 123 deletions

diff --git a/include/depricated.h b/include/depricated.h
index 64353121b..17bb4e82f 100644
--- a/include/depricated.h
+++ b/include/depricated.h
@@ -24,7 +24,7 @@
    anope_cmd_bot_nick(nick,user,host,real,modes)
 
 #define s_akill(user, host, who, when, expires, reason) \
-  anope_cmd_akill(user, host, who, when, expires, reason)
+  anope_SendAkill(user, host, who, when, expires, reason)
 
 #define set_umode(user, ac, av) anope_set_umode(user, ac, av)
 
diff --git a/include/extern.h b/include/extern.h
index d43995284..eff96a80d 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1115,7 +1115,7 @@ E void notice(char *source, const char *dest, const char *fmt, ...);
 
 /******************************************************************************/
 
-E void anope_cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason); /* AKILL */
+E void anope_SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason); /* AKILL */
 E void anope_cmd_capab();						  	  		  /* CAPAB */
 E void anope_cmd_chghost(const char *nick, const char *vhost);                   			  /* CHGHOST */
 E void anope_cmd_chgident(const char *nick, const char *vIdent);                 			  /* CHGIDENT */
@@ -1159,8 +1159,8 @@ E void anope_cmd_release_svshold(const char *nick);				  		  /* SVSHOLD */
 E void anope_cmd_svsinfo();								  /* SVSINFO */
 E void anope_cmd_svsjoin(const char *source, const char *nick,const char *chan, const char *param);          	  /* SVSJOIN */
 E void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...);     		  /* SVSKILL */
-E void anope_cmd_svsmode(User * u, int ac, const char **av);   	        	  		  /* SVSMODE */
-E void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);				  /* SVSMODE */
+E void anope_SendSVSMode(User * u, int ac, const char **av);   	        	  		  /* SVSMODE */
+E void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick);				  /* SVSMODE */
 E void anope_cmd_svsnick(const char *nick,const char *newnick, time_t when);     	  		  /* SVSNICK */
 E void anope_SendSVSNOOP(const char *server, int set);			  	  		  /* SVSNOOP */
 E void anope_cmd_svso(const char *source,const char *nick, const char *flag);          	  		  /* SVSO   */
diff --git a/include/services.h b/include/services.h
index 80216f7b3..7a30f63df 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1235,9 +1235,9 @@ class IRCDProto {
 		virtual void SendAkillDel(const char *, const char *) = 0;
 		virtual void SendTopic(BotInfo *, const char *, const char *, const char *, time_t) = 0;
 		virtual void SendVhostDel(User *) { }
-		virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
+		virtual void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
 		virtual void SendSVSKill(const char *, const char *, const char *) = 0;
-		virtual void cmd_svsmode(User *, int, const char **) = 0;
+		virtual void SendSVSMode(User *, int, const char **) = 0;
 		virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
 		virtual void cmd_mode(const char *, const char *, const char *) = 0;
 		virtual void cmd_bot_nick(const char *, const char *, const char *, const char *, const char *) = 0;
@@ -1321,7 +1321,7 @@ class IRCDProto {
 		virtual void cmd_szline(const char *, const char *, const char *) { }
 		virtual void cmd_sgline(const char *, const char *) { }
 		virtual void cmd_unban(const char *, const char *) { }
-		virtual void cmd_svsmode_chan(const char *, const char *, const char *) { }
+		virtual void SendSVSMode_chan(const char *, const char *, const char *) { }
 		virtual void cmd_svid_umode(const char *, time_t) { }
 		virtual void cmd_nc_change(User *) { }
 		virtual void cmd_svid_umode2(User *, const char *) { }
diff --git a/src/actions.c b/src/actions.c
index ab6d08cbf..067647970 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -218,7 +218,7 @@ void common_svsmode(User * u, const char *modes, const char *arg)
         ac++;
     }
 
-    anope_cmd_svsmode(u, ac, av);
+    anope_SendSVSMode(u, ac, av);
     anope_set_umode(u, ac, av);
 }
 
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 5c9dbc871..dee19bcf4 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -177,12 +177,12 @@ int do_clear(User * u)
 
         if (ircd->svsmode_ucmode) {
             av[0] = chan;
-            anope_cmd_svsmode_chan(av[0], "-o", NULL);
+            anope_SendSVSMode_chan(av[0], "-o", NULL);
             if (ircd->owner) {
-                anope_cmd_svsmode_chan(av[0], ircd->ownerunset, NULL);
+                anope_SendSVSMode_chan(av[0], ircd->ownerunset, NULL);
             }
             if (ircd->protect || ircd->admin) {
-                anope_cmd_svsmode_chan(av[0], ircd->adminunset, NULL);
+                anope_SendSVSMode_chan(av[0], ircd->adminunset, NULL);
             }
             for (cu = c->users; cu; cu = next) {
                 next = cu->next;
@@ -284,9 +284,9 @@ int do_clear(User * u)
 
             if (ircd->svsmode_ucmode) {
                 if (ircdcap->tsmode)
-                    anope_cmd_svsmode_chan(av[0], av[2], NULL);
+                    anope_SendSVSMode_chan(av[0], av[2], NULL);
                 else
-                    anope_cmd_svsmode_chan(av[0], av[1], NULL);
+                    anope_SendSVSMode_chan(av[0], av[1], NULL);
 
                 do_cmode(s_ChanServ, ac, av);
                 break;
@@ -328,9 +328,9 @@ int do_clear(User * u)
 
             if (ircd->svsmode_ucmode) {
                 if (ircdcap->tsmode)
-                    anope_cmd_svsmode_chan(av[0], av[2], NULL);
+                    anope_SendSVSMode_chan(av[0], av[2], NULL);
                 else
-                    anope_cmd_svsmode_chan(av[0], av[1], NULL);
+                    anope_SendSVSMode_chan(av[0], av[1], NULL);
 
                 do_cmode(s_ChanServ, ac, av);
                 break;
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index d286c31f0..0b16571a6 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -105,7 +105,7 @@ int do_clearmodes(User * u)
         if (all) {
             /* Clear mode +o */
             if (ircd->svsmode_ucmode) {
-                anope_cmd_svsmode_chan(c->name, "-o", NULL);
+                anope_SendSVSMode_chan(c->name, "-o", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_OP)) {
@@ -129,7 +129,7 @@ int do_clearmodes(User * u)
             }
 
             if (ircd->svsmode_ucmode) {
-                anope_cmd_svsmode_chan(c->name, "-v", NULL);
+                anope_SendSVSMode_chan(c->name, "-v", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_VOICE)) {
@@ -155,7 +155,7 @@ int do_clearmodes(User * u)
 
             /* Clear mode +h */
             if (ircd->svsmode_ucmode && ircd->halfop) {
-                anope_cmd_svsmode_chan(c->name, "-h", NULL);
+                anope_SendSVSMode_chan(c->name, "-h", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
@@ -179,7 +179,7 @@ int do_clearmodes(User * u)
             }
             /* Clear mode Owners */
             if (ircd->svsmode_ucmode && ircd->owner) {
-                anope_cmd_svsmode_chan(c->name, ircd->ownerunset, NULL);
+                anope_SendSVSMode_chan(c->name, ircd->ownerunset, NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
@@ -204,7 +204,7 @@ int do_clearmodes(User * u)
             /* Clear mode protected or admins */
             if (ircd->svsmode_ucmode && (ircd->protect || ircd->admin)) {
 
-                anope_cmd_svsmode_chan(c->name, ircd->adminunset, NULL);
+                anope_SendSVSMode_chan(c->name, ircd->adminunset, NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
diff --git a/src/ircd.c b/src/ircd.c
index ac53b6716..b7e027456 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,9 +63,9 @@ void anope_SendVhostDel(User *u)
 	ircdproto->SendVhostDel(u);
 }
 
-void anope_cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
+void anope_SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
 {
-	ircdproto->cmd_akill(user, host, who, when, expires, reason);
+	ircdproto->SendAkill(user, host, who, when, expires, reason);
 }
 
 void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ...)
@@ -80,9 +80,9 @@ void anope_SendSVSKill(const char *source, const char *user, const char *fmt, ..
 	ircdproto->SendSVSKill(source, user, buf);
 }
 
-void anope_cmd_svsmode(User *u, int ac, const char **av)
+void anope_SendSVSMode(User *u, int ac, const char **av)
 {
-	ircdproto->cmd_svsmode(u, ac, av);
+	ircdproto->SendSVSMode(u, ac, av);
 }
 
 void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
@@ -317,9 +317,9 @@ void anope_cmd_unban(const char *name, const char *nick)
 	ircdproto->cmd_unban(name, nick);
 }
 
-void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick)
+void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick)
 {
-	ircdproto->cmd_svsmode_chan(name, mode, nick);
+	ircdproto->SendSVSMode_chan(name, mode, nick);
 }
 
 void anope_cmd_svid_umode(const char *nick, time_t ts)
diff --git a/src/operserv.c b/src/operserv.c
index 79e175126..1bee93082 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -825,7 +825,7 @@ int add_akill(User * u, char *mask, const char *by, const time_t expires,
     slist_add(&akills, entry);
 
     if (AkillOnAdd)
-        anope_cmd_akill(entry->user, entry->host, entry->by, entry->seton,
+        anope_SendAkill(entry->user, entry->host, entry->by, entry->seton,
                         entry->expires, entry->reason);
 
     free(mask2);
@@ -858,7 +858,7 @@ int check_akill(const char *nick, const char *username, const char *host,
             continue;
         if (match_wild_nocase(ak->user, username)
             && match_wild_nocase(ak->host, host)) {
-            anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
+            anope_SendAkill(ak->user, ak->host, ak->by, ak->seton,
                             ak->expires, ak->reason);
             return 1;
         }
@@ -866,7 +866,7 @@ int check_akill(const char *nick, const char *username, const char *host,
             if (vhost) {
                 if (match_wild_nocase(ak->user, username)
                     && match_wild_nocase(ak->host, vhost)) {
-                    anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
+                    anope_SendAkill(ak->user, ak->host, ak->by, ak->seton,
                                     ak->expires, ak->reason);
                     return 1;
                 }
@@ -876,7 +876,7 @@ int check_akill(const char *nick, const char *username, const char *host,
             if (ip) {
                 if (match_wild_nocase(ak->user, username)
                     && match_wild_nocase(ak->host, ip)) {
-                    anope_cmd_akill(ak->user, ak->host, ak->by, ak->seton,
+                    anope_SendAkill(ak->user, ak->host, ak->by, ak->seton,
                                     ak->expires, ak->reason);
                     return 1;
                 }
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 416cc9974..34aa254b2 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -474,13 +474,13 @@ void BahamutIRCdProto::cmd_release_svshold(const char *nick)
 /* SVSMODE -b */
 void BahamutIRCdProto::cmd_unban(const char *name, const char *nick)
 {
-	cmd_svsmode_chan(name, "-b", nick);
+	SendSVSMode_chan(name, "-b", nick);
 }
 
 
 /* SVSMODE channel modes */
 
-void BahamutIRCdProto::cmd_svsmode_chan(const char *name, const char *mode, const char *nick)
+void BahamutIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const char *nick)
 {
 	if (nick) send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick);
 	else send_cmd(ServerName, "SVSMODE %s %s", name, mode);
@@ -747,7 +747,7 @@ void bahamut_cmd_burst()
  * parv[5]=time set
  * parv[6]=reason
  */
-void BahamutIRCdProto::cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
+void BahamutIRCdProto::SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
 {
 	// Calculate the time left before this would expire, capping it at 2 days
 	time_t timeleft = expires - time(NULL);
@@ -777,7 +777,7 @@ void BahamutIRCdProto::SendSVSKill(const char *source, const char *user, const c
  * parv[3] - mode (or services id if old svs version)
  * parv[4] - optional arguement (services id)
  */
-void BahamutIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
+void BahamutIRCdProto::SendSVSMode(User *u, int ac, const char **av)
 {
 	send_cmd(ServerName, "SVSMODE %s %ld %s", u->nick, static_cast<long>(u->timestamp), merge_args(ac, av));
 }
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index b620a1ae3..eaf1e97ea 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -63,9 +63,9 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendSVSNOOP(const char *, int);
 		void SendAkillDel(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
-		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
-		void cmd_svsmode(User *, int, 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 cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
@@ -83,7 +83,7 @@ class BahamutIRCdProto : public IRCDProto {
 		void cmd_szline(const char *, const char *, const char *);
 		void cmd_sgline(const char *, const char *);
 		void cmd_unban(const char *, const char *);
-		void cmd_svsmode_chan(const char *, const char *, const char *);
+		void SendSVSMode_chan(const char *, const char *, const char *);
 		void cmd_svid_umode(const char *, time_t);
 		void cmd_nc_change(User *);
 		void cmd_svid_umode3(User *, const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index a2111f691..d4b1d990e 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -766,7 +766,7 @@ host:		the 'host' portion of the kline
 reason:		the reason for the kline.
 */
 
-void CharybdisProto::cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
+void CharybdisProto::SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
 {
 	Uid *ud = find_uid(s_OperServ);
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "KLINE * %ld %s %s :%s", static_cast<long>(expires - time(NULL)), user, host, reason);
@@ -779,7 +779,7 @@ void CharybdisProto::SendSVSKill(const char *source, const char *user, const cha
 	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "KILL %s :%s", UseTS6 ? (ud2 ? ud2->uid : user) : user, buf);
 }
 
-void CharybdisProto::cmd_svsmode(User *u, int ac, const char **av)
+void CharybdisProto::SendSVSMode(User *u, int ac, const char **av)
 {
 	send_cmd(UseTS6 ? TS6SID : ServerName, "SVSMODE %s %s", u->nick, av[0]);
 }
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index cc94c1afe..ba54fffe9 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -50,9 +50,9 @@ class CharybdisProto : public IRCDTS6Proto {
 	public:
 		void SendAkillDel(const char *, const char *);
 		void SendVhostDel(User *);
-		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
-		void cmd_svsmode(User *, int, const char **);
+		void SendSVSMode(User *, int, const char **);
 		void cmd_mode(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 *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index c05c65fe6..e29dba262 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -538,7 +538,7 @@ void InspIRCdProto::SendVhostDel(User *u)
 	inspircd_cmd_chghost(u->nick, (u->mode & umodes['x']) ? u->chost.c_str() : u->host);
 }
 
-void InspIRCdProto::cmd_akill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
+void InspIRCdProto::SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
 {
 	// Calculate the time left before this would expire, capping it at 2 days
 	time_t timeleft = expires - time(NULL);
@@ -552,7 +552,7 @@ void InspIRCdProto::SendSVSKill(const char *source, const char *user, const char
 	send_cmd(source, "KILL %s :%s", user, buf);
 }
 
-void InspIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
+void InspIRCdProto::SendSVSMode(User *u, int ac, const char **av)
 {
 	/* This was originally done using this:
 	   send_cmd(s_NickServ, "MODE %s %s%s%s", u->nick, av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 612a3f8c9..409962001 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -68,9 +68,9 @@ class InspIRCdProto : public IRCDProto {
 		void SendAkillDel(const char *, const char *);
 		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 		void SendVhostDel(User *);
-		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
+		void SendAkill(const char *, const char *, const char *, time_t, time_t, const char *);
 		void SendSVSKill(const char *, const char *, const char *);
-		void cmd_svsmode(User *, int, 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 cmd_bot_nick(const char *, const char *, const char *, const char *, const char *);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 77c641036..bab8a26d1 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -738,7 +738,7 @@ host:		the 'host' portion of the kline
 reason:		the reason for the kline.
 */
 
-void hybrid_cmd_akill(const char *user, const char *host, const char *who, time_t when,
+void hybrid_SendAkill(const char *user, const char *host, const char *who, time_t when,
                       time_t expires, const char *reason)
 {
     send_cmd(s_OperServ, "KLINE * %ld %s %s :%s",
@@ -759,7 +759,7 @@ void hybrid_SendSVSKill(const char *source, const char *user, const char *buf)
 }
 
 
-void hybrid_cmd_svsmode(User * u, int ac, const char **av)
+void hybrid_SendSVSMode(User * u, int ac, const char **av)
 {
     /* Hybrid does not support SVSMODE */
 }
@@ -1292,7 +1292,7 @@ void hybrid_cmd_unban(const char *name, const char *nick)
 
 /* SVSMODE channel modes */
 
-void hybrid_cmd_svsmode_chan(const char *name, const char *mode, const char *nick)
+void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1455,9 +1455,9 @@ void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(hybrid_cmd_topic);
     pmodule_SendVhostDel(hybrid_cmd_vhost_off);
-    pmodule_cmd_akill(hybrid_cmd_akill);
+    pmodule_SendAkill(hybrid_cmd_akill);
     pmodule_SendSVSKill(hybrid_SendSVSKill);
-    pmodule_cmd_svsmode(hybrid_cmd_svsmode);
+    pmodule_SendSVSMode(hybrid_cmd_svsmode);
     pmodule_cmd_372(hybrid_cmd_372);
     pmodule_cmd_372_error(hybrid_cmd_372_error);
     pmodule_cmd_375(hybrid_cmd_375);
@@ -1510,7 +1510,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_szline(hybrid_cmd_szline);
     pmodule_cmd_sgline(hybrid_cmd_sgline);
     pmodule_cmd_unban(hybrid_cmd_unban);
-    pmodule_cmd_svsmode_chan(hybrid_cmd_svsmode_chan);
+    pmodule_SendSVSMode_chan(hybrid_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(hybrid_cmd_svid_umode);
     pmodule_cmd_nc_change(hybrid_cmd_nc_change);
     pmodule_cmd_svid_umode2(hybrid_cmd_svid_umode2);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index 610d8f6a9..25c0350d6 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -46,9 +46,9 @@
 void hybrid_set_umode(User * user, int ac, const char **av);
 void hybrid_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void hybrid_SendVhostDel(User * u);
-void hybrid_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
+void hybrid_SendAkill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void hybrid_SendSVSKill(const char *source, const char *user, const char *buf);
-void hybrid_cmd_svsmode(User * u, int ac, const char **av);
+void hybrid_SendSVSMode(User * u, int ac, const char **av);
 void hybrid_cmd_372(const char *source, const char *msg);
 void hybrid_cmd_372_error(const char *source);
 void hybrid_cmd_375(const char *source);
@@ -101,7 +101,7 @@ void hybrid_cmd_unszline(const char *mask);
 void hybrid_cmd_szline(const char *mask, const char *reason, const char *whom);
 void hybrid_cmd_sgline(const char *mask, const char *reason);
 void hybrid_cmd_unban(const char *name, const char *nick);
-void hybrid_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
+void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
 void hybrid_cmd_svid_umode(const char *nick, time_t ts);
 void hybrid_cmd_nc_change(User * u);
 void hybrid_cmd_svid_umode2(User * u, const char *ts);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 85e608e41..28d5d7583 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -855,7 +855,7 @@ reason:		the reason for the kline.
 */
 
 void
-plexus_cmd_akill (const char *user, const char *host, const char *who, time_t when,
+plexus_SendAkill (const char *user, const char *host, const char *who, time_t when,
 		  time_t expires, const char *reason)
 {
   send_cmd (s_OperServ, "KLINE * %ld %s %s :%s",
@@ -879,7 +879,7 @@ plexus_SendSVSKill (const char *source, const char *user, const char *buf)
 }
 
 void
-plexus_cmd_svsmode (User * u, int ac, const char **av)
+plexus_SendSVSMode (User * u, int ac, const char **av)
 {
   send_cmd (ServerName, "ENCAP * SVSMODE %s %ld %s%s%s", u->nick,
 	    (long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
@@ -1534,7 +1534,7 @@ plexus_cmd_unban (const char *name, const char *nick)
 /* SVSMODE channel modes */
 
 void
-plexus_cmd_svsmode_chan (const char *name, const char *mode, const char *nick)
+plexus_SendSVSMode_chan (const char *name, const char *mode, const char *nick)
 {
   /* Not Supported by this IRCD */
 }
@@ -1739,9 +1739,9 @@ moduleAddAnopeCmds ()
 {
   pmodule_cmd_topic (plexus_cmd_topic);
   pmodule_SendVhostDel (plexus_cmd_vhost_off);
-  pmodule_cmd_akill (plexus_cmd_akill);
+  pmodule_SendAkill (plexus_cmd_akill);
   pmodule_SendSVSKill (plexus_SendSVSKill);
-  pmodule_cmd_svsmode (plexus_cmd_svsmode);
+  pmodule_SendSVSMode (plexus_cmd_svsmode);
   pmodule_cmd_372 (plexus_cmd_372);
   pmodule_cmd_372_error (plexus_cmd_372_error);
   pmodule_cmd_375 (plexus_cmd_375);
@@ -1794,7 +1794,7 @@ moduleAddAnopeCmds ()
   pmodule_cmd_szline (plexus_cmd_szline);
   pmodule_cmd_sgline (plexus_cmd_sgline);
   pmodule_cmd_unban (plexus_cmd_unban);
-  pmodule_cmd_svsmode_chan (plexus_cmd_svsmode_chan);
+  pmodule_SendSVSMode_chan (plexus_cmd_svsmode_chan);
   pmodule_cmd_svid_umode (plexus_cmd_svid_umode);
   pmodule_cmd_nc_change (plexus_cmd_nc_change);
   pmodule_cmd_svid_umode2 (plexus_cmd_svid_umode2);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index acdb8c56f..0e07c4d24 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -42,9 +42,9 @@
 void plexus_set_umode(User * user, int ac, const char **av);
 void plexus_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void plexus_SendVhostDel(User * u);
-void plexus_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
+void plexus_SendAkill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void plexus_SendSVSKill(const char *source, const char *user, const char *buf);
-void plexus_cmd_svsmode(User * u, int ac, const char **av);
+void plexus_SendSVSMode(User * u, int ac, const char **av);
 void plexus_cmd_372(const char *source, const char *msg);
 void plexus_cmd_372_error(const char *source);
 void plexus_cmd_375(const char *source);
@@ -97,7 +97,7 @@ void plexus_cmd_unszline(const char *mask);
 void plexus_cmd_szline(const char *mask, const char *reason, const char *whom);
 void plexus_cmd_sgline(const char *mask, const char *reason);
 void plexus_cmd_unban(const char *name, const char *nick);
-void plexus_cmd_svsmode_chan(const char *name, const char *mode, const char *nick);
+void plexus_SendSVSMode_chan(const char *name, const char *mode, const char *nick);
 void plexus_cmd_svid_umode(const char *nick, time_t ts);
 void plexus_cmd_nc_change(User * u);
 void plexus_cmd_svid_umode2(User * u, const char *ts);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index f31036443..e27c072d8 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -736,7 +736,7 @@ void ptlink_cmd_join(const char *user, const char *channel, time_t chantime)
 	parv[3] = who added the gline
 	parv[4] = reason
 */
-void ptlink_cmd_akill(const char *user, const char *host, const char *who, time_t when,
+void ptlink_SendAkill(const char *user, const char *host, const char *who, time_t when,
                       time_t expires, const char *reason)
 {
     send_cmd(ServerName, "GLINE %s@%s %i %s :%s", user, host, 86400 * 2,
@@ -765,7 +765,7 @@ void ptlink_SendSVSKill(const char *source, const char *user, const char *buf)
 	parv[3] = extra parameter ( if news setting mode(+n) )
   e.g.:	:NickServ SVSMODE Lamego +rn 1991234
 */
-void ptlink_cmd_svsmode(User * u, int ac, const char **av)
+void ptlink_SendSVSMode(User * u, int ac, const char **av)
 {
     send_cmd(ServerName, "SVSMODE %s %s%s%s", u->nick, av[0],
              (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
@@ -1490,7 +1490,7 @@ void ptlink_cmd_unban(const char *name, const char *nick)
 
 /* SVSMODE channel modes */
 
-void ptlink_cmd_svsmode_chan(const char *name, const char *mode, const char *nick)
+void ptlink_SendSVSMode_chan(const char *name, const char *mode, const char *nick)
 {
     /* Not Supported by this IRCD */
 }
@@ -1684,9 +1684,9 @@ void moduleAddAnopeCmds()
 {
     pmodule_cmd_topic(ptlink_cmd_topic);
     pmodule_SendVhostDel(ptlink_cmd_vhost_off);
-    pmodule_cmd_akill(ptlink_cmd_akill);
+    pmodule_SendAkill(ptlink_cmd_akill);
     pmodule_SendSVSKill(ptlink_SendSVSKill);
-    pmodule_cmd_svsmode(ptlink_cmd_svsmode);
+    pmodule_SendSVSMode(ptlink_cmd_svsmode);
     pmodule_cmd_372(ptlink_cmd_372);
     pmodule_cmd_372_error(ptlink_cmd_372_error);
     pmodule_cmd_375(ptlink_cmd_375);
@@ -1739,7 +1739,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_szline(ptlink_cmd_szline);
     pmodule_cmd_sgline(ptlink_cmd_sgline);
     pmodule_cmd_unban(ptlink_cmd_unban);
-    pmodule_cmd_svsmode_chan(ptlink_cmd_svsmode_chan);
+    pmodule_SendSVSMode_chan(ptlink_cmd_svsmode_chan);
     pmodule_cmd_svid_umode(ptlink_cmd_svid_umode);
     pmodule_cmd_nc_change(ptlink_cmd_nc_change);
     pmodule_cmd_svid_umode2(ptlink_cmd_svid_umode2);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 3d22d99d1..8ef520d45 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -81,9 +81,9