class command_t -> class Command. Whey :D

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

171 files changed, 321 insertions, 321 deletions

diff --git a/include/command_parse.h b/include/command_parse.h
index 4e25d1004..be3ea89ff 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -77,13 +77,13 @@ class CoreExport CommandParser : public classbase
 	/** Removes a command if the sources match. Used as a helper for
 	 *  safe hash_map delete while iter in RemoveCommands(const char* source).
 	 */
-	void RemoveCommand(nspace::hash_map<std::string,command_t*>::iterator safei, const char* source);
+	void RemoveCommand(nspace::hash_map<std::string,Command*>::iterator safei, const char* source);
 
 
  public:
-	/** Command list, a hash_map of command names to command_t*
+	/** Command list, a hash_map of command names to Command*
 	 */
-	command_table cmdlist;
+	Commandable cmdlist;
 
 	/** Reload a core command.
 	 * This will only reload commands implemented by the core,
@@ -117,7 +117,7 @@ class CoreExport CommandParser : public classbase
 	 * @param commandname The command required. Always use uppercase for this parameter.
 	 * @return a pointer to the command handler, or NULL
 	 */
-	command_t* GetHandler(const std::string &commandname);
+	Command* GetHandler(const std::string &commandname);
 
 	/** This function returns true if a command is valid with the given number of parameters and user.
 	 * @param commandname The command name to check
@@ -150,7 +150,7 @@ class CoreExport CommandParser : public classbase
 	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
 	 * caller should return without doing anything, otherwise it should continue into its main section of code.
 	 */
-	int LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra);
+	int LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra);
 
 	/** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
 	 * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
@@ -173,7 +173,7 @@ class CoreExport CommandParser : public classbase
 	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
 	 * caller should return without doing anything, otherwise it should continue into its main section of code.
 	 */
-	int LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere);
+	int LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere);
 
 	/** Take a raw input buffer from a recvq, and process it on behalf of a user.
 	 * @param buffer The buffer line to process
@@ -188,13 +188,13 @@ class CoreExport CommandParser : public classbase
 	bool RemoveCommands(const char* source);
 
 	/** Add a new command to the commands hash
-	 * @param f The new command_t to add to the list
+	 * @param f The new Command to add to the list
 	 * @param so_handle The handle to the shared object where the command can be found.
 	 * Only core commands loaded via cmd_*.so files should set this parameter to anything
 	 * meaningful. Module authors should leave this parameter at its default of NULL.
 	 * @return True if the command was added
 	 */
-	bool CreateCommand(command_t *f, void* so_handle = NULL);
+	bool CreateCommand(Command *f, void* so_handle = NULL);
 
 	/** Insert the default RFC1459 commands into the command hash.
 	 * Ignore any already loaded commands.
@@ -215,12 +215,12 @@ class CoreExport CommandParser : public classbase
 /** Command handler class for the RELOAD command.
  * A command cant really reload itself, so this has to be in here.
  */
