Change the mode name code to use Flags names in preparation for extban support

9 files changed, 312 insertions, 314 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 285fd316c..aabe2c904 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -163,9 +163,9 @@ class BahamutIRCdProto : public IRCDProto
 	{
 		send_cmd(user->nick, "SJOIN %ld %s", static_cast<long>(c->creation_time), c->name.c_str());
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	void SendAkill(User *, const XLine *x)
@@ -551,38 +551,38 @@ class ProtoBahamut : public Module
 	void AddModes()
 	{
 		/* Add user modes */
-		ModeManager::AddUserMode(new UserMode(UMODE_SERV_ADMIN, "UMODE_SERV_ADMIN", 'A'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", 'R'));
-		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
-		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, "UMODE_DEAF", 'd'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SERV_ADMIN, 'A'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, 'R'));
+		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, 'a'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, 'r'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, 's'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, 'd'));
 
 		/* b/e/I */
 		ModeManager::AddChannelMode(new ChannelModeBan('b'));
 
 		/* v/h/o/a/q */
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
 
 		/* Add channel modes */
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, 'c'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 		ModeManager::AddChannelMode(new ChannelModeFlood('f'));
 		ModeManager::AddChannelMode(new ChannelModeKey('k'));
-		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
+		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
 		ModeManager::AddChannelMode(new ChannelModeRegistered('r'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", 'M'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, 'M'));
 		ModeManager::AddChannelMode(new ChannelModeOper('O'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R'));
 	}
 
  public:
diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h
index 427233738..952268184 100644
--- a/modules/protocol/inspircd-ts6.h
+++ b/modules/protocol/inspircd-ts6.h
@@ -113,9 +113,9 @@ class InspIRCdTS6Proto : public IRCDProto
 		 * merge these modes with +nrt and other mlocked modes
 		 */
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	/* UNSQLINE */
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index e4ccd90b6..9d72eef6c 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -158,9 +158,9 @@ class InspIRCdProto : public IRCDProto
 	{
 		send_cmd(user->nick, "JOIN %s %ld", c->name.c_str(), static_cast<long>(c->creation_time));
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	/* UNSQLINE */
@@ -383,7 +383,7 @@ class InspircdIRCdMessage : public IRCdMessage
 								ModeManager::AddChannelMode(new ChannelModeInvex('I'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t]));
 						}
 					}
 
@@ -396,7 +396,7 @@ class InspircdIRCdMessage : public IRCdMessage
 								ModeManager::AddChannelMode(new ChannelModeKey('k'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t]));
 						}
 					}
 
@@ -409,13 +409,13 @@ class InspircdIRCdMessage : public IRCdMessage
 								ModeManager::AddChannelMode(new ChannelModeFlood('f'));
 								continue;
 							case 'l':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l', true));
 								continue;
 							case 'L':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", 'L', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, 'L', true));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t], true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], true));
 						}
 					}
 
@@ -425,67 +425,67 @@ class InspircdIRCdMessage : public IRCdMessage
 						switch (modebuf[t])
 						{
 							case 'i':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 								continue;
 							case 'm':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
 								continue;
 							case 'n':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
 								continue;
 							case 'p':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
 								continue;
 							case 's':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
 								continue;
 							case 't':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
 								continue;
 							case 'r':
 								ModeManager::AddChannelMode(new ChannelModeRegistered('r'));
 								continue;
 							case 'c':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, 'c'));
 								continue;
 							case 'u':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", 'u'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, 'u'));
 								continue;
 							case 'z':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'z'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, 'z'));
 								continue;
 							case 'A':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_ALLINVITE, "CMODE_ALLINVITE", 'A'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_ALLINVITE, 'A'));
 								continue;
 							case 'C':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", 'C'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, 'C'));
 								continue;
 							case 'G':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, "CMODE_FILTER", 'G'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, 'G'));
 								continue;
 							case 'K':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", 'K'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, 'K'));
 								continue;
 							case 'N':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, "CMODE_NONICK", 'N'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, 'N'));
 								continue;
 							case 'O':
 								ModeManager::AddChannelMode(new ChannelModeOper('O'));
 								continue;
 							case 'Q':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", 'Q'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, 'Q'));
 								continue;
 							case 'R':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R'));
 								continue;
 							case 'S':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", 'S'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, 'S'));
 								continue;
 							case 'V':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOINVITE, "CMODE_NOINVITE", 'V'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOINVITE, 'V'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t]));
 						}
 					}
 				}
@@ -499,19 +499,19 @@ class InspircdIRCdMessage : public IRCdMessage
 						switch (modes[t])
 						{
 							case 'q':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', '~'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, 'q', '~'));
 								continue;
 							case 'a':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", 'a', '&'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, 'a', '&'));
 								continue;
 							case 'o':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
 								continue;
 							case 'h':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", 'h', '%'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, 'h', '%'));
 								continue;
 							case 'v':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
 								continue;
 						}
 					}
