Replaced all of the old %S's in the language strings that were used for service nicks

44 files changed, 162 insertions, 146 deletions

diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp
index 5c6dc3efd..4bbced7e5 100644
--- a/modules/core/bs_badwords.cpp
+++ b/modules/core/bs_badwords.cpp
@@ -279,7 +279,7 @@ class CommandBSBadwords : public Command
 				"Maintains the \002bad words list\002 for a channel. The bad\n"
 				"words list determines which words are to be kicked\n"
 				"when the bad words kicker is enabled. For more information,\n"
-				"type \002%R%S HELP KICK BADWORDS\002.\n"
+				"type \002%R%s HELP KICK BADWORDS\002.\n"
 				" \n"
 				"The \002BADWORDS ADD\002 command adds the given word to the\n"
 				"badword list. If SINGLE is specified, a kick will be\n"
@@ -303,7 +303,7 @@ class CommandBSBadwords : public Command
 				"      7 through 9.\n"
 				" \n"
 				"The \002BADWORDS CLEAR\002 command clears all entries of the\n"
-				"bad words list."));
+				"bad words list."), BotServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp
index ff669e82a..7c0d2da70 100644
--- a/modules/core/bs_help.cpp
+++ b/modules/core/bs_help.cpp
@@ -32,13 +32,14 @@ class CommandBSHelp : public Command
 	{
 		// Abuse syntax error to display general list help.
 		User *u = source.u;
-		source.Reply(_("\002%S\002 allows you to have a bot on your own channel.\n"
+		source.Reply(_("\002%s\002 allows you to have a bot on your own channel.\n"
 				"It has been created for users that can't host or\n"
 				"configure a bot, or for use on networks that don't\n"
 				"allow user bots. Available commands are listed \n"
-				"below; to use them, type \002%R%S \037command\037\002.  For \n"
+				"below; to use them, type \002%R%s \037command\037\002.  For \n"
 				"more information on a specific command, type \002%R\n"
-				"%S HELP \037command\037\002."));
+				"%s HELP \037command\037\002."),
+				BotServ->nick.c_str(), BotServ->nick.c_str(), BotServ->nick.c_str());
 		for (CommandMap::const_iterator it = BotServ->Commands.begin(), it_end = BotServ->Commands.end(); it != it_end; ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp
index 123083f41..157b24d9c 100644
--- a/modules/core/bs_info.cpp
+++ b/modules/core/bs_info.cpp
@@ -222,11 +222,11 @@ class CommandBSInfo : public Command
 	{
 		source.Reply(_("Syntax: \002INFO {\037chan\037 | \037nick\037}\002\n"
 				" \n"
-				"Allows you to see %S information about a channel or a bot.\n"
+				"Allows you to see %s information about a channel or a bot.\n"
 				"If the parameter is a channel, then you'll get information\n"
 				"such as enabled kickers. If the parameter is a nick,\n"
 				"you'll get information about a bot, such as creation\n"
-				"time or number of channels it is on."));
+				"time or number of channels it is on."), NickServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp
index 67bd2ca05..d37a9d990 100644
--- a/modules/core/bs_kick.cpp
+++ b/modules/core/bs_kick.cpp
@@ -428,22 +428,22 @@ class CommandBSKick : public Command
 					"    UNDERLINES    Sets if the bot kicks underlines\n"
 					"    ITALICS       Sets if the bot kicks italics\n"
 					" \n"
-					"Type \002%R%S HELP KICK \037option\037\002 for more information\n"
+					"Type \002%R%s HELP KICK \037option\037\002 for more information\n"
 					"on a specific option.\n"
 					" \n"
 					"Note: access to this command is controlled by the\n"
-					"level SET."));
+					"level SET."), ChanServ->nick.c_str());
 		else if (subcommand.equals_ci("BADWORDS"))
 			source.Reply(_("Syntax: \002KICK \037#channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n"
 					"Sets the bad words kicker on or off. When enabled, this\n"
 					"option tells the bot to kick users who say certain words\n"
 					"on the channels.\n"
 					"You can define bad words for your channel using the\n"
-					"\002BADWORDS\002 command. Type \002%R%S HELP BADWORDS\002 for\n"
+					"\002BADWORDS\002 command. Type \002%R%s HELP BADWORDS\002 for\n"
 					"more information.\n"
 					"ttb is the number of times a user can be kicked\n"
 					"before it get banned. Don't give ttb to disable\n"
-					"the ban system once activated."));
+					"the ban system once activated."), ChanServ->nick.c_str());
 		else if (subcommand.equals_ci("BOLDS"))
 			source.Reply(_("Syntax: \002KICK \037channel\037 BOLDS {\037ON|OFF\037} [\037ttb\037]\002\n"
 					"Sets the bolds kicker on or off. When enabled, this\n"
diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index ce5377878..f05cf9930 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -212,10 +212,10 @@ class CommandBSSet : public Command
 					"    SYMBIOSIS        Allow the bot to act as a real bot\n"
 					"    MSG              Configure how fantasy commands should be replied to\n"
 					" \n"
-					"Type \002%R%S HELP SET \037option\037\002 for more information\n"
+					"Type \002%R%s HELP SET \037option\037\002 for more information\n"
 					"on a specific option.\n"
 					"Note: access to this command is controlled by the\n"
-					"level SET."));
+					"level SET."), BotServ->nick.c_str());
 			User *u = source.u;
 			if (u->Account() && u->Account()->IsServicesOper())
 				source.Reply(_("These options are reserved to Services Operators:\n"
diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp
index 4eb4974fe..3ae5693d3 100644
--- a/modules/core/cs_access.cpp
+++ b/modules/core/cs_access.cpp
@@ -461,9 +461,9 @@ class CommandCSAccess : public Command
 				" \n"
 				"Maintains the \002access list\002 for a channel.  The access\n"
 				"list specifies which users are allowed chanop status or\n"
-				"access to %S commands on the channel.  Different\n"
+				"access to %s commands on the channel.  Different\n"
 				"user levels allow for access to different subsets of\n"
-				"privileges; \002%R%S HELP ACCESS LEVELS\002 for more\n"
+				"privileges; \002%R%s HELP ACCESS LEVELS\002 for more\n"
 				"specific information.  Any nick not on the access list has\n"
 				"a user level of 0.\n"
 				" \n"
@@ -496,12 +496,13 @@ class CommandCSAccess : public Command
 				"to \002ACCESS LIST\002 but shows the creator and last used time.\n"
 				" \n"
 				"The \002ACCESS CLEAR\002 command clears all entries of the\n"
-				"access list."));
+				"access list."),
+				ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		source.Reply(_("\002User access levels\002\n"
 				" \n"
 				"By default, the following access levels are defined:\n"
 				" \n"
-				"   \002Founder\002   Full access to %S functions; automatic\n"
+				"   \002Founder\002   Full access to %s functions; automatic\n"
 				"                     opping upon entering channel.  Note\n"
 				"                     that only one person may have founder\n"
 				"                     status (it cannot be given using the\n"
@@ -514,8 +515,8 @@ class CommandCSAccess : public Command
 				"   \002     <0\002   May not be opped.\n"
 				" \n"
 				"These levels may be changed, or new ones added, using the\n"
-				"\002LEVELS\002 command; type \002%R%S HELP LEVELS\002 for\n"
-				"information."));
+				"\002LEVELS\002 command; type \002%R%s HELP LEVELS\002 for\n"
+				"information."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -717,7 +718,7 @@ class CommandCSLevels : public Command
 					"The \002LEVELS\002 command allows fine control over the meaning of\n"
 					"the numeric access levels used for channels.  With this\n"
 					"command, you can define the access level required for most\n"
