class command_t -> class Command. Whey :D

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

53 files changed, 105 insertions, 105 deletions

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