@@ -868,13 +868,13 @@ class ProtoInspIRCd : public Module
 
 	void AddModes()
 	{
-		ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, "UMODE_CALLERID", 'g'));
-		ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, "UMODE_HELPOP", 'h'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, 'g'));
+		ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, 'h'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, 'r'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, 'x'));
 	}
 
  public:
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index f89ef2dc9..5bdae4b7b 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -398,13 +398,13 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 								continue;
 							/* InspIRCd sends q and a here if they have no prefixes */
 							case 'q':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', '@'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, 'q', '@'));
 								continue;
 							case 'a':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT , "CMODE_PROTECT", 'a', '@'));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT , 'a', '@'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t]));
 						}
 					}
 
@@ -417,7 +417,7 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 								ModeManager::AddChannelMode(new ChannelModeKey('k'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t]));
 						}
 					}
 
@@ -427,25 +427,25 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 						switch (modebuf[t])
 						{
 							case 'F':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_NICKFLOOD, "CMODE_NICKFLOOD", 'F', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_NICKFLOOD, 'F', true));
 								continue;
 							case 'J':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_NOREJOIN, "CMODE_NOREJOIN", 'J', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_NOREJOIN, 'J', true));
 								continue;
 							case 'L':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", 'L', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, 'L', true));
 								continue;
 							case 'f':
 								ModeManager::AddChannelMode(new ChannelModeFlood('f', true));
 								continue;
 							case 'j':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", 'j', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, 'j', true));
 								continue;
 							case 'l':
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l', true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l', true));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t], true));
+								ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], true));
 						}
 					}
 
@@ -455,79 +455,79 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 						switch (modebuf[t])
 						{
 							case 'A':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_ALLINVITE, "CMODE_ALLINVITE", 'A'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_ALLINVITE, 'A'));
 								continue;
 							case 'B':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCAPS, "CMODE_BLOCKCAPS", 'B'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCAPS, 'B'));
 								continue;
 							case 'C':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", 'C'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, 'C'));
 								continue;
 							case 'D':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_DELAYEDJOIN, "CMODE_DELAYEDJOIN", 'D'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_DELAYEDJOIN, 'D'));
 								continue;
 							case 'G':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, "CMODE_FILTER", 'G'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, 'G'));
 								continue;
 							case 'K':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", 'K'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, 'K'));
 								continue;
 							case 'M':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", 'M'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, 'M'));
 								continue;
 							case 'N':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, "CMODE_NONICK", 'N'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, 'N'));
 								continue;
 							case 'O':
 								ModeManager::AddChannelMode(new ChannelModeOper('O'));
 								continue;
 							case 'P':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, "CMODE_PERM", 'P'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, 'P'));
 								continue;
 							case 'Q':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", 'Q'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, 'Q'));
 								continue;
 							case 'R':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R'));
 								continue;
 							case 'S':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", 'S'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, 'S'));
 								continue;
 							case 'T':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", 'T'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, 'T'));
 								continue;
 							case 'c':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, 'c'));
 								continue;
 							case 'i':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 								continue;
 							case 'm':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
 								continue;
 							case 'n':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
 								continue;
 							case 'p':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
 								continue;
 							case 'r':
 								ModeManager::AddChannelMode(new ChannelModeRegistered('r'));
 								continue;
 							case 's':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
 								continue;
 							case 't':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
 								continue;
 							case 'u':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", 'u'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, 'u'));
 								continue;
 							case 'z':
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'z'));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, 'z'));
 								continue;
 							default:
-								ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t], modebuf[t]));
+								ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t]));
 						}
 					}
 				}
@@ -544,61 +544,61 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 							switch (modebuf[t])
 							{
 								case 'h':
-									ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, "UMODE_HELPOP", 'h'));
+									ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, 'h'));
 									continue;
 								case 'B':
-									ModeManager::AddUserMode(new UserMode(UMODE_BOT, "UMODE_BOT", 'B'));
+									ModeManager::AddUserMode(new UserMode(UMODE_BOT, 'B'));
 									continue;
 								case 'G':
-									ModeManager::AddUserMode(new UserMode(UMODE_FILTER, "UMODE_FILTER", 'G'));
+									ModeManager::AddUserMode(new UserMode(UMODE_FILTER, 'G'));
 									continue;
 								case 'H':
-									ModeManager::AddUserMode(new UserMode(UMODE_HIDEOPER, "UMODE_HIDEOPER", 'H'));
+									ModeManager::AddUserMode(new UserMode(UMODE_HIDEOPER, 'H'));
 									continue;
 								case 'I':
-									ModeManager::AddUserMode(new UserMode(UMODE_PRIV, "UMODE_PRIV", 'I'));
+									ModeManager::AddUserMode(new UserMode(UMODE_PRIV, 'I'));
 									continue;
 								case 'Q':
