Convert CmdResult to an 8-bit strongly typed enum.

133 files changed, 477 insertions, 477 deletions

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index b9ebd7ea3..95d64bc5c 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -127,7 +127,7 @@ CmdResult CommandParser::CallHandler(const std::string& commandname, const Comma
 	if (n != cmdlist.end())
 	{
 		if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
-			return CMD_INVALID;
+			return CmdResult::INVALID;
 
 		if (parameters.size() >= n->second->min_params)
 		{
@@ -166,7 +166,7 @@ CmdResult CommandParser::CallHandler(const std::string& commandname, const Comma
 			}
 		}
 	}
-	return CMD_INVALID;
+	return CmdResult::INVALID;
 }
 
 void CommandParser::ProcessCommand(LocalUser* user, std::string& command, CommandBase::Params& command_p)
diff --git a/src/commands.cpp b/src/commands.cpp
index 39d58e1c8..997077232 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -94,20 +94,20 @@ CmdResult SplitCommand::Handle(User* user, const Params& parameters)
 
 	ServerInstance->Logs.Log("COMMAND", LOG_DEFAULT, "Unknown user type %d in command (uuid=%s)!",
 		user->usertype, user->uuid.c_str());
-	return CMD_INVALID;
+	return CmdResult::INVALID;
 }
 
 CmdResult SplitCommand::HandleLocal(LocalUser* user, const Params& parameters)
 {
-	return CMD_INVALID;
+	return CmdResult::INVALID;
 }
 
 CmdResult SplitCommand::HandleRemote(RemoteUser* user, const Params& parameters)
 {
-	return CMD_INVALID;
+	return CmdResult::INVALID;
 }
 
 CmdResult SplitCommand::HandleServer(FakeUser* user, const Params& parameters)
 {
-	return CMD_INVALID;
+	return CmdResult::INVALID;
 }
diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp
index aa3356cc4..fd7ab6f05 100644
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -70,7 +70,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 				if (!InspIRCd::Duration(parameters[2], duration))
 				{
 					user->WriteNotice("*** Invalid duration for invite");
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 				timeout = ServerInstance->Time() + duration;
 			}
@@ -81,12 +81,12 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 		if (!c)
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(parameters[1]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		if ((!u) || (u->registered != REG_ALL))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Verify channel timestamp if the INVITE is coming from a remote server
@@ -94,31 +94,31 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 		{
 			// Remote INVITE commands must carry a channel timestamp
 			if (parameters.size() < 3)
-				return CMD_INVALID;
+				return CmdResult::INVALID;
 
 			// Drop the invite if our channel TS is lower
 			time_t RemoteTS = ConvToNum<time_t>(parameters[2]);
 			if (c->age < RemoteTS)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 		}
 
 		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
 		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel!");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (c->HasUser(u))
 		{
 			user->WriteNumeric(ERR_USERONCHANNEL, u->nick, c->name, "is already on channel");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user,u,c,timeout));
 
 		if (MOD_RESULT == MOD_RES_DENY)
 		{
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		else if (MOD_RESULT == MOD_RES_PASSTHRU)
 		{
@@ -131,7 +131,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 					ModeHandler* mh = ServerInstance->Modes.FindMode('h', MODETYPE_CHANNEL);
 					user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator",
 						(mh && mh->name == "halfop" ? "half-" : "")));
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 			}
 		}
@@ -198,7 +198,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 		}
 		user->WriteNumeric(RPL_ENDOFINVITELIST, "End of INVITE list");
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandInvite::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_channel/cmd_join.cpp b/src/coremods/core_channel/cmd_join.cpp
index 4af9493eb..b2e542a14 100644
--- a/src/coremods/core_channel/cmd_join.cpp
+++ b/src/coremods/core_channel/cmd_join.cpp
@@ -40,26 +40,26 @@ CmdResult CommandJoin::HandleLocal(LocalUser* user, const Params& parameters)
 	if (parameters.size() > 1)
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0, 1, false))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
 			Channel::JoinUser(user, parameters[0], false, parameters[1]);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 	}
 	else
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0, -1, false))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
 			Channel::JoinUser(user, parameters[0]);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 	}
 
 	user->WriteNumeric(ERR_BADCHANMASK, parameters[0], "Invalid channel name");
-	return CMD_FAILURE;
+	return CmdResult::FAILURE;
 }
diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index ee1d8818f..2b8bd2dfe 100644
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -43,7 +43,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 	User* u;
 
 	if (CommandParser::LoopCall(user, this, parameters, 1))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	if (IS_LOCAL(user))
 		u = ServerInstance->Users.FindNick(parameters[1]);
