Another big commit, just to please all my fans out there.. cmd_* -> Command*. Muahaha.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8290 e03df62e-2008-0410-955e-edbf42e46eb7

100 files changed, 330 insertions, 330 deletions

diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp
index 427342cfb..0d704ba24 100644
--- a/src/cmd_admin.cpp
+++ b/src/cmd_admin.cpp
@@ -17,12 +17,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_admin(Instance);
+	return new CommandAdmin(Instance);
 }
 
 /** Handle /ADMIN
  */
-CmdResult cmd_admin::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandAdmin::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName);
 	if (*ServerInstance->Config->AdminName)
diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp
index c237a94fd..ce4628858 100644
--- a/src/cmd_away.cpp
+++ b/src/cmd_away.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_away(Instance);
+	return new CommandAway(Instance);
 }
 
 /** Handle /AWAY
  */
-CmdResult cmd_away::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandAway::Handle (const char** parameters, int pcnt, User *user)
 {
 	if ((pcnt) && (*parameters[0]))
 	{
diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp
index aed05c093..cbc796bba 100644
--- a/src/cmd_clearcache.cpp
+++ b/src/cmd_clearcache.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_clearcache(Instance);
+	return new CommandClearcache(Instance);
 }
 
 /** Handle /CLEARCACHE
  */
-CmdResult cmd_clearcache::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandClearcache::Handle (const char** parameters, int pcnt, User *user)
 {
 	int n = ServerInstance->Res->ClearCache();
 	user->WriteServ("NOTICE %s :*** Cleared DNS cache of %d items.", user->nick, n);
diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index f9327d372..68c5a8c78 100644
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -18,10 +18,10 @@
  */
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_commands(Instance);
+	return new CommandCommands(Instance);
 }
 
-CmdResult cmd_commands::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandCommands::Handle (const char** parameters, int pcnt, User *user)
 {
 	for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 	{
diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp
index eff8a23f0..b44264123 100644
--- a/src/cmd_connect.cpp
+++ b/src/cmd_connect.cpp
@@ -20,12 +20,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_connect(Instance);
+	return new CommandConnect(Instance);
 }
 
 /** Handle /CONNECT
  */
-CmdResult cmd_connect::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandConnect::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_SUCCESS;
diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 3193a19e1..4ef9e4301 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -17,12 +17,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_die(Instance);
+	return new CommandDie(Instance);
 }
 
 /** Handle /DIE
  */
-CmdResult cmd_die::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (!strcmp(parameters[0],ServerInstance->Config->diepass))
 	{
diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 6a4db99dd..bd9832c8a 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -17,12 +17,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_eline(Instance);
+	return new CommandEline(Instance);
 }
 
 /** Handle /ELINE
  */
-CmdResult cmd_eline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 1cd4bcb48..3845c23ee 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -17,12 +17,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_gline(Instance);
+	return new CommandGline(Instance);
 }
 
 /** Handle /GLINE
  */
-CmdResult cmd_gline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp
index 447834a7f..959f04a39 100644
--- a/src/cmd_info.cpp
+++ b/src/cmd_info.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_info(Instance);
+	return new CommandInfo(Instance);
 }
 
 /** Handle /INFO
  */
-CmdResult cmd_info::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandInfo::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "371 %s :                   -/\\- \2InspIRCd\2 -\\/-", user->nick);
 	user->WriteServ( "371 %s :                 November 2002 - Present", user->nick);
diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 49382deb8..d5ce160ac 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_invite(Instance);
+	return new CommandInvite(Instance);
 }
 
 /** Handle /INVITE
  */
-CmdResult cmd_invite::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
 {
 	int MOD_RESULT = 0;
 
diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index 94221f152..9289dd014 100644
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_ison(Instance);
+	return new CommandIson(Instance);
 }
 
 /** Handle /ISON
  */
-CmdResult cmd_ison::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandIson::Handle (const char** parameters, int pcnt, User *user)
 {
 	std::map<User*,User*> ison_already;
 	User *u;
diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 0c5c3f157..b5359397d 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_join(Instance);
+	return new CommandJoin(Instance);
 }
 
 /** Handle /JOIN
  */
-CmdResult cmd_join::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt > 1)
 	{
diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index c4eeaf609..c8b505ff0 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_kick(Instance);
+	return new CommandKick(Instance);
 }
 
 /** Handle /KICK
  */
-CmdResult cmd_kick::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKick::Handle (const char** parameters, int pcnt, User *user)
 {
 	char reason[MAXKICK];
 	Channel* c = ServerInstance->FindChan(parameters[0]);
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index e137e1ab2..29ce56b5c 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_kill(Instance);
+	return new CommandKill(Instance);
 }
 
 /** Handle /KILL
  */
-CmdResult cmd_kill::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user)
 {
 	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 5dbdf2b2e..5edb414ea 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -17,12 +17,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_kline(Instance);
+	return new CommandKline(Instance);
 }
 
 /** Handle /KLINE
  */
-CmdResult cmd_kline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp
index 0bf8a19de..4c50b2684 100644
--- a/src/cmd_links.cpp
+++ b/src/cmd_links.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_links(Instance);
+	return new CommandLinks(Instance);
 }
 
 /** Handle /LINKS
  */
-CmdResult cmd_links::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandLinks::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("364 %s %s %s :0 %s",user->nick,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc);
 	user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index ff4715bec..0e97d0db1 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -19,10 +19,10 @@
  */
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_list(Instance);
+	return new CommandList(Instance);
 }
 
-CmdResult cmd_list::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandList::Handle (const char** parameters, int pcnt, User *user)
 {
 	int minusers = 0, maxusers = 0;
 
diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp
index a16a58789..c6f0a611c 100644
--- a/src/cmd_loadmodule.cpp
+++ b/src/cmd_loadmodule.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_loadmodule(Instance);
+	return new CommandLoadmodule(Instance);
 }
 
 /** Handle /LOADMODULE
  */
-CmdResult cmd_loadmodule::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandLoadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Load(parameters[0]))
 	{
diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index 1ea6f2f42..04f2906ac 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_lusers(Instance);
+	return new CommandLusers(Instance);
 }
 
 /** Handle /LUSERS
  */
-CmdResult cmd_lusers::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandLusers::Handle (const char** parameters, int pcnt, User *user)
 {
 	// this lusers command shows one server at all times because
 	// a protocol module must override it to show those stats.
diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp
index 05bd0cbef..7d391d275 100644
--- a/src/cmd_map.cpp
+++ b/src/cmd_map.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_map(Instance);
+	return new CommandMap(Instance);
 }
 
 /** Handle /MAP
  */
-CmdResult cmd_map::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandMap::Handle (const char** parameters, int pcnt, User *user)
 {
 	// as with /LUSERS this does nothing without a linking
 	// module to override its behaviour and display something
diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp
index e5240b00d..e0d3b4242 100644
--- a/src/cmd_mode.cpp
+++ b/src/cmd_mode.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_mode(Instance);
+	return new CommandMode(Instance);
 }
 
 /** Handle /MODE
  */
