6 files changed, 23 insertions, 17 deletions
diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index bd86410c8..4fcf3c097 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -266,8 +266,9 @@ public:
 			"who is allowed channel operator privileges. Available\n"
 			"commands are listed below; to use them, type\n"
 			"\002%s \037command\037\002. For more information on a\n"
-			"specific command, type \002%s HELP \037command\037\002.\n"),
-			ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->GetQueryCommand().c_str(), ChanServ->GetQueryCommand().c_str());
+			"specific command, type \002%s \037command\037\002.\n"),
+			ChanServ->nick.c_str(), ChanServ->nick.c_str(),
+			ChanServ->GetQueryCommand().c_str(), ChanServ->GetQueryCommand("generic/help").c_str());
 		return EVENT_CONTINUE;
 	}
 
diff --git a/modules/chanserv/cs_access.cpp b/modules/chanserv/cs_access.cpp
index cf7ad90f4..72dc57450 100644
--- a/modules/chanserv/cs_access.cpp
+++ b/modules/chanserv/cs_access.cpp
@@ -625,9 +625,12 @@ public:
 		BotInfo *bi;
 		Anope::string cmd;
 		if (Command::FindCommandFromService("chanserv/levels", bi, cmd))
+		{
 			source.Reply(_("\002User access levels\002 can be seen by using the\n"
-					"\002%s\002 command; type \002%s HELP LEVELS\002 for\n"
-					"information."), cmd.c_str(), bi->GetQueryCommand().c_str());
+					"\002%s\002 command; type \002%s LEVELS\002 for\n"
+					"information."),
+			cmd.c_str(), bi->GetQueryCommand("generic/help").c_str());
+		}
 		return true;
 	}
 };
@@ -662,8 +665,8 @@ class CommandCSLevels final
 			Privilege *p = PrivilegeManager::FindPrivilege(what);
 			if (p == NULL)
 			{
-				source.Reply(_("Setting \002%s\002 not known.  Type \002%s HELP LEVELS\002 for a list of valid settings."),
-					what.c_str(), source.service->GetQueryCommand().c_str());
+				source.Reply(_("Setting \002%s\002 not known.  Type \002%s LEVELS\002 for a list of valid settings."),
+					what.c_str(), source.service->GetQueryCommand("generic/help").c_str());
 			}
 			else
 			{
@@ -705,8 +708,8 @@ class CommandCSLevels final
 			return;
 		}
 
-		source.Reply(_("Setting \002%s\002 not known.  Type \002%s HELP LEVELS\002 for a list of valid settings."),
-			what.c_str(), source.service->GetQueryCommand().c_str());
+		source.Reply(_("Setting \002%s\002 not known.  Type \002%s LEVELS\002 for a list of valid settings."),
+			what.c_str(), source.service->GetQueryCommand("generic/help").c_str());
 	}
 
 	static void DoList(CommandSource &source, ChannelInfo *ci)
diff --git a/modules/chanserv/cs_drop.cpp b/modules/chanserv/cs_drop.cpp
index 21e7fc44f..582ede836 100644
--- a/modules/chanserv/cs_drop.cpp
+++ b/modules/chanserv/cs_drop.cpp
@@ -58,7 +58,7 @@ public:
 				*code = Anope::Random(Config->GetBlock("options").Get<size_t>("codelength", 15));
 			}
 
-			source.Reply(CONFIRM_DROP, ci->name.c_str(), source.service->GetQueryCommand().c_str(),
+			source.Reply(CONFIRM_DROP, ci->name.c_str(), source.service->GetQueryCommand("chanserv/drop").c_str(),
 				ci->name.c_str(), code->c_str());
 			return;
 		}
diff --git a/modules/chanserv/cs_register.cpp b/modules/chanserv/cs_register.cpp
index 97bddf5cd..e8074ed19 100644
--- a/modules/chanserv/cs_register.cpp
+++ b/modules/chanserv/cs_register.cpp
@@ -100,9 +100,10 @@ public:
 		Anope::string cmd;
 		if (Command::FindCommandFromService("chanserv/access", bi, cmd))
 			source.Reply(_(" \n"
-				"See the \002%s\002 command (\002%s HELP ACCESS\002) for\n"
+				"See the \002%s\002 command (\002%s ACCESS\002) for\n"
 				"information on giving a subset of these privileges to\n"
-				"other channel users.\n"), cmd.c_str(), bi->GetQueryCommand().c_str());
+				"other channel users.\n"),
+			cmd.c_str(), bi->GetQueryCommand("generic/help").c_str());
 		source.Reply(_(" \n"
 			"NOTICE: In order to register a channel, you must have\n"
 			"first registered your nickname."));
diff --git a/modules/chanserv/cs_set.cpp b/modules/chanserv/cs_set.cpp
index c2298e68a..271746b49 100644
--- a/modules/chanserv/cs_set.cpp
+++ b/modules/chanserv/cs_set.cpp
@@ -59,8 +59,9 @@ public:
 				c->OnServHelp(source);
 			}
 		}
-		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;
 	}
 };
diff --git a/modules/chanserv/cs_xop.cpp b/modules/chanserv/cs_xop.cpp
index b005af2d1..e2e326eb8 100644
--- a/modules/chanserv/cs_xop.cpp
+++ b/modules/chanserv/cs_xop.cpp
@@ -590,11 +590,11 @@ public:
 			source.Reply(_("Alternative methods of modifying channel access lists are\n"
 					"available."));
 			if (!access_cmd.empty())
-				source.Reply(_("See \002%s HELP %s\002 for more information\n"
-						"about the access list."), access_bi->GetQueryCommand().c_str(), access_cmd.c_str());
+				source.Reply(_("See \002%s\002 for more information\n"
+						"about the access list."), access_bi->GetQueryCommand("generic/help", access_cmd).c_str());
 			if (!flags_cmd.empty())
-				source.Reply(_("See \002%s HELP %s\002 for more information\n"
-						"about the flags system."), flags_bi->GetQueryCommand().c_str(), flags_cmd.c_str());
+				source.Reply(_("See \002%s\002 for more information\n"
+						"about the flags system."), flags_bi->GetQueryCommand("generic/help", flags_cmd).c_str());
 		}
 		return true;
 	}