-									ModeManager::AddUserMode(new UserMode(UMODE_HIDDEN, "UMODE_HIDDEN", 'Q'));
+									ModeManager::AddUserMode(new UserMode(UMODE_HIDDEN, 'Q'));
 									continue;
 								case 'R':
-									ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", 'R'));
+									ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, 'R'));
 									continue;
 								case 'S':
-									ModeManager::AddUserMode(new UserMode(UMODE_STRIPCOLOR, "UMODE_STRIPCOLOR", 'S'));
+									ModeManager::AddUserMode(new UserMode(UMODE_STRIPCOLOR, 'S'));
 									continue;
 								case 'W':
-									ModeManager::AddUserMode(new UserMode(UMODE_WHOIS, "UMODE_WHOIS", 'W'));
+									ModeManager::AddUserMode(new UserMode(UMODE_WHOIS, 'W'));
 									continue;
 								case 'c':
-									ModeManager::AddUserMode(new UserMode(UMODE_COMMONCHANS, "UMODE_COMMONCHANS", 'c'));
+									ModeManager::AddUserMode(new UserMode(UMODE_COMMONCHANS, 'c'));
 									continue;
 								case 'g':
-									ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, "UMODE_CALLERID", 'g'));
+									ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, 'g'));
 									continue;
 								case 'i':
-									ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
+									ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
 									continue;
 								case 'k':
-									ModeManager::AddUserMode(new UserMode(UMODE_PROTECTED, "UMODE_PROTECTED", 'k'));
+									ModeManager::AddUserMode(new UserMode(UMODE_PROTECTED, 'k'));
 									continue;
 								case 'o':
-									ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
+									ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
 									continue;
 								case 'r':
-									ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
+									ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, 'r'));
 									continue;
 								case 'w':
-									ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
+									ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
 									continue;
 								case 'x':
-									ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
+									ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, 'x'));
 									continue;
 								case 'd':
-									ModeManager::AddUserMode(new UserMode(UMODE_DEAF, "UMODE_DEAF", 'd'));
+									ModeManager::AddUserMode(new UserMode(UMODE_DEAF, 'd'));
 									continue;
 								default:
-									ModeManager::AddUserMode(new UserMode(UMODE_END, "", modebuf[t]));
+									ModeManager::AddUserMode(new UserMode(UMODE_END, modebuf[t]));
 							}
 						}
 					}
@@ -613,19 +613,19 @@ class Inspircd12IRCdMessage : public InspircdIRCdMessage
 						switch (modes[t])
 						{
 							case 'q':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', chars[t]));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, 'q', chars[t]));
 								continue;
 							case 'a':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", 'a', chars[t]));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, 'a', chars[t]));
 								continue;
 							case 'o':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', chars[t]));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', chars[t]));
 								continue;
 							case 'h':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", 'h', chars[t]));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, 'h', chars[t]));
 								continue;
 							case 'v':
-								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', chars[t]));
+								ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', chars[t]));
 								continue;
 						}
 					}
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 908868463..cbe6b7e60 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -381,86 +381,86 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 				ChannelMode *cm = NULL;
 
 				if (modename.equals_cs("admin"))
-					cm = new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_PROTECT, modechar[1], modechar[0]);
 				else if (modename.equals_cs("allowinvite"))
-					cm = new ChannelMode(CMODE_ALLINVITE, "CMODE_ALLINVITE", modechar[0]);
+					cm = new ChannelMode(CMODE_ALLINVITE, modechar[0]);
 				else if (modename.equals_cs("auditorium"))
-					cm = new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", modechar[0]);
+					cm = new ChannelMode(CMODE_AUDITORIUM, modechar[0]);
 				else if (modename.equals_cs("ban"))
 					cm = new ChannelModeBan(modechar[0]);
 				else if (modename.equals_cs("banexception"))
 					cm = new ChannelModeExcept(modechar[0]);
 				else if (modename.equals_cs("blockcaps"))
-					cm = new ChannelMode(CMODE_BLOCKCAPS, "CMODE_BLOCKCAPS", modechar[0]);
+					cm = new ChannelMode(CMODE_BLOCKCAPS, modechar[0]);
 				else if (modename.equals_cs("blockcolor"))
-					cm = new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", modechar[0]);
+					cm = new ChannelMode(CMODE_BLOCKCOLOR, modechar[0]);
 				else if (modename.equals_cs("c_registered"))
 					cm = new ChannelModeRegistered(modechar[0]);
 				else if (modename.equals_cs("censor"))
-					cm = new ChannelMode(CMODE_FILTER, "CMODE_FILTER", modechar[0]);
+					cm = new ChannelMode(CMODE_FILTER, modechar[0]);
 				else if (modename.equals_cs("delayjoin"))
-					cm = new ChannelMode(CMODE_DELAYEDJOIN, "CMODE_DELAYEDJOIN", modechar[0]);
+					cm = new ChannelMode(CMODE_DELAYEDJOIN, modechar[0]);
 				else if (modename.equals_cs("flood"))
 					cm = new ChannelModeFlood(modechar[0], true);
 				else if (modename.equals_cs("founder"))