-class cmd_reload : public command_t
+class cmd_reload : public Command
 {
  public:
 	/** Standard constructor
 	 */
-	cmd_reload (InspIRCd* Instance) : command_t(Instance,"RELOAD",'o',1) { syntax = "<core-command>"; }
+	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
 	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
diff --git a/include/commands/cmd_admin.h b/include/commands/cmd_admin.h
index c1f90312b..049d230b0 100644
--- a/include/commands/cmd_admin.h
+++ b/include/commands/cmd_admin.h
@@ -22,12 +22,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_admin : public command_t
+class cmd_admin : public Command
 {
  public:
 	/** Constructor for admin.
 	 */
-	cmd_admin (InspIRCd* Instance) : command_t(Instance,"ADMIN",0,0) { syntax = "[<servername>]"; }
+	cmd_admin (InspIRCd* Instance) : Command(Instance,"ADMIN",0,0) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_away.h b/include/commands/cmd_away.h
index 73b75fd28..269c548aa 100644
--- a/include/commands/cmd_away.h
+++ b/include/commands/cmd_away.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_away : public command_t
+class cmd_away : public Command
 {
  public:
 	/** Constructor for away.
 	 */
-	cmd_away (InspIRCd* Instance) : command_t(Instance,"AWAY",0,0) { syntax = "[<message>]"; }
+	cmd_away (InspIRCd* Instance) : Command(Instance,"AWAY",0,0) { syntax = "[<message>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_clearcache.h b/include/commands/cmd_clearcache.h
index 10cd20994..b89029a30 100644
--- a/include/commands/cmd_clearcache.h
+++ b/include/commands/cmd_clearcache.h
@@ -23,12 +23,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_clearcache : public command_t
+class cmd_clearcache : public Command
 {
  public:
 	/** Constructor for clearcache.
 	 */
-	cmd_clearcache (InspIRCd* Instance) : command_t(Instance,"CLEARCACHE",'o',0) { }
+	cmd_clearcache (InspIRCd* Instance) : Command(Instance,"CLEARCACHE",'o',0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_commands.h b/include/commands/cmd_commands.h
index c7206b657..a796d4ebd 100644
--- a/include/commands/cmd_commands.h
+++ b/include/commands/cmd_commands.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_commands : public command_t
+class cmd_commands : public Command
 {
  public:
 	/** Constructor for commands.
 	 */
-	cmd_commands (InspIRCd* Instance) : command_t(Instance,"COMMANDS",0,0) { }
+	cmd_commands (InspIRCd* Instance) : Command(Instance,"COMMANDS",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_connect.h b/include/commands/cmd_connect.h
index 4cb3d7992..b621cab77 100644
--- a/include/commands/cmd_connect.h
+++ b/include/commands/cmd_connect.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_connect : public command_t
+class cmd_connect : public Command
 {
  public:
 	/** Constructor for connect.
 	 */
-	cmd_connect (InspIRCd* Instance) : command_t(Instance,"CONNECT",'o',1) { syntax = "<servername> [<remote-server>]"; }
+	cmd_connect (InspIRCd* Instance) : Command(Instance,"CONNECT",'o',1) { syntax = "<servername> [<remote-server>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h
index f74ea1585..cae2637e9 100644
--- a/include/commands/cmd_die.h
+++ b/include/commands/cmd_die.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_die : public command_t
+class cmd_die : public Command
 {
  public:
 	/** Constructor for die.
 	 */
-	cmd_die (InspIRCd* Instance) : command_t(Instance,"DIE",'o',1) { syntax = "<password>"; }
+	cmd_die (InspIRCd* Instance) : Command(Instance,"DIE",'o',1) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h
index 1b31431e3..36b22ce79 100644
--- a/include/commands/cmd_eline.h
+++ b/include/commands/cmd_eline.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_eline : public command_t
+class cmd_eline : public Command
 {
  public:
 	/** Constructor for eline.
 	 */
-	cmd_eline (InspIRCd* Instance) : command_t(Instance,"ELINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	cmd_eline (InspIRCd* Instance) : Command(Instance,"ELINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h
index 906b1c784..caf703009 100644
--- a/include/commands/cmd_gline.h
+++ b/include/commands/cmd_gline.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_gline : public command_t
+class cmd_gline : public Command
 {
  public:
 	/** Constructor for gline.
 	 */
-	cmd_gline (InspIRCd* Instance) : command_t(Instance,"GLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	cmd_gline (InspIRCd* Instance) : Command(Instance,"GLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_info.h b/include/commands/cmd_info.h
index 9627112d6..c84a03adf 100644
--- a/include/commands/cmd_info.h
+++ b/include/commands/cmd_info.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_info : public command_t
+class cmd_info : public Command
 {
  public:
 	/** Constructor for info.
 	 */
-	cmd_info (InspIRCd* Instance) : command_t(Instance,"INFO",0,0) { syntax = "[<servermask>]"; }
+	cmd_info (InspIRCd* Instance) : Command(Instance,"INFO",0,0) { syntax = "[<servermask>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_invite.h b/include/commands/cmd_invite.h
index 3be048ea2..95391e829 100644
--- a/include/commands/cmd_invite.h
+++ b/include/commands/cmd_invite.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_invite : public command_t
+class cmd_invite : public Command
 {
  public:
 	/** Constructor for invite.
 	 */
-	cmd_invite (InspIRCd* Instance) : command_t(Instance,"INVITE",0,0) { syntax = "[<nick> <channel>]"; }
+	cmd_invite (InspIRCd* Instance) : Command(Instance,"INVITE",0,0) { syntax = "[<nick> <channel>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_ison.h b/include/commands/cmd_ison.h
index 4e64ec91b..3b914d62e 100644
--- a/include/commands/cmd_ison.h
+++ b/include/commands/cmd_ison.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_ison : public command_t
+class cmd_ison : public Command
 {
  public:
 	/** Constructor for ison.
 	 */
-	cmd_ison (InspIRCd* Instance) : command_t(Instance,"ISON",0,0) { syntax = "<nick> {nick}"; }
+	cmd_ison (InspIRCd* Instance) : Command(Instance,"ISON",0,0) { syntax = "<nick> {nick}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_join.h b/include/commands/cmd_join.h
index 6981d458b..cf678e4ea 100644
--- a/include/commands/cmd_join.h
+++ b/include/commands/cmd_join.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_join : public command_t
+class cmd_join : public Command
 {
  public:
 	/** Constructor for join.
 	 */
-	cmd_join (InspIRCd* Instance) : command_t(Instance,"JOIN",0,1) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; }
+	cmd_join (InspIRCd* Instance) : Command(Instance,"JOIN",0,1) { syntax = "<channel>{,<channel>} {<key>{,<key>}}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kick.h b/include/commands/cmd_kick.h
index acd177b44..3a58d4203 100644
--- a/include/commands/cmd_kick.h
+++ b/include/commands/cmd_kick.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_kick : public command_t
+class cmd_kick : public Command
 {
  public:
 	/** Constructor for kick.
 	 */
-	cmd_kick (InspIRCd* Instance) : command_t(Instance,"KICK",0,2) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
+	cmd_kick (InspIRCd* Instance) : Command(Instance,"KICK",0,2) { syntax = "<channel> <nick>{,<nick>} [<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h
index 7a3ae5304..1e1835f00 100644
--- a/include/commands/cmd_kill.h
+++ b/include/commands/cmd_kill.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_kill : public command_t
+class cmd_kill : public Command
 {
  public:
 	/** Constructor for kill.
 	 */
-	cmd_kill (InspIRCd* Instance) : command_t(Instance,"KILL",'o',2) { syntax = "<nickname> <reason>"; }
+	cmd_kill (InspIRCd* Instance) : Command(Instance,"KILL",'o',2) { syntax = "<nickname> <reason>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h
index 3ce7d34e5..edaa8a8bc 100644
--- a/include/commands/cmd_kline.h
+++ b/include/commands/cmd_kline.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_kline : public command_t
+class cmd_kline : public Command
 {
  public:
 	/** Constructor for kline.
 	 */
-	cmd_kline (InspIRCd* Instance) : command_t(Instance,"KLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	cmd_kline (InspIRCd* Instance) : Command(Instance,"KLINE",'o',1) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_links.h b/include/commands/cmd_links.h
index 260ba60fb..74b616401 100644
--- a/include/commands/cmd_links.h
+++ b/include/commands/cmd_links.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_links : public command_t
+class cmd_links : public Command
 {
  public:
 	/** Constructor for links.
 	 */
-	cmd_links (InspIRCd* Instance) : command_t(Instance,"LINKS",0,0) { }
+	cmd_links (InspIRCd* Instance) : Command(Instance,"LINKS",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_list.h b/include/commands/cmd_list.h
index 5395b3180..f99111fa0 100644
--- a/include/commands/cmd_list.h
+++ b/include/commands/cmd_list.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_list : public command_t
+class cmd_list : public Command
 {
  public:
 	/** Constructor for list.
 	 */
-	cmd_list (InspIRCd* Instance) : command_t(Instance,"LIST",0,0) { }
+	cmd_list (InspIRCd* Instance) : Command(Instance,"LIST",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h
index 19de8b988..4288eb4c6 100644
--- a/include/commands/cmd_loadmodule.h
+++ b/include/commands/cmd_loadmodule.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_loadmodule : public command_t
+class cmd_loadmodule : public Command
 {
  public:
 	/** Constructor for loadmodule.
 	 */
-	cmd_loadmodule (InspIRCd* Instance) : command_t(Instance,"LOADMODULE",'o',1) { syntax = "<modulename>"; }
+	cmd_loadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE",'o',1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_lusers.h b/include/commands/cmd_lusers.h
index e257899c0..76ebf5674 100644
--- a/include/commands/cmd_lusers.h
+++ b/include/commands/cmd_lusers.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_lusers : public command_t
+class cmd_lusers : public Command
 {
  public:
 	/** Constructor for lusers.
 	 */
-	cmd_lusers (InspIRCd* Instance) : command_t(Instance,"LUSERS",0,0) { }
+	cmd_lusers (InspIRCd* Instance) : Command(Instance,"LUSERS",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_map.h b/include/commands/cmd_map.h
index 961e91753..1ae324309 100644
--- a/include/commands/cmd_map.h
+++ b/include/commands/cmd_map.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_map : public command_t
+class cmd_map : public Command
 {
  public:
 	/** Constructor for map.
 	 */
-	cmd_map (InspIRCd* Instance) : command_t(Instance,"MAP",0,0) { }
+	cmd_map (InspIRCd* Instance) : Command(Instance,"MAP",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_mode.h b/include/commands/cmd_mode.h
index 3d6c72840..9231f2c61 100644
--- a/include/commands/cmd_mode.h
+++ b/include/commands/cmd_mode.h
@@ -23,12 +23,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_mode : public command_t
+class cmd_mode : public Command
 {
  public:
 	/** Constructor for mode.
 	 */
-	cmd_mode (InspIRCd* Instance) : command_t(Instance,"MODE",0,1) { syntax = "<target> <modes> {<mode-parameters>}"; }
+	cmd_mode (InspIRCd* Instance) : Command(Instance,"MODE",0,1) { syntax = "<target> <modes> {<mode-parameters>}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_modules.h b/include/commands/cmd_modules.h
index 7d2657416..73a6074d1 100644
--- a/include/commands/cmd_modules.h
+++ b/include/commands/cmd_modules.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_modules : public command_t
+class cmd_modules : public Command
 {
  public:
 	/** Constructor for modules.
 	 */
-	cmd_modules (InspIRCd* Instance) : command_t(Instance,"MODULES",0,0) { syntax = "[debug]"; }
+	cmd_modules (InspIRCd* Instance) : Command(Instance,"MODULES",0,0) { syntax = "[debug]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_motd.h b/include/commands/cmd_motd.h
index c58599938..e6f5092b2 100644
--- a/include/commands/cmd_motd.h
+++ b/include/commands/cmd_motd.h
@@ -27,12 +27,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_motd : public command_t
+class cmd_motd : public Command
 {
  public:
 	/** Constructor for motd.
 	 */
-	cmd_motd (InspIRCd* Instance) : command_t(Instance,"MOTD",0,0) { syntax = "[<servername>]"; }
+	cmd_motd (InspIRCd* Instance) : Command(Instance,"MOTD",0,0) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_names.h b/include/commands/cmd_names.h
index 577e49e34..b65fdeda8 100644
--- a/include/commands/cmd_names.h
+++ b/include/commands/cmd_names.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_names : public command_t
+class cmd_names : public Command
 {
  public:
 	/** Constructor for names.
 	 */
-	cmd_names (InspIRCd* Instance) : command_t(Instance,"NAMES",0,0) { syntax = "{<channel>{,<channel>}}"; }
+	cmd_names (InspIRCd* Instance) : Command(Instance,"NAMES",0,0) { syntax = "{<channel>{,<channel>}}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_nick.h b/include/commands/cmd_nick.h
index 6b361c9c0..849b59c22 100644
--- a/include/commands/cmd_nick.h
+++ b/include/commands/cmd_nick.h
@@ -24,13 +24,13 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_nick : public command_t
+class cmd_nick : public Command
 {
 	bool allowinvalid;
  public:
 	/** Constructor for nick.
 	 */
-	cmd_nick (InspIRCd* Instance) : command_t(Instance,"NICK",0,1,true), allowinvalid(false) { syntax = "<newnick>"; }
+	cmd_nick (InspIRCd* Instance) : Command(Instance,"NICK",0,1,true), allowinvalid(false) { syntax = "<newnick>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_notice.h b/include/commands/cmd_notice.h
index 8ae576ee2..20c34b6bf 100644
--- a/include/commands/cmd_notice.h
+++ b/include/commands/cmd_notice.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_notice : public command_t
+class cmd_notice : public Command
 {
  public:
 	/** Constructor for notice.
 	 */
-	cmd_notice (InspIRCd* Instance) : command_t(Instance,"NOTICE",0,2) { syntax = "<target>{,<target>} <message>"; }
+	cmd_notice (InspIRCd* Instance) : Command(Instance,"NOTICE",0,2) { syntax = "<target>{,<target>} <message>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_oper.h b/include/commands/cmd_oper.h
index 3a61c8a80..17d71dbe3 100644
--- a/include/commands/cmd_oper.h
+++ b/include/commands/cmd_oper.h
@@ -26,12 +26,12 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist);
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_oper : public command_t
+class cmd_oper : public Command
 {
  public:
 	/** Constructor for oper.
 	 */
-	cmd_oper (InspIRCd* Instance) : command_t(Instance,"OPER",0,2) { syntax = "<username> <password>"; }
+	cmd_oper (InspIRCd* Instance) : Command(Instance,"OPER",0,2) { syntax = "<username> <password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_part.h b/include/commands/cmd_part.h
index c4c9668a3..c419fb798 100644
--- a/include/commands/cmd_part.h
+++ b/include/commands/cmd_part.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_part : public command_t
+class cmd_part : public Command
 {
  public:
 	/** Constructor for part.
 	 */
-	cmd_part (InspIRCd* Instance) : command_t(Instance,"PART",0,1) { syntax = "<channel>{,<channel>} [<reason>]"; }
+	cmd_part (InspIRCd* Instance) : Command(Instance,"PART",0,1) { syntax = "<channel>{,<channel>} [<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_pass.h b/include/commands/cmd_pass.h
index 609c1e72f..0edd17a97 100644
--- a/include/commands/cmd_pass.h
+++ b/include/commands/cmd_pass.h
@@ -27,12 +27,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_pass : public command_t
+class cmd_pass : public Command
 {
  public:
 	/** Constructor for pass.
 	 */
-	cmd_pass (InspIRCd* Instance) : command_t(Instance,"PASS",0,1,true) { syntax = "<password>"; }
+	cmd_pass (InspIRCd* Instance) : Command(Instance,"PASS",0,1,true) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_ping.h b/include/commands/cmd_ping.h
index 83bbd06ad..6e856fa3a 100644
--- a/include/commands/cmd_ping.h
+++ b/include/commands/cmd_ping.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_ping : public command_t
+class cmd_ping : public Command
 {
  public:
 	/** Constructor for ping.
 	 */
-	cmd_ping (InspIRCd* Instance) : command_t(Instance,"PING",0,1) { syntax = "<servername> [:<servername>]"; }
+	cmd_ping (InspIRCd* Instance) : Command(Instance,"PING",0,1) { syntax = "<servername> [:<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_pong.h b/include/commands/cmd_pong.h
index 26e7444d1..f050a4ee8 100644
--- a/include/commands/cmd_pong.h
+++ b/include/commands/cmd_pong.h
@@ -25,12 +25,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_pong : public command_t
+class cmd_pong : public Command
 {
  public:
 	/** Constructor for pong.
 	 */
-	cmd_pong (InspIRCd* Instance) : command_t(Instance,"PONG",0,1) { syntax = "<ping-text>"; }
+	cmd_pong (InspIRCd* Instance) : Command(Instance,"PONG",0,1) { syntax = "<ping-text>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_privmsg.h b/include/commands/cmd_privmsg.h
index 276580fbe..604093851 100644
--- a/include/commands/cmd_privmsg.h
+++ b/include/commands/cmd_privmsg.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_privmsg : public command_t
+class cmd_privmsg : public Command
 {
  public:
 	/** Constructor for privmsg.
 	 */
-	cmd_privmsg (InspIRCd* Instance) : command_t(Instance,"PRIVMSG",0,2) { syntax = "<target>{,<target>} <message>"; }
+	cmd_privmsg (InspIRCd* Instance) : Command(Instance,"PRIVMSG",0,2) { syntax = "<target>{,<target>} <message>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h
index 4221f78b7..fb9e88048 100644
--- a/include/commands/cmd_qline.h
+++ b/include/commands/cmd_qline.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_qline : public command_t
+class cmd_qline : public Command
 {
  public:
 	/** Constructor for qline.
 	 */
-	cmd_qline (InspIRCd* Instance) : command_t(Instance,"QLINE",'o',1) { syntax = "<nick> [<duration> :<reason>]"; }
+	cmd_qline (InspIRCd* Instance) : Command(Instance,"QLINE",'o',1) { syntax = "<nick> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_quit.h b/include/commands/cmd_quit.h
index c0a27744a..06c564ac0 100644
--- a/include/commands/cmd_quit.h
+++ b/include/commands/cmd_quit.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_quit : public command_t
+class cmd_quit : public Command
 {
  public:
 	/** Constructor for quit.
 	 */
-	cmd_quit (InspIRCd* Instance) : command_t(Instance,"QUIT",0,0,true) { syntax = "[<message>]"; }
+	cmd_quit (InspIRCd* Instance) : Command(Instance,"QUIT",0,0,true) { syntax = "[<message>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h
index 818a038c8..684ffee9c 100644
--- a/include/commands/cmd_rehash.h
+++ b/include/commands/cmd_rehash.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_rehash : public command_t
+class cmd_rehash : public Command
 {
  public:
 	/** Constructor for rehash.
 	 */
-	cmd_rehash (InspIRCd* Instance) : command_t(Instance,"REHASH",'o',0) { syntax = "[<servermask>]"; }
+	cmd_rehash (InspIRCd* Instance) : Command(Instance,"REHASH",'o',0) { syntax = "[<servermask>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_reloadmodule.h b/include/commands/cmd_reloadmodule.h
index 6e21e0dfa..672816289 100644
--- a/include/commands/cmd_reloadmodule.h
+++ b/include/commands/cmd_reloadmodule.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_reloadmodule : public command_t
+class cmd_reloadmodule : public Command
 {
  public:
 	/** Constructor for reloadmodule.
 	 */
-	cmd_reloadmodule (InspIRCd* Instance) : command_t(Instance,"RELOADMODULE",'o',1) { syntax = "<modulename>"; }
+	cmd_reloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE",'o',1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_restart.h b/include/commands/cmd_restart.h
index e66873ebb..0834bf61b 100644
--- a/include/commands/cmd_restart.h
+++ b/include/commands/cmd_restart.h
@@ -27,12 +27,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_restart : public command_t
+class cmd_restart : public Command
 {
  public:
 	/** Constructor for restart.
 	 */
-	cmd_restart (InspIRCd* Instance) : command_t(Instance,"RESTART",'o',1) { syntax = "<password>"; }
+	cmd_restart (InspIRCd* Instance) : Command(Instance,"RESTART",'o',1) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_rules.h b/include/commands/cmd_rules.h
index a57080eaa..5313dae32 100644
--- a/include/commands/cmd_rules.h
+++ b/include/commands/cmd_rules.h
@@ -27,12 +27,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_rules : public command_t
+class cmd_rules : public Command
 {
  public:
 	/** Constructor for rules.
 	 */
-	cmd_rules (InspIRCd* Instance) : command_t(Instance,"RULES",0,0) { syntax = "[<servername>]"; }
+	cmd_rules (InspIRCd* Instance) : Command(Instance,"RULES",0,0) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_server.h b/include/commands/cmd_server.h
index 20d8ca8a3..e3383e5c7 100644
--- a/include/commands/cmd_server.h
+++ b/include/commands/cmd_server.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_server : public command_t
+class cmd_server : public Command
 {
  public:
 	/** Constructor for server.
 	 */
-	cmd_server (InspIRCd* Instance) : command_t(Instance,"SERVER",0,0) { }
+	cmd_server (InspIRCd* Instance) : Command(Instance,"SERVER",0,0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index fd09ca437..faef49dff 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -27,12 +27,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_squit : public command_t
+class cmd_squit : public Command
 {
  public:
 	/** Constructor for squit.
 	 */
-	cmd_squit (InspIRCd* Instance) : command_t(Instance,"SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
+	cmd_squit (InspIRCd* Instance) : Command(Instance,"SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_stats.h b/include/commands/cmd_stats.h
index ce4755fec..2931a27e0 100644
--- a/include/commands/cmd_stats.h
+++ b/include/commands/cmd_stats.h
@@ -27,12 +27,12 @@ DllExport void DoStats(InspIRCd* Instance, char statschar, userrec* user, string
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_stats : public command_t
+class cmd_stats : public Command
 {
  public:
 	/** Constructor for stats.
 	 */
-	cmd_stats (InspIRCd* Instance) : command_t(Instance,"STATS",0,1) { syntax = "<stats-symbol> [<servername>]"; }
+	cmd_stats (InspIRCd* Instance) : Command(Instance,"STATS",0,1) { syntax = "<stats-symbol> [<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_time.h b/include/commands/cmd_time.h
index d0206b84b..24423c46e 100644
--- a/include/commands/cmd_time.h
+++ b/include/commands/cmd_time.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_time : public command_t
+class cmd_time : public Command
 {
  public:
 	/** Constructor for time.
 	 */
-	cmd_time (InspIRCd* Instance) : command_t(Instance,"TIME",0,0) { syntax = "[<servername>]"; }
+	cmd_time (InspIRCd* Instance) : Command(Instance,"TIME",0,0) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_topic.h b/include/commands/cmd_topic.h
index ce82ad119..0e75df750 100644
--- a/include/commands/cmd_topic.h
+++ b/include/commands/cmd_topic.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_topic : public command_t
+class cmd_topic : public Command
 {
  public:
 	/** Constructor for topic.
 	 */
-	cmd_topic (InspIRCd* Instance) : command_t(Instance,"TOPIC",0,1) { syntax = "<channel> [<topic>]"; }
+	cmd_topic (InspIRCd* Instance) : Command(Instance,"TOPIC",0,1) { syntax = "<channel> [<topic>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h
index 69ee31df1..6f5aecf00 100644
--- a/include/commands/cmd_trace.h
+++ b/include/commands/cmd_trace.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_trace : public command_t
+class cmd_trace : public Command
 {
  public:
 	/** Constructor for trace.
 	 */
-	cmd_trace (InspIRCd* Instance) : command_t(Instance,"TRACE",'o',0) { syntax = "[<object>]"; }
+	cmd_trace (InspIRCd* Instance) : Command(Instance,"TRACE",'o',0) { syntax = "[<object>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h
index 25515114d..962c7dcb6 100644
--- a/include/commands/cmd_unloadmodule.h
+++ b/include/commands/cmd_unloadmodule.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_unloadmodule : public command_t
+class cmd_unloadmodule : public Command
 {
  public:
 	/** Constructor for unloadmodule.
 	 */
-	cmd_unloadmodule (InspIRCd* Instance) : command_t(Instance,"UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
+	cmd_unloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_user.h b/include/commands/cmd_user.h
index 29a859131..dc4e0e3aa 100644
--- a/include/commands/cmd_user.h
+++ b/include/commands/cmd_user.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_user : public command_t
+class cmd_user : public Command
 {
  public:
 	/** Constructor for user.
 	 */
-	cmd_user (InspIRCd* Instance) : command_t(Instance,"USER",0,4,true) { syntax = "<username> <localhost> <remotehost> <GECOS>"; }
+	cmd_user (InspIRCd* Instance) : Command(Instance,"USER",0,4,true) { syntax = "<username> <localhost> <remotehost> <GECOS>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_userhost.h b/include/commands/cmd_userhost.h
index 85ad55550..bd19219de 100644
--- a/include/commands/cmd_userhost.h
+++ b/include/commands/cmd_userhost.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_userhost : public command_t
+class cmd_userhost : public Command
 {
  public:
 	/** Constructor for userhost.
 	 */
-	cmd_userhost (InspIRCd* Instance) : command_t(Instance,"USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
+	cmd_userhost (InspIRCd* Instance) : Command(Instance,"USERHOST",0,1) { syntax = "<nick>{,<nick>}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_version.h b/include/commands/cmd_version.h
index 825e9fdbc..2163bc1cf 100644
--- a/include/commands/cmd_version.h
+++ b/include/commands/cmd_version.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_version : public command_t
+class cmd_version : public Command
 {
  public:
 	/** Constructor for version.
 	 */
-	cmd_version (InspIRCd* Instance) : command_t(Instance,"VERSION",0,0) { syntax = "[<servername>]"; }
+	cmd_version (InspIRCd* Instance) : Command(Instance,"VERSION",0,0) { syntax = "[<servername>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h
index a65bced0d..6c09989fe 100644
--- a/include/commands/cmd_wallops.h
+++ b/include/commands/cmd_wallops.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_wallops : public command_t
+class cmd_wallops : public Command
 {
  public:
 	/** Constructor for wallops.
 	 */
-	cmd_wallops (InspIRCd* Instance) : command_t(Instance,"WALLOPS",'o',1) { syntax = "<any-text>"; }
+	cmd_wallops (InspIRCd* Instance) : Command(Instance,"WALLOPS",'o',1) { syntax = "<any-text>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_who.h b/include/commands/cmd_who.h
index cf6849d7d..f89137c0a 100644
--- a/include/commands/cmd_who.h
+++ b/include/commands/cmd_who.h
@@ -24,7 +24,7 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_who : public command_t
+class cmd_who : public Command
 {
 	bool CanView(chanrec* chan, userrec* user);
 	bool opt_viewopersonly;
@@ -41,7 +41,7 @@ class cmd_who : public command_t
  public:
 	/** Constructor for who.
 	 */
-	cmd_who (InspIRCd* Instance) : command_t(Instance,"WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]"; }
+	cmd_who (InspIRCd* Instance) : Command(Instance,"WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]"; }
 	void SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
diff --git a/include/commands/cmd_whois.h b/include/commands/cmd_whois.h
index 545b0c8c4..6aec85e0a 100644
--- a/include/commands/cmd_whois.h
+++ b/include/commands/cmd_whois.h
@@ -27,12 +27,12 @@ DllExport void do_whois(InspIRCd* Instance, userrec* user, userrec* dest,unsigne
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_whois : public command_t
+class cmd_whois : public Command
 {
  public:
 	/** Constructor for whois.
 	 */
-	cmd_whois (InspIRCd* Instance) : command_t(Instance,"WHOIS",0,1) { syntax = "<nick>{,<nick>}"; }
+	cmd_whois (InspIRCd* Instance) : Command(Instance,"WHOIS",0,1) { syntax = "<nick>{,<nick>}"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 28ded7ca2..50f5ffd0f 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -56,7 +56,7 @@ typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_whowas : public command_t
+class cmd_whowas : public Command
 {
   private:
 	/** Whowas container, contains a map of vectors of users tracked by WHOWAS
diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h
index 1a89dcf82..114de31b1 100644
--- a/include/commands/cmd_zline.h
+++ b/include/commands/cmd_zline.h
@@ -24,12 +24,12 @@
  * the same way, however, they can be fully unloaded, where these
  * may not.
  */
-class cmd_zline : public command_t
+class cmd_zline : public Command
 {
  public:
 	/** Constructor for zline.
 	 */
-	cmd_zline (InspIRCd* Instance) : command_t(Instance,"ZLINE",'o',1) { syntax = "<ipmask> [<duration> :<reason>]"; }
+	cmd_zline (InspIRCd* Instance) : Command(Instance,"ZLINE",'o',1) { syntax = "<ipmask> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/ctables.h b/include/ctables.h
index d112e885c..abfc740da 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -52,9 +52,9 @@ enum TranslateType
 
 
 /** A structure that defines a command. Every command available
- * in InspIRCd must be defined as derived from command_t.
+ * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport command_t : public Extensible
+class CoreExport Command : public Extensible
 {
  protected:
 	/** Owner/Creator object
@@ -102,7 +102,7 @@ class CoreExport command_t : public Extensible
 	 * be allowed before the user is 'registered' (has sent USER,
 	 * NICK, optionally PASS, and been resolved).
 	 */
-	command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg)
+	Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg)
 	{
 		use_count = 0;
 		total_bytes = 0;
@@ -173,12 +173,12 @@ class CoreExport command_t : public Extensible
 
 	/** Standard constructor gubbins
 	 */
-	virtual ~command_t() {}
+	virtual ~Command() {}
 };
 
 /** A hash of commands used by the core
  */
-typedef nspace::hash_map<std::string,command_t*> command_table;
+typedef nspace::hash_map<std::string,Command*> Commandable;
 
 #define TRANSLATE1(x1)	translation.push_back(x1);
 #define TRANSLATE2(x1,x2)  translation.push_back(x1);translation.push_back(x2);
diff --git a/include/inspircd.h b/include/inspircd.h
index c44325a02..7aa5a5ec3 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -773,10 +773,10 @@ class CoreExport InspIRCd : public classbase
 	bool AddResolver(Resolver* r, bool cached);
 
 	/** Add a command to this server's command parser
-	 * @param f A command_t command handler object to add
+	 * @param f A Command command handler object to add
 	 * @throw ModuleException Will throw ModuleExcption if the command already exists
 	 */
-	void AddCommand(command_t *f);
+	void AddCommand(Command *f);
 
 	/** Send a modechange.
 	 * The parameters provided are identical to that sent to the
diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp
index df984a10f..a7a72c0f8 100644
--- a/src/cmd_admin.cpp
+++ b/src/cmd_admin.cpp
@@ -15,7 +15,7 @@
 #include "commands/cmd_admin.h"
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_admin(Instance);
 }
diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp
index 98209217f..c27ce222a 100644
--- a/src/cmd_away.cpp
+++ b/src/cmd_away.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_away.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_away(Instance);
 }
diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp
index 333593425..0a08498e8 100644
--- a/src/cmd_clearcache.cpp
+++ b/src/cmd_clearcache.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_clearcache.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_clearcache(Instance);
 }
diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index 85437c2b0..41f68690e 100644
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -16,14 +16,14 @@
 
 /** Handle /COMMANDS
  */
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_commands(Instance);
 }
 
 CmdResult cmd_commands::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+	for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 	{
 		user->WriteServ("902 %s :%s %s %d",user->nick,i->second->command.c_str(),i->second->source.c_str(),i->second->min_params);
 	}
diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp
index 0f1e10695..63afa02a2 100644
--- a/src/cmd_connect.cpp
+++ b/src/cmd_connect.cpp
@@ -18,7 +18,7 @@
  * This is handled by the server linking module, if necessary. Do not remove this stub.
  */
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_connect(Instance);
 }
diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 6025ea2b5..4772c9d17 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -15,7 +15,7 @@
 #include "commands/cmd_die.h"
 #include "exitcodes.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_die(Instance);
 }
diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 96e04da71..d28f72418 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -15,7 +15,7 @@
 #include "xline.h"
 #include "commands/cmd_eline.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_eline(Instance);
 }
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index bed81c984..2dff4902e 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -15,7 +15,7 @@
 #include "xline.h"
 #include "commands/cmd_gline.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_gline(Instance);
 }
diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp
index ce2b471db..29085afb7 100644
--- a/src/cmd_info.cpp
+++ b/src/cmd_info.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_info.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_info(Instance);
 }
diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 74ac7ea2c..a1e3fb24b 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_invite.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_invite(Instance);
 }
diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index 4ca319afc..4c5542cd8 100644
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_ison.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_ison(Instance);
 }
diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 4e69cbb4e..171f90bba 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_join.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_join(Instance);
 }
diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index bd700113f..78edb177d 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_kick.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_kick(Instance);
 }
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 43cf1d5ab..a2e76ce45 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_kill.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_kill(Instance);
 }
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index ec31228ed..75a868577 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -15,7 +15,7 @@
 #include "xline.h"
 #include "commands/cmd_kline.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_kline(Instance);
 }
diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp
index 45011d3e8..2576b63e9 100644
--- a/src/cmd_links.cpp
+++ b/src/cmd_links.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_links.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_links(Instance);
 }
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 1e994965b..e77feeb66 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -17,7 +17,7 @@
 
 /** Handle /LIST
  */
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_list(Instance);
 }
diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp
index e9f6cf39c..0c5cb139b 100644
--- a/src/cmd_loadmodule.cpp
+++ b/src/cmd_loadmodule.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_loadmodule.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_loadmodule(Instance);
 }
diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index 0d70fa788..cc66ba435 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_lusers.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_lusers(Instance);
 }
diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp
index 70918e392..471f53a1a 100644
--- a/src/cmd_map.cpp
+++ b/src/cmd_map.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_map.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_map(Instance);
 }
diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp
index 4e4466d36..5680e1b05 100644
--- a/src/cmd_mode.cpp
+++ b/src/cmd_mode.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_mode.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_mode(Instance);
 }
diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index dc3eea15d..12697a68f 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -31,7 +31,7 @@ char* itab[] = {
 	"OnPostCommand", "OnPostJoin", "OnWhoisLine", "OnBuildExemptList", "OnRawSocketConnect", "OnGarbageCollect", NULL
 };
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_modules(Instance);
 }
diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp
index 38117be6b..53d140a9d 100644
--- a/src/cmd_motd.cpp
+++ b/src/cmd_motd.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_motd.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_motd(Instance);
 }
diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 2b3a421a2..21ab2f3ed 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_names.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_names(Instance);
 }
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 4eb439895..6eb72349b 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -15,7 +15,7 @@
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_nick(Instance);
 }
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index f66341846..7c0f06b40 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -15,7 +15,7 @@
 #include "wildcard.h"
 #include "commands/cmd_notice.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_notice(Instance);
 }
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 4d70f29eb..cc2ae6e65 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -30,7 +30,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	return false;
 }
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_oper(Instance);
 }
diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 9887d844e..9088ec21d 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_part.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_part(Instance);
 }
diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index 9b57c375d..78bf1a2cf 100644
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_pass.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_pass(Instance);
 }
diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp
index 2ffd7850b..ff16f2e44 100644
--- a/src/cmd_ping.cpp
+++ b/src/cmd_ping.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_ping.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_ping(Instance);
 }
diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp
index 08d47eca7..dab4de720 100644
--- a/src/cmd_pong.cpp
+++ b/src/cmd_pong.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_pong.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_pong(Instance);
 }
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 5c3020b5b..2c54a770a 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -15,7 +15,7 @@
 #include "wildcard.h"
 #include "commands/cmd_privmsg.h"
 
-extern "C" DllExport  command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_privmsg(Instance);
 }
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 41643c5d6..1d4f8d089 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -17,7 +17,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_qline(Instance);
 }
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 671e1ccef..8626db1ef 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_quit(Instance);
 }
diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index ed972007d..a1292f19f 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_rehash(Instance);
 }
diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp
index df198d662..b1201ef6e 100644
--- a/src/cmd_reloadmodule.cpp
+++ b/src/cmd_reloadmodule.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_reloadmodule.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_reloadmodule(Instance);
 }
diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index b9afd7c9d..8da98f77e 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_restart.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_restart(Instance);
 }
diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp
index ef63d58fd..7c47607db 100644
--- a/src/cmd_rules.cpp
+++ b/src/cmd_rules.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_rules.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_rules(Instance);
 }
diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp
index 0b71ba005..837c94067 100644
--- a/src/cmd_server.cpp
+++ b/src/cmd_server.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_server(Instance);
 }
diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp
index 94e7c148b..a29ddbaef 100644
--- a/src/cmd_squit.cpp
+++ b/src/cmd_squit.cpp
@@ -19,7 +19,7 @@
  */
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_squit(Instance);
 }
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index f8d5eba27..4b93d5f5f 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -26,7 +26,7 @@
 #include "commands/cmd_whowas.h"
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_stats(Instance);
 }
@@ -159,7 +159,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 
 		/* stats m (list number of times each command has been used, plus bytecount) */
 		case 'm':
-			for (command_table::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
+			for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 			{
 				if (i->second->use_count)
 				{
@@ -175,11 +175,11 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 			results.push_back(sn+" 240 "+user->nick+" :InspIRCd(CLASS) "+ConvToStr(sizeof(InspIRCd))+" bytes");
 			results.push_back(sn+" 249 "+user->nick+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(userrec))+" bytes)");
 			results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(chanrec))+" bytes)");
-			results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(command_t))+" bytes)");
+			results.push_back(sn+" 249 "+user->nick+" :Commands(VECTOR) "+ConvToStr(ServerInstance->Parser->cmdlist.size())+" ("+ConvToStr(ServerInstance->Parser->cmdlist.size()*sizeof(Command))+" bytes)");
 
 			if (!ServerInstance->Config->WhoWasGroupSize == 0 && !ServerInstance->Config->WhoWasMaxGroups == 0)
 			{
-				command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+				Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
 				if (whowas_command)
 				{
 					std::deque<classbase*> params;
diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp
index d34a1eed5..926d69204 100644
--- a/src/cmd_time.cpp
+++ b/src/cmd_time.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_time(Instance);
 }
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index d30383024..3318972fb 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -15,7 +15,7 @@
 #include "commands/cmd_topic.h"
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_topic(Instance);
 }
diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index d4e0b9254..a71bb42bf 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_trace.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_trace(Instance);
 }
diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index 932142049..5cb410950 100644
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_unloadmodule(Instance);
 }
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 42e70c1df..f2240bb92 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_user.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_user(Instance);
 }
diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 8a0e187fb..dd1a2d819 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "commands/cmd_userhost.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_userhost(Instance);
 }
diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index 2b6522d81..c355717f7 100644
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_version(Instance);
 }
diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp
index a66ceddf5..90a7d8bde 100644
--- a/src/cmd_wallops.cpp
+++ b/src/cmd_wallops.cpp
@@ -16,7 +16,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_wallops(Instance);
 }
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 93855dce2..91c651bcc 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -107,7 +107,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext)
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_who(Instance);
 }
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index b6f85e01c..508200cb6 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -86,7 +86,7 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_whois(Instance);
 }
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 1531f6239..f982d4873 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -16,13 +16,13 @@
 
 WhoWasMaintainTimer * timer;
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_whowas(Instance);
 }
 
 cmd_whowas::cmd_whowas(InspIRCd* Instance)
-: command_t(Instance, "WHOWAS", 0, 1)
+: Command(Instance, "WHOWAS", 0, 1)
 {
 	syntax = "<nick>{,<nick>}";
 	timer = new WhoWasMaintainTimer(Instance, 3600);
@@ -340,7 +340,7 @@ WhoWasGroup::~WhoWasGroup()
 /* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */
 void WhoWasMaintainTimer::Tick(time_t t)
 {
-	command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+	Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
 	if (whowas_command)
 	{
 		std::deque<classbase*> params;
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 4a70069ab..cb0167f4e 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -17,7 +17,7 @@
 
 
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
 	return new cmd_zline(Instance);
 }
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 30865f414..68555ec8b 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -112,7 +112,7 @@ long InspIRCd::Duration(const std::string &str)
  * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
  * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
  */
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
 	/* First check if we have more than one item in the list, if we don't we return zero here and the handler
 	 * which called us just carries on as it was.
@@ -161,7 +161,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 	return 1;
 }
 
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
 {
 	/* First check if we have more than one item in the list, if we don't we return zero here and the handler
 	 * which called us just carries on as it was.
@@ -211,7 +211,7 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p
 
 bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
 {
-	command_table::iterator n = cmdlist.find(commandname);
+	Commandable::iterator n = cmdlist.find(commandname);
 
 	if (n != cmdlist.end())
 	{
@@ -233,9 +233,9 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use
 	return false;
 }
 
-command_t* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string &commandname)
 {
-	command_table::iterator n = cmdlist.find(commandname);
+	Commandable::iterator n = cmdlist.find(commandname);
 	if (n != cmdlist.end())
 		return n->second;
 
@@ -246,7 +246,7 @@ command_t* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
 {
-	command_table::iterator n = cmdlist.find(commandname);
+	Commandable::iterator n = cmdlist.find(commandname);
 
 	if (n != cmdlist.end())
 	{
@@ -310,7 +310,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 		return;
 	}
 
-	command_table::iterator cm = cmdlist.find(command);
+	Commandable::iterator cm = cmdlist.find(command);
 	
 	if (cm != cmdlist.end())
 	{
@@ -381,7 +381,7 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
 
 bool CommandParser::RemoveCommands(const char* source)
 {
-	command_table::iterator i,safei;
+	Commandable::iterator i,safei;
 	for (i = cmdlist.begin(); i != cmdlist.end(); i++)
 	{
 		safei = i;
@@ -399,9 +399,9 @@ bool CommandParser::RemoveCommands(const char* source)
 	return true;
 }
 
-void CommandParser::RemoveCommand(command_table::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
 {
-	command_t* x = safei->second;
+	Command* x = safei->second;
 	if (x->source == std::string(source))
 	{
 		cmdlist.erase(safei);
@@ -431,7 +431,7 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
 	}
 }
 
-bool CommandParser::CreateCommand(command_t *f, void* so_handle)
+bool CommandParser::CreateCommand(Command *f, void* so_handle)
 {
 	if (so_handle)
 	{
@@ -485,7 +485,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
 
 	if (command != RFCCommands.end())
 	{
-		command_t* cmdptr = cmdlist.find(commandname)->second;
+		Command* cmdptr = cmdlist.find(commandname)->second;
 		cmdlist.erase(cmdlist.find(commandname));
 
 		for (char* x = commandname; *x; x++)
@@ -531,7 +531,7 @@ const char* CommandParser::LoadCommand(const char* name)
 {
 	char filename[MAXBUF];
 	void* h;
-	command_t* (*cmd_factory_func)(InspIRCd*);
+	Command* (*cmd_factory_func)(InspIRCd*);
 
 	/* Command already exists? Succeed silently - this is needed for REHASH */
 	if (RFCCommands.find(name) != RFCCommands.end())
@@ -552,7 +552,7 @@ const char* CommandParser::LoadCommand(const char* name)
 
 	if (this->FindSym((void **)&cmd_factory_func, h, name))
 	{
-		command_t* newcommand = cmd_factory_func(ServerInstance);
+		Command* newcommand = cmd_factory_func(ServerInstance);
 		this->CreateCommand(newcommand, h);
 	}
 	return NULL;
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 3767fbda9..daf1b04de 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -204,13 +204,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance)
 	std::string thiscmd;
 
 	/* Enable everything first */
-	for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+	for (Commandable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
 		x->second->Disable(false);
 
 	/* Now disable all the ones which the user wants disabled */
 	while (dcmds >> thiscmd)
 	{
-		command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
+		Commandable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
 		if (cm != ServerInstance->Parser->cmdlist.end())
 		{
 			cm->second->Disable(true);
@@ -395,7 +395,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu
 		conf->GetInstance()->Log(DEFAULT,"WARNING: <whowas:maxkeep> value less than 3600, setting to default 3600");
 	}
 
-	command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
+	Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS");
 	if (whowas_command)
 	{
 		std::deque<classbase*> params;
diff --git a/src/modules.cpp b/src/modules.cpp
index b844bc56b..b95dcd59d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -785,7 +785,7 @@ bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, us
 	return this->Parser->IsValidCommand(commandname, pcnt, user);
 }
 
-void InspIRCd::AddCommand(command_t *f)
+void InspIRCd::AddCommand(Command *f)
 {
 	if (!this->Parser->CreateCommand(f))
 	{
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index a0d96fc88..d1bece343 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -227,7 +227,7 @@ public:
 
 	void LoginFail(userrec* user, const std::string &username, const std::string &pass)
 	{
-		command_t* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
 
 		if (oper_command)
 		{
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index c67b50c8c..e95447b6d 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -24,10 +24,10 @@
 
 /** Handle /FINGERPRINT
  */
-class cmd_fingerprint : public command_t
+class cmd_fingerprint : public Command
 {
  public:
-	cmd_fingerprint (InspIRCd* Instance) : command_t(Instance,"FINGERPRINT", 0, 1)
+	cmd_fingerprint (InspIRCd* Instance) : Command(Instance,"FINGERPRINT", 0, 1)
 	{
 		this->source = "m_ssl_oper_cert.so";
 		syntax = "<nickname>";
diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index dc9274f1e..008608f03 100644
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -24,10 +24,10 @@
 
 /** Handle /SSLINFO
  */
-class cmd_sslinfo : public command_t
+class cmd_sslinfo : public Command
 {
  public:
-	cmd_sslinfo (InspIRCd* Instance) : command_t(Instance,"SSLINFO", 0, 1)
+	cmd_sslinfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
 	{
 		this->source = "m_sslinfo.so";
 		this->syntax = "<nick>";
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 37dbf38a0..7afa71803 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_t
+class cmd_alltime : public Command
 {
  public:
-	cmd_alltime(InspIRCd *Instance) : command_t(Instance, "ALLTIME", 'o', 0)
+	cmd_alltime(InspIRCd *Instance) : Command(Instance, "ALLTIME", 'o', 0)
 	{
 		this->source = "m_alltime.so";
 		syntax.clear();
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index a054a00ef..aa5e18438 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -164,7 +164,7 @@ class ModuleAuditorium : public Module
 
 	void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
 	{
-		command_t* parthandler = ServerInstance->Parser->GetHandler("PART");
+		Command* parthandler = ServerInstance->Parser->GetHandler("PART");
 		std::vector<std::string> to_leave;
 		const char* parameters[2];
 		if (parthandler)
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 7c88b03da..6d56b62bc 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_t
+class cmd_cban : public Command
 {
  public:
-	cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1)
+	cmd_cban(InspIRCd* Me) : Command(Me, "CBAN", 'o', 1)
 	{
 		this->source = "m_cban.so";
 		this->syntax = "<channel> [<duration> :<reason>]";
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 49a6fdabb..eb497dea4 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_t
+class cmd_webirc : public Command
 {
 	InspIRCd* Me;
 	CGIHostlist Hosts;
 	bool notify;
 	public:
-		cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : command_t(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)
+		cmd_webirc(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";
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index c4ec91988..7a48a3d45 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /CHECK
  */
-class cmd_check : public command_t
+class cmd_check : public Command
 {
  public:
- 	cmd_check (InspIRCd* Instance) : command_t(Instance,"CHECK", 'o', 1)
+ 	cmd_check (InspIRCd* Instance) : Command(Instance,"CHECK", 'o', 1)
 	{
 		this->source = "m_check.so";
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 5f5623682..db8094aa2 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -17,12 +17,12 @@
 
 /** Handle /CHGHOST
  */
-class cmd_chghost : public command_t
+class cmd_chghost : public Command
 {
  private:
 	char* hostmap;
  public:
-	cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
+	cmd_chghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST",'o',2), hostmap(hmap)
 	{
 		this->source = "m_chghost.so";
 		syntax = "<nick> <newhost>";
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index d79088cf9..0561c5156 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CHGIDENT
  */
-class cmd_chgident : public command_t
+class cmd_chgident : public Command
 {
  public:
-	cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
+	cmd_chgident (InspIRCd* Instance) : Command(Instance,"CHGIDENT", 'o', 2)
 	{
 		this->source = "m_chgident.so";
 		syntax = "<nick> <newident>";
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index ddb38567f..31467459c 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CHGNAME
  */
-class cmd_chgname : public command_t
+class cmd_chgname : public Command
 {
  public:
-	cmd_chgname (InspIRCd* Instance) : command_t(Instance,"CHGNAME", 'o', 2)
+	cmd_chgname (InspIRCd* Instance) : Command(Instance,"CHGNAME", 'o', 2)
 	{
 		this->source = "m_chgname.so";
 		syntax = "<nick> <newname>";
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 85613f4ef..a8644f6ed 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /CHECK
  */
-class cmd_clones : public command_t
+class cmd_clones : public Command
 {
  public:
- 	cmd_clones (InspIRCd* Instance) : command_t(Instance,"CLONES", 'o', 1)
+ 	cmd_clones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
 	{
 		this->source = "m_clones.so";
 		syntax = "<limit>";
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index e395b427f..da52dd7d9 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -15,11 +15,11 @@
 
 /** Handle /CLOSE
  */
-class cmd_close : public command_t
+class cmd_close : public Command
 {
  public:
 	/* Command 'close', needs operator */
-	cmd_close (InspIRCd* Instance) : command_t(Instance,"CLOSE", 'o', 0)
+	cmd_close (InspIRCd* Instance) : Command(Instance,"CLOSE", 'o', 0)
 	{
 		this->source = "m_close.so";
 	}
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 73f2cda87..ca277c3ae 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -18,11 +18,11 @@
 
 /** Handle /TITLE
  */
-class cmd_title : public command_t
+class cmd_title : public Command
 {
 	
  public:
-	cmd_title (InspIRCd* Instance) : command_t(Instance,"TITLE",0,2)
+	cmd_title (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
 	{
 		this->source = "m_customtitle.so";
 		syntax = "<user> <password>";
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index fa55f44d8..06361c692 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public command_t
+class cmd_cycle : public Command
 {
  public:
-	cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1)
+	cmd_cycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1)
 	{
 		this->source = "m_cycle.so";
 		syntax = "<channel> :[reason]";
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index fd9e329cd..7ddce8ab0 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_t
+class cmd_dccallow : public Command
 {
  public:
-	cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
+	cmd_dccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
 	{
 		this->source = "m_dccallow.so";
 		syntax = "{[+|-]<nick> <time>|HELP|LIST}";
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index f2c47cc9a..3056bdaff 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -22,10 +22,10 @@
 
 /** Handle /DEVOICE
  */
-class cmd_devoice : public command_t
+class cmd_devoice : public Command
 {
  public:
-	cmd_devoice (InspIRCd* Instance) : command_t(Instance,"DEVOICE", 0, 1)
+	cmd_devoice (InspIRCd* Instance) : Command(Instance,"DEVOICE", 0, 1)
 	{
 		this->source = "m_devoice.so";
 		syntax = "<channel>";
diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 5e74177e5..e0faafc98 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -116,11 +116,11 @@ class FilterBase : public Module
 	bool AppliesToMe(userrec* user, FilterResult* filter, int flags);
 };
 
-class cmd_filter : public command_t
+class cmd_filter : public Command
 {
 	FilterBase* Base;
  public:
-	cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : command_t(Me, "FILTER", 'o', 1), Base(f)
+	cmd_filter(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>";
@@ -338,7 +338,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 			return 0;
 
 		/* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */
-		command_t* c = ServerInstance->Parser->GetHandler(command);
+		Command* c = ServerInstance->Parser->GetHandler(command);
 		if (c)
 		{
 			const char* params[MAXPARAMETERS];
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index faf35d572..0e7ff2e6d 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /GLOADMODULE
  */
-class cmd_gloadmodule : public command_t
+class cmd_gloadmodule : public Command
 {
  public:
-	cmd_gloadmodule (InspIRCd* Instance) : command_t(Instance,"GLOADMODULE", 'o', 1)
+	cmd_gloadmodule (InspIRCd* Instance) : Command(Instance,"GLOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -52,10 +52,10 @@ class cmd_gloadmodule : public command_t
 
 /** Handle /GUNLOADMODULE
  */
-class cmd_gunloadmodule : public command_t
+class cmd_gunloadmodule : public Command
 {
  public:
-	cmd_gunloadmodule (InspIRCd* Instance) : command_t(Instance,"GUNLOADMODULE", 'o', 1)
+	cmd_gunloadmodule (InspIRCd* Instance) : Command(Instance,"GUNLOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
@@ -86,10 +86,10 @@ class cmd_gunloadmodule : public command_t
 
 /** Handle /GRELOADMODULE
  */
-class cmd_greloadmodule : public command_t
+class cmd_greloadmodule : public Command
 {
  public:
-	cmd_greloadmodule (InspIRCd* Instance) : command_t(Instance, "GRELOADMODULE", 'o', 1)
+	cmd_greloadmodule (InspIRCd* Instance) : Command(Instance, "GRELOADMODULE", 'o', 1)
 	{
 		this->source = "m_globalload.so";
 		syntax = "<modulename> [servermask]";
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 9908ad053..1d870a7c2 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -19,10 +19,10 @@
 
 /** Handle /GLOBOPS
  */
-class cmd_globops : public command_t
+class cmd_globops : public Command
 {
  public:
-	cmd_globops (InspIRCd* Instance) : command_t(Instance,"GLOBOPS",'o',1)
+	cmd_globops (InspIRCd* Instance) : Command(Instance,"GLOBOPS",'o',1)
 	{
 		this->source = "m_globops.so";
 		syntax = "<any-text>";
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index b1028a042..86866f7fb 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_t
+class cmd_helpop : public Command
 {
  public:
-	cmd_helpop (InspIRCd* Instance) : command_t(Instance, "HELPOP", 0, 0)
+	cmd_helpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
 	{
 		this->source = "m_helpop.so";
 		syntax = "<any-text>";
diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index a0a2388f0..47e9f595c 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -221,7 +221,7 @@ class ModuleInvisible : public Module
 	{
 		if (user->IsModeSet('Q'))
 		{
-			command_t* parthandler = ServerInstance->Parser->GetHandler("PART");
+			Command* parthandler = ServerInstance->Parser->GetHandler("PART");
 			std::vector<std::string> to_leave;
 			const char* parameters[2];
 			if (parthandler)
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index fb8727e3a..600b8f70f 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -17,7 +17,7 @@
 
 /** Handle /SAPART
  */
-class cmd_jumpserver : public command_t
+class cmd_jumpserver : public Command
 {
  public:
 	bool redirect_all_immediately;
@@ -27,7 +27,7 @@ class cmd_jumpserver : public command_t
 	std::string reason;
 	int port;
 
-	cmd_jumpserver (InspIRCd* Instance) : command_t(Instance, "JUMPSERVER", 'o', 0)
+	cmd_jumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
 	{
 		this->source = "m_jumpserver.so";
 		syntax = "[<server> <port> <+/-a> :<reason>]";
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 5ed69273e..fd8256641 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_t
+class cmd_knock : public Command
 {
  public:
-	cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2)
+	cmd_knock (InspIRCd* Instance) : Command(Instance,"KNOCK", 0, 2)
 	{
 		this->source = "m_knock.so";
 		syntax = "<channel> <reason>";
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 94ab31421..a4b794050 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -21,14 +21,14 @@
 */
 
 
-class cmd_lockserv : public command_t
+class cmd_lockserv : public Command
 {
 private:
 	bool& locked;
 
 public:
 	cmd_lockserv (InspIRCd* Instance, bool &lock)
-	: command_t(Instance, "LOCKSERV", 'o', 0), locked(lock)
+	: Command(Instance, "LOCKSERV", 'o', 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
 		syntax.clear();
@@ -44,14 +44,14 @@ public:
 	}
 };
 
-class cmd_unlockserv : public command_t
+class cmd_unlockserv : public Command
 {
 private:
 	bool& locked;
 
 public:
 	cmd_unlockserv (InspIRCd* Instance, bool &lock)
-	: command_t(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
+	: Command(Instance, "UNLOCKSERV", 'o', 0), locked(lock)
 	{
 		this->source = "m_lockserv.so";
 		syntax.clear();
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 731c0433d..e21ea9b90 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /NICKLOCK
  */
-class cmd_nicklock : public command_t
+class cmd_nicklock : public Command
 {
 	char* dummy;
  public:
-	cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
+	cmd_nicklock (InspIRCd* Instance) : Command(Instance,"NICKLOCK", 'o', 2)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<oldnick> <newnick>";
@@ -72,10 +72,10 @@ class cmd_nicklock : public command_t
 
 /** Handle /NICKUNLOCK
  */
-class cmd_nickunlock : public command_t
+class cmd_nickunlock : public Command
 {
  public:
-	cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
+	cmd_nickunlock (InspIRCd* Instance) : Command(Instance,"NICKUNLOCK", 'o', 1)
 	{
 		this->source = "m_nicklock.so";
 		syntax = "<locked-nick>";
diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index d8acc3ef9..66fa1e61e 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -21,14 +21,14 @@ typedef std::map<irc::string, Module*> hashymodules;
 
 /* Handle /MKPASSWD
  */
-class cmd_mkpasswd : public command_t
+class cmd_mkpasswd : 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)
-		: command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
+		: Command(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
 	{
 		this->source = "m_oper_hash.so";
 		syntax = "<hashtype> <any-text>";
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index b02689704..09395fccb 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -47,7 +47,7 @@ class ModuleOperLog : public Module
  
 		if ((IS_OPER(user)) && (IS_LOCAL(user)) && (user->HasPermission(command)))
 		{
-			command_t* thiscommand = ServerInstance->Parser->GetHandler(command);
+			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
 			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
 			{
 				std::string plist;
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 6de816413..2ae4c30b5 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -40,10 +40,10 @@ CmdResult ShowOperMOTD(userrec* user)
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public command_t
+class cmd_opermotd : public Command
 {
  public:
-	cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
+	cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
 	{
 		this->source = "m_opermotd.so";
 		syntax = "[<servername>]";
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 5f8d52714..96ed2758e 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_t
+class cmd_randquote : public Command
 {
  public:
-	cmd_randquote (InspIRCd* Instance) : command_t(Instance,"RANDQUOTE", 0, 0)
+	cmd_randquote (InspIRCd* Instance) : Command(Instance,"RANDQUOTE", 0, 0)
 	{
 		this->source = "m_randquote.so";
 	}
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index c8d661890..9de0942c1 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_t, public RemoveBase
+class cmd_remove : public Command, public RemoveBase
 {
  public:
-	cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+	cmd_remove(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_t, public RemoveBase
 
 /** Handle /FPART
  */
-class cmd_fpart : public command_t, public RemoveBase
+class cmd_fpart : public Command, public RemoveBase
 {
  public:
-	cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+	cmd_fpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
 	{
 		this->source = "m_remove.so";
 		syntax = "<channel> <nick> [<reason>]";
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index d0567cb16..03bf7c47c 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAJOIN
  */
-class cmd_sajoin : public command_t
+class cmd_sajoin : public Command
 {
  public:
- cmd_sajoin (InspIRCd* Instance) : command_t(Instance,"SAJOIN", 'o', 2)
+ cmd_sajoin (InspIRCd* Instance) : Command(Instance,"SAJOIN", 'o', 2)
 	{
 		this->source = "m_sajoin.so";
 		syntax = "<nick> <channel>";
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index bb0394fb0..a083f4305 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAMODE
  */
-class cmd_samode : public command_t
+class cmd_samode : public Command
 {
  public:
-	cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
+	cmd_samode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index de70579f9..e4f2006c4 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SANICK
  */
-class cmd_sanick : public command_t
+class cmd_sanick : public Command
 {
  public:
- cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
+ cmd_sanick (InspIRCd* Instance) : Command(Instance,"SANICK", 'o', 2)
 	{
 		this->source = "m_sanick.so";
 		syntax = "<nick> <new-nick>";
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 32cd751b0..0c4d061e1 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAPART
  */
-class cmd_sapart : public command_t
+class cmd_sapart : public Command
 {
  public:
-	cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+	cmd_sapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2)
 	{
 		this->source = "m_sapart.so";
 		syntax = "<nick> <channel>";
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 7aafcc193..7f4212d80 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SAQUIT
  */
-class cmd_saquit : public command_t
+class cmd_saquit : public Command
 {
  public:
- cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
+ cmd_saquit (InspIRCd* Instance) : Command(Instance,"SAQUIT",'o',2)
 	{
 		this->source = "m_saquit.so";
 		syntax = "<nick> <reason>";
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 730909d6c..59b48fbc1 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -17,12 +17,12 @@
 
 /** Handle /SETHOST
  */
-class cmd_sethost : public command_t
+class cmd_sethost : public Command
 {
  private:
 	char* hostmap;
  public:
-	cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+	cmd_sethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index a353f883c..4a19b8412 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SETIDENT
  */
-class cmd_setident : public command_t
+class cmd_setident : public Command
 {
  public:
- cmd_setident (InspIRCd* Instance) : command_t(Instance,"SETIDENT", 'o', 1)
+ cmd_setident (InspIRCd* Instance) : Command(Instance,"SETIDENT", 'o', 1)
 	{
 		this->source = "m_setident.so";
 		syntax = "<new-ident>";
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index d95a9bfc1..6dbcae711 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /SETIDLE
  */
-class cmd_setidle : public command_t
+class cmd_setidle : public Command
 {
  public:
-	cmd_setidle (InspIRCd* Instance) : command_t(Instance,"SETIDLE", 'o', 1)
+	cmd_setidle (InspIRCd* Instance) : Command(Instance,"SETIDLE", 'o', 1)
 	{
 		this->source = "m_setidle.so";
 		syntax = "<duration>";
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index fb439db6f..80179c8cb 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -17,10 +17,10 @@
 
 
 
-class cmd_setname : public command_t
+class cmd_setname : public Command
 {
  public:
-	cmd_setname (InspIRCd* Instance) : command_t(Instance,"SETNAME", 0, 1)
+	cmd_setname (InspIRCd* Instance) : Command(Instance,"SETNAME", 0, 1)
 	{
 		this->source = "m_setname.so";
 		syntax = "<new-gecos>";
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index f809d7d57..1bea10b70 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_t
+class cmd_silence : public Command
 {
 	unsigned int& maxsilence;
  public:
-	cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
+	cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
 	{
 		this->source = "m_silence.so";
 		syntax = "{[+|-]<mask>}";
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index 9a3abe543..e9a4fdc78 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_t
+class cmd_silence : public Command
 {
 	unsigned int& maxsilence;
  public:
-	cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max)
+	cmd_silence (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>}";
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 029b826bc..f538e2963 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -38,7 +38,7 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const char**
 	if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
 	{
 		/* Safe, we know its non-null because IsValidModuleCommand returned true */
-		command_t* thiscmd = ServerInstance->Parser->GetHandler(command);
+		Command* thiscmd = ServerInstance->Parser->GetHandler(command);
 		// this bit of code cleverly routes all module commands
 		// to all remote severs *automatically* so that modules
 		// can just handle commands locally, without having
diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index e992554ed..25bf833e1 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -30,7 +30,7 @@
 
 /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h */
 
-cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : command_t(Instance, "RCONNECT", 'o', 2), Creator(Callback), Utils(Util)
+cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RCONNECT", 'o', 2), Creator(Callback), Utils(Util)
 {
 	this->source = "m_spanningtree.so";
 	syntax = "<remote-server-mask> <target-server-mask>";
diff --git a/src/modules/m_spanningtree/rconnect.h b/src/modules/m_spanningtree/rconnect.h
index 77e271949..080d2aad6 100644
--- a/src/modules/m_spanningtree/rconnect.h
+++ b/src/modules/m_spanningtree/rconnect.h
@@ -16,7 +16,7 @@
 
 /** Handle /RCONNECT
  */
-class cmd_rconnect : public command_t
+class cmd_rconnect : public Command
 {
         Module* Creator;		/* Creator */
         SpanningTreeUtilities* Utils;	/* Utility class */
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 0ea7988ec..8c7e9d7f9 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -30,7 +30,7 @@
 
 /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 
-cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : command_t(Instance, "RSQUIT", 'o', 1), Creator(Callback), Utils(Util)
+cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", 'o', 1), Creator(Callback), Utils(Util)
 {
 	this->source = "m_spanningtree.so";
 	syntax = "<remote-server-mask> [target-server-mask]";
diff --git a/src/modules/m_spanningtree/rsquit.h b/src/modules/m_spanningtree/rsquit.h
index 81e9bc2b7..d6285b83f 100644
--- a/src/modules/m_spanningtree/rsquit.h
+++ b/src/modules/m_spanningtree/rsquit.h
@@ -16,7 +16,7 @@
 
 /** Handle /RCONNECT
  */
-class cmd_rsquit : public command_t
+class cmd_rsquit : public Command
 {
         Module* Creator;		/* Creator */
         SpanningTreeUtilities* Utils;	/* Utility class */
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 60b893e1d..8e42f9c75 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -63,10 +63,10 @@ void spy_userlist(userrec *user, chanrec *c)
 
 /** Handle /SPYLIST
  */
-class cmd_spylist : public command_t
+class cmd_spylist : public Command
 {
   public:
-	cmd_spylist (InspIRCd* Instance) : command_t(Instance,"SPYLIST", 'o', 0)
+	cmd_spylist (InspIRCd* Instance) : Command(Instance,"SPYLIST", 'o', 0)
 	{
 		this->source = "m_spy.so";
 		syntax.clear();
@@ -91,10 +91,10 @@ class cmd_spylist : public command_t
 
 /** Handle /SPYNAMES
  */
-class cmd_spynames : public command_t
+class cmd_spynames : public Command
 {
   public:
-	cmd_spynames (InspIRCd* Instance) : command_t(Instance,"SPYNAMES", 'o', 0)
+	cmd_spynames (InspIRCd* Instance) : Command(Instance,"SPYNAMES", 'o', 0)
 	{
 		this->source = "m_spy.so";
 		syntax = "{<channel>{,<channel>}}";
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 4027dbeb7..f26454d3e 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_t
+class cmd_svshold : public Command
 {
  public:
-	cmd_svshold(InspIRCd* Me) : command_t(Me, "SVSHOLD", 'o', 1)
+	cmd_svshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1)
 	{
 		this->source = "m_svshold.so";
 		this->syntax = "<nickname> [<duration> :<reason>]";
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 09d9d94af..3e8c53ea1 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /SWHOIS
  */
-class cmd_swhois : public command_t
+class cmd_swhois : public Command
 {
 	
  public:
-	cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
+	cmd_swhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> <swhois>";
diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index a137e8d90..da8ad9749 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -17,13 +17,13 @@
 
 /** Handle /TAXONOMY
  */
-class cmd_taxonomy : public command_t
+class cmd_taxonomy : 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_t(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
+	cmd_taxonomy (InspIRCd* Instance, Module* maker, bool &claim) : Command(Instance,"TAXONOMY", 'o', 1), Creator(maker), claimed(claim)
 	{
 		this->source = "m_taxonomy.so";
 		syntax = "<nickname>";
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index f2a0fb5fd..d99a51c7d 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -17,11 +17,11 @@
 
 /** Handle /DALINFO
  */
-class cmd_dalinfo : public command_t
+class cmd_dalinfo : public Command
 {
  public:
 	/* Command 'dalinfo', takes no parameters and needs no special modes */
-	cmd_dalinfo (InspIRCd* Instance) : command_t(Instance,"DALINFO", 0, 0)
+	cmd_dalinfo (InspIRCd* Instance) : Command(Instance,"DALINFO", 0, 0)
 	{
 		this->source = "m_testcommand.so";
 	}
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 58dffbbe4..714b8b40a 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_t
+class cmd_tban : public Command
 {
  public:
- cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3)
+ cmd_tban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
 	{
 		this->source = "m_timedbans.so";
 		syntax = "<channel> <duration> <banmask>";
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 3296a7f15..bfeeb202e 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -18,10 +18,10 @@
 
 /** Handle /TLINE
  */ 
-class cmd_tline : public command_t
+class cmd_tline : public Command
 {
  public:
-	cmd_tline (InspIRCd* Instance) : command_t(Instance,"TLINE", 'o', 1)
+	cmd_tline (InspIRCd* Instance) : Command(Instance,"TLINE", 'o', 1)
 	{
 		this->source = "m_tline.so";
 		this->syntax = "<mask>";
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index cd3296ce6..7e13a63f9 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /UNINVITE
  */	 
-class cmd_uninvite : public command_t
+class cmd_uninvite : public Command
 {
  public:
-	cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
+	cmd_uninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
 	{
 		this->source = "m_uninvite.so";
 		syntax = "<nick> <channel>";
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 81e2cf6c8..949ce758e 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /USERIP
  */
-class cmd_userip : public command_t
+class cmd_userip : public Command
 {
  public:
-	cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
+	cmd_userip (InspIRCd* Instance) : Command(Instance,"USERIP", 'o', 1)
 	{
 		this->source = "m_userip.so";
 		syntax = "<nick>{,<nick>}";
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 71f1069a3..92aeb3401 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -17,10 +17,10 @@
 
 /** Handle /VHOST
  */
-class cmd_vhost : public command_t
+class cmd_vhost : public Command
 {
  public:
-	cmd_vhost (InspIRCd* Instance) : command_t(Instance,"VHOST", 0, 2)
+	cmd_vhost (InspIRCd* Instance) : Command(Instance,"VHOST", 0, 2)
 	{
 		this->source = "m_vhost.so";
 		syntax = "<username> <password>";
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index caad37049..a090487f3 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_t
+class cmd_watch : public Command
 {
 	unsigned int& MAX_WATCH;
  public:
@@ -192,7 +192,7 @@ class cmd_watch : public command_t
 		return CMD_FAILURE;
 	}
 
-	cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : command_t(Instance,"WATCH",0,0), MAX_WATCH(maxwatch)
+	cmd_watch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch)
 	{
 		this->source = "m_watch.so";
 		syntax = "[C|L|S]|[+|-<nick>]";
diff --git a/src/users.cpp b/src/users.cpp
index feadc7b18..d3f6d6075 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -857,7 +857,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &qui
 /* adds or updates an entry in the whowas list */
 void userrec::AddToWhoWas()
 {
-	command_t* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
+	Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
 	if (whowas_command)
 	{
 		std::deque<classbase*> params;
@@ -1203,7 +1203,7 @@ bool userrec::ForceNickChange(const char* newnick)
 		if (this->registered == REG_ALL)
 		{
 			std::deque<classbase*> dummy;
-			command_t* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+			Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
 			if (nickhandler)
 			{
 				nickhandler->HandleInternal(1, dummy);