@@ -53,12 +53,12 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 	if (!c)
 	{
 		user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	if ((!u) || (u->registered != REG_ALL))
 	{
 		user->WriteNumeric(Numerics::NoSuchNick(parameters[1]));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	Membership* srcmemb = NULL;
@@ -68,13 +68,13 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 		if (!srcmemb)
 		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, parameters[0], "You're not on that channel!");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (u->server->IsULine())
 		{
 			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You may not kick a U-lined client");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
@@ -82,7 +82,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 	if (victimiter == c->userlist.end())
 	{
 		user->WriteNumeric(ERR_USERNOTINCHANNEL, u->nick, c->name, "They are not on that channel");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	Membership* const memb = victimiter->second;
 
@@ -93,7 +93,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 		if (memb->id != Membership::IdFromString(parameters[2]))
 		{
 			ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Dropped KICK due to membership id mismatch: " + ConvToStr(memb->id) + " != " + parameters[2]);
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
@@ -108,7 +108,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 		ModResult res;
 		FIRST_MOD_RESULT(OnUserPreKick, res, (user, memb, reason));
 		if (res == MOD_RES_DENY)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		if (res == MOD_RES_PASSTHRU)
 		{
@@ -125,14 +125,14 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters)
 			{
 				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator",
 					req > HALFOP_VALUE ? "" : "half-"));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 	}
 
 	c->KickUser(user, victimiter, reason);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandKick::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp
index 139667a35..6e5530685 100644
--- a/src/coremods/core_channel/cmd_names.cpp
+++ b/src/coremods/core_channel/cmd_names.cpp
@@ -49,11 +49,11 @@ CmdResult CommandNames::HandleLocal(LocalUser* user, const Params& parameters)
 	if (parameters.empty())
 	{
 		user->WriteNumeric(RPL_ENDOFNAMES, '*', "End of /NAMES list.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	if (CommandParser::LoopCall(user, this, parameters, 0))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	c = ServerInstance->FindChan(parameters[0]);
 	if (c)
@@ -68,12 +68,12 @@ CmdResult CommandNames::HandleLocal(LocalUser* user, const Params& parameters)
 		if ((show_invisible) || (!c->IsModeSet(secretmode)))
 		{
 			SendNames(user, c, show_invisible);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 	}
 
 	user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-	return CMD_FAILURE;
+	return CmdResult::FAILURE;
 }
 
 void CommandNames::SendNames(LocalUser* user, Channel* chan, bool show_invisible)
diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp
index 0424b26ca..605961007 100644
--- a/src/coremods/core_channel/cmd_topic.cpp
+++ b/src/coremods/core_channel/cmd_topic.cpp
@@ -44,7 +44,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 	if (!c)
 	{
 		user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (parameters.size() == 1)
@@ -52,7 +52,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 		if ((c->IsModeSet(secretmode)) && (!c->HasUser(user) && !user->HasPrivPermission("channels/auspex")))
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(c->name));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (c->topic.length())
@@ -63,7 +63,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 		{
 			user->WriteNumeric(RPL_NOTOPICSET, c->name, "No topic is set.");
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	std::string t = parameters[1]; // needed, in case a module wants to change it
@@ -71,13 +71,13 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 	FIRST_MOD_RESULT(OnPreTopicChange, res, (user,c,t));
 
 	if (res == MOD_RES_DENY)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	if (res != MOD_RES_ALLOW)
 	{
 		if (!c->HasUser(user))
 		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel!");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		if (c->IsModeSet(topiclockmode))
 		{
@@ -85,7 +85,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 			if (!MOD_RESULT.check(c->GetPrefixValue(user) >= HALFOP_VALUE))
 			{
 				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, "You do not have access to change the topic on this channel");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 	}
@@ -97,7 +97,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters)
 	// Only change if the new topic is different than the current one
 	if (c->topic != t)
 		c->SetTopic(user, t, ServerInstance->Time());
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 void Topic::ShowTopic(LocalUser* user, Channel* chan)
diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp
index 200fb1f83..40041dfaa 100644
--- a/src/coremods/core_info/cmd_admin.cpp
+++ b/src/coremods/core_info/cmd_admin.cpp
@@ -38,11 +38,11 @@ CommandAdmin::CommandAdmin(Module* parent)
 CmdResult CommandAdmin::Handle(User* user, const Params& parameters)
 {
 	if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	user->WriteRemoteNumeric(RPL_ADMINME, ServerInstance->Config->ServerName, "Administrative info");
 	if (!AdminName.empty())
 		user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name: %s", AdminName.c_str()));
 	user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname: %s", AdminNick.c_str()));
 	user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("Email: %s", AdminEmail.c_str()));
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_commands.cpp b/src/coremods/core_info/cmd_commands.cpp
index bf9742a31..bec8a16ae 100644
--- a/src/coremods/core_info/cmd_commands.cpp
+++ b/src/coremods/core_info/cmd_commands.cpp
@@ -72,5 +72,5 @@ CmdResult CommandCommands::Handle(User* user, const Params& parameters)
 	for(unsigned int i=0; i < list.size(); i++)
 		user->WriteNumeric(RPL_COMMANDS, list[i]);
 	user->WriteNumeric(RPL_COMMANDSEND, "End of COMMANDS list");
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index 36d1f4ce2..48f307f07 100644
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -83,12 +83,12 @@ static const char* const lines[] = {
 CmdResult CommandInfo::Handle(User* user, const Params& parameters)
 {
 	if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	int i=0;
 	while (lines[i])
 		user->WriteRemoteNumeric(RPL_INFO, lines[i++]);
 
 	user->WriteRemoteNumeric(RPL_ENDOFINFO, "End of /INFO list");
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 2d1ae7f60..5f2ee26ff 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -53,12 +53,12 @@ CmdResult CommandModules::Handle(User* user, const Params& parameters)
 		if (!user->IsOper())
 		{
 			user->WriteNotice("*** You cannot check what modules other servers have loaded.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// From an oper and not for us, forward
 		if (!for_us)
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 	}
 
 	bool has_priv = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex");
@@ -72,5 +72,5 @@ CmdResult CommandModules::Handle(User* user, const Params& parameters)
 	}
 	user->WriteRemoteNumeric(RPL_ENDOFMODLIST, "End of MODULES list");
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 21cdedf23..4ba7963da 100644
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -41,7 +41,7 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
 		LocalUser* localuser = IS_LOCAL(user);
 		if ((localuser) && (!user->IsOper()))
 			localuser->CommandFloodPenalty += 2000;
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	ConfigTag* tag = ServerInstance->Config->EmptyTag;
@@ -54,7 +54,7 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
 	if (motd == motds.end())
 	{
 		user->WriteRemoteNumeric(ERR_NOMOTD, "Message of the day file is missing.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	user->WriteRemoteNumeric(RPL_MOTDSTART, InspIRCd::Format("%s message of the day", ServerInstance->Config->ServerName.c_str()));
@@ -64,5 +64,5 @@ CmdResult CommandMotd::Handle(User* user, const Params& parameters)
 
 	user->WriteRemoteNumeric(RPL_ENDOFMOTD, "End of message of the day.");
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_servlist.cpp b/src/coremods/core_info/cmd_servlist.cpp
index 310aeb103..8c71e2521 100644
--- a/src/coremods/core_info/cmd_servlist.cpp
+++ b/src/coremods/core_info/cmd_servlist.cpp
@@ -55,5 +55,5 @@ CmdResult CommandServList::HandleLocal(LocalUser* user, const Params& parameters
 		user->WriteNumeric(numeric);
 	}
 	user->WriteNumeric(RPL_SERVLISTEND, mask, 0, "End of service listing");
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_time.cpp b/src/coremods/core_info/cmd_time.cpp
index bde2fb438..1707b21ee 100644
--- a/src/coremods/core_info/cmd_time.cpp
+++ b/src/coremods/core_info/cmd_time.cpp
@@ -35,9 +35,9 @@ CommandTime::CommandTime(Module* parent)
 CmdResult CommandTime::Handle(User* user, const Params& parameters)
 {
 	if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	user->WriteRemoteNumeric(RPL_TIME, ServerInstance->Config->ServerName, InspIRCd::TimeString(ServerInstance->Time()));
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_info/cmd_version.cpp b/src/coremods/core_info/cmd_version.cpp
index 0ae3ffe8c..f9927e08b 100644
--- a/src/coremods/core_info/cmd_version.cpp
+++ b/src/coremods/core_info/cmd_version.cpp
@@ -44,5 +44,5 @@ CmdResult CommandVersion::Handle(User* user, const Params& parameters)
 	LocalUser* luser = IS_LOCAL(user);
 	if (luser)
 		isupport.SendTo(luser);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp
index cd6b6acfc..503cfe024 100644
--- a/src/coremods/core_list.cpp
+++ b/src/coremods/core_list.cpp
@@ -201,7 +201,7 @@ CmdResult CommandList::Handle(User* user, const Params& parameters)
 	}
 	user->WriteNumeric(RPL_LISTEND, "End of channel list.");
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModList
diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp
index c35d0570e..c9f2ca2e8 100644
--- a/src/coremods/core_loadmodule.cpp
+++ b/src/coremods/core_loadmodule.cpp
@@ -56,12 +56,12 @@ CmdResult CommandLoadmodule::Handle(User* user, const Params& parameters)
 	{
 		ServerInstance->SNO.WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 	else
 	{
 		user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 }
 
@@ -92,14 +92,14 @@ CmdResult CommandUnloadmodule::Handle(User* user, const Params& parameters)
 	if (InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
 	{
 		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	Module* m = ServerInstance->Modules.Find(parameters[0]);
 	if (m == creator)
 	{
 		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload module loading commands!");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (m && ServerInstance->Modules.Unload(m))
@@ -110,10 +110,10 @@ CmdResult CommandUnloadmodule::Handle(User* user, const Params& parameters)
 	else
 	{
 		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], (m ? ServerInstance->Modules.LastError() : "No such module"));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModLoadModule : public Module
diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp
index 536704ecd..557537561 100644
--- a/src/coremods/core_lusers.cpp
+++ b/src/coremods/core_lusers.cpp
@@ -111,7 +111,7 @@ CmdResult CommandLusers::Handle(User* user, const Params& parameters)
 	user->WriteNumeric(RPL_LOCALUSERS, InspIRCd::Format("Current local users: %d  Max: %d", ServerInstance->Users.LocalUserCount(), counters.max_local));
 	user->WriteNumeric(RPL_GLOBALUSERS, InspIRCd::Format("Current global users: %d  Max: %d", n_users, counters.max_global));
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class InvisibleWatcher : public ModeWatcher
diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp
index 010cf4eae..668fb2a57 100644
--- a/src/coremods/core_message.cpp
+++ b/src/coremods/core_message.cpp
@@ -133,7 +133,7 @@ namespace
 
 		// Inform modules that a message was sent.
 		FOREACH_MOD(OnUserPostMessage, (source, msgtarget, msgdetails));
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 }
 
@@ -149,7 +149,7 @@ class CommandMessage : public Command
 		{
 			// The target channel does not exist.
 			source->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Fire the pre-message events.
@@ -157,7 +157,7 @@ class CommandMessage : public Command
 		MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags());
 		msgdetails.exemptions.insert(source);
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// Send the message to the members of the channel.
 		ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, source, chan, msgdetails.text, msgdetails.type, msgtarget.status);
@@ -176,7 +176,7 @@ class CommandMessage : public Command
 		if (!source->HasPrivPermission("users/mass-message"))
 		{
 			source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Extract the server glob match from the target parameter.
@@ -186,7 +186,7 @@ class CommandMessage : public Command
 		MessageTarget msgtarget(&servername);
 		MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags());
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// If the current server name matches the server name glob then send
 		// the message out to the local users.
@@ -247,14 +247,14 @@ class CommandMessage : public Command
 		{
 			// The target user does not exist or is not fully registered.
 			source->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Fire the pre-message events.
 		MessageTarget msgtarget(target);
 		MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags());
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// If the target is away then inform the user.
 		if (target->IsAway() && msgdetails.type == MSG_PRIVMSG)
@@ -290,13 +290,13 @@ class CommandMessage : public Command
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		// The specified message was empty.
 		if (parameters[1].empty())
 		{
 			user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// The target is a server glob.
@@ -342,7 +342,7 @@ class CommandSQuery : public SplitCommand
 		if (parameters[1].empty())
 		{
 			user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// The target can be either a nick or a nick@server mask.
@@ -365,14 +365,14 @@ class CommandSQuery : public SplitCommand
 		{
 			// The target user does not exist, is not fully registered, or is not a service.
 			user->WriteNumeric(ERR_NOSUCHSERVICE, parameters[0], "No such service");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Fire the pre-message events.
 		MessageTarget msgtarget(target);
 		MessageDetailsImpl msgdetails(MSG_PRIVMSG, parameters[1], parameters.GetTags());
 		if (!FirePreEvents(user, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// The SQUERY command targets a service on a U-lined server. This can never
 		// be on the server local to the source so we don't need to do any routing
diff --git a/src/coremods/core_mode.cpp b/src/coremods/core_mode.cpp
index 1377651ba..67191f5d3 100644
--- a/src/coremods/core_mode.cpp
+++ b/src/coremods/core_mode.cpp
@@ -101,12 +101,12 @@ CmdResult CommandMode::Handle(User* user, const Params& parameters)
 			user->WriteNumeric(Numerics::NoSuchChannel(target));
 		else
 			user->WriteNumeric(Numerics::NoSuchNick(target));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	if (parameters.size() == 1)
 	{
 		this->DisplayCurrentModes(user, targetuser, targetchannel);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	// Populate a temporary Modes::ChangeList with the parameters
@@ -126,7 +126,7 @@ CmdResult CommandMode::Handle(User* user, const Params& parameters)
 			{
 				// Local users may only change the modes of other users if a module explicitly allows it
 				user->WriteNumeric(ERR_USERSDONTMATCH, "Can't change mode for other users");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			// This is a mode change by a local user and modules didn't explicitly allow/deny.
@@ -134,7 +134,7 @@ CmdResult CommandMode::Handle(User* user, const Params& parameters)
 			flags |= ModeParser::MODE_CHECKACCESS;
 		}
 		else if (MOD_RESULT == MOD_RES_DENY)
-			return CMD_FAILURE; // Entire mode change denied by a module
+			return CmdResult::FAILURE; // Entire mode change denied by a module
 	}
 	else
 		flags |= ModeParser::MODE_LOCALONLY;
@@ -152,7 +152,7 @@ CmdResult CommandMode::Handle(User* user, const Params& parameters)
 		this->DisplayListModes(user, targetchannel, parameters[1]);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandMode::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp
index c1a103156..6ef846018 100644
--- a/src/coremods/core_oper/cmd_die.cpp
+++ b/src/coremods/core_oper/cmd_die.cpp
@@ -74,7 +74,7 @@ CmdResult CommandDie::Handle(User* user, const Params& parameters)
 	{
 		ServerInstance->Logs.Log(MODNAME, LOG_SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str());
 		ServerInstance->SNO.WriteGlobalSno('a', "Failed DIE command from %s.", user->GetFullRealHost().c_str());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index 2c0d42a4d..1c925870b 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -62,14 +62,14 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 	{
 		// If we got a colon delimited list of nicks then the handler ran for each nick,
 		// and KILL commands were broadcast for remote targets.
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	User* target = ServerInstance->Users.Find(parameters[0]);
 	if (!target)
 	{
 		user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	/*
@@ -90,7 +90,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 		FIRST_MOD_RESULT(OnKill, MOD_RESULT, (user, target, parameters[1]));
 
 		if (MOD_RESULT == MOD_RES_DENY)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		killreason = "Killed (";
 		if (!hidenick.empty())
@@ -137,7 +137,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters)
 	// send the quit out
 	ServerInstance->Users.QuitUser(target, killreason);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandKill::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_oper/cmd_oper.cpp b/src/coremods/core_oper/cmd_oper.cpp
index 7eb0084cc..ff0bd89a9 100644
--- a/src/coremods/core_oper/cmd_oper.cpp
+++ b/src/coremods/core_oper/cmd_oper.cpp
@@ -55,7 +55,7 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 		if (match_pass && match_hosts)
 		{
 			user->Oper(ifo);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 	}
 
@@ -73,5 +73,5 @@ CmdResult CommandOper::HandleLocal(LocalUser* user, const Params& parameters)
 	user->CommandFloodPenalty += 10000;
 
 	ServerInstance->SNO.WriteGlobalSno('o', "WARNING! Failed oper attempt by %s using login '%s': The following fields do not match: %s", user->GetFullRealHost().c_str(), parameters[0].c_str(), fields.c_str());
-	return CMD_FAILURE;
+	return CmdResult::FAILURE;
 }
diff --git a/src/coremods/core_oper/cmd_rehash.cpp b/src/coremods/core_oper/cmd_rehash.cpp
index a0736936d..f346f5ee1 100644
--- a/src/coremods/core_oper/cmd_rehash.cpp
+++ b/src/coremods/core_oper/cmd_rehash.cpp
@@ -52,7 +52,7 @@ CmdResult CommandRehash::Handle(User* user, const Params& parameters)
 		if (!InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0]))
 		{
 			// Doesn't match us. PreRehash is already done, nothing left to do
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 	}
 	else
@@ -64,7 +64,7 @@ CmdResult CommandRehash::Handle(User* user, const Params& parameters)
 			param.erase(param.begin());
 
 		FOREACH_MOD(OnModuleRehash, (user, param));
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	// Rehash for me. Try to start the rehash thread
@@ -90,5 +90,5 @@ CmdResult CommandRehash::Handle(User* user, const Params& parameters)
 	}
 
 	// Always return success so spanningtree forwards an incoming REHASH even if we failed
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp
index 6f35093ed..6bebe1d11 100644
--- a/src/coremods/core_oper/cmd_restart.cpp
+++ b/src/coremods/core_oper/cmd_restart.cpp
@@ -67,5 +67,5 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters)
 	{
 		ServerInstance->SNO.WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str());
 	}
-	return CMD_FAILURE;
+	return CmdResult::FAILURE;
 }
diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 2814ccff4..58237a1a1 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -748,21 +748,21 @@ CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
 	if (m == creator)
 	{
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (creator->dying)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	if ((m) && (ServerInstance->Modules.CanUnload(m)))
 	{
 		ServerInstance->AtomicActions.AddAction(new ReloadAction(m, user->uuid, parameters[0]));
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 	else
 	{
 		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 }
 
diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index fa51f39d7..4807132fd 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -391,7 +391,7 @@ CmdResult CommandStats::Handle(User* user, const Params& parameters)
 		LocalUser* localuser = IS_LOCAL(user);
 		if ((localuser) && (!user->IsOper()))
 			localuser->CommandFloodPenalty += 2000;
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 	Stats::Context stats(user, parameters[0][0]);
 	DoStats(stats);
@@ -402,7 +402,7 @@ CmdResult CommandStats::Handle(User* user, const Params& parameters)
 		user->WriteRemoteNumeric(row);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModStats : public Module
diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp
index 8fca22ac5..68aa887b6 100644
--- a/src/coremods/core_stub.cpp
+++ b/src/coremods/core_stub.cpp
@@ -54,7 +54,7 @@ class CommandConnect : public Command
 		 * This is handled by the server linking module, if necessary. Do not remove this stub.
 		 */
 		user->WriteNotice("Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -79,7 +79,7 @@ class CommandLinks : public Command
 	{
 		user->WriteNumeric(RPL_LINKS, ServerInstance->Config->ServerName, ServerInstance->Config->ServerName, InspIRCd::Format("0 %s", ServerInstance->Config->ServerDesc.c_str()));
 		user->WriteNumeric(RPL_ENDOFLINKS, '*', "End of /LINKS list.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -111,7 +111,7 @@ class CommandServer : public Command
 		{
 			user->WriteNumeric(ERR_NOTREGISTERED, "SERVER", "You may not register as a server (servers have separate ports from clients, change your config)");
 		}
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
@@ -137,7 +137,7 @@ class CommandSquit : public Command
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		user->WriteNotice("Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
@@ -153,7 +153,7 @@ class CommandSummon
 	CmdResult HandleLocal(LocalUser* user, const Params& parameters) override
 	{
 		user->WriteNumeric(ERR_SUMMONDISABLED, "SUMMON has been disabled");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -169,7 +169,7 @@ class CommandUsers
 	CmdResult HandleLocal(LocalUser* user, const Params& parameters) override
 	{
 		user->WriteNumeric(ERR_USERSDISABLED, "USERS has been disabled");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/coremods/core_user/cmd_away.cpp b/src/coremods/core_user/cmd_away.cpp
index b1f9768c7..6c3d773aa 100644
--- a/src/coremods/core_user/cmd_away.cpp
+++ b/src/coremods/core_user/cmd_away.cpp
@@ -56,7 +56,7 @@ CmdResult CommandAway::Handle(User* user, const Params& parameters)
 		{
 			FIRST_MOD_RESULT_CUSTOM(awayevprov, Away::EventListener, OnUserPreAway, MOD_RESULT, (luser, message));
 			if (MOD_RESULT == MOD_RES_DENY)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 		}
 
 		user->awaytime = ServerInstance->Time();
@@ -70,7 +70,7 @@ CmdResult CommandAway::Handle(User* user, const Params& parameters)
 		{
 			FIRST_MOD_RESULT_CUSTOM(awayevprov, Away::EventListener, OnUserPreBack, MOD_RESULT, (luser));
 			if (MOD_RESULT == MOD_RES_DENY)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 		}
 
 		user->awaytime = 0;
@@ -79,7 +79,7 @@ CmdResult CommandAway::Handle(User* user, const Params& parameters)
 		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (user));
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandAway::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_user/cmd_ison.cpp b/src/coremods/core_user/cmd_ison.cpp
index 116e08f7e..fc1e10ae0 100644
--- a/src/coremods/core_user/cmd_ison.cpp
+++ b/src/coremods/core_user/cmd_ison.cpp
@@ -59,5 +59,5 @@ CmdResult CommandIson::HandleLocal(LocalUser* user, const Params& parameters)
 		reply.AddNick(token);
 
 	reply.Flush();
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp
index 01b36c316..ac0f63b2c 100644
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -53,7 +53,7 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 	if (newnick.empty())
 	{
 		user->WriteNumeric(ERR_NONICKNAMEGIVEN, "No nickname given");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (newnick == "0")
@@ -63,7 +63,7 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 	else if (!ServerInstance->IsNick(newnick))
 	{
 		user->WriteNumeric(ERR_ERRONEUSNICKNAME, newnick, "Erroneous Nickname");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	ModResult MOD_RESULT;
@@ -71,7 +71,7 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 
 	// If a module denied the change, abort now
 	if (MOD_RESULT == MOD_RES_DENY)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// Disallow the nick change if <security:restrictbannedusers> is on and there is a ban matching this user in
 	// one of the channels they are on
@@ -85,13 +85,13 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 				if (ServerInstance->Config->RestrictBannedUsers == ServerConfig::BUT_RESTRICT_NOTIFY)
 					user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Cannot change nickname while on %s (you're banned)",
 						chan->name.c_str()));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 	}
 
 	if (!user->ChangeNick(newnick))
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	if (user->registered < REG_NICKUSER)
 	{
@@ -99,5 +99,5 @@ CmdResult CommandNick::HandleLocal(LocalUser* user, const Params& parameters)
 		return CommandUser::CheckRegister(user);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp
index f01af8ad2..09cd6c0a3 100644
--- a/src/coremods/core_user/cmd_part.cpp
+++ b/src/coremods/core_user/cmd_part.cpp
@@ -47,23 +47,23 @@ CmdResult CommandPart::Handle(User* user, const Params& parameters)
 	}
 
 	if (CommandParser::LoopCall(user, this, parameters, 0))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	Channel* c = ServerInstance->FindChan(parameters[0]);
 
 	if (!c)
 	{
 		user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (!c->PartUser(user, reason))
 	{
 		user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandPart::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_user/cmd_quit.cpp b/src/coremods/core_user/cmd_quit.cpp
index ce5295d5f..80394e7dc 100644
--- a/src/coremods/core_user/cmd_quit.cpp
+++ b/src/coremods/core_user/cmd_quit.cpp
@@ -47,7 +47,7 @@ CmdResult CommandQuit::Handle(User* user, const Params& parameters)
 	std::string* operquitmsg = operquit.get(user);
 	ServerInstance->Users.QuitUser(user, quitmsg, operquitmsg);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandQuit::GetRouting(User* user, const Params& parameters)
diff --git a/src/coremods/core_user/cmd_user.cpp b/src/coremods/core_user/cmd_user.cpp
index e5c289b2c..63a041cbc 100644
--- a/src/coremods/core_user/cmd_user.cpp
+++ b/src/coremods/core_user/cmd_user.cpp
@@ -50,7 +50,7 @@ CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
 		if (!ServerInstance->IsIdent(parameters[0]))
 		{
 			user->WriteNumeric(ERR_INVALIDUSERNAME, name, "Your username is not valid");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		else
 		{
@@ -63,7 +63,7 @@ CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
 	{
 		user->WriteNumeric(ERR_ALREADYREGISTERED, "You may not reregister");
 		user->CommandFloodPenalty += 1000;
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	/* parameters 2 and 3 are local and remote hosts, and are ignored */
@@ -72,15 +72,15 @@ CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
 
 CmdResult CommandUser::CheckRegister(LocalUser* user)
 {
-	// If the user is registered, return CMD_SUCCESS/CMD_FAILURE depending on what modules say, otherwise just
-	// return CMD_SUCCESS without doing anything, knowing the other handler will call us again
+	// If the user is registered, return CmdResult::SUCCESS/CmdResult::FAILURE depending on what modules say, otherwise just
+	// return CmdResult::SUCCESS without doing anything, knowing the other handler will call us again
 	if (user->registered == REG_NICKUSER)
 	{
 		ModResult MOD_RESULT;
 		FIRST_MOD_RESULT(OnUserRegister, MOD_RESULT, (user));
 		if (MOD_RESULT == MOD_RES_DENY)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_user/cmd_userhost.cpp b/src/coremods/core_user/cmd_userhost.cpp
index ea557f1de..6845253c1 100644
--- a/src/coremods/core_user/cmd_userhost.cpp
+++ b/src/coremods/core_user/cmd_userhost.cpp
@@ -62,5 +62,5 @@ CmdResult CommandUserhost::Handle(User* user, const Params& parameters)
 
 	user->WriteNumeric(RPL_USERHOST, retbuf);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp
index 0865a317e..02d334cd6 100644
--- a/src/coremods/core_user/core_user.cpp
+++ b/src/coremods/core_user/core_user.cpp
@@ -48,11 +48,11 @@ class CommandPass : public SplitCommand
 		{
 			user->CommandFloodPenalty += 1000;
 			user->WriteNumeric(ERR_ALREADYREGISTERED, "You may not reregister");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		user->password = parameters[0];
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -78,7 +78,7 @@ class CommandPing : public SplitCommand
 	{
 		ClientProtocol::Messages::Pong pong(parameters[0]);
 		user->Send(ServerInstance->GetRFCEvents().pong, pong);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -113,7 +113,7 @@ class CommandPong : public Command
 			else
 				localuser->lastping = 1;
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h
index 8495d7c8f..322d144d6 100644
--- a/src/coremods/core_user/core_user.h
+++ b/src/coremods/core_user/core_user.h
@@ -170,7 +170,7 @@ class CommandUser : public SplitCommand
 	/** Run the OnUserRegister hook if the user has sent both NICK and USER. Called after an unregistered user
 	 * successfully executes the USER or the NICK command.
 	 * @param user User to inspect and possibly pass to the OnUserRegister hook
-	 * @return CMD_FAILURE if OnUserRegister was called and it returned MOD_RES_DENY, CMD_SUCCESS in every other case
+	 * @return CmdResult::FAILURE if OnUserRegister was called and it returned MOD_RES_DENY, CmdResult::SUCCESS in every other case
 	 * (i.e. if the hook wasn't fired because the user still needs to send NICK/USER or if it was fired and finished with
 	 * a non-MOD_RES_DENY result).
 	 */
diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp
index 09864daaf..f280fc4cf 100644
--- a/src/coremods/core_wallops.cpp
+++ b/src/coremods/core_wallops.cpp
@@ -62,7 +62,7 @@ CmdResult CommandWallops::Handle(User* user, const Params& parameters)
 	if (parameters[0].empty())
 	{
 		user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	ClientProtocol::Message msg("WALLOPS", user);
@@ -77,7 +77,7 @@ CmdResult CommandWallops::Handle(User* user, const Params& parameters)
 			curr->Send(wallopsevent);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModWallops : public Module
diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 5bfe32ea8..f0e91397b 100644
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -582,7 +582,7 @@ CmdResult CommandWho::HandleLocal(LocalUser* user, const Params& parameters)
 
 	// Penalize the source a bit for large queries with one unit of penalty per 200 results.
 	user->CommandFloodPenalty += data.results.size() * 5;
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModWho
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 7ddd7e9c1..a217df1bb 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -284,21 +284,21 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned
 CmdResult CommandWhois::HandleRemote(RemoteUser* target, const Params& parameters)
 {
 	if (parameters.size() < 2)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	User* user = ServerInstance->Users.FindUUID(parameters[0]);
 	if (!user)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// User doing the whois must be on this server
 	LocalUser* localuser = IS_LOCAL(user);
 	if (!localuser)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	unsigned long idle = ConvToNum<unsigned long>(parameters.back());
 	DoWhois(localuser, target, target->signon, idle);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
@@ -309,7 +309,7 @@ CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
 	time_t signon = 0;
 
 	if (CommandParser::LoopCall(user, this, parameters, 0))
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	/*
 	 * If 2 parameters are specified (/whois nick nick), ignore the first one like spanningtree
@@ -344,10 +344,10 @@ CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
 		/* no such nick/channel */
 		user->WriteNumeric(Numerics::NoSuchNick(!parameters[userindex].empty() ? parameters[userindex] : "*"));
 		user->WriteNumeric(RPL_ENDOFWHOIS, (!parameters[userindex].empty() ? parameters[userindex] : "*"), "End of /WHOIS list.");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 class CoreModWhois : public Module
diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp
index 63f37fa88..0331e4db6 100644
--- a/src/coremods/core_whowas.cpp
+++ b/src/coremods/core_whowas.cpp
@@ -193,7 +193,7 @@ CmdResult CommandWhowas::Handle(User* user, const Params& parameters)
 	if (!manager.IsEnabled())
 	{
 		user->WriteNumeric(ERR_UNKNOWNCOMMAND, name, "This command has been disabled.");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	const WhoWas::Nick* const nick = manager.FindNick(parameters[0]);
@@ -220,7 +220,7 @@ CmdResult CommandWhowas::Handle(User* user, const Params& parameters)
 	}
 
 	user->WriteNumeric(RPL_ENDOFWHOWAS, parameters[0], "End of WHOWAS");
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 const WhoWas::Nick* WhoWas::Manager::FindNick(const std::string& nickname) const
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp
index f08251e58..8b0139798 100644
--- a/src/coremods/core_xline/cmd_eline.cpp
+++ b/src/coremods/core_xline/cmd_eline.cpp
@@ -58,18 +58,18 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 		if (ih.first.empty())
 		{
 			user->WriteNotice("*** Target not found.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		InsaneBan::IPHostMatcher matcher;
 		if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "E", "hostmasks"))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		unsigned long duration;
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("*** Invalid duration for E-line.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(el, user))
@@ -105,5 +105,5 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters)
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp
index b0a2ff44c..40c318f9f 100644
--- a/src/coremods/core_xline/cmd_gline.cpp
+++ b/src/coremods/core_xline/cmd_gline.cpp
@@ -59,24 +59,24 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
 		if (ih.first.empty())
 		{
 			user->WriteNotice("*** Target not found.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		InsaneBan::IPHostMatcher matcher;
 		if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "G", "hostmasks"))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		else if (target.find('!') != std::string::npos)
 		{
 			user->WriteNotice("*** G-line cannot operate on nick!user@host masks.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		unsigned long duration;
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("*** Invalid duration for G-line.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(gl, user))
@@ -115,5 +115,5 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters)
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp
index 483a3c917..87ea4aa9b 100644
--- a/src/coremods/core_xline/cmd_kline.cpp
+++ b/src/coremods/core_xline/cmd_kline.cpp
@@ -59,24 +59,24 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
 		if (ih.first.empty())
 		{
 			user->WriteNotice("*** Target not found.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		InsaneBan::IPHostMatcher matcher;
 		if (InsaneBan::MatchesEveryone(ih.first+"@"+ih.second, matcher, user, "K", "hostmasks"))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		if (target.find('!') != std::string::npos)
 		{
 			user->WriteNotice("*** K-line cannot operate on nick!user@host masks.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		unsigned long duration;
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("*** Invalid duration for K-line.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str());
 		if (ServerInstance->XLines->AddLine(kl,user))
@@ -114,5 +114,5 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters)
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp
index fddb71cdb..ffb65ea59 100644
--- a/src/coremods/core_xline/cmd_qline.cpp
+++ b/src/coremods/core_xline/cmd_qline.cpp
@@ -44,19 +44,19 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
 	{
 		NickMatcher matcher;
 		if (InsaneBan::MatchesEveryone(parameters[0], matcher, user, "Q", "nickmasks"))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		if (parameters[0].find('@') != std::string::npos || parameters[0].find('!') != std::string::npos || parameters[0].find('.') != std::string::npos)
 		{
 			user->WriteNotice("*** A Q-line only bans a nick pattern, not a nick!user@host pattern.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		unsigned long duration;
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("*** Invalid duration for Q-line.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		QLine* ql = new QLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 		if (ServerInstance->XLines->AddLine(ql,user))
@@ -90,11 +90,11 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters)
 		else
 		{
 			user->WriteNotice("*** Q-line " + parameters[0] + " not found on the list.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 bool CommandQline::NickMatcher::Check(User* user, const std::string& nick) const
diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index 0e4a1c0d3..eb9cdf71d 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -47,7 +47,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 		if (target.find('!') != std::string::npos)
 		{
 			user->WriteNotice("*** You cannot include a nickname in a Z-line, a Z-line must ban only an IP mask.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		User *u = ServerInstance->Users.Find(target);
@@ -68,13 +68,13 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 
 		IPMatcher matcher;
 		if (InsaneBan::MatchesEveryone(ipaddr, matcher, user, "Z", "ipmasks"))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		unsigned long duration;
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("*** Invalid duration for Z-line.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr);
 		if (ServerInstance->XLines->AddLine(zl,user))
@@ -108,11 +108,11 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 		else
 		{
 			user->WriteNotice("*** Z-line " + target + " not found on the list.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 bool CommandZline::IPMatcher::Check(User* user, const std::string& ip) const
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 0755b1505..736778de8 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -42,7 +42,7 @@ class CommandAlltime : public Command
 		user->WriteRemoteNotice(msg);
 
 		/* we want this routed out! */
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 2b954a0e3..14b017f0b 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -209,7 +209,7 @@ public:
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		/* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can
 		 * have a list already setup. */
@@ -217,7 +217,7 @@ public:
 		if (parameters[0] == "*")
 		{
 			ListAccept(user);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
 		std::string tok = parameters[0];
@@ -225,18 +225,18 @@ public:
 		if (!action.first)
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(tok));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if ((!IS_LOCAL(user)) && (!IS_LOCAL(action.first)))
 			// Neither source nor target is local, forward the command to the server of target
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		// The second item in the pair is true if the first char is a '+' (or nothing), false if it's a '-'
 		if (action.second)
-			return (AddAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
+			return (AddAccept(user, action.first) ? CmdResult::SUCCESS : CmdResult::FAILURE);
 		else
-			return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
+			return (RemoveAccept(user, action.first) ? CmdResult::SUCCESS : CmdResult::FAILURE);
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 5fb9a8b1a..a7f914d5c 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -426,7 +426,7 @@ class CommandCap : public SplitCommand
 		if (irc::equals(subcommand, "REQ"))
 		{
 			if (parameters.size() < 2)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 
 			const std::string replysubcmd = (manager.HandleReq(user, parameters[1]) ? "ACK" : "NAK");
 			DisplaySingleResult(user, replysubcmd, parameters[1], false);
@@ -463,10 +463,10 @@ class CommandCap : public SplitCommand
 		else
 		{
 			user->WriteNumeric(ERR_INVALIDCAPCMD, subcommand.empty() ? "*" : subcommand, "Invalid CAP subcommand");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 3759d4278..dd8f0a52a 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -114,7 +114,7 @@ class CommandCBan : public Command
 			else
 			{
 				user->WriteNotice("*** CBan " + parameters[0] + " not found on the list.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 		else
@@ -124,7 +124,7 @@ class CommandCBan : public Command
 			if (!InspIRCd::Duration(parameters[1], duration))
 			{
 				user->WriteNotice("*** Invalid duration for CBan.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 			const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
 			CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
@@ -146,10 +146,10 @@ class CommandCBan : public Command
 			{
 				delete r;
 				user->WriteNotice("*** CBan for " + parameters[0] + " already exists");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 8dc504ad0..b4aed47ee 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -143,7 +143,7 @@ class CommandWebIRC : public SplitCommand
 	CmdResult HandleLocal(LocalUser* user, const Params& parameters) override
 	{
 		if (user->registered == REG_ALL || realhost.get(user))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		for (std::vector<WebIRCHost>::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter)
 		{
@@ -157,7 +157,7 @@ class CommandWebIRC : public SplitCommand
 				WriteLog("Connecting user %s (%s) tried to use WEBIRC but gave an invalid IP address.",
 					user->uuid.c_str(), user->GetIPString().c_str());
 				ServerInstance->Users.QuitUser(user, "WEBIRC: IP address is invalid: " + parameters[3]);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			// The user matched a WebIRC block!
@@ -198,13 +198,13 @@ class CommandWebIRC : public SplitCommand
 			// Set the IP address sent via WEBIRC. We ignore the hostname and lookup
 			// instead do our own DNS lookups because of unreliable gateways.
 			user->SetClientIP(ipaddr);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
 		WriteLog("Connecting user %s (%s) tried to use WEBIRC but didn't match any configured WebIRC hosts.",
 			user->uuid.c_str(), user->GetIPString().c_str());
 		ServerInstance->Users.QuitUser(user, "WEBIRC: you don't match any configured WebIRC hosts.");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	void WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3)
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 809b4b465..b3869864c 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -157,7 +157,7 @@ class CommandCheck : public Command
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		User *targuser;
 		Channel *targchan;
@@ -306,7 +306,7 @@ class CommandCheck : public Command
 		}
 
 		// END is sent by the CheckContext destructor
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 51f3b76a4..d7333cad0 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -46,7 +46,7 @@ class CommandChghost : public Command
 		if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost)
 		{
 			user->WriteNotice("*** CHGHOST: Host too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++)
@@ -54,7 +54,7 @@ class CommandChghost : public Command
 			if (!hostmap.test(static_cast<unsigned char>(*x)))
 			{
 				user->WriteNotice("*** CHGHOST: Invalid characters in hostname");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
@@ -64,7 +64,7 @@ class CommandChghost : public Command
 		if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine())))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (IS_LOCAL(dest))
@@ -76,7 +76,7 @@ class CommandChghost : public Command
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 3650a2a72..d05892569 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -47,19 +47,19 @@ class CommandChgident : public Command
 		if ((!dest) || (dest->registered != REG_ALL))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (parameters[1].length() > ServerInstance->Config->Limits.IdentMax)
 		{
 			user->WriteNotice("*** CHGIDENT: Ident is too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!ServerInstance->IsIdent(parameters[1]))
 		{
 			user->WriteNotice("*** CHGIDENT: Invalid characters in ident");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (IS_LOCAL(dest))
@@ -70,7 +70,7 @@ class CommandChgident : public Command
 				ServerInstance->SNO.WriteGlobalSno('a', "%s used CHGIDENT to change %s's ident to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->ident.c_str());
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 1eee9888c..9568abc4c 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -46,19 +46,19 @@ class CommandChgname : public Command
 		if ((!dest) || (dest->registered != REG_ALL))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (parameters[1].empty())
 		{
 			user->WriteNotice("*** CHGNAME: Real name must be specified");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (parameters[1].length() > ServerInstance->Config->Limits.MaxReal)
 		{
 			user->WriteNotice("*** CHGNAME: Real name is too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (IS_LOCAL(dest))
@@ -67,7 +67,7 @@ class CommandChgname : public Command
 			ServerInstance->SNO.WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->GetRealName().c_str());
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 6fad233b8..5562b3ee7 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -43,7 +43,7 @@ class CommandClearChan : public Command
 		if (!chan)
 		{
 			user->WriteNotice("The channel " + parameters[0] + " does not exist.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// See what method the oper wants to use, default to KILL
@@ -61,12 +61,12 @@ class CommandClearChan : public Command
 			if ((method != "Z") && (method != "G"))
 			{
 				user->WriteNotice("Invalid method for clearing " + chan->name);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			xlf = ServerInstance->XLines->GetFactory(method);
 			if (!xlf)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 		}
 
 		const std::string reason = parameters.size() > 2 ? parameters.back() : "Clearing " + chan->name;
@@ -138,7 +138,7 @@ class CommandClearChan : public Command
 		if (xlf)
 			ServerInstance->XLines->ApplyLines();
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index ce981bfe3..5b8f8e6d4 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -527,7 +527,7 @@ CmdResult CommandCloak::Handle(User* user, const Params& parameters)
 		const std::string cloak = mod->GenCloak(*iter, sa, ipaddr, parameters[0]);
 		user->WriteNotice(InspIRCd::Format("*** Cloak #%u for %s is %s", ++id, parameters[0].c_str(), cloak.c_str()));
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 MODULE_INIT(ModuleCloaking)
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 8798256bd..89ada61aa 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -83,7 +83,7 @@ class CommandClones : public SplitCommand
 		if (batchmanager)
 			batchmanager->End(batch);
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index bca9aea98..b51d71c6e 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -101,12 +101,12 @@ class CommandTitle : public Command
 
 				user->WriteNotice("Custom title set to '" + config.title + "'");
 
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 		}
 
 		user->WriteNotice("Invalid title credentials");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 };
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index bfc9ffc76..05ca78436 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -54,7 +54,7 @@ class CommandCycle : public SplitCommand
 		if (!channel)
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (channel->HasUser(user))
@@ -63,20 +63,20 @@ class CommandCycle : public SplitCommand
 			{
 				// User is banned, send an error and don't cycle them
 				user->WriteNotice("*** You may not cycle, as you are banned on channel " + channel->name);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			channel->PartUser(user, reason);
 			Channel::JoinUser(user, parameters[0], true);
 
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNumeric(ERR_NOTONCHANNEL, channel->name, "You're not on that channel");
 		}
 
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 2cde67133..8198d712b 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -199,7 +199,7 @@ class CommandDccallow : public Command
 		{
 			// display current DCCALLOW list
 			DisplayDCCAllowList(user);
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		else if (parameters.size() > 0)
 		{
@@ -212,18 +212,18 @@ class CommandDccallow : public Command
 				{
 					// list current DCCALLOW list
 					DisplayDCCAllowList(user);
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 				else if (irc::equals(parameters[0], "HELP"))
 				{
 					// display help
 					DisplayHelp(user);
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 				else
 				{
 					user->WriteNumeric(ERR_UNKNOWNDCCALLOWCMD, "DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP");
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 			}
 
@@ -256,7 +256,7 @@ class CommandDccallow : public Command
 					if (target == user)
 					{
 						user->WriteNumeric(ERR_DCCALLOWINVALID, user->nick, "You cannot add yourself to your own DCCALLOW list!");
-						return CMD_FAILURE;
+						return CmdResult::FAILURE;
 					}
 
 					dl = ext.get(user);
@@ -271,7 +271,7 @@ class CommandDccallow : public Command
 					if (dl->size() >= ext.maxentries)
 					{
 						user->WriteNumeric(ERR_DCCALLOWINVALID, user->nick, "Too many nicks on DCCALLOW list");
-						return CMD_FAILURE;
+						return CmdResult::FAILURE;
 					}
 
 					for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k)
@@ -279,7 +279,7 @@ class CommandDccallow : public Command
 						if (k->nickname == target->nick)
 						{
 							user->WriteNumeric(ERR_DCCALLOWINVALID, user->nick, InspIRCd::Format("%s is already on your DCCALLOW list", target->nick.c_str()));
-							return CMD_FAILURE;
+							return CmdResult::FAILURE;
 						}
 					}
 
@@ -292,20 +292,20 @@ class CommandDccallow : public Command
 					else if (!InspIRCd::IsValidDuration(parameters[1]))
 					{
 						user->WriteNumeric(ERR_DCCALLOWINVALID, user->nick, InspIRCd::Format("%s is not a valid DCCALLOW duration", parameters[1].c_str()));
-						return CMD_FAILURE;
+						return CmdResult::FAILURE;
 					}
 					else
 					{
 						if (!InspIRCd::Duration(parameters[1], length))
 						{
 							user->WriteNotice("*** Invalid duration for DCC allow");
-							return CMD_FAILURE;
+							return CmdResult::FAILURE;
 						}
 					}
 
 					if (!InspIRCd::IsValidMask(mask))
 					{
-						return CMD_FAILURE;
+						return CmdResult::FAILURE;
 					}
 
 					dl->push_back(DCCAllow(target->nick, mask, ServerInstance->Time(), length));
@@ -320,17 +320,17 @@ class CommandDccallow : public Command
 					}
 
 					/* route it. */
-					return CMD_SUCCESS;
+					return CmdResult::SUCCESS;
 				}
 			}
 			else
 			{
 				// nick doesn't exist
 				user->WriteNumeric(Numerics::NoSuchNick(nick));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 34b73508e..9e2aae709 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -245,12 +245,12 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters)
 			user->WriteNotice("*** Removed filter '" + parameters[0] + "': " + reason);
 			ServerInstance->SNO.WriteToSnoMask(IS_LOCAL(user) ? 'f' : 'F', "%s removed filter '%s': %s",
 				user->nick.c_str(), parameters[0].c_str(), reason.c_str());
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNotice("*** Filter '" + parameters[0] + "' not found on the list.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 	else
@@ -270,7 +270,7 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters)
 					user->WriteNotice("*** Invalid filter type '" + parameters[1] + "'. Supported types are 'gline', 'zline', 'none', 'warn', 'block', 'silent', 'kill', and 'shun'.");
 				else
 					user->WriteNotice("*** Invalid filter type '" + parameters[1] + "'. Supported types are 'gline', 'zline', 'none', 'warn', 'block', 'silent', and 'kill'.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (type == FA_GLINE || type == FA_ZLINE || type == FA_SHUN)
@@ -280,14 +280,14 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters)
 					if (!InspIRCd::Duration(parameters[3], duration))
 					{
 						user->WriteNotice("*** Invalid duration for filter");
-						return CMD_FAILURE;
+						return CmdResult::FAILURE;
 					}
 					reasonindex = 4;
 				}
 				else
 				{
 					user->WriteNotice("*** Not enough parameters: When setting a '" + parameters[1] + "' type filter, a duration must be specified as the third parameter.");
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 			}
 			else
@@ -309,18 +309,18 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters)
 				ServerInstance->SNO.WriteToSnoMask(IS_LOCAL(user) ? 'f' : 'F',
 					"%s added filter %s", user->nick.c_str(), message.c_str());
 
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 			else
 			{
 				user->WriteNotice("*** Filter '" + freeform + "' could not be added: " + result.second);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 		else
 		{
 			user->WriteNotice("*** Not enough parameters.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 	}
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index fc814635c..e105bc5d6 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -56,7 +56,7 @@ class CommandGloadmodule : public Command
 		else
 			ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str());
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
@@ -81,7 +81,7 @@ class CommandGunloadmodule : public Command
 		if (InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
 		{
 			user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		std::string servername = parameters.size() > 1 ? parameters[1] : "*";
@@ -107,7 +107,7 @@ class CommandGunloadmodule : public Command
 		else
 			ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
@@ -142,13 +142,13 @@ class CommandGreloadmodule : public Command
 			else
 			{
 				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 		else
 			ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index c45259779..b0b4e1b2d 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -44,11 +44,11 @@ class CommandGlobops : public Command
 		if (parameters[0].empty())
 		{
 			user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		ServerInstance->SNO.WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 9575079f3..a9b732145 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -81,7 +81,7 @@ class CommandHelpop : public Command
 		if (titer == help.end())
 		{
 			user->WriteNumeric(ERR_HELPNOTFOUND, topic, nohelp);
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		const HelpTopic& entry = titer->second;
@@ -89,7 +89,7 @@ class CommandHelpop : public Command
 		for (HelpMessage::const_iterator liter = entry.body.begin(); liter != entry.body.end(); ++liter)
 			user->WriteNumeric(RPL_HELPTXT, topic, *liter);
 		user->WriteNumeric(RPL_ENDOFHELP, topic, "End of /HELPOP.");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 63c4c7f2e..2648207eb 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -63,7 +63,7 @@ class CommandTagMsg : public Command
 
 		// Inform modules that a TAGMSG was sent.
 		FOREACH_MOD_CUSTOM(tagevprov, CTCTags::EventListener, OnUserPostTagMessage, (source, msgtarget, msgdetails));
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	CmdResult HandleChannelTarget(User* source, const Params& parameters, const char* target, PrefixMode* pm)
@@ -73,14 +73,14 @@ class CommandTagMsg : public Command
 		{
 			// The target channel does not exist.
 			source->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Fire the pre-message events.
 		MessageTarget msgtarget(chan, pm ? pm->GetPrefix() : 0);
 		CTCTags::TagMessageDetails msgdetails(parameters.GetTags());
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		unsigned int minrank = pm ? pm->GetPrefixRank() : 0;
 		CTCTags::TagMessage message(source, chan, msgdetails.tags_out, msgtarget.status);
@@ -112,7 +112,7 @@ class CommandTagMsg : public Command
 		if (!source->HasPrivPermission("users/mass-message"))
 		{
 			source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Extract the server glob match from the target parameter.
@@ -122,7 +122,7 @@ class CommandTagMsg : public Command
 		MessageTarget msgtarget(&servername);
 		CTCTags::TagMessageDetails msgdetails(parameters.GetTags());
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// If the current server name matches the server name glob then send
 		// the message out to the local users.
@@ -183,14 +183,14 @@ class CommandTagMsg : public Command
 		{
 			// The target user does not exist or is not fully registered.
 			source->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// Fire the pre-message events.
 		MessageTarget msgtarget(target);
 		CTCTags::TagMessageDetails msgdetails(parameters.GetTags());
 		if (!FirePreEvents(source, msgtarget, msgdetails))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		LocalUser* const localtarget = IS_LOCAL(target);
 		if (localtarget && cap.IsEnabled(localtarget))
@@ -218,17 +218,17 @@ class CommandTagMsg : public Command
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0))
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 
 		// Check that the source has the message tags capability.
 		if (IS_LOCAL(user) && !cap.IsEnabled(user))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// The specified message tags were empty.
 		if (parameters.GetTags().empty())
 		{
 			user->WriteNumeric(ERR_NOTEXTTOSEND, "No tags to send");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		// The target is a server glob.
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 1b14ff745..c23188fce 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -77,25 +77,25 @@ class CommandKnock : public Command
 		if (!c)
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (c->HasUser(user))
 		{
 			user->WriteNumeric(ERR_KNOCKONCHAN, c->name, InspIRCd::Format("Can't KNOCK on %s, you are already on that channel.", c->name.c_str()));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (c->IsModeSet(noknockmode))
 		{
 			user->WriteNumeric(ERR_CANNOTKNOCK, InspIRCd::Format("Can't KNOCK on %s, +K is set.", c->name.c_str()));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!c->IsModeSet(inviteonlymode))
 		{
 			user->WriteNumeric(ERR_CHANOPEN, c->name, InspIRCd::Format("Can't KNOCK on %s, channel is not invite only so knocking is pointless!", c->name.c_str()));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (notify & KN_SEND_NOTICE)
@@ -115,7 +115,7 @@ class CommandKnock : public Command
 			user->WriteNumeric(RPL_KNOCKDLVR, c->name, "KNOCKing on channel");
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 6a80bcab9..20a927bf6 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -52,13 +52,13 @@ class CommandLockserv : public Command
 		if (!locked.empty())
 		{
 			user->WriteNotice("The server is already locked.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		locked = parameters.empty() ? "Server is temporarily closed. Please try again later." : parameters[0];
 		user->WriteNumeric(RPL_SERVLOCKON, user->server->GetName(), "Closed for new connections");
 		ServerInstance->SNO.WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str());
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
@@ -77,13 +77,13 @@ class CommandUnlockserv : public Command
 		if (locked.empty())
 		{
 			user->WriteNotice("The server isn't locked.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		locked.clear();
 		user->WriteNumeric(RPL_SERVLOCKOFF, user->server->GetName(), "Open for new connections");
 		ServerInstance->SNO.WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str());
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index 2fec3fd28..520b3c3b5 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -364,9 +364,9 @@ class CommandMonitor : public SplitCommand
 			offline.Flush();
 		}
 		else
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index cd5797ed6..0f50a1ac5 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -71,13 +71,13 @@ class CommandProp : public SplitCommand
 		if (!chan)
 		{
 			src->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (parameters.size() == 1)
 		{
 			DisplayList(src, chan);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		unsigned int i = 1;
 		Modes::ChangeList modes;
@@ -103,7 +103,7 @@ class CommandProp : public SplitCommand
 			}
 		}
 		ServerInstance->Modes.ProcessSingle(src, chan, NULL, modes, ModeParser::MODE_CHECKACCESS);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index df78c0f2b..ec59b7980 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -55,7 +55,7 @@ class CommandNicklock : public Command
 		if ((!target) || (target->registered != REG_ALL))
 		{
 			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		/* Do local sanity checks and bails */
@@ -64,7 +64,7 @@ class CommandNicklock : public Command
 			if (!ServerInstance->IsNick(parameters[1]))
 			{
 				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			user->WriteNumeric(RPL_NICKLOCKON, parameters[1], "Nickname now locked.");
@@ -85,7 +85,7 @@ class CommandNicklock : public Command
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
@@ -115,7 +115,7 @@ class CommandNickunlock : public Command
 		if (!target)
 		{
 			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (IS_LOCAL(target))
@@ -129,11 +129,11 @@ class CommandNickunlock : public Command
 			else
 			{
 				user->WriteRemoteNumeric(ERR_NICKNOTLOCKED, target->nick, "This user's nickname is not locked.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
@@ -148,7 +148,7 @@ class ModuleNickLock : public Module
 	IntExtItem locked;
 	CommandNicklock cmd1;
 	CommandNickunlock cmd2;
- 
+
  public:
 	ModuleNickLock()
 		: Module(VF_VENDOR | VF_OPTCOMMON, "Adds the /NICKLOCK command which allows server operators to change a user's nickname and prevent them from changing it again until they disconnect.")
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 33c50959d..7e9d76bca 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -50,7 +50,7 @@ class CommandOjoin : public SplitCommand
 		if (!ServerInstance->IsChannel(parameters[0]))
 		{
 			user->WriteNotice("*** Invalid characters in channel name or name too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		active = true;
@@ -69,7 +69,7 @@ class CommandOjoin : public SplitCommand
 		{
 			channel = ServerInstance->FindChan(parameters[0]);
 			if (!channel)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 
 			ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]);
 			// they're already in the channel
@@ -79,7 +79,7 @@ class CommandOjoin : public SplitCommand
 				changelist.push_add(*opmode, user->nick);
 			ServerInstance->Modes.Process(ServerInstance->FakeClient, channel, NULL, changelist);
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 98ffd78dc..85053588a 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -53,7 +53,7 @@ class CommandOpermotd : public Command
 	{
 		if ((parameters.empty()) || (irc::equals(parameters[0], ServerInstance->Config->ServerName)))
 			ShowOperMOTD(user, true);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index b125113df..aaa069fa8 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -47,13 +47,13 @@ class CommandMkpasswd : public Command
 			if (!hp)
 			{
 				user->WriteNotice("Unknown hash type");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (hp->IsKDF())
 			{
 				user->WriteNotice(type + " does not support HMAC");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			std::string salt = ServerInstance->GenRandomStr(hp->out_size, false);
@@ -61,19 +61,19 @@ class CommandMkpasswd : public Command
 			std::string str = BinToBase64(salt) + "$" + BinToBase64(target, NULL, 0);
 
 			user->WriteNotice(parameters[0] + " hashed password for " + parameters[1] + " is " + str);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
 		HashProvider* hp = ServerInstance->Modules.FindDataService<HashProvider>("hash/" + parameters[0]);
 		if (!hp)
 		{
 			user->WriteNotice("Unknown hash type");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		std::string hexsum = hp->Generate(parameters[1]);
 		user->WriteNotice(parameters[0] + " hashed password for " + parameters[1] + " is " + hexsum);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 22c2ca48e..b1ce048b6 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -84,24 +84,24 @@ class RemoveBase : public Command
 		if (!channel)
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(channame));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		if ((!target) || (target->registered != REG_ALL))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(username));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!channel->HasUser(target))
 		{
 			user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (target->server->IsULine())
 		{
 			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		/* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */
@@ -128,7 +128,7 @@ class RemoveBase : public Command
 						p.push_back(":" + parameters[2]);
 					ServerInstance->PI->SendEncapsulatedData(target->server->GetName(), "REMOVE", p, user);
 
-					return CMD_SUCCESS;
+					return CmdResult::SUCCESS;
 				}
 
 				std::string reasonparam;
@@ -150,17 +150,17 @@ class RemoveBase : public Command
 			else
 			{
 				user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 		else
 		{
 			/* m_nokicks.so was loaded and +Q was set, block! */
 			user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index eb152d7c0..4b282aa2d 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -151,7 +151,7 @@ class CommandRLine : public Command
 			if (!InspIRCd::Duration(parameters[1], duration))
 			{
 				user->WriteNotice("*** Invalid duration for R-line.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 			XLine *r = NULL;
 
@@ -202,7 +202,7 @@ class CommandRLine : public Command
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index aaf3a0a5c..593a5ca36 100644
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -43,20 +43,20 @@ class CommandRMode : public Command
 		if (chan == NULL)
 		{
 			user->WriteNotice("The channel " + parameters[0] + " does not exist.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		mh = ServerInstance->Modes.FindMode(modeletter, MODETYPE_CHANNEL);
 		if (mh == NULL || parameters[1].size() > 1)
 		{
 			user->WriteNotice(parameters[1] + " is not a valid channel mode.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (chan->GetPrefixValue(user) < mh->GetLevelRequired(false))
 		{
 			user->WriteNotice("You do not have access to unset " + ConvToStr(modeletter) + " on " +  chan->name + ".");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		std::string pattern = parameters.size() > 2 ? parameters[2] : "*";
@@ -93,7 +93,7 @@ class CommandRMode : public Command
 		}
 
 		ServerInstance->Modes.Process(user, chan, NULL, changelist);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index f79c82592..012938a47 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -44,7 +44,7 @@ class CommandSajoin : public Command
 	{
 		const unsigned int channelindex = (parameters.size() > 1) ? 1 : 0;
 		if (CommandParser::LoopCall(user, this, parameters, channelindex))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		const std::string& channel = parameters[channelindex];
 		const std::string& nickname = parameters.size() > 1 ? parameters[0] : user->nick;
@@ -55,30 +55,30 @@ class CommandSajoin : public Command
 			if (user != dest && !user->HasPrivPermission("users/sajoin-others"))
 			{
 				user->WriteNotice("*** You are not allowed to /SAJOIN other users (the privilege users/sajoin-others is needed to /SAJOIN others).");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (dest->server->IsULine())
 			{
 				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 			if (IS_LOCAL(user) && !ServerInstance->IsChannel(channel))
 			{
 				/* we didn't need to check this for each character ;) */
 				user->WriteNotice("*** Invalid characters in channel name or name too long");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			Channel* chan = ServerInstance->FindChan(channel);
 			if ((chan) && (chan->HasUser(dest)))
 			{
 				user->WriteRemoteNotice("*** " + dest->nick + " is already on " + channel);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			/* For local users, we call Channel::JoinUser which may create a channel and set its TS.
-			 * For non-local users, we just return CMD_SUCCESS, knowing this will propagate it where it needs to be
+			 * For non-local users, we just return CmdResult::SUCCESS, knowing this will propagate it where it needs to be
 			 * and then that server will handle the command.
 			 */
 			LocalUser* localuser = IS_LOCAL(dest);
@@ -88,23 +88,23 @@ class CommandSajoin : public Command
 				if (chan)
 				{
 					ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+channel);
-					return CMD_SUCCESS;
+					return CmdResult::SUCCESS;
 				}
 				else
 				{
 					user->WriteNotice("*** Could not join "+dest->nick+" to "+channel);
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 			}
 			else
 			{
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 		}
 		else
 		{
 			user->WriteNotice("*** No such nickname: '" + nickname + "'");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 0bb69c7e8..5a8675263 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -48,17 +48,17 @@ class CommandSakick : public Command
 			if (dest->server->IsULine())
 			{
 				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (!channel->HasUser(dest))
 			{
 				user->WriteNotice("*** " + dest->nick + " is not on " + channel->name);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			/* For local clients, directly kick them. For remote clients,
-			 * just return CMD_SUCCESS knowing the protocol module will route the SAKICK to the user's
+			 * just return CmdResult::SUCCESS knowing the protocol module will route the SAKICK to the user's
 			 * local server and that will kick them instead.
 			 */
 			if (IS_LOCAL(dest))
@@ -68,14 +68,14 @@ class CommandSakick : public Command
 				ServerInstance->SNO.WriteGlobalSno('a', user->nick + " SAKICKed " + dest->nick + " on " + channel->name);
 			}
 
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNotice("*** Invalid nickname or channel");
 		}
 
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 6dd793c0a..0af12e616 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -50,14 +50,14 @@ class CommandSamode : public Command
 			if ((!target) || (target->registered != REG_ALL))
 			{
 				user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			// Changing the modes of another user requires a special permission
 			if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes")))
 			{
 				user->WriteNotice("*** You are not allowed to /SAMODE other users (the privilege users/samode-usermodes is needed to /SAMODE others).");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
@@ -80,7 +80,7 @@ class CommandSamode : public Command
 			LogUsage(user, stdalgo::string::join(parameters));
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	void LogUsage(const User* user, const std::string& text)
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 571437289..5bb16d11a 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -48,19 +48,19 @@ class CommandSanick : public Command
 			if (target && target->server->IsULine())
 			{
 				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if ((!target) || (target->registered != REG_ALL))
 			{
 				user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (!ServerInstance->IsNick(parameters[1]))
 			{
 				user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
@@ -79,7 +79,7 @@ class CommandSanick : public Command
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 10c73cd6a..3b6813884 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -40,7 +40,7 @@ class CommandSapart : public Command
 	CmdResult Handle(User* user, const Params& parameters) override
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 1))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		User* dest = ServerInstance->Users.Find(parameters[0]);
 		Channel* channel = ServerInstance->FindChan(parameters[1]);
@@ -54,17 +54,17 @@ class CommandSapart : public Command
 			if (dest->server->IsULine())
 			{
 				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			if (!channel->HasUser(dest))
 			{
 				user->WriteNotice("*** " + dest->nick + " is not on " + channel->name);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			/* For local clients, directly part them generating a PART message. For remote clients,
-			 * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users
+			 * just return CmdResult::SUCCESS knowing the protocol module will route the SAPART to the users
 			 * local server and that will generate the PART instead
 			 */
 			if (IS_LOCAL(dest))
@@ -73,14 +73,14 @@ class CommandSapart : public Command
 				ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+channel->name);
 			}
 
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNotice("*** Invalid nickname or channel");
 		}
 
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index ec4a0ed5c..26f6639dd 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -47,22 +47,22 @@ class CommandSaquit : public Command
 			if (dest->server->IsULine())
 			{
 				user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			// Pass the command on, so the client's server can quit it properly.
 			if (!IS_LOCAL(dest))
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 
 			ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used SAQUIT to make "+dest->nick+" quit with a reason of "+parameters[1]);
 
 			ServerInstance->Users.QuitUser(dest, parameters[1]);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNotice("*** Invalid nickname: '" + parameters[0] + "'");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 3fdf8c24e..b174cb4f5 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -339,15 +339,15 @@ class CommandAuthenticate : public SplitCommand
 	{
 		{
 			if (!cap.IsEnabled(user))
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 
 			if (parameters[0].find(' ') != std::string::npos || parameters[0][0] == ':')
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 
 			if (parameters[0].length() > MAX_AUTHENTICATE_SIZE)
 			{
 				user->WriteNumeric(ERR_SASLTOOLONG, "SASL message too long");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			SaslAuthenticator *sasl = authExt.get(user);
@@ -359,7 +359,7 @@ class CommandAuthenticate : public SplitCommand
 				authExt.unset(user);
 			}
 		}
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
@@ -378,12 +378,12 @@ class CommandSASL : public Command
 		if (!target)
 		{
 			ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "User not found in sasl ENCAP event: %s", parameters[1].c_str());
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		SaslAuthenticator *sasl = authExt.get(target);
 		if (!sasl)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		SaslState state = sasl->ProcessInboundMessage(parameters);
 		if (state == SASL_DONE)
@@ -391,7 +391,7 @@ class CommandSASL : public Command
 			sasl->AnnounceState();
 			authExt.unset(target);
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 1c4ad4b82..585887cdc 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -50,18 +50,18 @@ class CommandSATopic : public Command
 			if (target->topic == newTopic)
 			{
 				user->WriteNotice(InspIRCd::Format("The topic on %s is already what you are trying to change it to.", target->name.c_str()));
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 
 			target->SetTopic(user, newTopic, ServerInstance->Time(), NULL);
 			ServerInstance->SNO.WriteGlobalSno('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 		else
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 	}
 };
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 6f4e8a8dc..ef7a8c315 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -45,7 +45,7 @@ class CommandSethost : public Command
 		if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
 		{
 			user->WriteNotice("*** SETHOST: Host too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++)
@@ -53,17 +53,17 @@ class CommandSethost : public Command
 			if (!hostmap.test(static_cast<unsigned char>(*x)))
 			{
 				user->WriteNotice("*** SETHOST: Invalid characters in hostname");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
 		if (user->ChangeDisplayedHost(parameters[0]))
 		{
 			ServerInstance->SNO.WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->GetDisplayedHost());
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index f85ca1f0a..c749548c8 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -43,19 +43,19 @@ class CommandSetident : public Command
 		if (parameters[0].size() > ServerInstance->Config->Limits.IdentMax)
 		{
 			user->WriteNotice("*** SETIDENT: Ident is too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!ServerInstance->IsIdent(parameters[0]))
 		{
 			user->WriteNotice("*** SETIDENT: Invalid characters in ident");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		user->ChangeIdent(parameters[0]);
 		ServerInstance->SNO.WriteGlobalSno('a', "%s used SETIDENT to change their ident to '%s'", user->nick.c_str(), user->ident.c_str());
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index c93bd1da7..bb71ae9aa 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -51,7 +51,7 @@ class CommandSetidle : public SplitCommand
 		if (!InspIRCd::Duration(parameters[0], idle))
 		{
 			user->WriteNumeric(ERR_INVALIDIDLETIME, "Invalid idle time.");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		user->idle_lastmsg = (ServerInstance->Time() - idle);
 		// minor tweak - we cant have signon time shorter than our idle time!
@@ -60,7 +60,7 @@ class CommandSetidle : public SplitCommand
 		ServerInstance->SNO.WriteToSnoMask('a', user->nick+" used SETIDLE to set their idle time to "+ConvToStr(idle)+" seconds");
 		user->WriteNumeric(RPL_IDLETIMESET, "Idle time set.");
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index e5cf8feca..e9e75bbdc 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -49,19 +49,19 @@ private:
 		if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal)
 		{
 			fail.SendIfCap(user, cap, this, "INVALID_REALNAME", "Real name is too long");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!user->ChangeRealName(parameters[0]))
 		{
 			fail.SendIfCap(user, cap, this, "CANNOT_CHANGE_REALNAME", "Unable to change your real name");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (notifyopers)
 			ServerInstance->SNO.WriteGlobalSno('a', "%s used SETNAME to change their real name to '%s'",
 				user->nick.c_str(), parameters[0].c_str());
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 9346df05e..64b54ec28 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -75,7 +75,7 @@ class CommandShowFile : public Command
 				localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg);
 			}
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	void UpdateSettings(ConfigTag* tag, const std::vector<std::string>& filecontents)
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 4743a03ca..26182df47 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -61,14 +61,14 @@ class WhoisNoticeCmd : public Command
 	{
 		User* dest = ServerInstance->Users.Find(parameters[0]);
 		if (!dest)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		User* source = ServerInstance->Users.Find(parameters[1]);
 
 		if (IS_LOCAL(dest) && source)
 			HandleFast(dest, source);
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 23aea494a..dce7cf6ea 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -92,7 +92,7 @@ class CommandShun : public Command
 			else
 			{
 				user->WriteNotice("*** Shun " + parameters[0] + " not found on the list.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 		else
@@ -105,7 +105,7 @@ class CommandShun : public Command
 				if (!InspIRCd::Duration(parameters[1], duration))
 				{
 					user->WriteNotice("*** Invalid duration for SHUN.");
-					return CMD_FAILURE;
+					return CmdResult::FAILURE;
 				}
 				expr = parameters[2];
 			}
@@ -134,10 +134,10 @@ class CommandShun : public Command
 			{
 				delete r;
 				user->WriteNotice("*** Shun for " + target + " already exists.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index bee62a940..cd3c6385c 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -284,7 +284,7 @@ class CommandSilence : public SplitCommand
 		if (list && list->size() > ext.maxsilence)
 		{
 			user->WriteNumeric(ERR_SILELISTFULL, mask, SilenceEntry::BitsToFlags(flags), "Your SILENCE list is full");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		else if (!list)
 		{
@@ -296,12 +296,12 @@ class CommandSilence : public SplitCommand
 		if (!list->insert(SilenceEntry(flags, mask)).second)
 		{
 			user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The SILENCE entry you specified already exists");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		SilenceMessage msg("+" + mask, SilenceEntry::BitsToFlags(flags));
 		user->Send(msgprov, msg);
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	CmdResult RemoveSilence(LocalUser* user, const std::string& mask, uint32_t flags)
@@ -317,12 +317,12 @@ class CommandSilence : public SplitCommand
 				list->erase(iter);
 				SilenceMessage msg("-" + mask, SilenceEntry::BitsToFlags(flags));
 				user->Send(msgprov, msg);
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 		}
 
 		user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The SILENCE entry you specified could not be found");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	CmdResult ShowSilenceList(LocalUser* user)
@@ -336,7 +336,7 @@ class CommandSilence : public SplitCommand
 			}
 		}
 		user->WriteNumeric(RPL_ENDOFSILELIST, "End of SILENCE list");
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
  public:
@@ -377,7 +377,7 @@ class CommandSilence : public SplitCommand
 			if (!SilenceEntry::FlagsToBits(parameters[1], flags))
 			{
 				user->WriteNumeric(ERR_SILENCE, mask, parameters[1], "You specified one or more invalid SILENCE flags");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 			else if (flags == SilenceEntry::SF_EXEMPT)
 			{
diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 57c0722c9..d408063dd 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -39,7 +39,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 	if (!xlf)
 	{
 		ServerInstance->SNO.WriteToSnoMask('x', "%s sent me an unknown ADDLINE type (%s).", setter.c_str(), params[0].c_str());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	XLine* xl = NULL;
@@ -50,7 +50,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 	catch (ModuleException &e)
 	{
 		ServerInstance->SNO.WriteToSnoMask('x', "Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	xl->SetCreateTime(ConvToNum<time_t>(params[3]));
 	if (ServerInstance->XLines->AddLine(xl, NULL))
@@ -75,12 +75,12 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 		{
 			ServerInstance->XLines->ApplyLines();
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 	else
 	{
 		delete xl;
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 }
 
diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp
index ba0870dcc..9dc372761 100644
--- a/src/modules/m_spanningtree/away.cpp
+++ b/src/modules/m_spanningtree/away.cpp
@@ -47,7 +47,7 @@ CmdResult CommandAway::HandleRemote(::RemoteUser* u, Params& params)
 		u->awaymsg.clear();
 		FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (u));
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CommandAway::Builder::Builder(User* user)
diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 0d24f4dcb..e2a8fa62a 100644
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -39,7 +39,7 @@ CmdResult CommandDelLine::Handle(User* user, Params& params)
 	{
 		ServerInstance->SNO.WriteToSnoMask('X', "%s removed %s%s on %s: %s", setter.c_str(),
 				params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str(), reason.c_str());
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
-	return CMD_FAILURE;
+	return CmdResult::FAILURE;
 }
diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index ee14fd10b..74a209253 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -40,7 +40,7 @@ CmdResult CommandEncap::Handle(User* user, Params& params)
 			ServerCommand* const scmd = Utils->Creator->CmdManager.GetHandler(params[1]);
 			if (scmd)
 				scmd->Handle(user, plist);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
 		Command* cmd = NULL;
@@ -48,9 +48,9 @@ CmdResult CommandEncap::Handle(User* user, Params& params)
 		// Discard return value, ENCAP shall succeed even if the command does not exist
 
 		if ((cmd) && (cmd->force_manual_route))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandEncap::GetRouting(User* user, const Params& params)
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 794555d91..db5b1d48c 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -196,7 +196,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 	if (apply_other_sides_modes)
 		ServerInstance->Modes.Process(srcuser, chan, NULL, modechangelist, ModeParser::MODE_LOCALONLY);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin)
diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index ba0717e8e..b7430b348 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -33,7 +33,7 @@ CmdResult CommandFMode::Handle(User* who, Params& params)
 	Channel* const chan = ServerInstance->FindChan(params[0]);
 	if (!chan)
 		// Channel doesn't exist
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// Extract the TS of the channel in question
 	time_t ourTS = chan->age;
@@ -41,7 +41,7 @@ CmdResult CommandFMode::Handle(User* who, Params& params)
 	/* If the TS is greater than ours, we drop the mode and don't pass it anywhere.
 	 */
 	if (TS > ourTS)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	/* TS is equal or less: apply the mode change locally and forward the message
 	 */
@@ -55,5 +55,5 @@ CmdResult CommandFMode::Handle(User* who, Params& params)
 		flags |= ModeParser::MODE_MERGE;
 
 	ServerInstance->Modes.Process(who, chan, NULL, changelist, flags);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 2f9813860..243d2e398 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -30,16 +30,16 @@ CmdResult CommandFTopic::Handle(User* user, Params& params)
 {
 	Channel* c = ServerInstance->FindChan(params[0]);
 	if (!c)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	if (c->age < ServerCommand::ExtractTS(params[1]))
 		// Our channel TS is older, nothing to do
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// Channel::topicset is initialized to 0 on channel creation, so their ts will always win if we never had a topic
 	time_t ts = ServerCommand::ExtractTS(params[2]);
 	if (ts < c->topicset)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// The topic text is always the last parameter
 	const std::string& newtopic = params.back();
@@ -60,15 +60,15 @@ CmdResult CommandFTopic::Handle(User* user, Params& params)
 	{
 		// Discard if their topic text is "smaller"
 		if (c->topic > newtopic)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		// If the texts are equal in addition to the timestamps, decide which setter to keep
 		if ((c->topic == newtopic) && (c->setby >= setter))
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 	}
 
 	c->SetTopic(user, newtopic, ts, &setter);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 // Used when bursting and in reply to RESYNC, contains topic setter as the 4th parameter
diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp
index 49a8b7cd7..8e9945582 100644
--- a/src/modules/m_spanningtree/idle.cpp
+++ b/src/modules/m_spanningtree/idle.cpp
@@ -41,13 +41,13 @@ CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, Params& params)
 
 	User* target = ServerInstance->Users.FindUUID(params[0]);
 	if ((!target) || (target->registered != REG_ALL))
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	LocalUser* localtarget = IS_LOCAL(target);
 	if (!localtarget)
 	{
 		// Forward to target's server
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	if (params.size() >= 2)
@@ -71,5 +71,5 @@ CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, Params& params)
 		reply.Unicast(issuer);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index b7b637c43..3ffc5d9e2 100644
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -36,7 +36,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 
 		CmdBuilder("RESYNC").push(params[0]).Unicast(user);
 
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	bool apply_modes;
@@ -51,10 +51,10 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 	// Join the user and set the membership id to what they sent
 	Membership* memb = chan->ForceJoin(user, apply_modes ? &params[3] : NULL);
 	if (!memb)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	memb->id = Membership::IdFromString(params[1]);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& params)
@@ -65,7 +65,7 @@ CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& p
 	{
 		// This can happen for a number of reasons, safe to ignore
 		ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Channel does not exist");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (!server->IsLocal())
@@ -73,5 +73,5 @@ CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& p
 
 	// Send all known information about the channel
 	server->GetSocket()->SyncChannel(chan);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index aa2d041d7..9d78dbbed 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -32,7 +32,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 	{
 		std::string value = params.size() < 3 ? "" : params[2];
 		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	if (params[0][0] == '#')
@@ -44,12 +44,12 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 
 		Channel* c = ServerInstance->FindChan(params[0]);
 		if (!c)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		time_t ChanTS = ServerCommand::ExtractTS(params[1]);
 		if (c->age < ChanTS)
 			// Their TS is newer than ours, discard this command and do not propagate
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		std::string value = params.size() < 4 ? "" : params[3];
 
@@ -72,7 +72,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CommandMetadata::Builder::Builder(User* user, const std::string& key, const std::string& val)
diff --git a/src/modules/m_spanningtree/misccommands.cpp b/src/modules/m_spanningtree/misccommands.cpp
index 1a07b4855..dd947f1f0 100644
--- a/src/modules/m_spanningtree/misccommands.cpp
+++ b/src/modules/m_spanningtree/misccommands.cpp
@@ -62,11 +62,11 @@ void CmdBuilder::UpdateTags()
 CmdResult CommandSNONotice::Handle(User* user, Params& params)
 {
 	ServerInstance->SNO.WriteToSnoMask(params[0][0], "From " + user->nick + ": " + params[1]);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandEndBurst::HandleServer(TreeServer* server, Params& params)
 {
 	server->FinishBurst();
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index 3a7571578..56fe314b1 100644
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -55,5 +55,5 @@ CmdResult CommandNick::HandleRemote(::RemoteUser* user, Params& params)
 
 	user->ChangeNick(params[0], newts);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/num.cpp b/src/modules/m_spanningtree/num.cpp
index d85faa373..bbe23dca4 100644
--- a/src/modules/m_spanningtree/num.cpp
+++ b/src/modules/m_spanningtree/num.cpp
@@ -28,11 +28,11 @@ CmdResult CommandNum::HandleServer(TreeServer* server, CommandBase::Params& para
 {
 	User* const target = ServerInstance->Users.FindUUID(params[1]);
 	if (!target)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	LocalUser* const localtarget = IS_LOCAL(target);
 	if (!localtarget)
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 
 	Numeric::Numeric numeric(ConvToNum<unsigned int>(params[2]));
 	// Passing NULL is ok, in that case the numeric source becomes this server
@@ -40,7 +40,7 @@ CmdResult CommandNum::HandleServer(TreeServer* server, CommandBase::Params& para
 	numeric.GetParams().insert(numeric.GetParams().end(), params.begin()+3, params.end());
 
 	localtarget->WriteNumeric(numeric);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandNum::GetRouting(User* user, const Params& params)
diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 9e587356d..b00829e99 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -54,11 +54,11 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, CommandBase::Params& para
 		 */
 		TreeServer* remoteserver = TreeServer::Get(u);
 		if (remoteserver->IsBehindBursting() || remoteserver->IsSilentULine())
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 	}
 
 	ServerInstance->SNO.WriteToSnoMask('O', "From %s: User %s (%s@%s) is now a server operator of type %s", u->server->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->GetRealHost().c_str(), opertype.c_str());
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CommandOpertype::Builder::Builder(User* user)
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index f70b6da1e..0543b8705 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -183,11 +183,11 @@ CmdResult CommandMap::Handle(User* user, const Params& parameters)
 		if (!s)
 		{
 			user->WriteNumeric(ERR_NOSUCHSERVER, parameters[0], "No such server");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (!s->IsRoot())
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 	}
 
 	// Max depth and max server name length
@@ -218,7 +218,7 @@ CmdResult CommandMap::Handle(User* user, const Params& parameters)
 		(unsigned int)Utils->serverlist.size(), (Utils->serverlist.size() > 1 ? "s" : ""), (unsigned int)totusers, (totusers > 1 ? "s" : ""), avg_users));
 	user->WriteRemoteNumeric(RPL_ENDMAP, "End of /MAP");
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandMap::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index df4d92073..0ed22845e 100644
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -42,5 +42,5 @@ CmdResult CommandPing::Handle(User* user, Params& params)
 
 		reply.Unicast(user);
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 879e429a0..342ca9a7a 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -42,5 +42,5 @@ CmdResult CommandPong::HandleServer(TreeServer* server, CommandBase::Params& par
 		// PONG for us
 		server->OnPong();
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 34220f865..eb3bc4043 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -29,7 +29,7 @@
 
 void ModuleSpanningTree::OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop)
 {
-	if (result == CMD_SUCCESS)
+	if (result == CmdResult::SUCCESS)
 		Utils->RouteCommand(NULL, command, parameters, user);
 }
 
diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 85121ddfb..8607f718b 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -43,7 +43,7 @@ CmdResult CommandRConnect::Handle(User* user, const Params& parameters)
 	if (!Utils->FindServerMask(parameters[0]))
 	{
 		user->WriteRemoteNotice(InspIRCd::Format("*** RCONNECT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str()));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	/* Is this aimed at our server? */
@@ -70,7 +70,7 @@ CmdResult CommandRConnect::Handle(User* user, const Params& parameters)
 			user->WriteNotice("*** RCONNECT: Sending remote connect to \002 " + parameters[0] + "\002 to connect server \002" + parameters[1] + "\002.");
 		}
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandRConnect::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 56d3ab53c..52500f5f5 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -46,13 +46,13 @@ CmdResult CommandRSQuit::Handle(User* user, const Params& parameters)
 	if (!server_target)
 	{
 		user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str()));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (server_target->IsRoot())
 	{
 		user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)", parameters[0].c_str()));
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	if (server_target->IsLocal())
@@ -63,7 +63,7 @@ CmdResult CommandRSQuit::Handle(User* user, const Params& parameters)
 		server_target->SQuit("Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandRSQuit::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index 3063ea50a..aa3cddcc7 100644
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -34,12 +34,12 @@ CmdResult CommandSave::Handle(User* user, Params& params)
 {
 	User* u = ServerInstance->Users.FindUUID(params[0]);
 	if (!u)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	time_t ts = ConvToNum<time_t>(params[1]);
 
 	if (u->age == ts)
 		u->ChangeNick(u->uuid, SavedTimestamp);
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index f73f9d6db..1cd5608b7 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -47,21 +47,21 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params)
 	if (!InspIRCd::IsSID(sid))
 	{
 		socket->SendError("Invalid format server ID: "+sid+"!");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	TreeServer* CheckDupe = Utils->FindServer(servername);
 	if (CheckDupe)
 	{
 		socket->SendError("Server "+servername+" already exists!");
 		ServerInstance->SNO.WriteToSnoMask('L', "Server \002"+CheckDupe->GetName()+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, already exists. Closing link with " + ParentOfThis->GetName());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 	CheckDupe = Utils->FindServer(sid);
 	if (CheckDupe)
 	{
 		socket->SendError("Server ID "+sid+" already exists! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
 		ServerInstance->SNO.WriteToSnoMask('L', "Server \002"+servername+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
 	TreeServer* route = ParentOfThis->GetRoute();
@@ -71,7 +71,7 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params)
 	HandleExtra(Node, params);
 
 	ServerInstance->SNO.WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 void CommandServer::HandleExtra(TreeServer* newserver, Params& params)
diff --git a/src/modules/m_spanningtree/sinfo.cpp b/src/modules/m_spanningtree/sinfo.cpp
index bfd38035d..5457d84db 100644
--- a/src/modules/m_spanningtree/sinfo.cpp
+++ b/src/modules/m_spanningtree/sinfo.cpp
@@ -47,7 +47,7 @@ CmdResult CommandSInfo::HandleServer(TreeServer* server, CommandBase::Params& pa
 		server->SetDesc(value);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CommandSInfo::Builder::Builder(TreeServer* server, const char* key, const std::string& val)
diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 0d3881f43..4eb47587f 100644
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -30,12 +30,12 @@ CmdResult CommandSVSJoin::Handle(User* user, Params& parameters)
 {
 	// Check for valid channel name
 	if (!ServerInstance->IsChannel(parameters[1]))
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	// Check target exists
 	User* u = ServerInstance->Users.FindUUID(parameters[0]);
 	if (!u)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	/* only join if it's local, otherwise just pass it on! */
 	LocalUser* localuser = IS_LOCAL(u);
@@ -53,7 +53,7 @@ CmdResult CommandSVSJoin::Handle(User* user, Params& parameters)
 		Channel::JoinUser(localuser, parameters[1], override, key);
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandSVSJoin::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index d88df9245..2246bec7b 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -53,7 +53,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		{
 			time_t ExpectedTS = ConvToNum<time_t>(parameters[3]);
 			if (u->age != ExpectedTS)
-				return CMD_FAILURE; // Ignore SVSNICK
+				return CmdResult::FAILURE; // Ignore SVSNICK
 		}
 
 		std::string nick = parameters[1];
@@ -62,7 +62,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 
 		time_t NickTS = ConvToNum<time_t>(parameters[2]);
 		if (NickTS <= 0)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		if (!u->ChangeNick(nick, NickTS))
 		{
@@ -71,7 +71,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		}
 	}
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandSVSNick::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp
index 6e5f9eb55..12b314d3a 100644
--- a/src/modules/m_spanningtree/svspart.cpp
+++ b/src/modules/m_spanningtree/svspart.cpp
@@ -30,18 +30,18 @@ CmdResult CommandSVSPart::Handle(User* user, Params& parameters)
 {
 	User* u = ServerInstance->Users.FindUUID(parameters[0]);
 	if (!u)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	Channel* c = ServerInstance->FindChan(parameters[1]);
 	if (!c)
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 
 	if (IS_LOCAL(u))
 	{
 		std::string reason = (parameters.size() == 3) ? parameters[2] : "Services forced part";
 		c->PartUser(u, reason);
 	}
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 RouteDescriptor CommandSVSPart::GetRouting(User* user, const Params& parameters)
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 0dcb655cc..b4a86f017 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -178,13 +178,13 @@ CmdResult CommandSQuit::HandleServer(TreeServer* server, CommandBase::Params& pa
 	if (!quitting)
 	{
 		ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 
-	CmdResult ret = CMD_SUCCESS;
+	CmdResult ret = CmdResult::SUCCESS;
 	if (quitting == server)
 	{
-		ret = CMD_FAILURE;
+		ret = CmdResult::FAILURE;
 		server = server->GetParent();
 	}
 	else if (quitting->GetParent() != server)
@@ -192,7 +192,7 @@ CmdResult CommandSQuit::HandleServer(TreeServer* server, CommandBase::Params& pa
 
 	server->SQuitChild(quitting, params[1]);
 
-	// XXX: Return CMD_FAILURE when servers SQUIT themselves (i.e. :00S SQUIT 00S :Shutting down)
+	// XXX: Return CmdResult::FAILURE when servers SQUIT themselves (i.e. :00S SQUIT 00S :Shutting down)
 	// to stop this message from being forwarded.
 	// The squit logic generates a SQUIT message with our sid as the source and sends it to the
 	// remaining servers.
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index b393cae8e..8ffc45cb7 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -385,11 +385,11 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 	else
 	{
 		res = cmd->Handle(who, newparams);
-		if (res == CMD_INVALID)
+		if (res == CmdResult::INVALID)
 			throw ProtocolException("Error in command handler");
 	}
 
-	if (res == CMD_SUCCESS)
+	if (res == CmdResult::SUCCESS)
 		Utils->RouteCommand(server->GetRoute(), cmdbase, newparams, who);
 }
 
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 85ce2dd5f..36a62caad 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -134,25 +134,25 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 
 	FOREACH_MOD(OnPostConnect, (_new));
 
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandFHost::HandleRemote(RemoteUser* src, Params& params)
 {
 	src->ChangeDisplayedHost(params[0]);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandFIdent::HandleRemote(RemoteUser* src, Params& params)
 {
 	src->ChangeIdent(params[0]);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CmdResult CommandFName::HandleRemote(RemoteUser* src, Params& params)
 {
 	src->ChangeRealName(params[0]);
-	return CMD_SUCCESS;
+	return CmdResult::SUCCESS;
 }
 
 CommandUID::Builder::Builder(User* user)
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 735342c7b..ff06347ce 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -163,14 +163,14 @@ class CommandSSLInfo : public Command
 		if ((!target) || (target->registered != REG_ALL))
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		bool operonlyfp = ServerInstance->Config->ConfValue("sslinfo")->getBool("operonly");
 		if (operonlyfp && !user->IsOper() && target != user)
 		{
 			user->WriteNotice("*** You cannot view TLS (SSL) client certificate information for other users");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		ssl_cert* cert = sslapi.GetCertificate(target);
@@ -190,7 +190,7 @@ class CommandSSLInfo : public Command
 			user->WriteNotice("*** Key Fingerprint:    " + cert->GetFingerprint());
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index fd3158783..f47ddb0f5 100644
--- a/src/modules/m_starttls.cpp
+++ b/src/modules/m_starttls.cpp
@@ -49,19 +49,19 @@ class CommandStartTLS : public SplitCommand
 		if (!ssl)
 		{
 			user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not enabled");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (user->registered == REG_ALL)
 		{
 			user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not permitted after client registration is complete");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (user->eh.GetIOHook())
 		{
 			user->WriteNumeric(ERR_STARTTLS, "STARTTLS failure");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		user->WriteNumeric(RPL_STARTTLS, "STARTTLS successful, go ahead with TLS handshake");
@@ -77,7 +77,7 @@ class CommandStartTLS : public SplitCommand
 
 		ssl->OnAccept(&user->eh, NULL, NULL);
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 69b987433..51402927b 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -113,7 +113,7 @@ class CommandSvshold : public Command
 		if (!user->server->IsULine())
 		{
 			/* don't allow SVSHOLD from non-ulined clients */
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (parameters.size() == 1)
@@ -133,20 +133,20 @@ class CommandSvshold : public Command
 		else
 		{
 			if (parameters.size() < 3)
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 
 			unsigned long duration;
 			if (!InspIRCd::Duration(parameters[1], duration))
 			{
 				user->WriteNotice("*** Invalid duration for SVSHOLD.");
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 			SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 
 			if (ServerInstance->XLines->AddLine(r, user))
 			{
 				if (silent)
-					return CMD_SUCCESS;
+					return CmdResult::SUCCESS;
 
 				if (!duration)
 				{
@@ -162,11 +162,11 @@ class CommandSvshold : public Command
 			else
 			{
 				delete r;
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index d840dba1e..c64522e7b 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -56,7 +56,7 @@ class CommandSwhois : public Command
 		if (!dest) // allow setting swhois using SWHOIS before reg
 		{
 			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		std::string* text = swhois.get(dest);
@@ -87,7 +87,7 @@ class CommandSwhois : public Command
 		 */
 		ServerInstance->PI->SendMetaData(dest, "swhois", parameters[1]);
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 };
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 0c7964ec2..cc8304a95 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -87,14 +87,14 @@ class CommandTban : public Command
 		if (!channel)
 		{
 			user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		unsigned int cm = channel->GetPrefixValue(user);
 		if (cm < HALFOP_VALUE)
 		{
 			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You do not have permission to set bans on this channel");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		TimedBan T;
@@ -102,7 +102,7 @@ class CommandTban : public Command
 		if (!InspIRCd::Duration(parameters[1], duration))
 		{
 			user->WriteNotice("Invalid ban time");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 		unsigned long expire = duration + ServerInstance->Time();
 
@@ -114,7 +114,7 @@ class CommandTban : public Command
 		if (IsBanSet(channel, mask))
 		{
 			user->WriteNotice("Ban already set");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		Modes::ChangeList setban;
@@ -125,7 +125,7 @@ class CommandTban : public Command
 		if (ServerInstance->Modes.GetLastChangeList().empty())
 		{
 			user->WriteNotice("Invalid ban mask");
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		T.mask = mask;
@@ -146,7 +146,7 @@ class CommandTban : public Command
 			channel->WriteRemoteNotice(message, pfxchar);
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index ef3f24346..f85d986cb 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -70,7 +70,7 @@ class CommandTline : public Command
 		else
 			user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against no user(s).", n_counted, parameters[0].c_str()));
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index ac27b1529..6cc88b8df 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -39,12 +39,12 @@ class CommandSVSTOPIC : public Command
 		if (!user->server->IsULine())
 		{
 			// Ulines only
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		Channel* chan = ServerInstance->FindChan(parameters[0]);
 		if (!chan)
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 
 		if (parameters.size() == 4)
 		{
@@ -53,7 +53,7 @@ class CommandSVSTOPIC : public Command
 			if (!topicts)
 			{
 				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
-				return CMD_INVALID;
+				return CmdResult::INVALID;
 			}
 
 			chan->SetTopic(user, parameters[3], topicts, &parameters[2]);
@@ -65,7 +65,7 @@ class CommandSVSTOPIC : public Command
 			chan->setby.clear();
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 921d1a47e..007203028 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -70,7 +70,7 @@ class CommandUninvite : public Command
 				user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			}
 
-			return CMD_FAILURE;
+			return CmdResult::FAILURE;
 		}
 
 		if (IS_LOCAL(user))
@@ -78,7 +78,7 @@ class CommandUninvite : public Command
 			if (c->GetPrefixValue(user) < HALFOP_VALUE)
 			{
 				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator", c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-"));
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 		}
 
@@ -97,7 +97,7 @@ class CommandUninvite : public Command
 				n.SetServer(user->server);
 				n.push(u->nick).push(c->name).push(InspIRCd::Format("Is not invited to channel %s", c->name.c_str()));
 				user->WriteRemoteNumeric(n);
-				return CMD_FAILURE;
+				return CmdResult::FAILURE;
 			}
 
 			Numeric::Numeric n(ERR_INVITEREMOVED);
@@ -109,7 +109,7 @@ class CommandUninvite : public Command
 			c->WriteRemoteNotice(InspIRCd::Format("*** %s uninvited %s.", user->nick.c_str(), u->nick.c_str()));
 		}
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const Params& parameters) override
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index ba6a8c5df..a617c8870 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -78,7 +78,7 @@ class CommandUserip : public Command
 		if (nicks != 0)
 			user->WriteNumeric(RPL_USERIP, retbuf);
 
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index bda8a9a3c..3f580029b 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -74,12 +74,12 @@ class CommandVhost : public Command
 			{
 				user->WriteNotice("Setting your VHost: " + config.vhost);
 				user->ChangeDisplayedHost(config.vhost);
-				return CMD_SUCCESS;
+				return CmdResult::SUCCESS;
 			}
 		}
 
 		user->WriteNotice("Invalid username or password.");
-		return CMD_FAILURE;
+		return CmdResult::FAILURE;
 	}
 };
 
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 6a0a87568..de193535b 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -144,7 +144,7 @@ class CommandWatch : public SplitCommand
 		if (parameters.empty())
 		{
 			HandleList(user, false);
-			return CMD_SUCCESS;
+			return CmdResult::SUCCESS;
 		}
 
 		bool watch_l_done = false;
@@ -179,7 +179,7 @@ class CommandWatch : public SplitCommand
 				HandleStats(user);
 			}
 		}
-		return CMD_SUCCESS;
+		return CmdResult::SUCCESS;
 	}
 };