-					cm = new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_OWNER, modechar[1], modechar[0]);
 				else if (modename.equals_cs("halfop"))
-					cm = new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_HALFOP, modechar[1], modechar[0]);
 				else if (modename.equals_cs("invex"))
 					cm = new ChannelModeInvex(modechar[0]);
 				else if (modename.equals_cs("inviteonly"))
-					cm = new ChannelMode(CMODE_INVITE, "CMODE_INVITE", modechar[0]);
+					cm = new ChannelMode(CMODE_INVITE, modechar[0]);
 				else if (modename.equals_cs("joinflood"))
-					cm = new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", modechar[0], true);
+					cm = new ChannelModeParam(CMODE_JOINFLOOD, modechar[0], true);
 				else if (modename.equals_cs("key"))
 					cm = new ChannelModeKey(modechar[0]);
 				else if (modename.equals_cs("kicknorejoin"))
-					cm = new ChannelModeParam(CMODE_NOREJOIN, "CMODE_NOREJOIN", modechar[0], true);
+					cm = new ChannelModeParam(CMODE_NOREJOIN, modechar[0], true);
 				else if (modename.equals_cs("limit"))
-					cm = new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", modechar[0], true);
+					cm = new ChannelModeParam(CMODE_LIMIT, modechar[0], true);
 				else if (modename.equals_cs("moderated"))
-					cm = new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", modechar[0]);
+					cm = new ChannelMode(CMODE_MODERATED, modechar[0]);
 				else if (modename.equals_cs("nickflood"))
-					cm = new ChannelModeParam(CMODE_NICKFLOOD, "CMODE_NICKFLOOD", modechar[0], true);
+					cm = new ChannelModeParam(CMODE_NICKFLOOD, modechar[0], true);
 				else if (modename.equals_cs("noctcp"))
-					cm = new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", modechar[0]);
+					cm = new ChannelMode(CMODE_NOCTCP, modechar[0]);
 				else if (modename.equals_cs("noextmsg"))
-					cm = new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", modechar[0]);
+					cm = new ChannelMode(CMODE_NOEXTERNAL, modechar[0]);
 				else if (modename.equals_cs("nokick"))
-					cm = new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", modechar[0]);
+					cm = new ChannelMode(CMODE_NOKICK, modechar[0]);
 				else if (modename.equals_cs("noknock"))
-					cm = new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", modechar[0]);
+					cm = new ChannelMode(CMODE_NOKNOCK, modechar[0]);
 				else if (modename.equals_cs("nonick"))
-					cm = new ChannelMode(CMODE_NONICK, "CMODE_NONICK", modechar[0]);
+					cm = new ChannelMode(CMODE_NONICK, modechar[0]);
 				else if (modename.equals_cs("nonotice"))
-					cm = new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", modechar[0]);
+					cm = new ChannelMode(CMODE_NONOTICE, modechar[0]);
 				else if (modename.equals_cs("op"))
-					cm = new ChannelModeStatus(CMODE_OP, "CMODE_OP", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_OP, modechar[1], modechar[0]);
 				else if (modename.equals_cs("operonly"))
 					cm = new ChannelModeOper(modechar[0]);
 				else if (modename.equals_cs("permanent"))
-					cm = new ChannelMode(CMODE_PERM, "CMODE_PERM", modechar[0]);
+					cm = new ChannelMode(CMODE_PERM, modechar[0]);
 				else if (modename.equals_cs("private"))
-					cm = new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", modechar[0]);
+					cm = new ChannelMode(CMODE_PRIVATE, modechar[0]);
 				else if (modename.equals_cs("redirect"))
-					cm = new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", modechar[0], true);
+					cm = new ChannelModeParam(CMODE_REDIRECT, modechar[0], true);
 				else if (modename.equals_cs("reginvite"))
-					cm = new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", modechar[0]);
+					cm = new ChannelMode(CMODE_REGISTEREDONLY, modechar[0]);
 				else if (modename.equals_cs("regmoderated"))
-					cm = new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", modechar[0]);
+					cm = new ChannelMode(CMODE_REGMODERATED, modechar[0]);
 				else if (modename.equals_cs("secret"))
-					cm = new ChannelMode(CMODE_SECRET, "CMODE_SECRET", modechar[0]);
+					cm = new ChannelMode(CMODE_SECRET, modechar[0]);
 				else if (modename.equals_cs("sslonly"))
-					cm = new ChannelMode(CMODE_SSL, "CMODE_SSL", modechar[0]);
+					cm = new ChannelMode(CMODE_SSL, modechar[0]);
 				else if (modename.equals_cs("stripcolor"))
-					cm = new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", modechar[0]);
+					cm = new ChannelMode(CMODE_STRIPCOLOR, modechar[0]);
 				else if (modename.equals_cs("topiclock"))