-					"of %S's functions. (The \002SET FOUNDER\002 and this command\n"
+					"of %s's functions. (The \002SET FOUNDER\002 and this command\n"
 					"are always restricted to the channel founder.)\n"
 					" \n"
 					"\002LEVELS SET\002 allows the access level for a function or group of\n"
@@ -732,7 +733,7 @@ class CommandCSLevels : public Command
 					"\002HELP ACCESS LEVELS\002).\n"
 					" \n"
 					"For a list of the features and functions whose levels can be\n"
-					"set, see \002HELP LEVELS DESC\002."));
+					"set, see \002HELP LEVELS DESC\002."), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp
index 11b5485ff..637ab0b08 100644
--- a/modules/core/cs_akick.cpp
+++ b/modules/core/cs_akick.cpp
@@ -521,7 +521,7 @@ class CommandCSAKick : public Command
 				" \n"
 				"Maintains the \002AutoKick list\002 for a channel.  If a user\n"
 				"on the AutoKick list attempts to join the channel,\n"
-				"%S will ban that user from the channel, then kick\n"
+				"%sS will ban that user from the channel, then kick\n"
 				"the user.\n"
 				" \n"
 				"The \002AKICK ADD\002 command adds the given nick or usermask\n"
@@ -545,12 +545,12 @@ class CommandCSAKick : public Command
 				"The \002AKICK VIEW\002 command is a more verbose version of\n"
 				"\002AKICK LIST\002 command.\n"
 				" \n"
