cmd_bot_nick -> SendClientIntroduction

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

28 files changed, 47 insertions, 47 deletions

diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 54b51200c..1e5251dda 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -164,7 +164,7 @@ int do_bot(User * u)
             EnforceQlinedNick(nick, s_BotServ);
 
             /* We make the bot online, ready to serve */
-            anope_cmd_bot_nick(bi->nick, bi->user, bi->host, bi->real,
+            anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
                                ircd->botserv_bot_mode);
 
             notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user,
@@ -292,14 +292,14 @@ int do_bot(User * u)
 
             /* If only the nick changes, we just make the bot change his nick,
                else we must make it quit and rejoin. We must not forget to set
-			   the Q:Line either (it's otherwise set in anope_cmd_bot_nick) */
+			   the Q:Line either (it's otherwise set in anope_SendClientIntroduction) */
             if (!user) {
                 anope_cmd_chg_nick(oldnick, bi->nick);
 				anope_cmd_sqline(bi->nick, "Reserved for services");
             } else {
                 anope_cmd_quit(oldnick, "Quit: Be right back");
 
-                anope_cmd_bot_nick(bi->nick, bi->user, bi->host, bi->real,
+                anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real,
                                    ircd->botserv_bot_mode);
                 bi->RejoinAll();
             }
diff --git a/src/init.c b/src/init.c
index 5af4ddf97..be5ac206b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -34,39 +34,39 @@ void introduce_user(const char *user)
 #undef LTSIZE
     /* We make aliases go online */
     if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) {
-        anope_cmd_bot_nick(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
+        anope_SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode);
     }
 
     if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) {
-        anope_cmd_bot_nick(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
+        anope_SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode);
     }
 
     if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) {
-        anope_cmd_bot_nick(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
+        anope_SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode);
     }
 
     if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) {
-        anope_cmd_bot_nick(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
+        anope_SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode);
     }
 
     if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) {
-        anope_cmd_bot_nick(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
+        anope_SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode);
     }
 
     if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) {
-        anope_cmd_bot_nick(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
+        anope_SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode);
     }
 
     if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) {
-        anope_cmd_bot_nick(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
+        anope_SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode);
     }
     if (s_HostServAlias && ircd->vhost
         && (!user || stricmp(user, s_HostServAlias) == 0)) {
-        anope_cmd_bot_nick(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
+        anope_SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode);
     }
     if (s_GlobalNoticerAlias
         && (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) {
-        anope_cmd_bot_nick(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
+        anope_SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode);
     }
 
     /* We make the bots go online */
@@ -79,7 +79,7 @@ void introduce_user(const char *user)
 		for (bi = botlists[i]; bi; bi = bi->next)
 		{
 			if (!user || !stricmp(user, bi->nick))
-				anope_cmd_bot_nick(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode);
+				anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode);
 		}
 	}
 }
diff --git a/src/ircd.c b/src/ircd.c
index c749e838f..2c45aa8f6 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -102,9 +102,9 @@ void anope_SendMode(const char *source, const char *dest, const char *fmt, ...)
 	ircdproto->SendMode(source, dest, buf);
 }
 
-void anope_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void anope_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
-	ircdproto->cmd_bot_nick(nick, user, host, real, modes);
+	ircdproto->SendClientIntroduction(nick, user, host, real, modes);
 }
 
 void anope_cmd_kick(const char *source, const char *chan, const char *user, const char *fmt, ...)
