Rename several modules to remove the m_ prefix.

43 files changed, 142 insertions, 142 deletions

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index e30226cdc..8aebe5b4e 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -28,9 +28,9 @@ jobs:
             ninja-build
       - name: Enable extras
         run: |
-          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp
+          for MODULE in ldap ldap_authentication ldap_oper mysql regex_pcre2 regex_posix regex_tre sql_authentication sql_log sql_oper sqlite ssl_gnutls ssl_openssl
           do
-            ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
+            ln -s ${{ github.workspace }}/modules/extra/$MODULE.cpp ${{ github.workspace }}/modules
           done
       - name: Run CMake
         run: |
diff --git a/.gitignore b/.gitignore
index 4e0d9badf..1495a75a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,19 @@
 build/
 config.cache
 include/sysconf.h
-modules/m_ldap.cpp
-modules/m_ldap_authentication.cpp
-modules/m_ldap_oper.cpp
-modules/m_mysql.cpp
-modules/m_regex_pcre.cpp
-modules/m_regex_pcre2.cpp
-modules/m_regex_posix.cpp
-modules/m_regex_tre.cpp
-modules/m_sql_authentication.cpp
-modules/m_sql_log.cpp
-modules/m_sql_oper.cpp
-modules/m_sqlite.cpp
-modules/m_ssl_gnutls.cpp
-modules/m_ssl_openssl.cpp
+modules/ldap.cpp
+modules/ldap_authentication.cpp
+modules/ldap_oper.cpp
+modules/mysql.cpp
+modules/regex_pcre2.cpp
+modules/regex_posix.cpp
+modules/regex_tre.cpp
+modules/sql_authentication.cpp
+modules/sql_log.cpp
+modules/sql_oper.cpp
+modules/sqlite.cpp
+modules/ssl_gnutls.cpp
+modules/ssl_openssl.cpp
 modules/stats
 run/
 *.mo
diff --git a/data/anope.example.conf b/data/anope.example.conf
index 62eaa8154..393eeaa46 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -1199,7 +1199,7 @@ module
  * db_redis.
  *
  * This module allows using Redis (https://redis.io/) as a database backend.
- * This module requires that m_redis is loaded and configured properly.
+ * This module requires that redis is loaded and configured properly.
  *
  * Redis 2.8 supports keyspace notifications which allows Redis to push notifications
  * to Anope about outside modifications to the database. This module supports this and
@@ -1211,7 +1211,7 @@ module
 	name = "db_redis"
 
 	/*
-	 * Redis database to use. This must be configured with m_redis.
+	 * Redis database to use. This must be configured with redis.
 	 */
 	engine = "redis/main"
 }
@@ -1225,7 +1225,7 @@ module
  *
  * Without any encryption modules loaded users will not be able to authenticate unless
  * there is another module loaded that provides authentication checking, such as
- * m_ldap_authentication or m_sql_authentication.
+ * ldap_authentication or sql_authentication.
  *
  * With enc_none, passwords will be stored in plain text, allowing for passwords
  * to be recovered later but it isn't secure and therefore is not recommended.