-				"The \002AKICK ENFORCE\002 command causes %S to enforce the\n"
+				"The \002AKICK ENFORCE\002 command causes %sS to enforce the\n"
 				"current AKICK list by removing those users who match an\n"
 				"AKICK mask.\n"
 				" \n"
 				"The \002AKICK CLEAR\002 command clears all entries of the\n"
-				"akick list."));
+				"akick list."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_clearusers.cpp b/modules/core/cs_clearusers.cpp
index b4786209c..ed58bacdf 100644
--- a/modules/core/cs_clearusers.cpp
+++ b/modules/core/cs_clearusers.cpp
@@ -53,10 +53,10 @@ class CommandCSClearUsers : public Command
 	{
 		source.Reply(_("Syntax: \002CLEARUSERS \037channel\037\002\n"
 				" \n"
-				"Tells %S to clear (kick) all users certain settings on a channel."
+				"Tells %s to clear (kick) all users certain settings on a channel."
 				" \n"
 				"By default, limited to those with founder access on the\n"
-				"channel."));
+				"channel."), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp
index b1916bace..db34fc8ea 100644
--- a/modules/core/cs_help.cpp
+++ b/modules/core/cs_help.cpp
@@ -32,13 +32,15 @@ class CommandCSHelp : public Command
 	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
 	{
 		User *u = source.u;
-		source.Reply(_("\002%S\002 allows you to register and control various\n"
-				"aspects of channels. %S can often prevent\n"
+		source.Reply(_("\002%s\002 allows you to register and control various\n"
+				"aspects of channels. %s can often prevent\n"
 				"malicious users from \"taking over\" channels by limiting\n"
 				"who is allowed channel operator privileges. Available\n"
 				"commands are listed below; to use them, type\n"
-				"\002%R%S \037command\037\002. For more information on a\n"
-				"specific command, type \002%R%S HELP \037command\037\002."));
+				"\002%R%s \037command\037\002. For more information on a\n"
+				"specific command, type \002%R%s HELP \037command\037\002."),
+				ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str(),
+				ChanServ->nick.c_str());
 		for (CommandMap::const_iterator it = ChanServ->Commands.begin(); it != ChanServ->Commands.end(); ++it)
 			if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission)))
 				it->second->OnServHelp(source);
diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp
index 0f55c1e1e..5b588824b 100644
--- a/modules/core/cs_invite.cpp
+++ b/modules/core/cs_invite.cpp
@@ -72,10 +72,10 @@ class CommandCSInvite : public Command
 	{
 		source.Reply(_("Syntax: \002INVITE \037channel\037\002\n"
 				" \n"
-				"Tells %S to invite you into the given channel.\n"
+				"Tells %s to invite you into the given channel.\n"
 				" \n"
 				"By default, limited to AOPs or those with level 5 and above\n"
-				"on the channel."));
+				"on the channel."), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp
index 92d1746cb..8968be739 100644
--- a/modules/core/cs_register.cpp
+++ b/modules/core/cs_register.cpp
@@ -100,7 +100,7 @@ class CommandCSRegister : public Command
 	{
 		source.Reply(_("Syntax: \002REGISTER \037channel\037 \037description\037\002\n"
 			" \n"
-			"Registers a channel in the %S database.  In order\n"
+			"Registers a channel in the %s database.  In order\n"
 			"to use this command, you must first be a channel operator\n"
 			"on the channel you're trying to register.\n"
 			"The description, which \002must\002 be included, is a\n"
@@ -109,15 +109,16 @@ class CommandCSRegister : public Command
 			"When you register a channel, you are recorded as the\n"
 			"\"founder\" of the channel. The channel founder is allowed\n"
 			"to change all of the channel settings for the channel;\n"
-			"%S will also automatically give the founder\n"
+			"%s will also automatically give the founder\n"
 			"channel-operator privileges when s/he enters the channel.\n"
-			"See the \002ACCESS\002 command (\002%R%S HELP ACCESS\002) for\n"
+			"See the \002ACCESS\002 command (\002%R%s HELP ACCESS\002) for\n"
 			"information on giving a subset of these privileges to\n"
 			"other channel users.\n"
 			" \n"
 			"NOTICE: In order to register a channel, you must have\n"
 			"first registered your nickname.  If you haven't,\n"
-			"\002%R%s HELP\002 for information on how to do so."));
+			"\002%R%s HELP\002 for information on how to do so."),
+			ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp
index 896f23971..6dcec0f56 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/core/cs_saset.cpp
@@ -77,8 +77,8 @@ class CommandCSSASet : public Command
 					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(_("Type \002%R%S HELP SASET \037option\037\002 for more information on a\n"
-				"particular option."));
+			source.Reply(_("Type \002%R%s HELP SASET \037option\037\002 for more information on a\n"
+				"particular option."), ChanServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp
index 489314e3c..560a5a1e2 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/core/cs_set.cpp
@@ -81,8 +81,8 @@ class CommandCSSet : public Command
 					"Available options:"));
 			for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it)
 				it->second->OnServHelp(source);