-					cm = new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", modechar[0]);
+					cm = new ChannelMode(CMODE_TOPIC, modechar[0]);
 				else if (modename.equals_cs("voice"))
-					cm = new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_VOICE, modechar[1], modechar[0]);
 				/* Unknown status mode, (customprefix) - add it */
 				else if (modechar.length() == 2)
-					cm = new ChannelModeStatus(CMODE_END, modechar[0], modechar[1], modechar[0]);
+					cm = new ChannelModeStatus(CMODE_END, modechar[1], modechar[0]);
 				/* else don't do anything here, we will get it in CAPAB CAPABILITIES */
 
 				if (cm)
@@ -481,46 +481,44 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 				UserMode *um = NULL;
 
 				if (modename.equals_cs("bot"))
-					um = new UserMode(UMODE_BOT, "UMODE_BOT", modechar[0]);
+					um = new UserMode(UMODE_BOT, modechar[0]);
 				else if (modename.equals_cs("callerid"))
-					um = new UserMode(UMODE_CALLERID, "UMODE_CALLERID", modechar[0]);
+					um = new UserMode(UMODE_CALLERID, modechar[0]);
 				else if (modename.equals_cs("cloak"))
-					um = new UserMode(UMODE_CLOAK, "UMODE_CLOAK", modechar[0]);
+					um = new UserMode(UMODE_CLOAK, modechar[0]);
 				else if (modename.equals_cs("deaf"))
-					um = new UserMode(UMODE_DEAF, "UMODE_DEAF", modechar[0]);
+					um = new UserMode(UMODE_DEAF, modechar[0]);
 				else if (modename.equals_cs("deaf_commonchan"))
-					um = new UserMode(UMODE_COMMONCHANS, "UMODE_COMMONCHANS", modechar[0]);
+					um = new UserMode(UMODE_COMMONCHANS, modechar[0]);
 				else if (modename.equals_cs("helpop"))
-					um = new UserMode(UMODE_HELPOP, "UMODE_HELPOP", modechar[0]);
+					um = new UserMode(UMODE_HELPOP, modechar[0]);
 				else if (modename.equals_cs("hidechans"))
-					um = new UserMode(UMODE_PRIV, "UMODE_PRIV", modechar[0]);
+					um = new UserMode(UMODE_PRIV, modechar[0]);
 				else if (modename.equals_cs("hideoper"))
-					um = new UserMode(UMODE_HIDEOPER, "UMODE_HIDEOPER", modechar[0]);
+					um = new UserMode(UMODE_HIDEOPER, modechar[0]);
 				else if (modename.equals_cs("invisible"))
-					um = new UserMode(UMODE_INVIS, "UMODE_INVIS", modechar[0]);
+					um = new UserMode(UMODE_INVIS, modechar[0]);
 				else if (modename.equals_cs("invis-oper"))
-					um = new UserMode(UMODE_INVISIBLE_OPER, "UMODE_INVISIBLE_OPER", modechar[0]);
+					um = new UserMode(UMODE_INVISIBLE_OPER, modechar[0]);
 				else if (modename.equals_cs("oper"))
-					um = new UserMode(UMODE_OPER, "UMODE_OPER", modechar[0]);
+					um = new UserMode(UMODE_OPER, modechar[0]);
 				else if (modename.equals_cs("regdeaf"))
-					um = new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", modechar[0]);
+					um = new UserMode(UMODE_REGPRIV, modechar[0]);
 				else if (modename.equals_cs("servprotect"))
 				{
-					um = new UserMode(UMODE_PROTECTED, "UMODE_PROTECTED", modechar[0]);
-					ircd->pseudoclient_mode = "+Ik";
+					um = new UserMode(UMODE_PROTECTED, modechar[0]);
+					ircd->pseudoclient_mode = "+Ik"; // XXX
 				}
 				else if (modename.equals_cs("showwhois"))
-					um = new UserMode(UMODE_WHOIS, "UMODE_WHOIS", modechar[0]);
-				else if (modename.equals_cs("snomask"))
-					continue; // XXX
+					um = new UserMode(UMODE_WHOIS, modechar[0]);
 				else if (modename.equals_cs("u_censor"))
-					um = new UserMode(UMODE_FILTER, "UMODE_FILTER", modechar[0]);
+					um = new UserMode(UMODE_FILTER, modechar[0]);
 				else if (modename.equals_cs("u_registered"))
-					um = new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", modechar[0]);
+					um = new UserMode(UMODE_REGISTERED, modechar[0]);
 				else if (modename.equals_cs("u_stripcolor"))
-					um = new UserMode(UMODE_STRIPCOLOR, "UMODE_STRIPCOLOR", modechar[0]);
+					um = new UserMode(UMODE_STRIPCOLOR, modechar[0]);
 				else if (modename.equals_cs("wallops"))