diff --git a/src/modules/demos/catserv/ircd_catserv.c b/src/modules/demos/catserv/ircd_catserv.c
index 784dc666c..1bd6be338 100644
--- a/src/modules/demos/catserv/ircd_catserv.c
+++ b/src/modules/demos/catserv/ircd_catserv.c
@@ -81,7 +81,7 @@ int my_privmsg(char *source, int ac, char **av)
 
 void addClient(char *nick, char *realname)
 {
-    anope_cmd_bot_nick(nick, "catserv", "meow.meow.land", realname, "+");
+    anope_SendClientIntroduction(nick, "catserv", "meow.meow.land", realname, "+");
 }
 
 void delClient(void)
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 9c70fabe7..5b80a8522 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -986,7 +986,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void BahamutIRCdProto::SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	EnforceQlinedNick(nick, s_BotServ);
 	send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index fc99b0640..2895d3a4b 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -68,7 +68,7 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendSVSMode(User *, int, const char **);
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
-		void cmd_bot_nick(const char *, const char *, 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 cmd_bot_chan_mode(const char *, const char *);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index b2344d3fb..8c6ef6b39 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -858,7 +858,7 @@ void CharybdisProto::cmd_connect()
 	charybdis_cmd_svinfo();
 }
 
-void CharybdisProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void CharybdisProto::SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	EnforceQlinedNick(nick, NULL);
 	if (UseTS6) {
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index bdea064b2..522c12365 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -54,7 +54,7 @@ class CharybdisProto : public IRCDTS6Proto {
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
 		void SendMode(const char *, const char *, const char *);
-		void cmd_bot_nick(const char *, const char *, 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 cmd_bot_chan_mode(const char *, const char *);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 8a7fee850..8b267d1ba 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -716,7 +716,7 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void InspIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void InspIRCdProto::SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
 	send_cmd(nick, "OPERTYPE Service");
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 6797f5783..f1357ab74 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -73,7 +73,7 @@ class InspIRCdProto : public IRCDProto {
 		void SendSVSMode(User *, int, const char **);
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
-		void cmd_bot_nick(const char *, const char *, 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 cmd_bot_chan_mode(const char *, const char *);
diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c
index 2392a73c3..6d8f6ef38 100644
--- a/src/protocol/obsolete/hybrid.c
+++ b/src/protocol/obsolete/hybrid.c
@@ -839,7 +839,7 @@ void hybrid_cmd_svsinfo()
 
 
 
-void hybrid_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void hybrid_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                          const char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1465,7 +1465,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(hybrid_cmd_nick);
     pmodule_SendGuestNick(hybrid_cmd_guest_nick);
     pmodule_SendMode(hybrid_cmd_mode);
-    pmodule_cmd_bot_nick(hybrid_cmd_bot_nick);
+    pmodule_SendClientIntroduction(hybrid_cmd_bot_nick);
     pmodule_cmd_kick(hybrid_cmd_kick);
     pmodule_cmd_notice_ops(hybrid_cmd_notice_ops);
     pmodule_cmd_notice(hybrid_cmd_notice);
diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h
index b87aacbae..a88b5bab9 100644
--- a/src/protocol/obsolete/hybrid.h
+++ b/src/protocol/obsolete/hybrid.h
@@ -56,7 +56,7 @@ void hybrid_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c
index 095c92189..a94a142dc 100644
--- a/src/protocol/obsolete/plexus3.c
+++ b/src/protocol/obsolete/plexus3.c
@@ -969,7 +969,7 @@ plexus_cmd_svsinfo ()
 
 
 void
-plexus_cmd_bot_nick (const char *nick, const char *user, const char *host, const char *real,
+plexus_SendClientIntroduction (const char *nick, const char *user, const char *host, const char *real,
 		     const char *modes)
 {
   EnforceQlinedNick (nick, NULL);
@@ -1749,7 +1749,7 @@ moduleAddAnopeCmds ()
   pmodule_cmd_nick (plexus_cmd_nick);
   pmodule_SendGuestNick (plexus_cmd_guest_nick);
   pmodule_SendMode (plexus_cmd_mode);
-  pmodule_cmd_bot_nick (plexus_cmd_bot_nick);
+  pmodule_SendClientIntroduction (plexus_cmd_bot_nick);
   pmodule_cmd_kick (plexus_cmd_kick);
   pmodule_cmd_notice_ops (plexus_cmd_notice_ops);
   pmodule_cmd_notice (plexus_cmd_notice);
diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h
index 71cc057ef..6914c749c 100644
--- a/src/protocol/obsolete/plexus3.h
+++ b/src/protocol/obsolete/plexus3.h
@@ -52,7 +52,7 @@ void plexus_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c
index a91c21753..6bcd16ae2 100644
--- a/src/protocol/obsolete/ptlink.c
+++ b/src/protocol/obsolete/ptlink.c
@@ -1379,7 +1379,7 @@ int anope_event_away(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void ptlink_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void ptlink_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                          char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1694,7 +1694,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(ptlink_cmd_nick);
     pmodule_SendGuestNick(ptlink_cmd_guest_nick);
     pmodule_SendMode(ptlink_cmd_mode);
-    pmodule_cmd_bot_nick(ptlink_cmd_bot_nick);
+    pmodule_SendClientIntroduction(ptlink_cmd_bot_nick);
     pmodule_cmd_kick(ptlink_cmd_kick);
     pmodule_cmd_notice_ops(ptlink_cmd_notice_ops);
     pmodule_cmd_notice(ptlink_cmd_notice);
diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h
index 44d448e92..c9671217a 100644
--- a/src/protocol/obsolete/ptlink.h
+++ b/src/protocol/obsolete/ptlink.h
@@ -91,7 +91,7 @@ void ptlink_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c
index 4f6cee8a3..d9cdff64c 100644
--- a/src/protocol/obsolete/rageircd.c
+++ b/src/protocol/obsolete/rageircd.c
@@ -1183,7 +1183,7 @@ void rageircd_cmd_quit(const char *source, const char *buf)
     }
 }
 
-void rageircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void rageircd_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                            const char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1574,7 +1574,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(rageircd_cmd_nick);
     pmodule_SendGuestNick(rageircd_cmd_guest_nick);
     pmodule_SendMode(rageircd_cmd_mode);
-    pmodule_cmd_bot_nick(rageircd_cmd_bot_nick);
+    pmodule_SendClientIntroduction(rageircd_cmd_bot_nick);
     pmodule_cmd_kick(rageircd_cmd_kick);
     pmodule_cmd_notice_ops(rageircd_cmd_notice_ops);
     pmodule_cmd_notice(rageircd_cmd_notice);
diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h
index 8a05ac1c7..a3b38b2fb 100644
--- a/src/protocol/obsolete/rageircd.h
+++ b/src/protocol/obsolete/rageircd.h
@@ -54,7 +54,7 @@ void rageircd_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c
index 92ee049e8..26579951b 100644
--- a/src/protocol/obsolete/solidircd.c
+++ b/src/protocol/obsolete/solidircd.c
@@ -1333,7 +1333,7 @@ void solidircd_cmd_351(const char *source)
 
 }
 
-void solidircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void solidircd_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                             const char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1607,7 +1607,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(solidircd_cmd_nick);
     pmodule_SendGuestNick(solidircd_cmd_guest_nick);
     pmodule_SendMode(solidircd_cmd_mode);
-    pmodule_cmd_bot_nick(solidircd_cmd_bot_nick);
+    pmodule_SendClientIntroduction(solidircd_cmd_bot_nick);
     pmodule_cmd_kick(solidircd_cmd_kick);
     pmodule_cmd_notice_ops(solidircd_cmd_notice_ops);
     pmodule_cmd_notice(solidircd_cmd_notice);
diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h
index d6bb1cd13..8afde2a39 100644
--- a/src/protocol/obsolete/solidircd.h
+++ b/src/protocol/obsolete/solidircd.h
@@ -78,7 +78,7 @@ void solidircd_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c
index f62446bb4..abe77e230 100644
--- a/src/protocol/obsolete/ultimate3.c
+++ b/src/protocol/obsolete/ultimate3.c
@@ -1078,7 +1078,7 @@ void ultimate3_SendMode(const char *source, const char *dest, const char *buf)
     send_cmd(source, "MODE %s %s", dest, buf);
 }
 
-void ultimate3_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void ultimate3_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                             const char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1715,7 +1715,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(ultimate3_cmd_nick);
     pmodule_SendGuestNick(ultimate3_cmd_guest_nick);
     pmodule_SendMode(ultimate3_cmd_mode);
-    pmodule_cmd_bot_nick(ultimate3_cmd_bot_nick);
+    pmodule_SendClientIntroduction(ultimate3_cmd_bot_nick);
     pmodule_cmd_kick(ultimate3_cmd_kick);
     pmodule_cmd_notice_ops(ultimate3_cmd_notice_ops);
     pmodule_cmd_notice(ultimate3_cmd_notice);
diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h
index 587ee9477..124ec01dd 100644
--- a/src/protocol/obsolete/ultimate3.h
+++ b/src/protocol/obsolete/ultimate3.h
@@ -64,7 +64,7 @@ void ultimate3_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c
index 6f1eb9e35..dfc4d1c4c 100644
--- a/src/protocol/obsolete/viagra.c
+++ b/src/protocol/obsolete/viagra.c
@@ -1323,7 +1323,7 @@ void viagra_cmd_351(const char *source)
              EncModule, version_build);
 }
 
-void viagra_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real,
+void viagra_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real,
                          const char *modes)
 {
     EnforceQlinedNick(nick, s_BotServ);
@@ -1614,7 +1614,7 @@ void moduleAddAnopeCmds()
     pmodule_cmd_nick(viagra_cmd_nick);
     pmodule_SendGuestNick(viagra_cmd_guest_nick);
     pmodule_SendMode(viagra_cmd_mode);
-    pmodule_cmd_bot_nick(viagra_cmd_bot_nick);
+    pmodule_SendClientIntroduction(viagra_cmd_bot_nick);
     pmodule_cmd_kick(viagra_cmd_kick);
     pmodule_cmd_notice_ops(viagra_cmd_notice_ops);
     pmodule_cmd_notice(viagra_cmd_notice);
diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h
index 1bf050ffe..c73362c36 100644
--- a/src/protocol/obsolete/viagra.h
+++ b/src/protocol/obsolete/viagra.h
@@ -73,7 +73,7 @@ void viagra_cmd_376(const char *source);
 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_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
+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_cmd_notice(const char *source, const char *dest, const char *buf);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index b8c468734..b03205592 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -822,7 +822,7 @@ void RatboxProto::cmd_connect()
 	ratbox_cmd_svinfo();
 }
 
-void RatboxProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void RatboxProto::SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	EnforceQlinedNick(nick, NULL);
 	if (UseTS6) {
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index d8aff4855..e2501ab26 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -53,7 +53,7 @@ class RatboxProto : public IRCDProto {
 		void SendSVSKill(const char *, const char *, const char *);
 		void SendSVSMode(User *, int, const char **);
 		void SendMode(const char *, const char *, const char *);
-		void cmd_bot_nick(const char *, const char *, 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 cmd_message(const char *, const char *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index d30b82984..545e311af 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -553,7 +553,7 @@ void UnrealIRCdProto::SendMode(const char *source, const char *dest, const char
 	send_cmd(source, "%s %s %s", send_token("MODE", "G"), dest, buf);
 }
 
-void UnrealIRCdProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
+void UnrealIRCdProto::SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	EnforceQlinedNick(nick, s_BotServ);
 	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 8f190b6c4..3a1bcf25e 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -91,7 +91,7 @@ class UnrealIRCdProto : public IRCDProto {
 		void SendSVSMode(User *, int, const char **);
 		void SendGuestNick(const char *, const char *, const char *, const char *, const char *);
 		void SendMode(const char *, const char *, const char *);
-		void cmd_bot_nick(const char *, const char *, 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 cmd_bot_chan_mode(const char *, const char *);