-			source.Reply(_("Type \002%R%S HELP SET \037option\037\002 for more information on a\n"
-					"particular option."));
+			source.Reply(_("Type \002%R%s HELP SET \037option\037\002 for more information on a\n"
+					"particular option."), ChanServ->nick.c_str());
 			return true;
 		}
 		else
diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp
index 5a7bbd334..3d697e499 100644
--- a/modules/core/cs_set_keeptopic.cpp
+++ b/modules/core/cs_set_keeptopic.cpp
@@ -48,9 +48,9 @@ class CommandCSSetKeepTopic : public Command
 				" \n"
 				"Enables or disables the \002topic retention\002 option for a	\n"
 				"channel. When \002topic retention\002 is set, the topic for the\n"
-				"channel will be remembered by %S even after the\n"
+				"channel will be remembered by %s even after the\n"
 				"last user leaves the channel, and will be restored the\n"
-				"next time the channel is created."), this->name.c_str());
+				"next time the channel is created."), this->name.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp
index e55607ca3..535001919 100644
--- a/modules/core/cs_set_opnotice.cpp
+++ b/modules/core/cs_set_opnotice.cpp
@@ -47,9 +47,9 @@ class CommandCSSetOpNotice : public Command
 		source.Reply(_("Syntax: \002%s \037channel\037 OPNOTICE {ON | OFF}\002\n"
 				" \n"
 				"Enables or disables the \002op-notice\002 option for a channel.\n"
-				"When \002op-notice\002 is set, %S will send a notice to the\n"
+				"When \002op-notice\002 is set, %s will send a notice to the\n"
 				"channel whenever the \002OP\002 or \002DEOP\002 commands are used for a user\n"
-				"in the channel."), this->name.c_str());
+				"in the channel."), this->name.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp
index 5daa648f8..11cf545a1 100644
--- a/modules/core/cs_set_peace.cpp
+++ b/modules/core/cs_set_peace.cpp
@@ -49,7 +49,7 @@ class CommandCSSetPeace : public Command
 				"Enables or disables the \002peace\002 option for a channel.\n"
 				"When \002peace\002 is set, a user won't be able to kick,\n"
 				"ban or remove a channel status of a user that has\n"
-				"a level superior or equal to his via %S commands."), this->name.c_str());
+				"a level superior or equal to his via %s commands."), this->name.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp
index 162da757d..1f8f98fdc 100644
--- a/modules/core/cs_set_private.cpp
+++ b/modules/core/cs_set_private.cpp
@@ -47,8 +47,8 @@ class CommandCSSetPrivate : public Command
 		source.Reply(_("Syntax: \002%s \037channel\037 PRIVATE {ON | OFF}\002\n"
 				" \n"
 				"Enables or disables the \002private\002 option for a channel.\n"
-				"When \002private\002 is set, a \002%R%S LIST\002 will not\n"
-				"include the channel in any lists."), this->name.c_str());
+				"When \002private\002 is set, a \002%R%s LIST\002 will not\n"
+				"include the channel in any lists."), this->name.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp
index a84e91958..1aea9f887 100644
--- a/modules/core/cs_set_secure.cpp
+++ b/modules/core/cs_set_secure.cpp
@@ -46,11 +46,11 @@ class CommandCSSetSecure : public Command
 	{
 		source.Reply(_("Syntax: \002%s \037channel\037 SECURE {ON | OFF}\002\n"
 			" \n"
-			"Enables or disables %S's security features for a\n"
+			"Enables or disables %s's security features for a\n"
 			"channel. When \002SECURE\002 is set, only users who have\n"
 			"registered their nicknames with %s and IDENTIFY'd\n"
 			"with their password will be given access to the channel\n"
-			"as controlled by the access list."), this->name.c_str(), Config->s_NickServ.c_str());
+			"as controlled by the access list."), this->name.c_str(), NickServ->nick.c_str(), NickServ->nick.c_str());
 		return true;
 	}
 
@@ -61,7 +61,7 @@ class CommandCSSetSecure : public Command
 
 	void OnServHelp(CommandSource &source)
 	{
-		source.Reply(_("    SECURE        Activate %S security features"));
+		source.Reply(_("    SECURE        Activate %s security features"), ChanServ->nick.c_str());
 	}
 };
 
diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp
index c89e4b502..a3b0e0ea3 100644
--- a/modules/core/cs_set_signkick.cpp
+++ b/modules/core/cs_set_signkick.cpp
@@ -57,12 +57,13 @@ class CommandCSSetSignKick : public Command
 				" \n"
 				"Enables or disables signed kicks for a\n"
 				"channel.  When \002SIGNKICK\002 is set, kicks issued with\n"
-				"%S KICK command will have the nick that used the\n"
+				"%s KICK command will have the nick that used the\n"
 				"command in their reason.\n"
 				" \n"
 				"If you use \002LEVEL\002, those who have a level that is superior \n"
 				"or equal to the SIGNKICK level on the channel won't have their \n"
-				"kicks signed. See \002%R%S HELP LEVELS\002 for more information."), this->name.c_str());
+				"kicks signed. See \002%R%s HELP LEVELS\002 for more information."), this->name.c_str(),
+				ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp
index cb8faf724..5ffb05b1d 100644
--- a/modules/core/cs_set_topiclock.cpp
+++ b/modules/core/cs_set_topiclock.cpp
@@ -44,12 +44,12 @@ class CommandCSSetTopicLock : public Command
 
 	bool OnHelp(CommandSource &source, const Anope::string &)
 	{
-		source.Reply(_("Syntax: \002SET \037%s\037 TOPICLOCK {ON | OFF}\002\n"
+		source.Reply(_("Syntax: \002%s \037channel\037 TOPICLOCK {ON | OFF}\002\n"
 				" \n"
 				"Enables or disables the \002topic lock\002 option for a channel.\n"
-				"When \002topic lock\002 is set, %S will not allow the\n"
+				"When \002topic lock\002 is set, %s will not allow the\n"
 				"channel topic to be changed except via the \002TOPIC\002\n"
-				"command."), this->name.c_str());
+				"command."), this->name.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp
index 20005b07b..47c2b4aae 100644
--- a/modules/core/cs_topic.cpp
+++ b/modules/core/cs_topic.cpp
@@ -50,14 +50,14 @@ class CommandCSTopic : public Command
 	{
 		source.Reply(_("Syntax: \002TOPIC \037channel\037 [\037topic\037]\002\n"
 				" \n"
-				"Causes %S to set the channel topic to the one\n"
+				"Causes %s to set the channel topic to the one\n"
 				"specified. If \002topic\002 is not given, then an empty topic\n"
 				"is set. This command is most useful in conjunction\n"
-				"with \002SET TOPICLOCK\002. See \002%R%S HELP SET TOPICLOCK\002\n"
+				"with \002SET TOPICLOCK\002. See \002%R%s HELP SET TOPICLOCK\002\n"
 				"for more information.\n"
 				" \n"
 				"By default, limited to those with founder access on the\n"
-				"channel."));
+				"channel."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp
index f4156e02a..91db12350 100644
--- a/modules/core/cs_unban.cpp
+++ b/modules/core/cs_unban.cpp
@@ -61,11 +61,11 @@ class CommandCSUnban : public Command
 	{
 		source.Reply(_("Syntax: \002UNBAN \037channel\037 [\037nick\037]\002\n"
 				" \n"
-				"Tells %S to remove all bans preventing you or the given\n"
+				"Tells %s to remove all bans preventing you or the given\n"
 				"user from entering the given channel.  \n"
 				" \n"
 				"By default, limited to AOPs or those with level 5 and above\n"
-				"on the channel."));
+				"on the channel."), ChanServ->nick.c_str());
 		return true;
 	}
 
diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp
index 9a0e6e16d..0df9713db 100644
--- a/modules/core/cs_xop.cpp
+++ b/modules/core/cs_xop.cpp
@@ -447,9 +447,10 @@ class CommandCSQOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."));
+				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), ChanServ->nick.c_str(),
+				ChanServ->nick.c_str());
 		return true;
 	}
 
@@ -513,9 +514,9 @@ class CommandCSAOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."));
+				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 	/* CHAN_HELP_HOP */
 		return true;
 	}
@@ -578,9 +579,9 @@ class CommandCSHOP : public XOPBase
 				" \n"
 				"This command may have been disabled for your channel, and\n"
 				"in that case you need to use the access list. See \n"
-				"\002%R%S HELP ACCESS\002 for information about the access list,\n"
-				"and \002%R%S HELP SET XOP\002 to know how to toggle between \n"
-				"the access list and xOP list systems."));
+				"\002%R%s HELP ACCESS\002 for information about the access list,\n"
+				"and \002%R%s HELP SET XOP\002 to know how to toggle between \n"
+				"the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str());
 		return true;
 	}