-					um = new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", modechar[0]);
+					um = new UserMode(UMODE_WALLOPS, modechar[0]);
 
 				if (um)
 					ModeManager::AddUserMode(um);
@@ -569,7 +567,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t], modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t]));
 					}
 
 					sep.GetToken(modebuf);
@@ -577,7 +575,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t]));
 					}
 
 					sep.GetToken(modebuf);
@@ -585,7 +583,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t], true));
+						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, true));
 					}
 
 					sep.GetToken(modebuf);
@@ -593,7 +591,7 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 					{
 						if (ModeManager::FindChannelModeByChar(modebuf[t]))
 							continue;
-						ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t], modebuf[t]));
+						ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t]));
 					}
 				}
 				else if (capab.find("USERMODES") != Anope::string::npos)
@@ -607,11 +605,11 @@ class Inspircd20IRCdMessage : public InspircdIRCdMessage
 
 					if (sep.GetToken(modebuf))
 						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-							ModeManager::AddUserMode(new UserModeParam(UMODE_END, "", modebuf[t]));
+							ModeManager::AddUserMode(new UserModeParam(UMODE_END, modebuf[t]));
 
 					if (sep.GetToken(modebuf))
 						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-							ModeManager::AddUserMode(new UserMode(UMODE_END, "", modebuf[t]));
+							ModeManager::AddUserMode(new UserMode(UMODE_END, modebuf[t]));
 				}
 				else if (capab.find("MAXMODES=") != Anope::string::npos)
 				{
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index f72624419..cffbb1a53 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -61,9 +61,9 @@ class ngIRCdProto : public IRCDProto
 	{
 		send_cmd(user->nick, "JOIN %s", c->name.c_str());
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf)
@@ -416,33 +416,33 @@ class ProtongIRCd : public Module
 	void AddModes()
 	{
 		/* Add user modes */
-		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_RESTRICTED, "UMODE_RESTRICTED", 'r'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
+		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, 'a'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_RESTRICTED, 'r'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, 's'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, 'x'));
 
 		/* b/e/I */
 		ModeManager::AddChannelMode(new ChannelModeBan('b'));
 		ModeManager::AddChannelMode(new ChannelModeInvex('I'));
 
 		/* v/h/o/a/q */
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
 
 		/* Add channel modes */
 		// channel modes: biIklmnoPstvz
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 		ModeManager::AddChannelMode(new ChannelModeKey('k'));
-		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, "CMODE_PERM", 'P'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'z'));
+		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, 'P'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, 'z'));
 	}
 
  public:
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index a7ebabd86..fd6525701 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -124,9 +124,9 @@ class PlexusProto : public IRCDProto
 	{
 		send_cmd(Config->Numeric, "SJOIN %ld %s +%s :%s", static_cast<long>(c->creation_time), c->name.c_str(), c->GetModes(true, true).c_str(), user->GetUID().c_str());
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	void SendAkill(User *, const XLine *x)
@@ -579,21 +579,21 @@ class ProtoPlexus : public Module
 	void AddModes()
 	{
 		/* Add user modes */
-		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
-		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, "UMODE_DEAF", 'D'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SOFTCALLERID, "UMODE_SOFTCALLERID", 'G'));
-		ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, "UMODE_NETADMIN", 'M'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", 'R'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SSL, "UMODE_SSL", 'S'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WEBIRC, "UMODE_WEBIRC", 'W'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, "UMODE_CALLERID", 'g'));
-		ModeManager::AddUserMode(new UserMode(UMODE_PRIV, "UMODE_PRIV", 'p'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
+		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, 'a'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, 's'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, 'D'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SOFTCALLERID, 'G'));
+		ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, 'M'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, 'R'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SSL, 'S'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WEBIRC, 'W'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CALLERID, 'g'));
+		ModeManager::AddUserMode(new UserMode(UMODE_PRIV, 'p'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, 'r'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, 'x'));
 
 		/* b/e/I */
 		ModeManager::AddChannelMode(new ChannelModeBan('b'));
@@ -602,31 +602,31 @@ class ProtoPlexus : public Module
 	
 		/* l/k */
 		ModeManager::AddChannelMode(new ChannelModeKey('k'));
-		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l'));
+		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l'));
 
 		/* v/h/o/a/q */
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", 'h', '%'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", 'a', '&'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', '~'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, 'h', '%'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, 'a', '&'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, 'q', '~'));
 
 		/* Add channel modes */
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_BANDWIDTH, "CMODE_BANDWIDTH", 'B'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", 'M'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", 'N'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_BANDWIDTH, 'B'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, 'M'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, 'N'));
 		ModeManager::AddChannelMode(new ChannelModeOper('O'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
-
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'S'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, "CMODE_PERM", 'z'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R'));
+
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, 'S'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, 'c'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_PERM, 'z'));
 	}
 
  public:
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 844889310..f0352cf63 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -539,11 +539,11 @@ class ProtoRatbox : public Module
 	void AddModes()
 	{
 		/* Add user modes */
-		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, 'a'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, 's'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
 
 		/* b/e/I */
 		ModeManager::AddChannelMode(new ChannelModeBan('b'));
@@ -551,18 +551,18 @@ class ProtoRatbox : public Module
 		ModeManager::AddChannelMode(new ChannelModeInvex('I'));
 
 		/* v/h/o/a/q */
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
 
 		/* Add channel modes */
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 		ModeManager::AddChannelMode(new ChannelModeKey('k'));
-		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
-		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
+		ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
+		ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
 	}
 
  public:
diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp
index c510a4976..ca5f349e8 100644
--- a/modules/protocol/unreal32.cpp
+++ b/modules/protocol/unreal32.cpp
@@ -173,9 +173,9 @@ class UnrealIRCdProto : public IRCDProto
 	{
 		send_cmd(Config->ServerName, "~ %ld %s :%s", static_cast<long>(c->creation_time), c->name.c_str(), user->nick.c_str());
 		if (status)
-			for (size_t i = CMODE_BEGIN + 1; i != CMODE_END; ++i)
-				if (status->HasFlag(static_cast<ChannelModeName>(i)))
-					c->SetMode(user, static_cast<ChannelModeName>(i), user->nick, false);
+			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
+				if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
+					c->SetMode(user, ModeManager::ChannelModes[i], user->nick, false);
 	}
 
 	/* unsqline
@@ -530,7 +530,7 @@ class Unreal32IRCdMessage : public IRCdMessage
 							ModeManager::AddChannelMode(new ChannelModeInvex('I'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t], modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, modebuf[t]));
 					}
 				}
 
@@ -546,10 +546,10 @@ class Unreal32IRCdMessage : public IRCdMessage
 							ModeManager::AddChannelMode(new ChannelModeFlood('f'));
 							continue;
 						case 'L':
-							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", 'L'));
+							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_REDIRECT, 'L'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t]));
 					}
 				}
 
@@ -559,13 +559,13 @@ class Unreal32IRCdMessage : public IRCdMessage
 					switch (modebuf[t])
 					{
 						case 'l':
-							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", 'l', true));
+							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_LIMIT, 'l', true));
 							continue;
 						case 'j':
-							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", 'j', true));
+							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_JOINFLOOD, 'j', true));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], modebuf[t], true));
+							ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, modebuf[t], true));
 					}
 				}
 
@@ -575,31 +575,31 @@ class Unreal32IRCdMessage : public IRCdMessage
 					switch (modebuf[t])
 					{
 						case 'p':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", 'p'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_PRIVATE, 'p'));
 							continue;
 						case 's':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, "CMODE_SECRET", 's'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_SECRET, 's'));
 							continue;
 						case 'm':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", 'm'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_MODERATED, 'm'));
 							continue;
 						case 'n':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", 'n'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOEXTERNAL, 'n'));
 							continue;
 						case 't':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", 't'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_TOPIC, 't'));
 							continue;
 						case 'i':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, "CMODE_INVITE", 'i'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_INVITE, 'i'));
 							continue;
 						case 'r':
 							ModeManager::AddChannelMode(new ChannelModeRegistered('r'));
 							continue;
 						case 'R':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", 'R'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_REGISTEREDONLY, 'R'));
 							continue;
 						case 'c':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", 'c'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_BLOCKCOLOR, 'c'));
 							continue;
 						case 'O':
 							ModeManager::AddChannelMode(new ChannelModeOper('O'));
@@ -608,40 +608,40 @@ class Unreal32IRCdMessage : public IRCdMessage
 							ModeManager::AddChannelMode(new ChannelModeAdmin('A'));
 							continue;
 						case 'Q':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", 'Q'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKICK, 'Q'));
 							continue;
 						case 'K':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", 'K'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOKNOCK, 'K'));
 							continue;
 						case 'V':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOINVITE, "CMODE_NOINVITE", 'V'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOINVITE, 'V'));
 							continue;
 						case 'C':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", 'C'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NOCTCP, 'C'));
 							continue;
 						case 'u':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", 'u'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_AUDITORIUM, 'u'));
 							continue;
 						case 'z':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, "CMODE_SSL", 'z'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_SSL, 'z'));
 							continue;
 						case 'N':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, "CMODE_NONICK", 'N'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NONICK, 'N'));
 							continue;
 						case 'S':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", 'S'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_STRIPCOLOR, 'S'));
 							continue;
 						case 'M':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", 'M'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_REGMODERATED, 'M'));
 							continue;
 						case 'T':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", 'T'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_NONOTICE, 'T'));
 							continue;
 						case 'G':
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, "CMODE_FILTER", 'G'));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_FILTER, 'G'));
 							continue;
 						default:
-							ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t], modebuf[t]));
+							ModeManager::AddChannelMode(new ChannelMode(CMODE_END, modebuf[t]));
 					}
 				}
 			}
@@ -993,39 +993,39 @@ class ProtoUnreal : public Module
 
 	void AddModes()
 	{
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", 'v', '+'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", 'h', '%'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, "CMODE_OP", 'o', '@'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_VOICE, 'v', '+'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_HALFOP, 'h', '%'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OP, 'o', '@'));
 		/* Unreal sends +q as * and +a as ~ */
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", 'a', '~'));
-		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", 'q', '*'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_PROTECT, 'a', '~'));
+		ModeManager::AddChannelMode(new ChannelModeStatus(CMODE_OWNER, 'q', '*'));
 
 		/* Add user modes */