-CmdResult cmd_mode::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandMode::Handle (const char** parameters, int pcnt, User *user)
 {
 	ServerInstance->Modes->Process(parameters, pcnt, user, false);
 	return CMD_SUCCESS;
diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index fd86254e5..1ff8c1c75 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -33,12 +33,12 @@ char* itab[] = {
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_modules(Instance);
+	return new CommandModules(Instance);
 }
 
 /** Handle /MODULES
  */
-CmdResult cmd_modules::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandModules::Handle (const char** parameters, int pcnt, User *user)
 {
   	for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
 	{
diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp
index 019b13228..8098b2007 100644
--- a/src/cmd_motd.cpp
+++ b/src/cmd_motd.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_motd(Instance);
+	return new CommandMotd(Instance);
 }
 
 /** Handle /MOTD
  */
-CmdResult cmd_motd::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandMotd::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->ShowMOTD();
 	return CMD_SUCCESS;
diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 29d448f28..4049364a7 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_names(Instance);
+	return new CommandNames(Instance);
 }
 
 /** Handle /NAMES
  */
-CmdResult cmd_names::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandNames::Handle (const char** parameters, int pcnt, User *user)
 {
 	Channel* c;
 
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 976c78a7d..52e562d02 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -17,7 +17,7 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_nick(Instance);
+	return new CommandNick(Instance);
 }
 
 /** Handle nick changes from users.
@@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult cmd_nick::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandNick::Handle (const char** parameters, int pcnt, User *user)
 {
 	char oldnick[NICKMAX];
 
@@ -161,7 +161,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, User *user)
 
 }
 
-CmdResult cmd_nick::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
+CmdResult CommandNick::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
 {
 	allowinvalid = (id != 0);
 	return CMD_SUCCESS;
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index cf4d7b44a..9cc846dd8 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -17,10 +17,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_notice(Instance);
+	return new CommandNotice(Instance);
 }
 
-CmdResult cmd_notice::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
 {
 	User *dest;
 	Channel *chan;
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 8fa5d9382..bcb2991b7 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -32,10 +32,10 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_oper(Instance);
+	return new CommandOper(Instance);
 }
 
-CmdResult cmd_oper::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandOper::Handle (const char** parameters, int pcnt, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];
diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 18e8d19d9..46108eca2 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_part(Instance);
+	return new CommandPart(Instance);
 }
 
-CmdResult cmd_part::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPart::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return CMD_SUCCESS;
diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index db84eb051..801d9923b 100644
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_pass(Instance);
+	return new CommandPass(Instance);
 }
 
-CmdResult cmd_pass::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPass::Handle (const char** parameters, int pcnt, User *user)
 {
 	// Check to make sure they havnt registered -- Fix by FCS
 	if (user->registered == REG_ALL)
diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp
index 735f9c3be..fb0b03829 100644
--- a/src/cmd_ping.cpp
+++ b/src/cmd_ping.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_ping(Instance);
+	return new CommandPing(Instance);
 }
 
-CmdResult cmd_ping::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPing::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("PONG %s :%s",ServerInstance->Config->ServerName,parameters[0]);
 	return CMD_SUCCESS;
diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp
index aca317078..e1927deab 100644
--- a/src/cmd_pong.cpp
+++ b/src/cmd_pong.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_pong(Instance);
+	return new CommandPong(Instance);
 }
 
-CmdResult cmd_pong::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPong::Handle (const char** parameters, int pcnt, User *user)
 {
 	// set the user as alive so they survive to next ping
 	user->lastping = 1;
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index fddf810d2..96aff8392 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -17,10 +17,10 @@
 
 extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_privmsg(Instance);
+	return new CommandPrivmsg(Instance);
 }
 
-CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 {
 	User *dest;
 	Channel *chan;
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 4f843cb5e..16927d234 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -19,10 +19,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_qline(Instance);
+	return new CommandQline(Instance);
 }
 
-CmdResult cmd_qline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index ae3d68296..c74f868ba 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_quit(Instance);
+	return new CommandQuit(Instance);
 }
 
-CmdResult cmd_quit::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQuit::Handle (const char** parameters, int pcnt, User *user)
 {
 
 	std::string quitmsg;
diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 5612f59fa..2246c2f46 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_rehash(Instance);
+	return new CommandRehash(Instance);
 }
 
-CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 	std::string parameter;
diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp
index a08dc7fec..5180807b2 100644
--- a/src/cmd_reloadmodule.cpp
+++ b/src/cmd_reloadmodule.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_reloadmodule(Instance);
+	return new CommandReloadmodule(Instance);
 }
 
-CmdResult cmd_reloadmodule::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandReloadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Unload(parameters[0]))
 	{
diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 6880d5e28..3f1ff13b8 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_restart(Instance);
+	return new CommandRestart(Instance);
 }
 
-CmdResult cmd_restart::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRestart::Handle (const char** parameters, int pcnt, User *user)
 {
 	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
 	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp
index 668a207b7..f9009c9df 100644
--- a/src/cmd_rules.cpp
+++ b/src/cmd_rules.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_rules(Instance);
+	return new CommandRules(Instance);
 }
 
-CmdResult cmd_rules::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRules::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->ShowRULES();
 	return CMD_SUCCESS;
diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp
index 7781d3331..9e80cc386 100644
--- a/src/cmd_server.cpp
+++ b/src/cmd_server.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_server(Instance);
+	return new CommandServer(Instance);
 }
 
-CmdResult cmd_server::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandServer::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick);
 	ServerInstance->WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick);
diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp
index 3f8175093..8f1cbf43d 100644
--- a/src/cmd_squit.cpp
+++ b/src/cmd_squit.cpp
@@ -21,10 +21,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_squit(Instance);
+	return new CommandSquit(Instance);
 }
 
-CmdResult cmd_squit::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandSquit::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_FAILURE;
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 38cae03cf..52172df06 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -28,10 +28,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_stats(Instance);
+	return new CommandStats(Instance);
 }
 
-CmdResult cmd_stats::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandStats::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (IS_LOCAL(user))
 	{
diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp
index ddeb0b190..97f4eb5ae 100644
--- a/src/cmd_time.cpp
+++ b/src/cmd_time.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_time(Instance);
+	return new CommandTime(Instance);
 }
 
-CmdResult cmd_time::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandTime::Handle (const char** parameters, int pcnt, User *user)
 {
 	struct tm* timeinfo;
 	time_t local = ServerInstance->Time();
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index b3034ba39..e12fd64f9 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -17,10 +17,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_topic(Instance);
+	return new CommandTopic(Instance);
 }
 
-CmdResult cmd_topic::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandTopic::Handle (const char** parameters, int pcnt, User *user)
 {
 	Channel* Ptr;
 
diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index 5899c6832..d1e57ab00 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.cpp
@@ -16,12 +16,12 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_trace(Instance);
+	return new CommandTrace(Instance);
 }
 
 /** XXX: This is crap. someone fix this when you have time, to be more useful.
  */
-CmdResult cmd_trace::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandTrace::Handle (const char** parameters, int pcnt, User *user)
 {
 	for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
 	{
diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index d0b35f69f..fc20d4895 100644
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_unloadmodule(Instance);
+	return new CommandUnloadmodule(Instance);
 }
 
-CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandUnloadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Unload(parameters[0]))
 	{
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 740674833..0f64600e9 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_user(Instance);
+	return new CommandUser(Instance);
 }
 
-CmdResult cmd_user::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandUser::Handle (const char** parameters, int pcnt, User *user)
 {
 	/* A user may only send the USER command once */
 	if (!(user->registered & REG_USER))
diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 78d435a39..94f406c31 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -16,10 +16,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_userhost(Instance);
+	return new CommandUserhost(Instance);
 }
 
-CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user)
 {
 	std::string retbuf = std::string("302 ") + user->nick + " :";
 
diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index 86fde3210..19bb9e4af 100644
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_version(Instance);
+	return new CommandVersion(Instance);
 }
 
-CmdResult cmd_version::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandVersion::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str());
 	ServerInstance->Config->Send005(user);
diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp
index 14924e56b..f2a4ddfd9 100644
--- a/src/cmd_wallops.cpp
+++ b/src/cmd_wallops.cpp
@@ -18,10 +18,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_wallops(Instance);
+	return new CommandWallops(Instance);
 }
 