diff --git a/data/chanstats.example.conf b/data/chanstats.example.conf
index 338b93306..31e6897a6 100644
--- a/data/chanstats.example.conf
+++ b/data/chanstats.example.conf
@@ -5,7 +5,7 @@
 
 module
 {
-	name = "m_chanstats"
+	name = "chanstats"
 
 	/*
 	 * The name of this engine.
diff --git a/data/modules.example.conf b/data/modules.example.conf
index fb4f6a6d9..d60c83cce 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -19,14 +19,14 @@
 module { name = "help" }
 
 /*
- * m_dns
+ * dns
  *
  * Adds support for the DNS protocol. By itself this module does nothing useful,
- * but other modules such as m_dnsbl and os_dns require this.
+ * but other modules such as dnsbl and os_dns require this.
  */
 #module
 {
-	name = "m_dns"
+	name = "dns"
 
 	/*
 	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
@@ -80,7 +80,7 @@ module { name = "help" }
 }
 
 /*
- * m_dnsbl
+ * dnsbl
  *
  * Allows configurable DNS blacklists to check connecting users against. If a user
  * is found on the blacklist they will be immediately banned. This is a crucial module
@@ -88,7 +88,7 @@ module { name = "help" }
  */
 #module
 {
-	name = "m_dnsbl"
+	name = "dnsbl"
 
 	/*
 	 * If set, Anope will check clients against the DNSBLs when services connect to its uplink.
@@ -179,19 +179,19 @@ module { name = "help" }
 }
 
 /*
- * m_helpchan
+ * helpchan
  *
  * Gives users who are op in the specified help channel usermode +h (helpop).
  */
 #module
 {
-	name = "m_helpchan"
+	name = "helpchan"
 
 	helpchannel = "#help"
 }
 
 /*
- * m_httpd
+ * httpd
  *
  * Allows services to serve web pages. By itself, this module does nothing useful.
  *
@@ -200,7 +200,7 @@ module { name = "help" }
  */
 #module
 {
-	name = "m_httpd"
+	name = "httpd"
 
 	httpd
 	{
@@ -233,13 +233,13 @@ module { name = "help" }
 }
 
 /*
- * m_ldap [EXTRA]
+ * ldap [EXTRA]
  *
  * This module allows other modules to use LDAP. By itself, this module does nothing useful.
  */
 #module
 {
-	name = "m_ldap"
+	name = "ldap"
 
 	ldap
 	{
@@ -254,14 +254,14 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_authentication [EXTRA]
+ * ldap_authentication [EXTRA]
  *
  * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
- * LDAP to authenticate users. Requires m_ldap.
+ * LDAP to authenticate users. Requires ldap.
 */
 #module
 {
-	name = "m_ldap_authentication"
+	name = "ldap_authentication"
 
 	/*
 	 * The distinguished name used for searching for users's accounts.
@@ -314,16 +314,16 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_oper [EXTRA]
+ * ldap_oper [EXTRA]
  *
  * This module dynamically ties users to Anope opertypes when they identify
- * via LDAP group membership. Requires m_ldap.
+ * via LDAP group membership. Requires ldap.
  *
  * Note that this doesn't give the user privileges on the IRCd, only in Anope.
  */
 #module
 {
-	name = "m_ldap_oper"
+	name = "ldap_oper"
 
 	/*
 	 * An optional binddn to use when searching for groups.
@@ -355,13 +355,13 @@ module { name = "help" }
 }
 
 /*
- * m_mysql [EXTRA]
+ * mysql [EXTRA]
  *
  * This module allows other modules to use MySQL.
  */
 #module
 {
-	name = "m_mysql"
+	name = "mysql"
 
 	mysql
 	{
@@ -376,13 +376,13 @@ module { name = "help" }
 }
 
 /*
- * m_redis
+ * redis
  *
  * This module allows other modules to use Redis.
  */
 #module
 {
-	name = "m_redis"
+	name = "redis"
 
 	/* A redis database */
 	redis
@@ -401,29 +401,29 @@ module { name = "help" }
 }
 
 /*
- * m_regex_pcre2 [EXTRA]
+ * regex_pcre2 [EXTRA]
  *
  * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
  * Expressions library.
  */
-#module { name = "m_regex_pcre2" }
+#module { name = "regex_pcre2" }
 
 /*
- * m_regex_posix [EXTRA]
+ * regex_posix [EXTRA]
  *
  * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
  */
-#module { name = "m_regex_posix" }
+#module { name = "regex_posix" }
 
 /*
- * m_regex_stdlib
+ * regex_stdlib
  *
  * Provides the regex engine regex/stdlib, which uses the regular expression library that is part of
  * the C++ standard library.
  */
 module
 {
-	name = "m_regex_stdlib"
+	name = "regex_stdlib"
 
 	/*
 	 * The syntax scheme to use. Can be set to awk to use the regular expression grammar used by the
@@ -439,23 +439,23 @@ module
 }
 
 /*
- * m_regex_tre [EXTRA]
+ * regex_tre [EXTRA]
  *
  * Provides the regex engine regex/tre, which uses the TRE regex library.
  */
-#module { name = "m_regex_tre" }
+#module { name = "regex_tre" }
 
 /*
- * m_rewrite
+ * rewrite
  *
  * Allows rewriting commands sent to/from clients.
  */
-#module { name = "m_rewrite" }
+#module { name = "rewrite" }
 #command
 {
 	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
 
-	/* Enable m_rewrite. */
+	/* Enable rewrite. */
 	rewrite = true
 
 	/* Source message to match. A $ can be used to match anything. */
@@ -476,7 +476,7 @@ module
 }
 
 /*
- * m_proxyscan
+ * proxyscan
  *
  * This module allows you to scan connecting clients for open proxies.
  * Note that using this will allow users to get the IP of your services.
@@ -490,7 +490,7 @@ module
  */
 #module
 {
-	name = "m_proxyscan"
+	name = "proxyscan"
 
 	/*
 	 * The target IP services tells the proxy to connect back to. This must be a publicly
@@ -558,29 +558,29 @@ module
 }
 
 /*
- * m_sasl
+ * sasl
  *
  * Some IRCds allow "SASL" authentication to let users identify to services
  * during the IRCd user registration process. If this module is loaded, Anope will allow
  * authenticating users through this mechanism. Supported mechanisms are:
  * PLAIN, EXTERNAL.
  */
-module { name = "m_sasl" }
+module { name = "sasl" }
 
 /*
- * m_ssl_gnutls [EXTRA]
+ * ssl_gnutls [EXTRA]
  *
  * This module provides SSL services to Anope using GnuTLS, for example to
  * connect to the uplink server(s) via SSL.
  *
- * You may only load either m_ssl_gnutls or m_ssl_openssl, but not both.
+ * You may only load either ssl_gnutls or ssl_openssl, but not both.
  */
 #module
 {
-	name = "m_ssl_gnutls"
+	name = "ssl_gnutls"
 
 	/*
-	 * An optional certificate and key for m_ssl_gnutls to give to the uplink.
+	 * An optional certificate and key for ssl_gnutls to give to the uplink.
 	 *
 	 * You can generate your own certificate and key pair by using:
 	 *
@@ -606,20 +606,20 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_ssl_openssl [EXTRA]
+ * ssl_openssl [EXTRA]
  *
  * This module provides SSL services to Anope using OpenSSL, for example to
  * connect to the uplink server(s) via SSL.
  *
- * You may only load either m_ssl_openssl or m_ssl_gnutls, but not both.
+ * You may only load either ssl_openssl or ssl_gnutls, but not both.
  *
  */
 #module
 {
-	name = "m_ssl_openssl"
+	name = "ssl_openssl"
 
 	/*
-	 * An optional certificate and key for m_ssl_openssl to give to the uplink.
+	 * An optional certificate and key for ssl_openssl to give to the uplink.
 	 *
 	 * You can generate your own certificate and key pair by using:
 	 *
@@ -640,16 +640,16 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sql_authentication [EXTRA]
+ * sql_authentication [EXTRA]
  *
  * This module allows authenticating users against an external SQL database using a custom
  * query.
  */
 #module
 {
-	name = "m_sql_authentication"
+	name = "sql_authentication"
 
-	/* SQL engine to use. Should be configured elsewhere with m_mysql, m_sqlite, etc. */
+	/* SQL engine to use. Should be configured elsewhere with mysql, sqlite, etc. */
 	engine = "mysql/main"
 
 	/* Query to execute to authenticate. A non empty result from this query is considered a success,
@@ -691,7 +691,7 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sql_log [EXTRA]
+ * sql_log [EXTRA]
  *
  * This module adds an additional target option to log{} blocks
  * that allows logging Service's logs to SQL. To log to SQL, add
@@ -708,19 +708,19 @@ module { name = "m_sasl" }
  * it if it doesn't exist. This module does not create any indexes (keys)
  * on the table and it is recommended you add them yourself as necessary.
  */
-#module { name = "m_sql_log" }
+#module { name = "sql_log" }
 
 /*
- * m_sql_oper [EXTRA]
+ * sql_oper [EXTRA]
  *
  * This module allows granting users services operator privileges and possibly IRC Operator
  * privileges based on an external SQL database using a custom query.
  */
 #module
 {
-	name = "m_sql_oper"
+	name = "sql_oper"
 
-	/* SQL engine to use. Should be configured elsewhere with m_mysql, m_sqlite, etc. */
+	/* SQL engine to use. Should be configured elsewhere with mysql, sqlite, etc. */
 	engine = "mysql/main"
 
 	/* Query to execute to determine if a user should have operator privileges.
@@ -737,13 +737,13 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sqlite [EXTRA]
+ * sqlite [EXTRA]
  *
  * This module allows other modules to use SQLite.
  */
 #module
 {
-	name = "m_sqlite"
+	name = "sqlite"
 
 	/* A SQLite database */
 	sqlite
@@ -763,7 +763,7 @@ module { name = "m_sasl" }
  * as they could over IRC. If you are using the default configuration you should be able to access
  * this panel by visiting http://127.0.0.1:8080 in your web browser from the machine Anope is running on.
  *
- * This module requires m_httpd.
+ * This module requires httpd.
  */
 #module
 {
@@ -780,23 +780,23 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_xmlrpc
+ * xmlrpc
  *
  * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
  * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
  */
 #module
 {
-	name = "m_xmlrpc"
+	name = "xmlrpc"
 
-	/* Web service to use. Requires m_httpd. */
+	/* Web service to use. Requires httpd. */
 	server = "httpd/main"
 }
 
 /*
- * m_xmlrpc_main
+ * xmlrpc_main
  *
  * Adds the main XMLRPC core functions.
- * Requires m_xmlrpc.
+ * Requires xmlrpc.
  */
-#module { name = "m_xmlrpc_main" }
+#module { name = "xmlrpc_main" }
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index d4cfeda0b..e23efbb47 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -267,7 +267,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
  *
  * Provides the command operserv/dns.
  *
- * This module requires that m_dns is loaded.
+ * This module requires that dns is loaded.
  *
  * This module allows controlling a DNS zone. This is useful for
  * controlling what servers users are placed on for load balancing,
diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf
index bd40723e8..51698e795 100644
--- a/data/stats.standalone.example.conf
+++ b/data/stats.standalone.example.conf
@@ -483,13 +483,13 @@ log
 /*
  * [REQUIRED] MySQL Database configuration.
  *
- * m_mysql
+ * mysql
  *
  * This module allows other modules to use MySQL.
  */
 module
 {
-	name = "m_mysql"
+	name = "mysql"
 
 	mysql
 	{
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 8e6da9fcf..eae81a617 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -4,6 +4,7 @@ Added module:tlsv10 from m_ssl_openssl.
 Added module:tlsv11 from m_ssl_openssl.
 Added module:tlsv12 from m_ssl_openssl.
 Removed module:sslv3 from m_ssl_openssl.
+Removed the m_ prefix from the names of the chanstats, dns, dnsbl, helpchan, httpd, ldap, ldap_oper, mysql, proxyscan, redis, regex_pcre2, regex_posix, regex_stdlib, regex_tre, rewrite, sasl, sql_log, sql_oper, sqlite, ssl_gnutls, ssl_openssl, xmlrpc, and xmlrpc_main modules.
 
 Anope Version 2.1.1
 -------------------
diff --git a/docs/INSTALL b/docs/INSTALL
index cbd170804..2a643429a 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -37,7 +37,7 @@ Note: You should also read the README and FAQ files!
     Next, unpack the package in your home directory, and go into the created
     directory.
 
-    If there are any extra modules you want to enable, such as m_mysql, run
+    If there are any extra modules you want to enable, such as mysql, run
     the 'extras' script to enable them. If you do not know you can come back
     later and enable them.
 
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index f80aeb9d6..bdfbccc53 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -37,7 +37,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     Ensuite, décompressez le package dans votre répertoire home, et allez
     dans le répértoire qui vient d'être créé.
 
-    Si il y a des modules facultatifs que vous voulez activer comme m_mysql,
+    Si il y a des modules facultatifs que vous voulez activer comme mysql,
     exécuter le script 'extras' pour les activer. Si vous ne savez pas, vous
     pouvez les activer plus tard.
 
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index 104ef7441..bf7153010 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -70,7 +70,7 @@ Anope for Windows
        If you cannot find whats causing the error, please visit our forums or

        our IRC Support channel for assistance.

 

-       Some Anope modules require third party libraries, such as m_mysql and

+       Some Anope modules require third party libraries, such as mysql and

        the SSL modules. If these libraries are installed in nonstandard

        locations, cmake will probably not find them and should be told where

        they are by passing their location to Config.

diff --git a/docs/XMLRPC/XMLRPC b/docs/XMLRPC/XMLRPC
index 52f2248a6..7a64556db 100644
--- a/docs/XMLRPC/XMLRPC
+++ b/docs/XMLRPC/XMLRPC
@@ -1,7 +1,7 @@
 Starting with Anope 1.9.4 XMLRPC using PHP's xmlrpc_encode_request and xmlrpc_decode functions is supported.
 This allows external applications, such as websites, to execute remote procedure calls to Anope in real time.
 
-Currently there are 5 supported XMLRPC calls, provided by m_xmlrpc_main:
+Currently there are 5 supported XMLRPC calls, provided by xmlrpc_main:
 
 checkAuthentication - Takes two parameters, an account name and a password. Checks if the account name is valid and the password
                       is correct for the account name, useful for making login pages on websites.
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 8f9455572..df45c211d 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -19,18 +19,18 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake")
     file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/extra/${NAME}.cpp" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
   endfunction()
 
-  enable_extra("m_mysql" "LIBMYSQLCLIENT")
-  enable_extra("m_regex_pcre2" "PCRE2")
-  enable_extra("m_sqlite" "SQLITE3")
-  enable_extra("m_ssl_openssl" "OPENSSL")
+  enable_extra("mysql" "LIBMYSQLCLIENT")
+  enable_extra("regex_pcre2" "PCRE2")
+  enable_extra("sqlite" "SQLITE3")
+  enable_extra("ssl_openssl" "OPENSSL")
   # this uses Wldap so should always be available
-  copy_extra("m_ldap")
+  copy_extra("ldap")
   # these don't actually have extra dependencies, but require a module which does
-  copy_extra("m_sql_authentication")
-  copy_extra("m_sql_log")
-  copy_extra("m_sql_oper")
-  copy_extra("m_ldap_authentication")
-  copy_extra("m_ldap_oper")
+  copy_extra("sql_authentication")
+  copy_extra("sql_log")
+  copy_extra("sql_oper")
+  copy_extra("ldap_authentication")
+  copy_extra("ldap_oper")
 
   # Package extra dlls
   file(GLOB EXTRA_DLLS "${Anope_SOURCE_DIR}/extradll/bin/*.dll" "${Anope_SOURCE_DIR}/extradll/lib/*.dll")
diff --git a/modules/m_dns.cpp b/modules/dns.cpp
index a75ca6820..a75ca6820 100644
--- a/modules/m_dns.cpp
+++ b/modules/dns.cpp
diff --git a/modules/m_dnsbl.cpp b/modules/dnsbl.cpp
index 47aba3876..af4d686e1 100644
--- a/modules/m_dnsbl.cpp
+++ b/modules/dnsbl.cpp
@@ -81,7 +81,7 @@ public:
 
 		BotInfo *OperServ = Config->GetClient("OperServ");
 		Log(creator, "dnsbl", OperServ) << user->GetMask() << " (" << addr << ") appears in " << this->blacklist.name;
-		auto *x = new XLine("*@" + addr, OperServ ? OperServ->nick : "m_dnsbl", Anope::CurTime + this->blacklist.bantime, reason, XLineManager::GenerateUID());
+		auto *x = new XLine("*@" + addr, OperServ ? OperServ->nick : "dnsbl", Anope::CurTime + this->blacklist.bantime, reason, XLineManager::GenerateUID());
 		if (this->add_to_akill && akills)
 		{
 			akills->AddXLine(x);
diff --git a/modules/extra/m_ldap.cpp b/modules/extra/ldap.cpp
index 31e712662..31e712662 100644
--- a/modules/extra/m_ldap.cpp
+++ b/modules/extra/ldap.cpp
diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/ldap_authentication.cpp
index 1b8318d7e..c78d2ae25 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/ldap_authentication.cpp
@@ -69,7 +69,7 @@ public:
 					{
 						const LDAPAttributes &attr = r.get(0);
 						ii->dn = attr.get("dn");
-						Log(LOG_DEBUG) << "m_ldap_authenticationn: binding as " << ii->dn;
+						Log(LOG_DEBUG) << "ldap_authenticationn: binding as " << ii->dn;
 
 						ii->lprov->Bind(new IdentifyInterface(this->owner, ii), ii->dn, ii->req->GetPassword());
 						ii = NULL;
@@ -88,7 +88,7 @@ public:
 					Anope::string sf = search_filter.replace_all_cs("%account", ii->req->GetAccount()).replace_all_cs("%object_class", object_class);
 					try
 					{
-						Log(LOG_DEBUG) << "m_ldap_authentication: searching for " << sf;
+						Log(LOG_DEBUG) << "ldap_authentication: searching for " << sf;
 						ii->lprov->Search(new IdentifyInterface(this->owner, ii), basedn, sf);
 						ii->admin_bind = false;
 						ii = NULL;
@@ -113,7 +113,7 @@ public:
 					// encrypt and store the password in the nickcore
 					Anope::Encrypt(ii->req->GetPassword(), na->nc->pass);
 
-					na->nc->Extend<Anope::string>("m_ldap_authentication_dn", ii->dn);
+					na->nc->Extend<Anope::string>("ldap_authentication_dn", ii->dn);
 					ii->req->Success(me);
 				}
 				break;
@@ -205,7 +205,7 @@ class ModuleLDAPAuthentication final
 public:
 	ModuleLDAPAuthentication(const Anope::string &modname, const Anope::string &creator) :
 		Module(modname, creator, EXTRA | VENDOR), ldap("LDAPProvider", "ldap/main"), orinterface(this),
-		dn(this, "m_ldap_authentication_dn")
+		dn(this, "ldap_authentication_dn")
 	{
 		me = this;
 	}
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/ldap_oper.cpp
index 866ed0110..62749f957 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/ldap_oper.cpp
@@ -112,7 +112,7 @@ public:
 		try
 		{
 			if (!this->ldap)
-				throw LDAPException("No LDAP interface. Is m_ldap loaded and configured correctly?");
+				throw LDAPException("No LDAP interface. Is ldap loaded and configured correctly?");
 			else if (this->basedn.empty() || this->filter.empty() || opertype_attribute.empty())
 				throw LDAPException("Could not search LDAP for opertype settings, invalid configuration.");
 
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/mysql.cpp
index d4be01f88..f1baff7b9 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/mysql.cpp
@@ -383,14 +383,14 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D
 
 	if (known_cols.empty())
 	{
-		Log(LOG_DEBUG) << "m_mysql: Fetching columns for " << table;
+		Log(LOG_DEBUG) << "mysql: Fetching columns for " << table;
 
 		Result columns = this->RunQuery("SHOW COLUMNS FROM `" + table + "`");
 		for (int i = 0; i < columns.Rows(); ++i)
 		{
 			const Anope::string &column = columns.Get(i, "Field");
 
-			Log(LOG_DEBUG) << "m_mysql: Column #" << i << " for " << table << ": " << column;
+			Log(LOG_DEBUG) << "mysql: Column #" << i << " for " << table << ": " << column;
 			known_cols.insert(column);
 		}
 	}
diff --git a/modules/extra/m_regex_pcre2.cpp b/modules/extra/regex_pcre2.cpp
index ef2786823..ef2786823 100644
--- a/modules/extra/m_regex_pcre2.cpp
+++ b/modules/extra/regex_pcre2.cpp
diff --git a/modules/extra/m_regex_posix.cpp b/modules/extra/regex_posix.cpp
index cef4486f9..cef4486f9 100644
--- a/modules/extra/m_regex_posix.cpp
+++ b/modules/extra/regex_posix.cpp
diff --git a/modules/extra/m_regex_tre.cpp b/modules/extra/regex_tre.cpp
index 18485507a..18485507a 100644
--- a/modules/extra/m_regex_tre.cpp
+++ b/modules/extra/regex_tre.cpp
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/sql_authentication.cpp
index 8d60f12ea..bb2f82410 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/sql_authentication.cpp
@@ -32,12 +32,12 @@ public:
 	{
 		if (r.Rows() == 0)
 		{
-			Log(LOG_DEBUG) << "m_sql_authentication: Unsuccessful authentication for " << req->GetAccount();
+			Log(LOG_DEBUG) << "sql_authentication: Unsuccessful authentication for " << req->GetAccount();
 			delete this;
 			return;
 		}
 
-		Log(LOG_DEBUG) << "m_sql_authentication: Successful authentication for " << req->GetAccount();
+		Log(LOG_DEBUG) << "sql_authentication: Successful authentication for " << req->GetAccount();
 
 		Anope::string email;
 		try
@@ -69,7 +69,7 @@ public:
 
 	void OnError(const SQL::Result &r) override
 	{
-		Log(this->owner) << "m_sql_authentication: Error executing query " << r.GetQuery().query << ": " << r.GetError();
+		Log(this->owner) << "sql_authentication: Error executing query " << r.GetQuery().query << ": " << r.GetError();
 		delete this;
 	}
 };
@@ -143,7 +143,7 @@ public:
 
 		this->SQL->Run(new SQLAuthenticationResult(u, req), q);
 
-		Log(LOG_DEBUG) << "m_sql_authentication: Checking authentication for " << req->GetAccount();
+		Log(LOG_DEBUG) << "sql_authentication: Checking authentication for " << req->GetAccount();
 	}
 };
 
diff --git a/modules/extra/m_sql_log.cpp b/modules/extra/sql_log.cpp
index 7335a5abf..7335a5abf 100644
--- a/modules/extra/m_sql_log.cpp
+++ b/modules/extra/sql_log.cpp
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/sql_oper.cpp
index 7642bab5f..af2b40346 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/sql_oper.cpp
@@ -34,7 +34,7 @@ class SQLOperResult final
 			delete user->Account()->o;
 			user->Account()->o = NULL;
 
-			Log(this->owner) << "m_sql_oper: Removed services operator from " << user->nick << " (" << user->Account()->display << ")";
+			Log(this->owner) << "sql_oper: Removed services operator from " << user->nick << " (" << user->Account()->display << ")";
 
 			BotInfo *OperServ = Config->GetClient("OperServ");
 			user->RemoveMode(OperServ, "OPER"); // Probably not set, just incase
@@ -53,7 +53,7 @@ public:
 
 		if (r.Rows() == 0)
 		{
-			Log(LOG_DEBUG) << "m_sql_oper: Got 0 rows for " << user->nick;
+			Log(LOG_DEBUG) << "sql_oper: Got 0 rows for " << user->nick;
 			Deoper();
 			return;
 		}
@@ -69,7 +69,7 @@ public:
 			return;
 		}
 
-		Log(LOG_DEBUG) << "m_sql_oper: Got result for " << user->nick << ", opertype " << opertype;
+		Log(LOG_DEBUG) << "sql_oper: Got result for " << user->nick << ", opertype " << opertype;
 
 		Anope::string modes;
 		try
@@ -91,7 +91,7 @@ public:
 		OperType *ot = OperType::Find(opertype);
 		if (ot == NULL)
 		{
-			Log(this->owner) << "m_sql_oper: Oper " << user->nick << " has type " << opertype << ", but this opertype does not exist?";
+			Log(this->owner) << "sql_oper: Oper " << user->nick << " has type " << opertype << ", but this opertype does not exist?";
 			return;
 		}
 
@@ -103,7 +103,7 @@ public:
 
 		if (!user->Account()->o || user->Account()->o->ot != ot)
 		{
-			Log(this->owner) << "m_sql_oper: Tieing oper " << user->nick << " to type " << opertype;
+			Log(this->owner) << "sql_oper: Tieing oper " << user->nick << " to type " << opertype;
 
 			delete user->Account()->o;
 			user->Account()->o = new SQLOper(user->Account()->display, ot);
@@ -121,7 +121,7 @@ public:
 	void OnError(const SQL::Result &r) override
 	{
 		SQLOperResultDeleter d(this);
-		Log(this->owner) << "m_sql_oper: Error executing query " << r.GetQuery().query << ": " << r.GetError();
+		Log(this->owner) << "sql_oper: Error executing query " << r.GetQuery().query << ": " << r.GetError();
 	}
 };
 
@@ -174,7 +174,7 @@ public:
 
 		this->SQL->Run(new SQLOperResult(this, u), q);
 
-		Log(LOG_DEBUG) << "m_sql_oper: Checking authentication for " << u->Account()->display;
+		Log(LOG_DEBUG) << "sql_oper: Checking authentication for " << u->Account()->display;
 	}
 };
 
diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/sqlite.cpp
index f11c0bf09..a3d2f7757 100644
--- a/modules/extra/m_sqlite.cpp
+++ b/modules/extra/sqlite.cpp
@@ -213,14 +213,14 @@ std::vector<Query> SQLiteService::CreateTable(const Anope::string &table, const
 
 	if (known_cols.empty())
 	{
-		Log(LOG_DEBUG) << "m_sqlite: Fetching columns for " << table;
+		Log(LOG_DEBUG) << "sqlite: Fetching columns for " << table;
 
 		Result columns = this->RunQuery("PRAGMA table_info(" + table + ")");
 		for (int i = 0; i < columns.Rows(); ++i)
 		{
 			const Anope::string &column = columns.Get(i, "name");
 
-			Log(LOG_DEBUG) << "m_sqlite: Column #" << i << " for " << table << ": " << column;
+			Log(LOG_DEBUG) << "sqlite: Column #" << i << " for " << table << ": " << column;
 			known_cols.insert(column);
 		}
 	}
diff --git a/modules/extra/m_ssl_gnutls.cpp b/modules/extra/ssl_gnutls.cpp
index 28310471a..fdf5b1bff 100644
--- a/modules/extra/m_ssl_gnutls.cpp
+++ b/modules/extra/ssl_gnutls.cpp
@@ -350,7 +350,7 @@ public:
 				delete newcred;
 				throw;
 			}
-			Log(LOG_DEBUG) << "m_ssl_gnutls: Successfully loaded DH parameters from " << dhfile;
+			Log(LOG_DEBUG) << "ssl_gnutls: Successfully loaded DH parameters from " << dhfile;
 		}
 
 		if (cred)
@@ -358,7 +358,7 @@ public:
 		cred = newcred;
 		cred->incrref();
 
-		Log(LOG_DEBUG) << "m_ssl_gnutls: Successfully loaded certificate " << certfile << " and private key " << keyfile;
+		Log(LOG_DEBUG) << "ssl_gnutls: Successfully loaded certificate " << certfile << " and private key " << keyfile;
 	}
 
 	void OnPreServerConnect() override
diff --git a/modules/extra/m_ssl_openssl.cpp b/modules/extra/ssl_openssl.cpp
index 8d4aca9ba..a052752ae 100644
--- a/modules/extra/m_ssl_openssl.cpp
+++ b/modules/extra/ssl_openssl.cpp
@@ -154,7 +154,7 @@ public:
 			if (!SSL_CTX_use_certificate_chain_file(client_ctx, this->certfile.c_str()) || !SSL_CTX_use_certificate_chain_file(server_ctx, this->certfile.c_str()))
 				throw ConfigException("Error loading certificate");
 			else
-				Log(LOG_DEBUG) << "m_ssl_openssl: Successfully loaded certificate " << this->certfile;
+				Log(LOG_DEBUG) << "ssl_openssl: Successfully loaded certificate " << this->certfile;
 		}
 		else
 			Log() << "Unable to open certificate " << this->certfile;
@@ -164,7 +164,7 @@ public:
 			if (!SSL_CTX_use_PrivateKey_file(client_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM) || !SSL_CTX_use_PrivateKey_file(server_ctx, this->keyfile.c_str(), SSL_FILETYPE_PEM))
 				throw ConfigException("Error loading private key");
 			else
-				Log(LOG_DEBUG) << "m_ssl_openssl: Successfully loaded private key " << this->keyfile;
+				Log(LOG_DEBUG) << "ssl_openssl: Successfully loaded private key " << this->keyfile;
 		}
 		else
 		{
diff --git a/modules/m_helpchan.cpp b/modules/helpchan.cpp
index 061388dfe..061388dfe 100644
--- a/modules/m_helpchan.cpp
+++ b/modules/helpchan.cpp
diff --git a/modules/m_httpd.cpp b/modules/httpd.cpp
index 53e7c51a9..c80507621 100644
--- a/modules/m_httpd.cpp
+++ b/modules/httpd.cpp
@@ -75,13 +75,13 @@ class MyHTTPClient final
 				if (this->message.headers.count(token))
 				{
 					this->ip = this->message.headers[token];
-					Log(LOG_DEBUG, "httpd") << "m_httpd: IP for connection " << this->GetFD() << " changed to " << this->ip;
+					Log(LOG_DEBUG, "httpd") << "httpd: IP for connection " << this->GetFD() << " changed to " << this->ip;
 					break;
 				}
 			}
 		}
 
-		Log(LOG_DEBUG, "httpd") << "m_httpd: Serving page " << this->page_name << " to " << this->ip;
+		Log(LOG_DEBUG, "httpd") << "httpd: Serving page " << this->page_name << " to " << this->ip;
 
 		HTTPReply reply;
 		reply.content_type = this->page->GetContentType();
diff --git a/modules/m_proxyscan.cpp b/modules/proxyscan.cpp
index 279169bfb..b92de0dea 100644
--- a/modules/m_proxyscan.cpp
+++ b/modules/proxyscan.cpp
@@ -297,7 +297,7 @@ public:
 		}
 		catch (const SocketException &ex)
 		{
-			throw ConfigException("m_proxyscan: " + ex.GetReason());
+			throw ConfigException("proxyscan: " + ex.GetReason());
 		}
 
 		this->proxyscans.clear();
@@ -377,7 +377,7 @@ public:
 					}
 					catch (const SocketException &ex)
 					{
-						Log(LOG_DEBUG) << "m_proxyscan: " << ex.GetReason();
+						Log(LOG_DEBUG) << "proxyscan: " << ex.GetReason();
 					}
 				}
 			}
diff --git a/modules/m_redis.cpp b/modules/redis.cpp
index 6aa62bb29..6aa62bb29 100644
--- a/modules/m_redis.cpp
+++ b/modules/redis.cpp
diff --git a/modules/m_regex_stdlib.cpp b/modules/regex_stdlib.cpp
index d759cc8fd..d759cc8fd 100644
--- a/modules/m_regex_stdlib.cpp
+++ b/modules/regex_stdlib.cpp
diff --git a/modules/m_rewrite.cpp b/modules/rewrite.cpp
index 59560227b..3911b5ddf 100644
--- a/modules/m_rewrite.cpp
+++ b/modules/rewrite.cpp
@@ -112,14 +112,14 @@ public:
 		if (r != NULL)
 		{
 			Anope::string new_message = r->Process(source, full_params);
-			Log(LOG_DEBUG) << "m_rewrite: Rewrote '" << source.command << (!params.empty() ? " " + params[0] : "") << "' to '" << new_message << "' using '" << r->source_message << "'";
+			Log(LOG_DEBUG) << "rewrite: Rewrote '" << source.command << (!params.empty() ? " " + params[0] : "") << "' to '" << new_message << "' using '" << r->source_message << "'";
 			source.service = BotInfo::Find(r->client, true);
 			if (!source.service)
 				return;
 			Command::Run(source, new_message);
 		}
 		else
-			Log() << "m_rewrite: Unable to rewrite '" << source.command << (!params.empty() ? " " + params[0] : "") << "'";
+			Log() << "rewrite: Unable to rewrite '" << source.command << (!params.empty() ? " " + params[0] : "") << "'";
 	}
 
 	void OnServHelp(CommandSource &source) override
diff --git a/modules/m_sasl.cpp b/modules/sasl.cpp
index 298ad0e75..298ad0e75 100644
--- a/modules/m_sasl.cpp
+++ b/modules/sasl.cpp
diff --git a/modules/stats/m_chanstats.cpp b/modules/stats/chanstats.cpp
index db92689d7..db92689d7 100644
--- a/modules/stats/m_chanstats.cpp
+++ b/modules/stats/chanstats.cpp
diff --git a/modules/stats/cs_fantasy_stats.cpp b/modules/stats/cs_fantasy_stats.cpp
index fedbd49b0..516dd02b9 100644
--- a/modules/stats/cs_fantasy_stats.cpp
+++ b/modules/stats/cs_fantasy_stats.cpp
@@ -79,14 +79,14 @@ public:
 
 	void OnReload(Configuration::Conf *conf) override
 	{
-		prefix = conf->GetModule("m_chanstats")->Get<const Anope::string>("prefix", "anope_");
-		this->sql = ServiceReference<SQL::Provider>("SQL::Provider", conf->GetModule("m_chanstats")->Get<const Anope::string>("engine"));
+		prefix = conf->GetModule("chanstats")->Get<const Anope::string>("prefix", "anope_");
+		this->sql = ServiceReference<SQL::Provider>("SQL::Provider", conf->GetModule("chanstats")->Get<const Anope::string>("engine"));
 	}
 
 	SQL::Result RunQuery(const SQL::Query &query)
 	{
 		if (!this->sql)
-			throw SQL::Exception("Unable to locate SQL reference, is m_mysql loaded and configured correctly?");
+			throw SQL::Exception("Unable to locate SQL reference, is mysql loaded and configured correctly?");
 
 		SQL::Result res = this->sql->RunQuery(query);
 		if (!res.GetError().empty())
diff --git a/modules/stats/cs_fantasy_top.cpp b/modules/stats/cs_fantasy_top.cpp
index 6b3b344c6..3bc1fa261 100644
--- a/modules/stats/cs_fantasy_top.cpp
+++ b/modules/stats/cs_fantasy_top.cpp
@@ -106,14 +106,14 @@ public:
 
 	void OnReload(Configuration::Conf *conf) override
 	{
-		prefix = conf->GetModule("m_chanstats")->Get<const Anope::string>("prefix", "anope_");
-		this->sql = ServiceReference<SQL::Provider>("SQL::Provider", conf->GetModule("m_chanstats")->Get<const Anope::string>("engine"));
+		prefix = conf->GetModule("chanstats")->Get<const Anope::string>("prefix", "anope_");
+		this->sql = ServiceReference<SQL::Provider>("SQL::Provider", conf->GetModule("chanstats")->Get<const Anope::string>("engine"));
 	}
 
 	SQL::Result RunQuery(const SQL::Query &query)
 	{
 		if (!this->sql)
-			throw SQL::Exception("Unable to locate SQL reference, is m_mysql loaded and configured correctly?");
+			throw SQL::Exception("Unable to locate SQL reference, is mysql loaded and configured correctly?");
 
 		SQL::Result res = sql->RunQuery(query);
 		if (!res.GetError().empty())
diff --git a/modules/stats/irc2sql/irc2sql.cpp b/modules/stats/irc2sql/irc2sql.cpp
index 2753dc00e..ed83001c3 100644
--- a/modules/stats/irc2sql/irc2sql.cpp
+++ b/modules/stats/irc2sql/irc2sql.cpp
@@ -11,7 +11,7 @@
 void IRC2SQL::OnShutdown()
 {
 	// TODO: test if we really have to use blocking query here
-	// (sometimes m_mysql get unloaded before the other thread executed all queries)
+	// (sometimes mysql get unloaded before the other thread executed all queries)
 	if (this->sql)
 		SQL::Result r = this->sql->RunQuery(SQL::Query("CALL " + prefix + "OnShutdown()"));
 	quitting = true;
diff --git a/modules/stats/irc2sql/irc2sql.h b/modules/stats/irc2sql/irc2sql.h
index ea537a424..e08f39a34 100644
--- a/modules/stats/irc2sql/irc2sql.h
+++ b/modules/stats/irc2sql/irc2sql.h
@@ -24,9 +24,9 @@ public:
 	void OnError(const SQL::Result &r) override
 	{
 		if (!r.GetQuery().query.empty())
-			Log(LOG_DEBUG) << "m_irc2sql: Error executing query " << r.finished_query << ": " << r.GetError();
+			Log(LOG_DEBUG) << "irc2sql: Error executing query " << r.finished_query << ": " << r.GetError();
 		else
-			Log(LOG_DEBUG) << "m_irc2sql: Error executing query: " << r.GetError();
+			Log(LOG_DEBUG) << "irc2sql: Error executing query: " << r.GetError();
 	}
 };
 
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index f0cb06771..53243103c 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -67,7 +67,7 @@ public:
 
 		provider = ServiceReference<HTTPProvider>("HTTPProvider", provider_name);
 		if (!provider)
-			throw ModuleException("Unable to find HTTPD provider. Is m_httpd loaded?");
+			throw ModuleException("Unable to find HTTPD provider. Is httpd loaded?");
 
 		provider->RegisterPage(&this->style_css);
 		provider->RegisterPage(&this->logo_png);
diff --git a/modules/m_xmlrpc.cpp b/modules/xmlrpc.cpp
index 854fcc732..319730be0 100644
--- a/modules/m_xmlrpc.cpp
+++ b/modules/xmlrpc.cpp
@@ -154,7 +154,7 @@ public:
 
 		while (GetData(content, tname, data))
 		{
-			Log(LOG_DEBUG) << "m_xmlrpc: Tag name: " << tname << ", data: " << data;
+			Log(LOG_DEBUG) << "xmlrpc: Tag name: " << tname << ", data: " << data;
 			if (tname == "methodName")
 				request.name = data;
 			else if (tname == "name" && data == "id")
@@ -221,7 +221,7 @@ public:
 			httpref->UnregisterPage(&xmlrpcinterface);
 		this->httpref = ServiceReference<HTTPProvider>("HTTPProvider", conf->GetModule(this)->Get<const Anope::string>("server", "httpd/main"));
 		if (!httpref)
-			throw ConfigException("Unable to find http reference, is m_httpd loaded?");
+			throw ConfigException("Unable to find http reference, is httpd loaded?");
 		httpref->RegisterPage(&xmlrpcinterface);
 	}
 };
diff --git a/modules/m_xmlrpc_main.cpp b/modules/xmlrpc_main.cpp
index 63ad601e9..23ea1fb0b 100644
--- a/modules/m_xmlrpc_main.cpp
+++ b/modules/xmlrpc_main.cpp
@@ -291,7 +291,7 @@ public:
 		me = this;
 
 		if (!xmlrpc)
-			throw ModuleException("Unable to find xmlrpc reference, is m_xmlrpc loaded?");
+			throw ModuleException("Unable to find xmlrpc reference, is xmlrpc loaded?");
 
 		xmlrpc->Register(&stats);
 	}