-		ModeManager::AddUserMode(new UserMode(UMODE_SERV_ADMIN, "UMODE_SERV_ADMIN", 'A'));
-		ModeManager::AddUserMode(new UserMode(UMODE_BOT, "UMODE_BOT", 'B'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CO_ADMIN, "UMODE_CO_ADMIN", 'C'));
-		ModeManager::AddUserMode(new UserMode(UMODE_FILTER, "UMODE_FILTER", 'G'));
-		ModeManager::AddUserMode(new UserMode(UMODE_HIDEOPER, "UMODE_HIDEOPER", 'H'));
-		ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, "UMODE_NETADMIN", 'N'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", 'R'));
-		ModeManager::AddUserMode(new UserMode(UMODE_PROTECTED, "UMODE_PROTECTED", 'S'));
-		ModeManager::AddUserMode(new UserMode(UMODE_NO_CTCP, "UMODE_NO_CTCP", 'T'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WEBTV, "UMODE_WEBTV", 'V'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WHOIS, "UMODE_WHOIS", 'W'));
-		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, "UMODE_ADMIN", 'a'));
-		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, "UMODE_DEAF", 'd'));
-		ModeManager::AddUserMode(new UserMode(UMODE_GLOBOPS, "UMODE_GLOBOPS", 'g'));
-		ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, "UMODE_HELPOP", 'h'));
-		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, "UMODE_INVIS", 'i'));
-		ModeManager::AddUserMode(new UserMode(UMODE_OPER, "UMODE_OPER", 'o'));
-		ModeManager::AddUserMode(new UserMode(UMODE_PRIV, "UMODE_PRIV", 'p'));
-		ModeManager::AddUserMode(new UserMode(UMODE_GOD, "UMODE_GOD", 'q'));
-		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", 'r'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, "UMODE_SNOMASK", 's'));
-		ModeManager::AddUserMode(new UserMode(UMODE_VHOST, "UMODE_VHOST", 't'));
-		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", 'w'));
-		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, "UMODE_CLOAK", 'x'));
-		ModeManager::AddUserMode(new UserMode(UMODE_SSL, "UMODE_SSL", 'z'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SERV_ADMIN, 'A'));
+		ModeManager::AddUserMode(new UserMode(UMODE_BOT, 'B'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CO_ADMIN, 'C'));
+		ModeManager::AddUserMode(new UserMode(UMODE_FILTER, 'G'));
+		ModeManager::AddUserMode(new UserMode(UMODE_HIDEOPER, 'H'));
+		ModeManager::AddUserMode(new UserMode(UMODE_NETADMIN, 'N'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGPRIV, 'R'));
+		ModeManager::AddUserMode(new UserMode(UMODE_PROTECTED, 'S'));
+		ModeManager::AddUserMode(new UserMode(UMODE_NO_CTCP, 'T'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WEBTV, 'V'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WHOIS, 'W'));
+		ModeManager::AddUserMode(new UserMode(UMODE_ADMIN, 'a'));
+		ModeManager::AddUserMode(new UserMode(UMODE_DEAF, 'd'));
+		ModeManager::AddUserMode(new UserMode(UMODE_GLOBOPS, 'g'));
+		ModeManager::AddUserMode(new UserMode(UMODE_HELPOP, 'h'));
+		ModeManager::AddUserMode(new UserMode(UMODE_INVIS, 'i'));
+		ModeManager::AddUserMode(new UserMode(UMODE_OPER, 'o'));
+		ModeManager::AddUserMode(new UserMode(UMODE_PRIV, 'p'));
+		ModeManager::AddUserMode(new UserMode(UMODE_GOD, 'q'));
+		ModeManager::AddUserMode(new UserMode(UMODE_REGISTERED, 'r'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SNOMASK, 's'));
+		ModeManager::AddUserMode(new UserMode(UMODE_VHOST, 't'));
+		ModeManager::AddUserMode(new UserMode(UMODE_WALLOPS, 'w'));
+		ModeManager::AddUserMode(new UserMode(UMODE_CLOAK, 'x'));
+		ModeManager::AddUserMode(new UserMode(UMODE_SSL, 'z'));
 	}
 
  public: