Rename several modules to remove the m_ prefix.

31 files changed, 54 insertions, 54 deletions

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);
 	}