4 files changed, 14 insertions, 10 deletions

diff --git a/modules/botserv/botserv.cpp b/modules/botserv/botserv.cpp
index e77ffe46c..6478161bf 100644
--- a/modules/botserv/botserv.cpp
+++ b/modules/botserv/botserv.cpp
@@ -155,9 +155,9 @@ public:
 				"allow user bots. Available commands are listed\n"
 				"below; to use them, type \002%s \037command\037\002. For\n"
 				"more information on a specific command, type\n"
-				"\002%s %s \037command\037\002.\n"),
+				"\002%s \037command\037\002.\n"),
 				BotServ->nick.c_str(), BotServ->GetQueryCommand().c_str(),
-				BotServ->GetQueryCommand().c_str(), source.command.c_str());
+				BotServ->GetQueryCommand({}, source.command).c_str());
 		}
 
 		return EVENT_CONTINUE;
diff --git a/modules/botserv/bs_badwords.cpp b/modules/botserv/bs_badwords.cpp
index a0399ef6a..789689699 100644
--- a/modules/botserv/bs_badwords.cpp
+++ b/modules/botserv/bs_badwords.cpp
@@ -438,7 +438,7 @@ public:
 		source.Reply(_("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%s HELP KICK %s\002.\n"
+				"type \002%s KICK %s\002.\n"
 				" \n"
 				"The \002ADD\002 command adds the given word to the\n"
 				"bad words list. If SINGLE is specified, a kick will be\n"
@@ -448,7 +448,8 @@ public:
 				"will be done if a user says a word that ends with\n"
 				"\037word\037. If you don't specify anything, a kick will\n"
 				"be issued every time \037word\037 is said by a user.\n"
-				" \n"), source.service->GetQueryCommand().c_str(), source.command.c_str());
+				" \n"), source.service->GetQueryCommand("generic/help").c_str(), source.command.c_str());
+
 		source.Reply(_("The \002DEL\002 command removes the given word from the\n"
 				"bad words list.  If a list of entry numbers is given, those\n"
 				"entries are deleted.  (See the example for LIST below.)\n"
diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp
index 4fb781f5d..835d90491 100644
--- a/modules/botserv/bs_kick.cpp
+++ b/modules/botserv/bs_kick.cpp
@@ -153,11 +153,12 @@ public:
 			}
 		}
 
-		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information\n"
+		source.Reply(_("Type \002%s \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."), source.service->GetQueryCommand().c_str(), this_name.c_str());
+				"level SET."),
+			source.service->GetQueryCommand("generic/help", this_name).c_str());
 
 		return true;
 	}
@@ -308,12 +309,13 @@ public:
 				"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%s HELP BADWORDS\002 for\n"
+				"\002BADWORDS\002 command. Type \002%s BADWORDS\002 for\n"
 				"more information.\n"
 				" \n"
 				"\037ttb\037 is the number of times a user can be kicked\n"
 				"before it gets banned. Don't give ttb to disable\n"
-				"the ban system once activated."), source.service->GetQueryCommand().c_str());
+				"the ban system once activated."),
+			source.service->GetQueryCommand("generic/help").c_str());
 		return true;
 	}
 };
diff --git a/modules/botserv/bs_set.cpp b/modules/botserv/bs_set.cpp
index 9b536e19a..7110e123b 100644
--- a/modules/botserv/bs_set.cpp
+++ b/modules/botserv/bs_set.cpp
@@ -58,8 +58,9 @@ public:
 				}
 			}
 		}
-		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information on a\n"
-				"particular option."), source.service->GetQueryCommand().c_str(), this_name.c_str());
+		source.Reply(_("Type \002%s \037option\037\002 for more information on a\n"
+				"particular option."),
+			source.service->GetQueryCommand("generic/help", this_name).c_str());
 
 		return true;
 	}