diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index fca9c8d1..73e7277c 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -41,6 +41,7 @@
 #include "hook.h"
 
 static int m_part(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char part_desc[] = "Provides the PART command to leave a channel";
 
 struct Message part_msgtab = {
 	"PART", 0, 0, 0, 0,
@@ -49,9 +50,6 @@ struct Message part_msgtab = {
 
 mapi_clist_av1 part_clist[] = { &part_msgtab, NULL };
 
-static const char part_desc[] =
-	"Provides the PART client and server commands";
-
 DECLARE_MODULE_AV2(part, NULL, NULL, part_clist, NULL, NULL, NULL, NULL, part_desc);
 
 static void part_one_client(struct Client *client_p,
diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c
index 402e0235..4c769129 100644
--- a/modules/core/m_quit.c
+++ b/modules/core/m_quit.c
@@ -36,6 +36,7 @@
 
 static int m_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static int ms_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char quit_desc[] = "Provides the QUIT command to allow a user to leave the network";
 
 struct Message quit_msgtab = {
 	"QUIT", 0, 0, 0, 0,
@@ -44,9 +45,6 @@ struct Message quit_msgtab = {
 
 mapi_clist_av1 quit_clist[] = { &quit_msgtab, NULL };
 
-static const char quit_desc[] =
-	"Provides the QUIT command for clients and servers";
-
 DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, NULL, NULL, NULL, NULL, quit_desc);
 
 /*
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 3933c311..91e71990 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -43,6 +43,8 @@
 static int mr_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static int ms_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static int ms_sid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char server_desc[] =
+	"Provides the TS6 commands to introduce a new server to the network";
 
 struct Message server_msgtab = {
 	"SERVER", 0, 0, 0, 0,
@@ -55,8 +57,6 @@ struct Message sid_msgtab = {
 
 mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
 
-static const char server_desc[] = "Provides the SERVER and SID commands for TS6 use";
-
 DECLARE_MODULE_AV2(server, NULL, NULL, server_clist, NULL, NULL, NULL, NULL, server_desc);
 
 int bogus_host(const char *host);
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 9fca6d73..f85adba3 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -40,6 +40,7 @@
 
 static int ms_squit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static int mo_squit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char squit_desc[] = "Provides the SQUIT command to cause a server to quit";
 
 struct Message squit_msgtab = {
 	"SQUIT", 0, 0, 0, 0,
@@ -48,8 +49,6 @@ struct Message squit_msgtab = {
 
 mapi_clist_av1 squit_clist[] = { &squit_msgtab, NULL };
 
-static const char squit_desc[] = "Provides the TS6 SQUIT command";
-
 DECLARE_MODULE_AV2(squit, NULL, NULL, squit_clist, NULL, NULL, NULL, NULL, squit_desc);
 
 struct squit_parms