-CmdResult cmd_wallops::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandWallops::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteWallOps(std::string(parameters[0]));
 	FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0]));
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 0ebe20d10..70fe78da1 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -27,7 +27,7 @@ static char *get_first_visible_channel(User *u)
 	return "*";
 }
 
-bool cmd_who::whomatch(User* user, const char* matchtext)
+bool CommandWho::whomatch(User* user, const char* matchtext)
 {
 	bool realhost = false;
 	bool realname = false;
@@ -109,10 +109,10 @@ bool cmd_who::whomatch(User* user, const char* matchtext)
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_who(Instance);
+	return new CommandWho(Instance);
 }
 
-bool cmd_who::CanView(Channel* chan, User* user)
+bool CommandWho::CanView(Channel* chan, User* user)
 {
 	if (!user || !chan)
 		return false;
@@ -132,7 +132,7 @@ bool cmd_who::CanView(Channel* chan, User* user)
 	return false;
 }
 
-void cmd_who::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
+void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
 {
 	std::string lcn = get_first_visible_channel(u);
 	Channel* chlast = ServerInstance->FindChan(lcn);
@@ -165,7 +165,7 @@ void cmd_who::SendWhoLine(User* user, const std::string &initial, Channel* ch, U
 	whoresults.push_back(wholine);
 }
 
-CmdResult cmd_who::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
 {
 	/*
 	 * XXX - RFC says:
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index f861dde36..45249a0f6 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -88,10 +88,10 @@ void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long sig
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_whois(Instance);
+	return new CommandWhois(Instance);
 }
 
-CmdResult cmd_whois::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandWhois::Handle (const char** parameters, int pcnt, User *user)
 {
 	User *dest;
 	int userindex = 0;
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 447beba89..005a23489 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -18,17 +18,17 @@ WhoWasMaintainTimer * timer;
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_whowas(Instance);
+	return new CommandWhowas(Instance);
 }
 
-cmd_whowas::cmd_whowas(InspIRCd* Instance) : Command(Instance, "WHOWAS", 0, 1, false, 2)
+CommandWhowas::CommandWhowas(InspIRCd* Instance) : Command(Instance, "WHOWAS", 0, 1, false, 2)
 {
 	syntax = "<nick>{,<nick>}";
 	timer = new WhoWasMaintainTimer(Instance, 3600);
 	Instance->Timers->AddTimer(timer);
 }
 
-CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, User* user)
+CmdResult CommandWhowas::Handle (const char** parameters, int pcnt, User* user)
 {
 	/* if whowas disabled in config */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
@@ -86,7 +86,7 @@ CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, User* user)
 	return CMD_SUCCESS;
 }
 
-CmdResult cmd_whowas::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
+CmdResult CommandWhowas::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
 {
 	switch (id)
 	{
@@ -112,7 +112,7 @@ CmdResult cmd_whowas::HandleInternal(const unsigned int id, const std::deque<cla
 	return CMD_SUCCESS;
 }
 
-void cmd_whowas::GetStats(Extensible* ext)
+void CommandWhowas::GetStats(Extensible* ext)
 {
 	int whowas_size = 0;
 	int whowas_bytes = 0;
@@ -130,7 +130,7 @@ void cmd_whowas::GetStats(Extensible* ext)
 	ext->Extend("stats", stats.c_str());
 }
 
-void cmd_whowas::AddToWhoWas(User* user)
+void CommandWhowas::AddToWhoWas(User* user)
 {
 	/* if whowas disabled */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
@@ -187,7 +187,7 @@ void cmd_whowas::AddToWhoWas(User* user)
 }
 
 /* on rehash, refactor maps according to new conf values */
-void cmd_whowas::PruneWhoWas(time_t t)
+void CommandWhowas::PruneWhoWas(time_t t)
 {
 	/* config values */
 	int groupsize = ServerInstance->Config->WhoWasGroupSize;
@@ -259,7 +259,7 @@ void cmd_whowas::PruneWhoWas(time_t t)
 }
 
 /* call maintain once an hour to remove expired nicks */
-void cmd_whowas::MaintainWhoWas(time_t t)
+void CommandWhowas::MaintainWhoWas(time_t t)
 {
 	for (whowas_users::iterator iter = whowas.begin(); iter != whowas.end(); iter++)
 	{
@@ -276,7 +276,7 @@ void cmd_whowas::MaintainWhoWas(time_t t)
 	}
 }
 
-cmd_whowas::~cmd_whowas()
+CommandWhowas::~CommandWhowas()
 {
 	if (timer)
 	{
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index a1d22e32a..d6394a7a3 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -19,10 +19,10 @@
 
 extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
-	return new cmd_zline(Instance);
+	return new CommandZline(Instance);
 }
 
-CmdResult cmd_zline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 1b48c237f..48b54137e 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -15,10 +15,10 @@
 
 /* $ModDesc: Display timestamps from all servers connected to the network */
 
-class cmd_alltime : public Command
+class CommandAlltime : public Command
 {
  public:
-	cmd_alltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", 'o', 0)
+	CommandAlltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", 'o', 0)
 	{
 		this->source = "m_alltime.so";
 		syntax.clear();
@@ -60,12 +60,12 @@ class cmd_alltime : public Command
 
 class Modulealltime : public Module
 {
-	cmd_alltime *mycommand;
+	CommandAlltime *mycommand;
  public:
 	Modulealltime(InspIRCd *Me)
 		: Module(Me)
 	{
-		mycommand = new cmd_alltime(ServerInstance);
+		mycommand = new CommandAlltime(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index b02e892d3..a978d2fd9 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -44,10 +44,10 @@ cbanlist cbans;
 
 /** Handle /CBAN
  */
-class cmd_cban : public Command
+class CommandCban : public Command
 {
  public:
-	cmd_cban(InspIRCd* Me) : Command(Me, "CBAN", 'o', 1)
+	CommandCban(InspIRCd* Me) : Command(Me, "CBAN", 'o', 1)
 	{
 		this->source = "m_cban.so";
 		this->syntax = "<channel> [<duration> :<reason>]";
@@ -118,14 +118,14 @@ bool CBanComp(const CBan &ban1, const CBan &ban2)
 
 class ModuleCBan : public Module
 {
-	cmd_cban* mycommand;
+	CommandCban* mycommand;
 	
 
  public:
 	ModuleCBan(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_cban(Me);
+		mycommand = new CommandCban(Me);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index b30b9316b..74802da88 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -40,13 +40,13 @@ public:
 };
 typedef std::vector<CGIhost> CGIHostlist;
 
-class cmd_webirc : public Command
+class CommandWebirc : public Command
 {
 	InspIRCd* Me;
 	CGIHostlist Hosts;
 	bool notify;
 	public:
-		cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : Command(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
+		CommandWebirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : Command(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
 		{
 			this->source = "m_cgiirc.so";
 			this->syntax = "password client hostname ip";
@@ -123,7 +123,7 @@ class CGIResolver : public Resolver
 
 class ModuleCgiIRC : public Module
 {
-	cmd_webirc* mycommand;
+	CommandWebirc* mycommand;
 	bool NotifyOpers;
 	CGIHostlist Hosts;
 public:
@@ -131,7 +131,7 @@ public:
 	{
 		
 		OnRehash(NULL,"");
-		mycommand=new cmd_webirc(Me, Hosts, NotifyOpers);
+		mycommand=new CommandWebirc(Me, Hosts, NotifyOpers);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 24024e2f9..b505f10ee 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /CHECK
  */
-class cmd_check : public Command
+class CommandCheck : public Command
 {
  public:
- 	cmd_check (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
+ 	CommandCheck (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
@@ -157,12 +157,12 @@ class cmd_check : public Command
 class ModuleCheck : public Module
 {
  private:
-	cmd_check *mycommand;
+	CommandCheck *mycommand;
  public:
 	ModuleCheck(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_check(ServerInstance);
+		mycommand = new CommandCheck(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 4b53e7c12..e13dc1c31 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -17,12 +17,12 @@
 
 /** Handle /CHGHOST
  */
-class cmd_chghost : public Command
+class CommandChghost : public Command
 {
  private:
 	char* hostmap;
  public:
-	cmd_chghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST",'o',2), hostmap(hmap)
+	CommandChghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST",'o',2), hostmap(hmap)
 	{
 		this->source = "m_chghost.so";
 		syntax = "<nick> <newhost>";
@@ -75,14 +75,14 @@ class cmd_chghost : public Command
 
 class ModuleChgHost : public Module
 {
-	cmd_chghost* mycommand;
+	CommandChghost* mycommand;
 	char hostmap[256];
  public:
 	ModuleChgHost(InspIRCd* Me)
 		: Module(Me)
 	{
 		OnRehash(NULL,"");
-		mycommand = new cmd_chghost(ServerInstance, hostmap);
+		mycommand = new CommandChghost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 7ae98b37d..42a4ef747 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CHGIDENT
  */
-class cmd_chgident : public Command
+class CommandChgident : public Command
 {
  public:
-	cmd_chgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", 'o', 2)
+	CommandChgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", 'o', 2)
 	{
 		this->source = "m_chgident.so";
 		syntax = "<nick> <newident>";
@@ -68,13 +68,13 @@ class cmd_chgident : public Command
 
 class ModuleChgIdent : public Module
 {
-	cmd_chgident* mycommand;
+	CommandChgident* mycommand;
 	
 	
 public:
 	ModuleChgIdent(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_chgident(ServerInstance);
+		mycommand = new CommandChgident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 987678b5b..dc90b016b 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CHGNAME
  */
-class cmd_chgname : public Command
+class CommandChgname : public Command
 {
  public:
-	cmd_chgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", 'o', 2)
+	CommandChgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", 'o', 2)
 	{
 		this->source = "m_chgname.so";
 		syntax = "<nick> <newname>";
@@ -64,13 +64,13 @@ class cmd_chgname : public Command
 
 class ModuleChgName : public Module
 {
-	cmd_chgname* mycommand;
+	CommandChgname* mycommand;
 	
 	
 public:
 	ModuleChgName(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_chgname(ServerInstance);
+		mycommand = new CommandChgname(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 82fdf535f..8f47a6432 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /CHECK
  */
-class cmd_clones : public Command
+class CommandClones : public Command
 {
  public:
- 	cmd_clones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
+ 	CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
 	{
 		this->source = "m_clones.so";
 		syntax = "<limit>";
@@ -69,12 +69,12 @@ class cmd_clones : public Command
 class ModuleClones : public Module
 {
  private:
-	cmd_clones *mycommand;
+	CommandClones *mycommand;
  public:
 	ModuleClones(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_clones(ServerInstance);
+		mycommand = new CommandClones(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 4b91ca789..7a823e799 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -15,11 +15,11 @@
 
 /** Handle /CLOSE
  */
-class cmd_close : public Command
+class CommandClose : public Command
 {
  public:
 	/* Command 'close', needs operator */
-	cmd_close (InspIRCd* Instance) : Command(Instance,"CLOSE", 'o', 0)
+	CommandClose (InspIRCd* Instance) : Command(Instance,"CLOSE", 'o', 0)
 	{
 		this->source = "m_close.so";
 	}
@@ -55,13 +55,13 @@ class cmd_close : public Command
 
 class ModuleClose : public Module
 {
-	cmd_close* newcommand;
+	CommandClose* newcommand;
  public:
 	ModuleClose(InspIRCd* Me)
 		: Module(Me)
 	{
 		// Create a new command
-		newcommand = new cmd_close(ServerInstance);
+		newcommand = new CommandClose(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 	}
 
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index bd165034f..da28ea8af 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -18,11 +18,11 @@
 
 /** Handle /TITLE
  */
-class cmd_title : public Command
+class CommandTitle : public Command
 {
 	
  public:
-	cmd_title (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
+	CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
 	{
 		this->source = "m_customtitle.so";
 		syntax = "<user> <password>";
@@ -110,13 +110,13 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 
 class ModuleCustomTitle : public Module
 {
-	cmd_title* mycommand;
+	CommandTitle* mycommand;
 	
  public:
 	ModuleCustomTitle(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_title(ServerInstance);
+		mycommand = new CommandTitle(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index aee8ba8cf..c271f024c 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public Command
+class CommandCycle : public Command
 {
  public:
-	cmd_cycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
+	CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
 	{
 		this->source = "m_cycle.so";
 		syntax = "<channel> :[reason]";
@@ -79,13 +79,13 @@ class cmd_cycle : public Command
 
 class ModuleCycle : public Module
 {
-	cmd_cycle*	mycommand;
+	CommandCycle*	mycommand;
  public:
 	ModuleCycle(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_cycle(ServerInstance);
+		mycommand = new CommandCycle(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index ebd3b8630..2b67654cc 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -44,10 +44,10 @@ dccallowlist* dl;
 typedef std::vector<BannedFileList> bannedfilelist;
 bannedfilelist bfl;
 
-class cmd_dccallow : public Command
+class CommandDccallow : public Command
 {
  public:
-	cmd_dccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
+	CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
 	{
 		this->source = "m_dccallow.so";
 		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
@@ -245,14 +245,14 @@ class cmd_dccallow : public Command
 	
 class ModuleDCCAllow : public Module
 {
-	cmd_dccallow* mycommand;
+	CommandDccallow* mycommand;
  public:
 
 	ModuleDCCAllow(InspIRCd* Me)
 		: Module(Me)
 	{
 		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_dccallow(ServerInstance);
+		mycommand = new CommandDccallow(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ReadFileConf();
 	}
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 553d3dfeb..c11c95f85 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -22,10 +22,10 @@
 
 /** Handle /DEVOICE
  */
-class cmd_devoice : public Command
+class CommandDevoice : public Command
 {
  public:
-	cmd_devoice (InspIRCd* Instance) : Command(Instance,"DEVOICE", 0, 1)
+	CommandDevoice (InspIRCd* Instance) : Command(Instance,"DEVOICE", 0, 1)
 	{
 		this->source = "m_devoice.so";
 		syntax = "<channel>";
@@ -54,12 +54,12 @@ class cmd_devoice : public Command
 
 class ModuleDeVoice : public Module
 {
-	cmd_devoice *mycommand;
+	CommandDevoice *mycommand;
  public:
 	ModuleDeVoice(InspIRCd* Me) : Module(Me)
 	{
 
-		mycommand = new cmd_devoice(ServerInstance);
+		mycommand = new CommandDevoice(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 941576f79..0f1dc97bd 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -88,11 +88,11 @@ class FilterResult : public classbase
 	}
 };
 
-class cmd_filter;
+class CommandFilter;
 
 class FilterBase : public Module
 {
-	cmd_filter* filtcommand;
+	CommandFilter* filtcommand;
 	int flags;
  public:
 	FilterBase(InspIRCd* Me, const std::string &source);
@@ -116,11 +116,11 @@ class FilterBase : public Module
 	bool AppliesToMe(User* user, FilterResult* filter, int flags);
 };
 
-class cmd_filter : public Command
+class CommandFilter : public Command
 {
 	FilterBase* Base;
  public:
-	cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f)
+	CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f)
 	{
 		this->source = source;
 		this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
@@ -223,7 +223,7 @@ bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags)
 
 FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me)
 {
-	filtcommand = new cmd_filter(this, Me, source);
+	filtcommand = new CommandFilter(this, Me, source);
 	ServerInstance->AddCommand(filtcommand);
 }
 
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index df439b989..1c2b47a48 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /GLOADMODULE
  */
-class cmd_gloadmodule : public Command
+class CommandGloadmodule : public Command
 {
  public:
-	cmd_gloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1)
+	CommandGloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -52,10 +52,10 @@ class cmd_gloadmodule : public Command
 
 /** Handle /GUNLOADMODULE
  */
-class cmd_gunloadmodule : public Command
+class CommandGunloadmodule : public Command
 {
  public:
-	cmd_gunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1)
+	CommandGunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -86,10 +86,10 @@ class cmd_gunloadmodule : public Command
 
 /** Handle /GRELOADMODULE
  */
-class cmd_greloadmodule : public Command
+class CommandGreloadmodule : public Command
 {
  public:
-	cmd_greloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", 'o', 1)
+	CommandGreloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -121,17 +121,17 @@ class cmd_greloadmodule : public Command
 
 class ModuleGlobalLoad : public Module
 {
-	cmd_gloadmodule *mycommand;
-	cmd_gunloadmodule *mycommand2;
-	cmd_greloadmodule *mycommand3;
+	CommandGloadmodule *mycommand;
+	CommandGunloadmodule *mycommand2;
+	CommandGreloadmodule *mycommand3;
 	
  public:
 	ModuleGlobalLoad(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_gloadmodule(ServerInstance);
-		mycommand2 = new cmd_gunloadmodule(ServerInstance);
-		mycommand3 = new cmd_greloadmodule(ServerInstance);
+		mycommand = new CommandGloadmodule(ServerInstance);
+		mycommand2 = new CommandGunloadmodule(ServerInstance);
+		mycommand3 = new CommandGreloadmodule(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ServerInstance->AddCommand(mycommand2);
 		ServerInstance->AddCommand(mycommand3);
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index b95f455dc..fe4279213 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -19,10 +19,10 @@
 
 /** Handle /GLOBOPS
  */
-class cmd_globops : public Command
+class CommandGlobops : public Command
 {
  public:
-	cmd_globops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1)
+	CommandGlobops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1)
 	{
 		this->source = "m_globops.so";
 		syntax = "<any-text>";
@@ -45,12 +45,12 @@ class cmd_globops : public Command
 
 class ModuleGlobops : public Module
 {
-	cmd_globops* mycommand;
+	CommandGlobops* mycommand;
  public:
 	ModuleGlobops(InspIRCd* Me)
 		: Module(Me)
 	{
-		mycommand = new cmd_globops(ServerInstance);
+		mycommand = new CommandGlobops(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index a2a64cc26..1ca9e0b5e 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -49,10 +49,10 @@ class Helpop : public ModeHandler
 
 /** Handles /HELPOP
  */
-class cmd_helpop : public Command
+class CommandHelpop : public Command
 {
  public:
-	cmd_helpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
+	CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
 	{
 		this->source = "m_helpop.so";
 		syntax = "<any-text>";
@@ -106,7 +106,7 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		cmd_helpop* mycommand;
+		CommandHelpop* mycommand;
 		Helpop* ho;
 
 	public:
@@ -117,7 +117,7 @@ class ModuleHelpop : public Module
 			ho = new Helpop(ServerInstance);
 			if (!ServerInstance->AddMode(ho, 'h'))
 				throw ModuleException("Could not add new modes!");
-			mycommand = new cmd_helpop(ServerInstance);
+			mycommand = new CommandHelpop(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
 		}
 
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 94367f696..9a88cfc45 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -17,7 +17,7 @@
 
 /** Handle /SAPART
  */
-class cmd_jumpserver : public Command
+class CommandJumpserver : public Command
 {
  public:
 	bool redirect_all_immediately;
@@ -27,7 +27,7 @@ class cmd_jumpserver : public Command
 	std::string reason;
 	int port;
 
-	cmd_jumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
+	CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
 	{
 		this->source = "m_jumpserver.so";
 		syntax = "[<server> <port> <+/-a> :<reason>]";
@@ -121,13 +121,13 @@ class cmd_jumpserver : public Command
 
 class ModuleJumpServer : public Module
 {
-	cmd_jumpserver*	js;
+	CommandJumpserver*	js;
  public:
 	ModuleJumpServer(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		js = new cmd_jumpserver(ServerInstance);
+		js = new CommandJumpserver(ServerInstance);
 		ServerInstance->AddCommand(js);
 	}
 	
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index f4a3335e6..bf44bff53 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -17,10 +17,10 @@
 
 /** Handles the /KNOCK command
  */
-class cmd_knock : public Command
+class CommandKnock : public Command
 {
  public:
-	cmd_knock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
+	CommandKnock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
 		syntax = "<channel> <reason>";
@@ -95,7 +95,7 @@ class Knock : public ModeHandler
 
 class ModuleKnock : public Module
 {
-	cmd_knock* mycommand;
+	CommandKnock* mycommand;
 	Knock* kn;
  public:
 	ModuleKnock(InspIRCd* Me) : Module(Me)
@@ -105,7 +105,7 @@ class ModuleKnock : public Module
 		if (!ServerInstance->AddMode(kn, 'K'))
 			throw ModuleException("Could not add new modes!");
 
-		mycommand = new cmd_knock(ServerInstance);
+		mycommand = new CommandKnock(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index f14e437ee..d2bfff6a5 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -21,13 +21,13 @@
 */
 
 
-class cmd_lockserv : public Command
+class CommandLockserv : public Command
 {
 private:
 	bool& locked;
 
 public:
-	cmd_lockserv (InspIRCd* Instance, bool &lock)
+	CommandLockserv (InspIRCd* Instance, bool &lock)
 	: Command(Instance, "LOCKSERV", 'o', 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
@@ -44,13 +44,13 @@ public:
 	}
 };
 
-class cmd_unlockserv : public Command
+class CommandUnlockserv : public Command
 {
 private:
 	bool& locked;
 
 public:
-	cmd_unlockserv (InspIRCd* Instance, bool &lock)
+	CommandUnlockserv (InspIRCd* Instance, bool &lock)
 	: Command(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
@@ -71,8 +71,8 @@ class ModuleLockserv : public Module
 {
 private:
 	bool locked;
-	cmd_lockserv* lockcommand;
-	cmd_unlockserv* unlockcommand;
+	CommandLockserv* lockcommand;
+	CommandUnlockserv* unlockcommand;
 
 	virtual void ResetLocked()
 	{
@@ -83,10 +83,10 @@ public:
 	ModuleLockserv(InspIRCd* Me) : Module(Me)
 	{
 		ResetLocked();
-		lockcommand = new cmd_lockserv(ServerInstance, locked);
+		lockcommand = new CommandLockserv(ServerInstance, locked);
 		ServerInstance->AddCommand(lockcommand);
 
-		unlockcommand = new cmd_unlockserv(ServerInstance, locked);
+		unlockcommand = new CommandUnlockserv(ServerInstance, locked);
 		ServerInstance->AddCommand(unlockcommand);
 	}
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index c2c02f629..6f2e94cd4 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /NICKLOCK
  */
-class cmd_nicklock : public Command
+class CommandNicklock : public Command
 {
 	char* dummy;
  public:
-	cmd_nicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
+	CommandNicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
@@ -72,10 +72,10 @@ class cmd_nicklock : public Command
 
 /** Handle /NICKUNLOCK
  */
-class cmd_nickunlock : public Command
+class CommandNickunlock : public Command
 {
  public:
-	cmd_nickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
+	CommandNickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
@@ -99,16 +99,16 @@ class cmd_nickunlock : public Command
 
 class ModuleNickLock : public Module
 {
-	cmd_nicklock*	cmd1;
-	cmd_nickunlock*	cmd2;
+	CommandNicklock*	cmd1;
+	CommandNickunlock*	cmd2;
 	char* n;
  public:
 	ModuleNickLock(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		cmd1 = new cmd_nicklock(ServerInstance);
-		cmd2 = new cmd_nickunlock(ServerInstance);
+		cmd1 = new CommandNicklock(ServerInstance);
+		cmd2 = new CommandNickunlock(ServerInstance);
 		ServerInstance->AddCommand(cmd1);
 		ServerInstance->AddCommand(cmd2);
 	}
diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index cc2afbe54..fd7e683de 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -21,13 +21,13 @@ typedef std::map<irc::string, Module*> hashymodules;
 
 /* Handle /MKPASSWD
  */
-class cmd_mkpasswd : public Command
+class CommandMkpasswd : public Command
 {
 	Module* Sender;
 	hashymodules &hashers;
 	std::deque<std::string> &names;
  public:
-	cmd_mkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
+	CommandMkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
 		: Command(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
 	{
 		this->source = "m_oper_hash.so";
@@ -66,7 +66,7 @@ class cmd_mkpasswd : public Command
 class ModuleOperHash : public Module
 {
 	
-	cmd_mkpasswd* mycommand;
+	CommandMkpasswd* mycommand;
 	ConfigReader* Conf;
 	hashymodules hashers; /* List of modules which implement HashRequest */
 	std::deque<std::string> names; /* Module names which implement HashRequest */
@@ -106,7 +106,7 @@ class ModuleOperHash : public Module
 			throw ModuleException("I can't find any modules loaded which implement the HashRequest interface! You probably forgot to load a hashing module such as m_md5.so or m_sha256.so.");
 		}
 
-		mycommand = new cmd_mkpasswd(ServerInstance, this, hashers, names);
+		mycommand = new CommandMkpasswd(ServerInstance, this, hashers, names);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index ef3ae98c4..fbc72aeea 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -40,10 +40,10 @@ CmdResult ShowOperMOTD(User* user)
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public Command
+class CommandOpermotd : public Command
 {
  public:
-	cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
+	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
 	{
 		this->source = "m_opermotd.so";
 		syntax = "[<servername>]";
@@ -58,7 +58,7 @@ class cmd_opermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-	cmd_opermotd* mycommand;
+	CommandOpermotd* mycommand;
  public:
 
 	void LoadOperMOTD()
@@ -79,7 +79,7 @@ class ModuleOpermotd : public Module
 		: Module(Me)
 	{
 		opermotd = NULL;
-		mycommand = new cmd_opermotd(ServerInstance);
+		mycommand = new CommandOpermotd(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		opermotd = new FileReader(ServerInstance);
 		LoadOperMOTD();
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 435c41453..e4cb70a76 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -23,10 +23,10 @@ std::string suffix;
 
 /** Handle /RANDQUOTE
  */
-class cmd_randquote : public Command
+class CommandRandquote : public Command
 {
  public:
-	cmd_randquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
+	CommandRandquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
 	{
 		this->source = "m_randquote.so";
 	}
@@ -72,7 +72,7 @@ class RandquoteException : public ModuleException
 class ModuleRandQuote : public Module
 {
  private:
-	cmd_randquote* mycommand;
+	CommandRandquote* mycommand;
 	ConfigReader *conf;
  public:
 	ModuleRandQuote(InspIRCd* Me)
@@ -104,7 +104,7 @@ class ModuleRandQuote : public Module
 		else
 		{
 			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			mycommand = new cmd_randquote(ServerInstance);
+			mycommand = new CommandRandquote(ServerInstance);
 			ServerInstance->AddCommand(mycommand);
 		}
 	}
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 22e4b6490..8be08db62 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -203,10 +203,10 @@ class RemoveBase
 
 /** Handle /REMOVE
  */
-class cmd_remove : public Command, public RemoveBase
+class CommandRemove : public Command, public RemoveBase
 {
  public:
-	cmd_remove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+	CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
 	{
 		this->source = "m_remove.so";
 		syntax = "<nick> <channel> [<reason>]";
@@ -221,10 +221,10 @@ class cmd_remove : public Command, public RemoveBase
 
 /** Handle /FPART
  */
-class cmd_fpart : public Command, public RemoveBase
+class CommandFpart : public Command, public RemoveBase
 {
  public:
-	cmd_fpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+	CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
 	{
 		this->source = "m_remove.so";
 		syntax = "<channel> <nick> [<reason>]";
@@ -238,8 +238,8 @@ class cmd_fpart : public Command, public RemoveBase
 
 class ModuleRemove : public Module
 {
-	cmd_remove* mycommand;
-	cmd_fpart* mycommand2;
+	CommandRemove* mycommand;
+	CommandFpart* mycommand2;
 	bool supportnokicks;
 	
 	
@@ -247,8 +247,8 @@ class ModuleRemove : public Module
 	ModuleRemove(InspIRCd* Me)
 	: Module(Me)
 	{
-		mycommand = new cmd_remove(ServerInstance, supportnokicks);
-		mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+		mycommand = new CommandRemove(ServerInstance, supportnokicks);
+		mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
 		ServerInstance->AddCommand(mycommand);
 		ServerInstance->AddCommand(mycommand2);
 		OnRehash(NULL,"");
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index b6cf6782d..36eb9f15c 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAJOIN
  */
-class cmd_sajoin : public Command
+class CommandSajoin : public Command
 {
  public:
-	cmd_sajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2, false, 0)
+	CommandSajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2, false, 0)
 	{
 		this->source = "m_sajoin.so";
 		syntax = "<nick> <channel>";
@@ -88,13 +88,13 @@ class cmd_sajoin : public Command
 
 class ModuleSajoin : public Module
 {
-	cmd_sajoin*	mycommand;
+	CommandSajoin*	mycommand;
  public:
 	ModuleSajoin(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_sajoin(ServerInstance);
+		mycommand = new CommandSajoin(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index c3631bbfd..0e922326e 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAMODE
  */
-class cmd_samode : public Command
+class CommandSamode : public Command
 {
  public:
-	cmd_samode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0)
+	CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
@@ -68,13 +68,13 @@ class cmd_samode : public Command
 
 class ModuleSaMode : public Module
 {
-	cmd_samode*	mycommand;
+	CommandSamode*	mycommand;
  public:
 	ModuleSaMode(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_samode(ServerInstance);
+		mycommand = new CommandSamode(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index b6ec61876..4011b6516 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SANICK
  */
-class cmd_sanick : public Command
+class CommandSanick : public Command
 {
  public:
-	cmd_sanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
+	CommandSanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2, false, 0)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
@@ -71,13 +71,13 @@ class cmd_sanick : public Command
 
 class ModuleSanick : public Module
 {
-	cmd_sanick*	mycommand;
+	CommandSanick*	mycommand;
  public:
 	ModuleSanick(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_sanick(ServerInstance);
+		mycommand = new CommandSanick(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 43a4782cc..3d24d60a9 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAPART
  */
-class cmd_sapart : public Command
+class CommandSapart : public Command
 {
  public:
-	cmd_sapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2, false, 0)
+	CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2, false, 0)
 	{
 		this->source = "m_sapart.so";
 		syntax = "<nick> <channel>";
@@ -86,13 +86,13 @@ class cmd_sapart : public Command
 
 class ModuleSapart : public Module
 {
-	cmd_sapart*	mycommand;
+	CommandSapart*	mycommand;
  public:
 	ModuleSapart(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_sapart(ServerInstance);
+		mycommand = new CommandSapart(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 9479509cc..215a099c6 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAQUIT
  */
-class cmd_saquit : public Command
+class CommandSaquit : public Command
 {
  public:
-	cmd_saquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
+	CommandSaquit (InspIRCd* Instance) : Command(Instance, "SAQUIT", 'o', 2, false, 0)
 	{
 		this->source = "m_saquit.so";
 		syntax = "<nick> <reason>";
@@ -60,13 +60,13 @@ class cmd_saquit : public Command
 
 class ModuleSaquit : public Module
 {
-	cmd_saquit*	mycommand;
+	CommandSaquit*	mycommand;
  public:
 	ModuleSaquit(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_saquit(ServerInstance);
+		mycommand = new CommandSaquit(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 7ea03ebbc..87b886661 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -17,12 +17,12 @@
 
 /** Handle /SETHOST
  */
-class cmd_sethost : public Command
+class CommandSethost : public Command
 {
  private:
 	char* hostmap;
  public:
-	cmd_sethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
+	CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
@@ -63,14 +63,14 @@ class cmd_sethost : public Command
 
 class ModuleSetHost : public Module
 {
-	cmd_sethost* mycommand;
+	CommandSethost* mycommand;
 	char hostmap[256];
  public:
 	ModuleSetHost(InspIRCd* Me)
 		: Module(Me)
 	{	
 		OnRehash(NULL,"");
-		mycommand = new cmd_sethost(ServerInstance, hostmap);
+		mycommand = new CommandSethost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 0eae1c7be..179053394 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SETIDENT
  */
-class cmd_setident : public Command
+class CommandSetident : public Command
 {
  public:
- cmd_setident (InspIRCd* Instance) : Command(Instance,"SETIDENT", 'o', 1)
+ CommandSetident (InspIRCd* Instance) : Command(Instance,"SETIDENT", 'o', 1)
 	{
 		this->source = "m_setident.so";
 		syntax = "<new-ident>";
@@ -57,13 +57,13 @@ class cmd_setident : public Command
 
 class ModuleSetIdent : public Module
 {
-	cmd_setident*	mycommand;
+	CommandSetident*	mycommand;
 	
  public:
 	ModuleSetIdent(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_setident(ServerInstance);
+		mycommand = new CommandSetident(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index a676eedb4..9207ad796 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SETIDLE
  */
-class cmd_setidle : public Command
+class CommandSetidle : public Command
 {
  public:
-	cmd_setidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", 'o', 1)
+	CommandSetidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", 'o', 1)
 	{
 		this->source = "m_setidle.so";
 		syntax = "<duration>";
@@ -49,13 +49,13 @@ class cmd_setidle : public Command
 
 class ModuleSetIdle : public Module
 {
-	cmd_setidle*	mycommand;
+	CommandSetidle*	mycommand;
  public:
 	ModuleSetIdle(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_setidle(ServerInstance);
+		mycommand = new CommandSetidle(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 04e101fa3..a139a0174 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -17,10 +17,10 @@
 
 
 
-class cmd_setname : public Command
+class CommandSetname : public Command
 {
  public:
-	cmd_setname (InspIRCd* Instance) : Command(Instance,"SETNAME", 0, 1)
+	CommandSetname (InspIRCd* Instance) : Command(Instance,"SETNAME", 0, 1)
 	{
 		this->source = "m_setname.so";
 		syntax = "<new-gecos>";
@@ -54,13 +54,13 @@ class cmd_setname : public Command
 
 class ModuleSetName : public Module
 {
-	cmd_setname*	mycommand;
+	CommandSetname*	mycommand;
  public:
 	ModuleSetName(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_setname(ServerInstance);
+		mycommand = new CommandSetname(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 240752099..b741105c7 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -21,11 +21,11 @@
 // have one of these structures associated with their user record.
 typedef std::map<irc::string, time_t> silencelist;
 
-class cmd_silence : public Command
+class CommandSilence : public Command
 {
 	unsigned int& maxsilence;
  public:
-	cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
+	CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
 	{
 		this->source = "m_silence.so";
 		syntax = "{[+|-]<mask>}";
@@ -125,7 +125,7 @@ class cmd_silence : public Command
 class ModuleSilence : public Module
 {
 	
-	cmd_silence* mycommand;
+	CommandSilence* mycommand;
 	unsigned int maxsilence;
  public:
  
@@ -133,7 +133,7 @@ class ModuleSilence : public Module
 		: Module(Me), maxsilence(32)
 	{
 		OnRehash(NULL, "");
-		mycommand = new cmd_silence(ServerInstance, maxsilence);
+		mycommand = new CommandSilence(ServerInstance, maxsilence);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index c6fbcdbdc..3cc40df2a 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -51,11 +51,11 @@ static int SILENCE_ALL		= 0x0020; /* a  all, (pcint)          */
 static int SILENCE_EXCLUDE	= 0x0040; /* x  exclude this pattern  */
 
 
-class cmd_silence : public Command
+class CommandSilence : public Command
 {
 	unsigned int& maxsilence;
  public:
-	cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
+	CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
 	{
 		this->source = "m_silence_ext.so";
 		syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
@@ -231,7 +231,7 @@ class cmd_silence : public Command
 
 class ModuleSilence : public Module
 {
-	cmd_silence* mycommand;
+	CommandSilence* mycommand;
 	unsigned int maxsilence;
  public:
  
@@ -239,7 +239,7 @@ class ModuleSilence : public Module
 		: Module(Me), maxsilence(32)
 	{
 		OnRehash(NULL, "");
-		mycommand = new cmd_silence(ServerInstance,maxsilence);
+		mycommand = new CommandSilence(ServerInstance,maxsilence);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 76ae8cfa4..de26a7e23 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -63,10 +63,10 @@ void spy_userlist(User *user, Channel *c)
 
 /** Handle /SPYLIST
  */
-class cmd_spylist : public Command
+class CommandSpylist : public Command
 {
   public:
-	cmd_spylist (InspIRCd* Instance) : Command(Instance,"SPYLIST", 'o', 0)
+	CommandSpylist (InspIRCd* Instance) : Command(Instance,"SPYLIST", 'o', 0)
 	{
 		this->source = "m_spy.so";
 		syntax.clear();
@@ -91,10 +91,10 @@ class cmd_spylist : public Command
 
 /** Handle /SPYNAMES
  */
-class cmd_spynames : public Command
+class CommandSpynames : public Command
 {
   public:
-	cmd_spynames (InspIRCd* Instance) : Command(Instance,"SPYNAMES", 'o', 0)
+	CommandSpynames (InspIRCd* Instance) : Command(Instance,"SPYNAMES", 'o', 0)
 	{
 		this->source = "m_spy.so";
 		syntax = "{<channel>{,<channel>}}";
@@ -130,14 +130,14 @@ class cmd_spynames : public Command
 
 class ModuleSpy : public Module
 {
-	cmd_spylist *mycommand;
-	cmd_spynames *mycommand2;
+	CommandSpylist *mycommand;
+	CommandSpynames *mycommand2;
  public:
 	ModuleSpy(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_spylist(ServerInstance);
-		mycommand2 = new cmd_spynames(ServerInstance);
+		mycommand = new CommandSpylist(ServerInstance);
+		mycommand2 = new CommandSpynames(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		ServerInstance->AddCommand(mycommand2);
 	}
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 7988d73ba..3eff54cab 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -47,10 +47,10 @@ SVSHoldMap HoldMap;
 
 /** Handle /SVSHold
  */
-class cmd_svshold : public Command
+class CommandSvshold : public Command
 {
  public:
-	cmd_svshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1)
+	CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1)
 	{
 		this->source = "m_svshold.so";
 		this->syntax = "<nickname> [<duration> :<reason>]";
@@ -151,13 +151,13 @@ bool SVSHoldComp(const SVSHold* ban1, const SVSHold* ban2)
 
 class ModuleSVSHold : public Module
 {
-	cmd_svshold *mycommand;
+	CommandSvshold *mycommand;
 	
 
  public:
 	ModuleSVSHold(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_svshold(Me);
+		mycommand = new CommandSvshold(Me);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 196c43553..cd82bce67 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /SWHOIS
  */
-class cmd_swhois : public Command
+class CommandSwhois : public Command
 {
 	
  public:
-	cmd_swhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
+	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> <swhois>";
@@ -97,7 +97,7 @@ class cmd_swhois : public Command
 
 class ModuleSWhois : public Module
 {
-	cmd_swhois* mycommand;
+	CommandSwhois* mycommand;
 	
 	ConfigReader* Conf;
 	
@@ -106,7 +106,7 @@ class ModuleSWhois : public Module
 	{
 		
 		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_swhois(ServerInstance);
+		mycommand = new CommandSwhois(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index bf77c5812..1fb4f886e 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -17,13 +17,13 @@
 
 /** Handle /TAXONOMY
  */
-class cmd_taxonomy : public Command
+class CommandTaxonomy : public Command
 {
 	Module* Creator;
 	bool& claimed;
  public:
 	/* Command 'taxonomy', takes no parameters and needs no special modes */
-	cmd_taxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
+	CommandTaxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
 	{
 		this->source = "m_taxonomy.so";
 		syntax = "<nickname>";
@@ -55,7 +55,7 @@ class cmd_taxonomy : public Command
 
 class ModuleTaxonomy : public Module
 {
-	cmd_taxonomy* newcommand;
+	CommandTaxonomy* newcommand;
 	bool claimed;
  public:
 	ModuleTaxonomy(InspIRCd* Me)
@@ -63,7 +63,7 @@ class ModuleTaxonomy : public Module
 	{
 		
 		// Create a new command
-		newcommand = new cmd_taxonomy(ServerInstance, this, claimed);
+		newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
 		ServerInstance->AddCommand(newcommand);
 	}
 
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index 58fd466df..2da77b34e 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /DALINFO
  */
-class cmd_dalinfo : public Command
+class CommandDalinfo : public Command
 {
  public:
 	/* Command 'dalinfo', takes no parameters and needs no special modes */
-	cmd_dalinfo (InspIRCd* Instance) : Command(Instance,"DALINFO", 0, 0)
+	CommandDalinfo (InspIRCd* Instance) : Command(Instance,"DALINFO", 0, 0)
 	{
 		this->source = "m_testcommand.so";
 	}
@@ -35,13 +35,13 @@ class cmd_dalinfo : public Command
 
 class ModuleTestCommand : public Module
 {
-	cmd_dalinfo* newcommand;
+	CommandDalinfo* newcommand;
  public:
 	ModuleTestCommand(InspIRCd* Me)
 		: Module(Me)
 	{
 		// Create a new command
-		newcommand = new cmd_dalinfo(ServerInstance);
+		newcommand = new CommandDalinfo(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 	}
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index a226b9747..682fc2f01 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -30,10 +30,10 @@ timedbans TimedBanList;
 
 /** Handle /TBAN
  */
-class cmd_tban : public Command
+class CommandTban : public Command
 {
  public:
- cmd_tban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
+ CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
 	{
 		this->source = "m_timedbans.so";
 		syntax = "<channel> <duration> <banmask>";
@@ -104,13 +104,13 @@ class cmd_tban : public Command
 
 class ModuleTimedBans : public Module
 {
-	cmd_tban* mycommand;
+	CommandTban* mycommand;
  public:
 	ModuleTimedBans(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_tban(ServerInstance);
+		mycommand = new CommandTban(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 		TimedBanList.clear();
 	}
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index c246cc811..74bf3a634 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /TLINE
  */ 
-class cmd_tline : public Command
+class CommandTline : public Command
 {
  public:
-	cmd_tline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
+	CommandTline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
 	{
 		this->source = "m_tline.so";
 		this->syntax = "<mask>";
@@ -64,13 +64,13 @@ class cmd_tline : public Command
 
 class ModuleTLine : public Module
 {
-	cmd_tline* newcommand;
+	CommandTline* newcommand;
  public:
 	ModuleTLine(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		newcommand = new cmd_tline(ServerInstance);
+		newcommand = new CommandTline(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
 	}
 
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 9fbd6dfb0..881483405 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /UNINVITE
  */	 
-class cmd_uninvite : public Command
+class CommandUninvite : public Command
 {
  public:
-	cmd_uninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
+	CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
 	{
 		this->source = "m_uninvite.so";
 		syntax = "<nick> <channel>";
@@ -79,14 +79,14 @@ class cmd_uninvite : public Command
 
 class ModuleUninvite : public Module
 {
-	cmd_uninvite *mycommand;
+	CommandUninvite *mycommand;
 
  public:
 
 	ModuleUninvite(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_uninvite(ServerInstance);
+		mycommand = new CommandUninvite(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 829a535e3..4097ab510 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /USERIP
  */
-class cmd_userip : public Command
+class CommandUserip : public Command
 {
  public:
-	cmd_userip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1)
+	CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1)
 	{
 		this->source = "m_userip.so";
 		syntax = "<nick>{,<nick>}";
@@ -48,13 +48,13 @@ class cmd_userip : public Command
 
 class ModuleUserIP : public Module
 {
-	cmd_userip* mycommand;
+	CommandUserip* mycommand;
  public:
 	ModuleUserIP(InspIRCd* Me)
 		: Module(Me)
 	{
 		
-		mycommand = new cmd_userip(ServerInstance);
+		mycommand = new CommandUserip(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 0827343de..08d3e6b66 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /VHOST
  */
-class cmd_vhost : public Command
+class CommandVhost : public Command
 {
  public:
-	cmd_vhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
+	CommandVhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
 	{
 		this->source = "m_vhost.so";
 		syntax = "<username> <password>";
@@ -58,12 +58,12 @@ class ModuleVHost : public Module
 {
  private:
 
-	cmd_vhost* mycommand;
+	CommandVhost* mycommand;
 	 
  public:
 	ModuleVHost(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_vhost(ServerInstance);
+		mycommand = new CommandVhost(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 6cc96d0f9..84058d627 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -76,7 +76,7 @@ watchentries* whos_watching_me;
 
 /** Handle /WATCH
  */
-class cmd_watch : public Command
+class CommandWatch : public Command
 {
 	unsigned int& MAX_WATCH;
  public:
@@ -192,7 +192,7 @@ class cmd_watch : public Command
 		return CMD_FAILURE;
 	}
 
-	cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch)
+	CommandWatch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch)
 	{
 		this->source = "m_watch.so";
 		syntax = "[C|L|S]|[+|-<nick>]";
@@ -301,7 +301,7 @@ class cmd_watch : public Command
 
 class Modulewatch : public Module
 {
-	cmd_watch* mycommand;
+	CommandWatch* mycommand;
 	unsigned int maxwatch;
  public:
 
@@ -310,7 +310,7 @@ class Modulewatch : public Module
 	{
 		OnRehash(NULL, "");
 		whos_watching_me = new watchentries();
-		mycommand = new cmd_watch(ServerInstance, maxwatch);
+		mycommand = new CommandWatch(ServerInstance, maxwatch);
 		ServerInstance->AddCommand(mycommand);
 	}