In the grand tradition of huge fucking commits:

 - chanrec -> Channel
 - userrec -> User
Enjoy.

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

321 files changed, 1690 insertions, 1690 deletions

diff --git a/include/base.h b/include/base.h
index faea391a3..4f5cc2e3e 100644
--- a/include/base.h
+++ b/include/base.h
@@ -52,7 +52,7 @@ class CoreExport classbase
 	virtual ~classbase() { }
 };
 
-/** class Extensible is the parent class of many classes such as userrec and chanrec.
+/** class Extensible is the parent class of many classes such as User and Channel.
  * class Extensible implements a system which allows modules to 'extend' the class by attaching data within
  * a map associated with the object. In this way modules can store their own custom information within user
  * objects, channel objects and server objects, without breaking other modules (this is more sensible than using
diff --git a/include/caller.h b/include/caller.h
index b5dd38ef0..5cf08905a 100644
--- a/include/caller.h
+++ b/include/caller.h
@@ -21,10 +21,10 @@
  * according to the number of parameters it takes, e.g. caller0, caller1, caller2.
  * These have been generated from zero parameters to eight.
  *
- * If you want to declare a functor which takes two parameters, a userrec and a chanrec,
+ * If you want to declare a functor which takes two parameters, a User and a Channel,
  * and returns bool, simply create it like this:
  *
- * caller2<bool, userrec*, chanrec*> MyFunction;
+ * caller2<bool, User*, Channel*> MyFunction;
  *
  * and initialize it correctly, when placed into a class you will be able to call it:
  *
diff --git a/include/channels.h b/include/channels.h
index b4fa1ca30..0f947ac22 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -35,8 +35,8 @@ enum ChannelModes {
 };
 
 /* Forward declarations - needed */
-class userrec;
-class chanrec;
+class User;
+class Channel;
 
 /** Holds an entry for a ban list, exemption list, or invite list.
  * This class contains a single element in a channel list, such as a banlist.
@@ -70,7 +70,7 @@ typedef std::vector<BanItem> 	BanList;
 
 /** A list of users on a channel
  */
-typedef std::map<userrec*,std::string> CUList;
+typedef std::map<User*,std::string> CUList;
 
 /** Shorthand for CUList::iterator
  */
@@ -106,13 +106,13 @@ typedef std::vector<prefixtype> pfxcontainer;
 
 /** A list of users with zero or more prefixes set on them
  */
-typedef std::map<userrec*, std::vector<prefixtype> > prefixlist;
+typedef std::map<User*, std::vector<prefixtype> > prefixlist;
 
 /** Holds all relevent information for a channel.
  * This class represents a channel, and contains its name, modes, time created, topic, topic set time,
  * etc, and an instance of the BanList type.
  */
-class CoreExport chanrec : public Extensible
+class CoreExport Channel : public Extensible
 {
  private:
 
@@ -120,9 +120,9 @@ class CoreExport chanrec : public Extensible
 	 */
 	InspIRCd* ServerInstance;
 
-	/** Connect a chanrec to a userrec
+	/** Connect a Channel to a User
 	 */
-	static chanrec* ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs);
+	static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs);
 
 	/** Set default modes for the channel on creation
 	 */
@@ -194,7 +194,7 @@ class CoreExport chanrec : public Extensible
 	time_t created;
 
 	/** Time topic was set.
-	 * If no topic was ever set, this will be equal to chanrec::created
+	 * If no topic was ever set, this will be equal to Channel::created
 	 */
 	time_t topicset;
 
@@ -264,67 +264,67 @@ class CoreExport chanrec : public Extensible
 	 * an arbitary pointer compared to other users by its memory address,
 	 * as this is a very fast 32 or 64 bit integer comparison.
 	 */
-	void AddUser(userrec* user);
+	void AddUser(User* user);
 
 	/** Add a user pointer to the internal reference list of opped users
 	 * @param user The user to add
 	 */
-	void AddOppedUser(userrec* user);
+	void AddOppedUser(User* user);
 
 	/** Add a user pointer to the internal reference list of halfopped users
 	 * @param user The user to add
 	 */
-	void AddHalfoppedUser(userrec* user);
+	void AddHalfoppedUser(User* user);
 
 	/** Add a user pointer to the internal reference list of voiced users
 	 * @param user The user to add
 	 */
-	void AddVoicedUser(userrec* user);
+	void AddVoicedUser(User* user);
 
 	/** Delete a user pointer to the internal reference list
 	 * @param user The user to delete
 	 * @return number of users left on the channel after deletion of the user
 	 */
-	unsigned long DelUser(userrec* user);
+	unsigned long DelUser(User* user);
 
 	/** Delete a user pointer to the internal reference list of opped users
 	 * @param user The user to delete
 	 */
-	void DelOppedUser(userrec* user);
+	void DelOppedUser(User* user);
 
 	/** Delete a user pointer to the internal reference list of halfopped users
 	 * @param user The user to delete
 	 */
-	void DelHalfoppedUser(userrec* user);
+	void DelHalfoppedUser(User* user);
 
 	/** Delete a user pointer to the internal reference list of voiced users
 	 * @param user The user to delete
 	 */
-	void DelVoicedUser(userrec* user);
+	void DelVoicedUser(User* user);
 
 	/** Obtain the internal reference list
-	 * The internal reference list contains a list of userrec*.
+	 * The internal reference list contains a list of User*.
 	 * These are used for rapid comparison to determine
 	 * channel membership for PRIVMSG, NOTICE, QUIT, PART etc.
 	 * The resulting pointer to the vector should be considered
 	 * readonly and only modified via AddUser and DelUser.
 	 *
-	 * @return This function returns pointer to a map of userrec pointers (CUList*).
+	 * @return This function returns pointer to a map of User pointers (CUList*).
 	 */
 	CUList* GetUsers();
 
 	/** Obtain the internal reference list of opped users
-	 * @return This function returns pointer to a map of userrec pointers (CUList*).
+	 * @return This function returns pointer to a map of User pointers (CUList*).
 	 */
 	CUList* GetOppedUsers();
 
 	/** Obtain the internal reference list of halfopped users
-	 * @return This function returns pointer to a map of userrec pointers (CUList*).
+	 * @return This function returns pointer to a map of User pointers (CUList*).
 	 */
 	CUList* GetHalfoppedUsers();
 
 	/** Obtain the internal reference list of voiced users
-	 * @return This function returns pointer to a map of userrec pointers (CUList*).
+	 * @return This function returns pointer to a map of User pointers (CUList*).
 	 */
 	CUList* GetVoicedUsers();
 
@@ -332,63 +332,63 @@ class CoreExport chanrec : public Extensible
 	 * @param The user to look for
 	 * @return True if the user is on this channel
 	 */
-	bool HasUser(userrec* user);
+	bool HasUser(User* user);
 
 	/** Creates a channel record and initialises it with default values
 	 * @throw Nothing at present.
 	 */
-	chanrec(InspIRCd* Instance);
+	Channel(InspIRCd* Instance);
 
 	/** Make src kick user from this channel with the given reason.
 	 * @param src The source of the kick
 	 * @param user The user being kicked (must be on this channel)
 	 * @param reason The reason for the kick
 	 * @return The number of users left on the channel. If this is zero
-	 * when the method returns, you MUST delete the chanrec immediately!
+	 * when the method returns, you MUST delete the Channel immediately!
 	 */
-	long KickUser(userrec *src, userrec *user, const char* reason);
+	long KickUser(User *src, User *user, const char* reason);
 
 	/** Make the server kick user from this channel with the given reason.
 	 * @param user The user being kicked (must be on this channel)
 	 * @param reason The reason for the kick
 	 * @param triggerevents True if you wish this kick to trigger module events
 	 * @return The number of users left on the channel. If this is zero
-	 * when the method returns, you MUST delete the chanrec immediately!
+	 * when the method returns, you MUST delete the Channel immediately!
 	 */
-	long ServerKickUser(userrec* user, const char* reason, bool triggerevents);
+	long ServerKickUser(User* user, const char* reason, bool triggerevents);
 
 	/** Part a user from this channel with the given reason.
 	 * If the reason field is NULL, no reason will be sent.
 	 * @param user The user who is parting (must be on this channel)
 	 * @param reason The (optional) part reason
 	 * @return The number of users left on the channel. If this is zero
-	 * when the method returns, you MUST delete the chanrec immediately!
+	 * when the method returns, you MUST delete the Channel immediately!
 	 */
-	long PartUser(userrec *user, const char* reason = NULL);
+	long PartUser(User *user, const char* reason = NULL);
 
 	/* Join a user to a channel. May be a channel that doesnt exist yet.
 	 * @param user The user to join to the channel.
 	 * @param cn The channel name to join to. Does not have to exist.
 	 * @param key The key of the channel, if given
 	 * @param override If true, override all join restrictions such as +bkil
-	 * @return A pointer to the chanrec the user was joined to. A new chanrec may have
+	 * @return A pointer to the Channel the user was joined to. A new Channel may have
 	 * been created if the channel did not exist before the user was joined to it.
 	 * If the user could not be joined to a channel, the return value may be NULL.
 	 */
-	static chanrec* JoinUser(InspIRCd* ServerInstance, userrec *user, const char* cn, bool override, const char* key, time_t TS = 0);
+	static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, time_t TS = 0);
 
 	/** Write to a channel, from a user, using va_args for text
 	 * @param user User whos details to prefix the line with
 	 * @param text A printf-style format string which builds the output line without prefix
 	 * @param ... Zero or more POD types
 	 */
-	void WriteChannel(userrec* user, char* text, ...);
+	void WriteChannel(User* user, char* text, ...);
 
 	/** Write to a channel, from a user, using std::string for text
 	 * @param user User whos details to prefix the line with
 	 * @param text A std::string containing the output line without prefix
 	 */
-	void WriteChannel(userrec* user, const std::string &text);
+	void WriteChannel(User* user, const std::string &text);
 
 	/** Write to a channel, from a server, using va_args for text
 	 * @param ServName Server name to prefix the line with
@@ -412,7 +412,7 @@ class CoreExport chanrec : public Extensible
 	 * @param text A printf-style format string which builds the output line without prefix
 	 * @param ... Zero or more POD type
 	 */
-	void WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...);
+	void WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...);
 
 	/** Write to all users on a channel except a list of users, using va_args for text
 	 * @param user User whos details to prefix the line with, and to omit from receipt of the message
@@ -423,7 +423,7 @@ class CoreExport chanrec : public Extensible
 	 * @param text A printf-style format string which builds the output line without prefix
 	 * @param ... Zero or more POD type
 	 */
-	void WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...);
+	void WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...);
 
 	/** Write to all users on a channel except a specific user, using std::string for text.
 	 * Internally, this calls WriteAllExcept().
@@ -433,7 +433,7 @@ class CoreExport chanrec : public Extensible
 	 * @param status The status of the users to write to, e.g. '@' or '%'. Use a value of 0 to write to everyone
 	 * @param text A std::string containing the output line without prefix
 	 */
-	void WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text);
+	void WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text);
 
 	/** Write to all users on a channel except a list of users, using std::string for text
 	 * @param user User whos details to prefix the line with, and to omit from receipt of the message
@@ -443,7 +443,7 @@ class CoreExport chanrec : public Extensible
 	 * @param except_list A list of users NOT to send the text to
 	 * @param text A std::string containing the output line without prefix
 	 */
-	void WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string& text);
+	void WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string& text);
 
 	/** Returns the maximum number of bans allowed to be set on this channel
 	 * @return The maximum number of bans allowed
@@ -462,7 +462,7 @@ class CoreExport chanrec : public Extensible
 	 * @param ulist The user list to send, NULL to use the
 	 * channel's default names list of everyone
 	 */
-	void UserList(userrec *user, CUList* ulist = NULL);
+	void UserList(User *user, CUList* ulist = NULL);
 
 	/** Get the number of invisible users on this channel
 	 * @return Number of invisible users
@@ -473,13 +473,13 @@ class CoreExport chanrec : public Extensible
 	 * @param user The user to look up
 	 * @return One of STATUS_OP, STATUS_HOP, STATUS_VOICE, or zero.
 	 */
-	int GetStatus(userrec *user);
+	int GetStatus(User *user);
 
 	/** Get a users status on this channel in a bitmask
 	 * @param user The user to look up
 	 * @return A bitmask containing zero or more of STATUS_OP, STATUS_HOP, STATUS_VOICE
 	 */
-	int GetStatusFlags(userrec *user);
+	int GetStatusFlags(User *user);
 
 	/** Get a users prefix on this channel in a string.
 	 * @param user The user to look up
@@ -492,7 +492,7 @@ class CoreExport chanrec : public Extensible
 	 * character you can get, you can deal with it in a 'proprtional' manner
 	 * compared to known prefixes, using GetPrefixValue().
 	 */
-	const char* GetPrefixChar(userrec *user);
+	const char* GetPrefixChar(User *user);
 
 	/** Return all of a users mode prefixes into a char* string.
 	 * @param user The user to look up
@@ -500,7 +500,7 @@ class CoreExport chanrec : public Extensible
 	 * be in rank order, greatest first, as certain IRC clients require
 	 * this when multiple prefixes are used names lists.
 	 */
-	const char* GetAllPrefixChars(userrec* user);
+	const char* GetAllPrefixChars(User* user);
 
 	/** Get the value of a users prefix on this channel.
 	 * @param user The user to look up
@@ -513,14 +513,14 @@ class CoreExport chanrec : public Extensible
 	 * is a prefix of greater 'worth' than ops, and a value less than
 	 * VOICE_VALUE is of lesser 'worth' than a voice.
 	 */
-	unsigned int GetPrefixValue(userrec* user);
+	unsigned int GetPrefixValue(User* user);
 
 	/** This method removes all prefix characters from a user.
 	 * It will not inform the user or the channel of the removal of prefixes,
 	 * and should be used when the user parts or quits.
 	 * @param user The user to remove all prefixes from
 	 */
-	void RemoveAllPrefixes(userrec* user);
+	void RemoveAllPrefixes(User* user);
 
 	/** Add a prefix character to a user.
 	 * Only the core should call this method, usually  from
@@ -531,21 +531,21 @@ class CoreExport chanrec : public Extensible
 	 * @param prefix_rank The rank (value) of this prefix character
 	 * @param adding True if adding the prefix, false when removing
 	 */
-	void SetPrefix(userrec* user, char prefix, unsigned int prefix_rank, bool adding);
+	void SetPrefix(User* user, char prefix, unsigned int prefix_rank, bool adding);
 
 	/** Check if a user is banned on this channel
 	 * @param user A user to check against the banlist
 	 * @returns True if the user given is banned
 	 */
-	bool IsBanned(userrec* user);
+	bool IsBanned(User* user);
 
 	/** Clears the cached max bans value
 	 */
 	void ResetMaxBans();
 
-	/** Destructor for chanrec
+	/** Destructor for Channel
 	 */
-	virtual ~chanrec() { /* stub */ }
+	virtual ~Channel() { /* stub */ }
 };
 
 #endif
diff --git a/include/command_parse.h b/include/command_parse.h
index be3ea89ff..be18db4f9 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -54,7 +54,7 @@ class CoreExport CommandParser : public classbase
 	 * @param user The user to parse the command for
 	 * @param cmd The command string to process
 	 */
-	void ProcessCommand(userrec *user, std::string &cmd);
+	void ProcessCommand(User *user, std::string &cmd);
 
 	/** Finds the init_command symbol in a .so file
 	 * @param v A function pointer to be initialized
@@ -93,7 +93,7 @@ class CoreExport CommandParser : public classbase
 	 * @return True if the command was reloaded, false if it could not be found
 	 * or another error occured
 	 */
-	bool ReloadCommand(const char* cmd, userrec* user);
+	bool ReloadCommand(const char* cmd, User* user);
 
 	/** Default constructor.
 	 * @param Instance The creator of this class
@@ -111,7 +111,7 @@ class CoreExport CommandParser : public classbase
 	 * command simply did not exist at all or the wrong number of parameters were given, or the user
 	 * was not privilaged enough to execute the command.
 	 */
-	CmdResult CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user);
+	CmdResult CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user);
 
 	/** Get the handler function for a command.
 	 * @param commandname The command required. Always use uppercase for this parameter.
@@ -127,7 +127,7 @@ class CoreExport CommandParser : public classbase
 	 * equal to or greater than the minimum number of parameters to the given command, then this
 	 * function will return true, otherwise it will return false.
 	 */
-	bool IsValidCommand(const std::string &commandname, int pcnt, userrec * user);
+	bool IsValidCommand(const std::string &commandname, int pcnt, User * user);
 	
 	/** 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.
@@ -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* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra);
+	int LoopCall(User* 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,13 +173,13 @@ 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* CommandObj, const char** parameters, int pcnt, unsigned int splithere);
+	int LoopCall(User* 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
 	 * @param user The user to whom this line belongs
 	 */
-	void ProcessBuffer(std::string &buffer,userrec *user);
+	void ProcessBuffer(std::string &buffer,User *user);
 
 	/** Remove all commands relating to module 'source'.
 	 * @param source A module name which has introduced new commands
@@ -201,7 +201,7 @@ class CoreExport CommandParser : public classbase
 	 * @param user User to spool errors to, or if NULL, when an error occurs spool the errors to
 	 * stdout then exit with EXIT_STATUS_HANDLER.
 	 */
-	void SetupCommandTable(userrec* user);
+	void SetupCommandTable(User* user);
 
 	/** Translate nicknames in a string into UIDs, based on the TranslationType given.
 	 * @param to The translation type to use for the process.
@@ -223,7 +223,7 @@ class cmd_reload : public Command
 	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 /** A lookup table of values for multiplier characters used by
diff --git a/include/commands/cmd_admin.h b/include/commands/cmd_admin.h
index 049d230b0..8b85a3e95 100644
--- a/include/commands/cmd_admin.h
+++ b/include/commands/cmd_admin.h
@@ -34,7 +34,7 @@ class cmd_admin : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_away.h b/include/commands/cmd_away.h
index 269c548aa..29255d936 100644
--- a/include/commands/cmd_away.h
+++ b/include/commands/cmd_away.h
@@ -36,7 +36,7 @@ class cmd_away : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_clearcache.h b/include/commands/cmd_clearcache.h
index b89029a30..0af086609 100644
--- a/include/commands/cmd_clearcache.h
+++ b/include/commands/cmd_clearcache.h
@@ -35,7 +35,7 @@ class cmd_clearcache : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_commands.h b/include/commands/cmd_commands.h
index a796d4ebd..03a6c08ba 100644
--- a/include/commands/cmd_commands.h
+++ b/include/commands/cmd_commands.h
@@ -36,7 +36,7 @@ class cmd_commands : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_connect.h b/include/commands/cmd_connect.h
index b621cab77..97096acb6 100644
--- a/include/commands/cmd_connect.h
+++ b/include/commands/cmd_connect.h
@@ -36,7 +36,7 @@ class cmd_connect : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h
index cae2637e9..2eb9f7a6d 100644
--- a/include/commands/cmd_die.h
+++ b/include/commands/cmd_die.h
@@ -36,7 +36,7 @@ class cmd_die : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h
index 36b22ce79..25c403be4 100644
--- a/include/commands/cmd_eline.h
+++ b/include/commands/cmd_eline.h
@@ -36,7 +36,7 @@ class cmd_eline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h
index caf703009..3a398995f 100644
--- a/include/commands/cmd_gline.h
+++ b/include/commands/cmd_gline.h
@@ -36,7 +36,7 @@ class cmd_gline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_info.h b/include/commands/cmd_info.h
index c84a03adf..578a83217 100644
--- a/include/commands/cmd_info.h
+++ b/include/commands/cmd_info.h
@@ -36,7 +36,7 @@ class cmd_info : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_invite.h b/include/commands/cmd_invite.h
index 95391e829..ad78869b2 100644
--- a/include/commands/cmd_invite.h
+++ b/include/commands/cmd_invite.h
@@ -36,7 +36,7 @@ class cmd_invite : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_ison.h b/include/commands/cmd_ison.h
index 3b914d62e..e0ac4cc93 100644
--- a/include/commands/cmd_ison.h
+++ b/include/commands/cmd_ison.h
@@ -36,7 +36,7 @@ class cmd_ison : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_join.h b/include/commands/cmd_join.h
index cf678e4ea..6889b71fe 100644
--- a/include/commands/cmd_join.h
+++ b/include/commands/cmd_join.h
@@ -36,7 +36,7 @@ class cmd_join : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_kick.h b/include/commands/cmd_kick.h
index 3a58d4203..769ab316e 100644
--- a/include/commands/cmd_kick.h
+++ b/include/commands/cmd_kick.h
@@ -36,7 +36,7 @@ class cmd_kick : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h
index 1e1835f00..1f80cded9 100644
--- a/include/commands/cmd_kill.h
+++ b/include/commands/cmd_kill.h
@@ -36,7 +36,7 @@ class cmd_kill : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h
index edaa8a8bc..897c5402f 100644
--- a/include/commands/cmd_kline.h
+++ b/include/commands/cmd_kline.h
@@ -36,7 +36,7 @@ class cmd_kline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_links.h b/include/commands/cmd_links.h
index 74b616401..6c5d521f1 100644
--- a/include/commands/cmd_links.h
+++ b/include/commands/cmd_links.h
@@ -36,7 +36,7 @@ class cmd_links : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_list.h b/include/commands/cmd_list.h
index f99111fa0..fabe50fca 100644
--- a/include/commands/cmd_list.h
+++ b/include/commands/cmd_list.h
@@ -36,7 +36,7 @@ class cmd_list : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h
index 4288eb4c6..4e640b938 100644
--- a/include/commands/cmd_loadmodule.h
+++ b/include/commands/cmd_loadmodule.h
@@ -36,7 +36,7 @@ class cmd_loadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_lusers.h b/include/commands/cmd_lusers.h
index 76ebf5674..d4bebca18 100644
--- a/include/commands/cmd_lusers.h
+++ b/include/commands/cmd_lusers.h
@@ -36,7 +36,7 @@ class cmd_lusers : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_map.h b/include/commands/cmd_map.h
index 1ae324309..e3f546d7b 100644
--- a/include/commands/cmd_map.h
+++ b/include/commands/cmd_map.h
@@ -36,7 +36,7 @@ class cmd_map : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_mode.h b/include/commands/cmd_mode.h
index 9231f2c61..ddaeb69fb 100644
--- a/include/commands/cmd_mode.h
+++ b/include/commands/cmd_mode.h
@@ -35,7 +35,7 @@ class cmd_mode : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_modules.h b/include/commands/cmd_modules.h
index 73a6074d1..5dd3fab2b 100644
--- a/include/commands/cmd_modules.h
+++ b/include/commands/cmd_modules.h
@@ -36,7 +36,7 @@ class cmd_modules : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_motd.h b/include/commands/cmd_motd.h
index e6f5092b2..c79d22efb 100644
--- a/include/commands/cmd_motd.h
+++ b/include/commands/cmd_motd.h
@@ -39,7 +39,7 @@ class cmd_motd : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_names.h b/include/commands/cmd_names.h
index b65fdeda8..82c25f569 100644
--- a/include/commands/cmd_names.h
+++ b/include/commands/cmd_names.h
@@ -36,7 +36,7 @@ class cmd_names : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_nick.h b/include/commands/cmd_nick.h
index 849b59c22..f02522e9b 100644
--- a/include/commands/cmd_nick.h
+++ b/include/commands/cmd_nick.h
@@ -37,7 +37,7 @@ class cmd_nick : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 
 	/** Handle internal command
 	 * @param id Used to indicate if invalid nick changes are allowed.
diff --git a/include/commands/cmd_notice.h b/include/commands/cmd_notice.h
index 20c34b6bf..377aa4aba 100644
--- a/include/commands/cmd_notice.h
+++ b/include/commands/cmd_notice.h
@@ -36,7 +36,7 @@ class cmd_notice : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_oper.h b/include/commands/cmd_oper.h
index 17d71dbe3..581cfea16 100644
--- a/include/commands/cmd_oper.h
+++ b/include/commands/cmd_oper.h
@@ -38,7 +38,7 @@ class cmd_oper : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_part.h b/include/commands/cmd_part.h
index c419fb798..0965a5031 100644
--- a/include/commands/cmd_part.h
+++ b/include/commands/cmd_part.h
@@ -36,7 +36,7 @@ class cmd_part : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_pass.h b/include/commands/cmd_pass.h
index 0edd17a97..26e360923 100644
--- a/include/commands/cmd_pass.h
+++ b/include/commands/cmd_pass.h
@@ -39,7 +39,7 @@ class cmd_pass : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_ping.h b/include/commands/cmd_ping.h
index 6e856fa3a..326342e7b 100644
--- a/include/commands/cmd_ping.h
+++ b/include/commands/cmd_ping.h
@@ -36,7 +36,7 @@ class cmd_ping : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_pong.h b/include/commands/cmd_pong.h
index f050a4ee8..91b87bfb0 100644
--- a/include/commands/cmd_pong.h
+++ b/include/commands/cmd_pong.h
@@ -37,7 +37,7 @@ class cmd_pong : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_privmsg.h b/include/commands/cmd_privmsg.h
index 604093851..12f1c0756 100644
--- a/include/commands/cmd_privmsg.h
+++ b/include/commands/cmd_privmsg.h
@@ -36,7 +36,7 @@ class cmd_privmsg : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h
index fb9e88048..7ea7643f1 100644
--- a/include/commands/cmd_qline.h
+++ b/include/commands/cmd_qline.h
@@ -36,7 +36,7 @@ class cmd_qline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_quit.h b/include/commands/cmd_quit.h
index 06c564ac0..23da5481c 100644
--- a/include/commands/cmd_quit.h
+++ b/include/commands/cmd_quit.h
@@ -36,7 +36,7 @@ class cmd_quit : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h
index 684ffee9c..401247972 100644
--- a/include/commands/cmd_rehash.h
+++ b/include/commands/cmd_rehash.h
@@ -36,7 +36,7 @@ class cmd_rehash : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_reloadmodule.h b/include/commands/cmd_reloadmodule.h
index 672816289..cdf053062 100644
--- a/include/commands/cmd_reloadmodule.h
+++ b/include/commands/cmd_reloadmodule.h
@@ -36,7 +36,7 @@ class cmd_reloadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_restart.h b/include/commands/cmd_restart.h
index 0834bf61b..f85a00a82 100644
--- a/include/commands/cmd_restart.h
+++ b/include/commands/cmd_restart.h
@@ -39,7 +39,7 @@ class cmd_restart : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_rules.h b/include/commands/cmd_rules.h
index 5313dae32..adfab7e17 100644
--- a/include/commands/cmd_rules.h
+++ b/include/commands/cmd_rules.h
@@ -39,7 +39,7 @@ class cmd_rules : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_server.h b/include/commands/cmd_server.h
index e3383e5c7..2b25e406d 100644
--- a/include/commands/cmd_server.h
+++ b/include/commands/cmd_server.h
@@ -36,7 +36,7 @@ class cmd_server : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index faef49dff..f1270ef4c 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -39,7 +39,7 @@ class cmd_squit : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_stats.h b/include/commands/cmd_stats.h
index 2931a27e0..69e151135 100644
--- a/include/commands/cmd_stats.h
+++ b/include/commands/cmd_stats.h
@@ -20,7 +20,7 @@
 #include "users.h"
 #include "channels.h"
 
-DllExport void DoStats(InspIRCd* Instance, char statschar, userrec* user, string_list &results);
+DllExport void DoStats(InspIRCd* Instance, char statschar, User* user, string_list &results);
 
 /** Handle /STATS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -39,7 +39,7 @@ class cmd_stats : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_time.h b/include/commands/cmd_time.h
index 24423c46e..b6d353c89 100644
--- a/include/commands/cmd_time.h
+++ b/include/commands/cmd_time.h
@@ -36,7 +36,7 @@ class cmd_time : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_topic.h b/include/commands/cmd_topic.h
index 0e75df750..3375c1641 100644
--- a/include/commands/cmd_topic.h
+++ b/include/commands/cmd_topic.h
@@ -36,7 +36,7 @@ class cmd_topic : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h
index 6f5aecf00..1f551f1eb 100644
--- a/include/commands/cmd_trace.h
+++ b/include/commands/cmd_trace.h
@@ -36,7 +36,7 @@ class cmd_trace : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h
index 962c7dcb6..2afd84168 100644
--- a/include/commands/cmd_unloadmodule.h
+++ b/include/commands/cmd_unloadmodule.h
@@ -36,7 +36,7 @@ class cmd_unloadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_user.h b/include/commands/cmd_user.h
index dc4e0e3aa..186269d9a 100644
--- a/include/commands/cmd_user.h
+++ b/include/commands/cmd_user.h
@@ -36,7 +36,7 @@ class cmd_user : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_userhost.h b/include/commands/cmd_userhost.h
index bd19219de..65b358e47 100644
--- a/include/commands/cmd_userhost.h
+++ b/include/commands/cmd_userhost.h
@@ -36,7 +36,7 @@ class cmd_userhost : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_version.h b/include/commands/cmd_version.h
index 2163bc1cf..a70e033df 100644
--- a/include/commands/cmd_version.h
+++ b/include/commands/cmd_version.h
@@ -36,7 +36,7 @@ class cmd_version : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h
index 6c09989fe..c4ab9973f 100644
--- a/include/commands/cmd_wallops.h
+++ b/include/commands/cmd_wallops.h
@@ -36,7 +36,7 @@ class cmd_wallops : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_who.h b/include/commands/cmd_who.h
index f89137c0a..7d1bab933 100644
--- a/include/commands/cmd_who.h
+++ b/include/commands/cmd_who.h
@@ -26,7 +26,7 @@
  */
 class cmd_who : public Command
 {
-	bool CanView(chanrec* chan, userrec* user);
+	bool CanView(Channel* chan, User* user);
 	bool opt_viewopersonly;
 	bool opt_showrealhost;
 	bool opt_unlimit;
@@ -42,15 +42,15 @@ class cmd_who : public Command
 	/** Constructor for who.
 	 */
 	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);
+	void SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults);
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
-	bool whomatch(userrec* user, const char* matchtext);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	bool whomatch(User* user, const char* matchtext);
 };
 
 #endif
diff --git a/include/commands/cmd_whois.h b/include/commands/cmd_whois.h
index 6aec85e0a..b83fe8e5f 100644
--- a/include/commands/cmd_whois.h
+++ b/include/commands/cmd_whois.h
@@ -20,7 +20,7 @@
 #include "channels.h"
 
 const char* Spacify(char* n);
-DllExport void do_whois(InspIRCd* Instance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick);
+DllExport void do_whois(InspIRCd* Instance, User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick);
 
 /** Handle /WHOIS. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -39,7 +39,7 @@ class cmd_whois : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 50f5ffd0f..c8f367116 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -79,7 +79,7 @@ class cmd_whowas : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
     /** Handle an internal request from another command, the core, or a module
      * @param Command ID
      * @param Zero or more parameters, whos form is specified by the command ID.
@@ -88,7 +88,7 @@ class cmd_whowas : public Command
      * return CMD_LOCALONLY.
      */
 	CmdResult HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters);
-	void AddToWhoWas(userrec* user);
+	void AddToWhoWas(User* user);
 	void GetStats(Extensible* ext);
 	void PruneWhoWas(time_t t);
 	void MaintainWhoWas(time_t t);
@@ -121,7 +121,7 @@ class WhoWasGroup : public classbase
 
 	/** Initialize this WhoQasFroup with a user
 	 */
-	WhoWasGroup(userrec* user);
+	WhoWasGroup(User* user);
 	/** Destructor
 	 */
 	~WhoWasGroup();
diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h
index 114de31b1..e3ad7b727 100644
--- a/include/commands/cmd_zline.h
+++ b/include/commands/cmd_zline.h
@@ -36,7 +36,7 @@ class cmd_zline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+	CmdResult Handle(const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/include/configreader.h b/include/configreader.h
index 8b031012d..86441d344 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -235,7 +235,7 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Check that there is only one of each configuration item
 	 */
-	bool CheckOnce(char* tag, bool bail, userrec* user);
+	bool CheckOnce(char* tag, bool bail, User* user);
   
   public:
 
@@ -628,13 +628,13 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Send the 005 numerics (ISUPPORT) to a user
 	 */
-	void Send005(userrec* user);
+	void Send005(User* user);
 
 	/** Read the entire configuration into memory
 	 * and initialize this class. All other methods
 	 * should be used only by the core.
 	 */
-	void Read(bool bail, userrec* user);
+	void Read(bool bail, User* user);
 
 	/** Read a file into a file_cache object
 	 */
@@ -646,7 +646,7 @@ class CoreExport ServerConfig : public Extensible
 	 * this user as SNOTICEs.
 	 * If the parameter is NULL, the messages are spooled to all users via WriteOpers as SNOTICEs.
 	 */
-	void ReportConfigError(const std::string &errormessage, bool bail, userrec* user);
+	void ReportConfigError(const std::string &errormessage, bool bail, User* user);
 
 	/** Load 'filename' into 'target', with the new config parser everything is parsed into
 	 * tag/key/value at load-time rather than at read-value time.
diff --git a/include/connection.h b/include/connection.h
index 65d342447..f476c39a5 100644
--- a/include/connection.h
+++ b/include/connection.h
@@ -19,7 +19,7 @@
 #include "base.h"
 #include "socketengine.h"
 
-/** connection is the base class of userrec, and holds basic user properties.
+/** connection is the base class of User, and holds basic user properties.
  * This can be extended for holding other user-like objects in the future.
  */
 class CoreExport connection : public EventHandler
@@ -50,7 +50,7 @@ class CoreExport connection : public EventHandler
 	 */
 	bool haspassed;
 
-	/** Used by userrec to indicate the registration status of the connection
+	/** Used by User to indicate the registration status of the connection
 	 * It is a bitfield of the REG_NICK, REG_USER and REG_ALL bits to indicate
 	 * the connection state.
 	 */
diff --git a/include/ctables.h b/include/ctables.h
index abfc740da..0c2802baa 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -20,7 +20,7 @@
 #include "base.h"
 
 /* Forward declarations - required */
-class userrec;
+class User;
 class InspIRCd;
 
 /** Used to indicate command success codes
@@ -119,7 +119,7 @@ class CoreExport Command : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult Handle(const char** parameters, int pcnt, userrec* user) = 0;
+	virtual CmdResult Handle(const char** parameters, int pcnt, User* user) = 0;
 
 	/** Handle an internal request from another command, the core, or a module
 	 * @param Command ID
diff --git a/include/cull_list.h b/include/cull_list.h
index 129f0d43d..c5daab5dd 100644
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -35,7 +35,7 @@ class CoreExport CullItem : public classbase
 	/** Holds a pointer to the user,
 	 * must be valid and can be a local or remote user.
 	 */
-	userrec* user;
+	User* user;
 	/** Holds the quit reason to use for this user.
 	 */
 	std::string reason;
@@ -53,7 +53,7 @@ class CoreExport CullItem : public classbase
 	* @param r The quit reason of the added user
 	* @param ro The quit reason to show to opers only
 	*/
-	CullItem(userrec* u, std::string &r, const char* ro = "");
+	CullItem(User* u, std::string &r, const char* ro = "");
 	/** Constrcutor.
 	 * Initializes the CullItem with a user pointer
 	 * and their quit reason
@@ -61,7 +61,7 @@ class CoreExport CullItem : public classbase
 	 * @param r The quit reason of the added user
 	 * @param ro The quit reason to show to opers only
 	 */
-	CullItem(userrec* u, const char* r, const char* ro = "");
+	CullItem(User* u, const char* r, const char* ro = "");
 
 	/** Make the quit silent a module is dealing with
 	 * displaying this users quit, so we shouldn't
@@ -80,7 +80,7 @@ class CoreExport CullItem : public classbase
 
 	/** Returns a pointer to the user
 	*/
-	userrec* GetUser();
+	User* GetUser();
 	/** Returns the user's quit reason
 	*/
 	std::string& GetReason();
@@ -111,7 +111,7 @@ class CoreExport CullList : public classbase
 
 	/** Holds a list of users already added for quick lookup
 	 */
-	std::map<userrec*, userrec*> exempt;
+	std::map<User*, User*> exempt;
 
 	/** Holds a list of users being quit.
 	 * See the information for CullItem for
@@ -133,7 +133,7 @@ class CoreExport CullList : public classbase
 	 * @param reason The quit reason of the user being added
 	 * @param o_reason The quit reason to show only to opers
 	 */
-	void AddItem(userrec* user, std::string &reason, const char* o_reason = "");
+	void AddItem(User* user, std::string &reason, const char* o_reason = "");
 
 	/** Adds a user to the cull list for later
 	 * removal via QUIT.
@@ -141,11 +141,11 @@ class CoreExport CullList : public classbase
 	 * @param reason The quit reason of the user being added
 	 * @param o_reason The quit reason to show only to opers
 	 */
-	void AddItem(userrec* user, const char* reason, const char* o_reason = "");
+	void AddItem(User* user, const char* reason, const char* o_reason = "");
 
 	/* Turn an item into a silent item (don't send out QUIT for this user)
 	 */
-	void MakeSilent(userrec* user);
+	void MakeSilent(User* user);
 
 	/** Applies the cull list, quitting all the users
 	 * on the list with their quit reasons all at once.
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 033003f71..78792d1ab 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -438,8 +438,8 @@ namespace irc
 	 * To use this class, you must derive from it.
 	 * This is because each derived instance has its own freebits array
 	 * which can determine what bitfields are allocated on a TYPE BY TYPE
-	 * basis, e.g. an irc::dynamicbitmask type for userrecs, and one for
-	 * chanrecs, etc. You should inheret it in a very simple way as follows.
+	 * basis, e.g. an irc::dynamicbitmask type for Users, and one for
+	 * Channels, etc. You should inheret it in a very simple way as follows.
 	 * The base class will resize and maintain freebits as required, you are
 	 * just required to make the pointer static and specific to this class
 	 * type.
diff --git a/include/inspircd.h b/include/inspircd.h
index 7aa5a5ec3..afa4db7f4 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -231,11 +231,11 @@ typedef std::map<irc::string, unsigned int> clonemap;
 
 class InspIRCd;
 
-DEFINE_HANDLER1(ProcessUserHandler, void, userrec*);
+DEFINE_HANDLER1(ProcessUserHandler, void, User*);
 DEFINE_HANDLER1(IsNickHandler, bool, const char*);
 DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
-DEFINE_HANDLER1(FindDescriptorHandler, userrec*, int);
-DEFINE_HANDLER1(FloodQuitUserHandler, void, userrec*);
+DEFINE_HANDLER1(FindDescriptorHandler, User*, int);
+DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
 
 /* Forward declaration - required */
 class XLineManager;
@@ -287,7 +287,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param user The user to verify
 	 * @return True if all modules have finished checking this user
 	 */
-	bool AllModulesReportReady(userrec* user);
+	bool AllModulesReportReady(User* user);
 
 	/** Logfile pathname specified on the commandline, or empty string
 	 */
@@ -348,12 +348,12 @@ class CoreExport InspIRCd : public classbase
 	/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
 	 * Reason for it:
 	 * kludge alert!
-	 * SendMode expects a userrec* to send the numeric replies
+	 * SendMode expects a User* to send the numeric replies
 	 * back to, so we create it a fake user that isnt in the user
 	 * hash and set its descriptor to FD_MAGIC_NUMBER so the data
 	 * falls into the abyss :p
 	 */
-	userrec *FakeClient;
+	User *FakeClient;
 
 	/** Returns the next available UID for this server.
 	 */
@@ -363,13 +363,13 @@ class CoreExport InspIRCd : public classbase
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	userrec *FindUUID(const std::string &);
+	User *FindUUID(const std::string &);
 
 	/** Find a user in the UUID hash
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	userrec *FindUUID(const char *);
+	User *FindUUID(const char *);
 
 	/** Build the ISUPPORT string by triggering all modules On005Numeric events
 	 */
@@ -427,7 +427,7 @@ class CoreExport InspIRCd : public classbase
 	user_hash* clientlist;
 
 	/** Client list stored by UUID. Contains all clients, and is updated
-	 * automatically by the constructor and destructor of userrec.
+	 * automatically by the constructor and destructor of User.
 	 */
 	user_hash* uuidlist;
 
@@ -437,11 +437,11 @@ class CoreExport InspIRCd : public classbase
 
 	/** Local client list, a vector containing only local clients
 	 */
-	std::vector<userrec*> local_users;
+	std::vector<User*> local_users;
 
 	/** Oper list, a vector containing all local and remote opered users
 	 */
-	std::list<userrec*> all_opers;
+	std::list<User*> all_opers;
 
 	/** Map of local ip addresses for clone counting
 	 */
@@ -490,12 +490,12 @@ class CoreExport InspIRCd : public classbase
 	/** Add a user to the local clone map
 	 * @param user The user to add
 	 */
-	void AddLocalClone(userrec* user);
+	void AddLocalClone(User* user);
 
 	/** Add a user to the global clone map
 	 * @param user The user to add
 	 */
-	void AddGlobalClone(userrec* user);
+	void AddGlobalClone(User* user);
 	
 	/** Number of users with a certain mode set on them
 	 */
@@ -511,7 +511,7 @@ class CoreExport InspIRCd : public classbase
 	 * @return There is no actual return value, however upon exit, the user 'cu' may have been
 	 * marked for deletion in the global CullList.
 	 */
-	caller1<void, userrec*> ProcessUser;
+	caller1<void, User*> ProcessUser;
 
 	/** Bind all ports specified in the configuration file.
 	 * @param bail True if the function should bail back to the shell on failure
@@ -534,7 +534,7 @@ class CoreExport InspIRCd : public classbase
 	void AddServerName(const std::string &servername);
 
 	/** Finds a cached char* pointer of a server name,
-	 * This is used to optimize userrec by storing only the pointer to the name
+	 * This is used to optimize User by storing only the pointer to the name
 	 * @param The servername to find
 	 * @return A pointer to this name, gauranteed to never become invalid
 	 */
@@ -571,34 +571,34 @@ class CoreExport InspIRCd : public classbase
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	userrec* FindNick(const std::string &nick);
+	User* FindNick(const std::string &nick);
 
 	/** Find a user in the nick hash.
 	 * If the user cant be found in the nick hash check the uuid hash
 	 * @param nick The nickname to find
 	 * @return A pointer to the user, or NULL if the user does not exist
 	 */
-	userrec* FindNick(const char* nick);
+	User* FindNick(const char* nick);
 
 	/** Find a user in the nick hash ONLY
 	 */
-	userrec* FindNickOnly(const char* nick);
+	User* FindNickOnly(const char* nick);
 
 	/** Find a user in the nick hash ONLY
 	 */
-	userrec* FindNickOnly(const std::string &nick);
+	User* FindNickOnly(const std::string &nick);
 
 	/** Find a channel in the channels hash
 	 * @param chan The channel to find
 	 * @return A pointer to the channel, or NULL if the channel does not exist
 	 */
-	chanrec* FindChan(const std::string &chan);
+	Channel* FindChan(const std::string &chan);
 
 	/** Find a channel in the channels hash
 	 * @param chan The channel to find
 	 * @return A pointer to the channel, or NULL if the channel does not exist
 	 */
-	chanrec* FindChan(const char* chan);
+	Channel* FindChan(const char* chan);
 
 	/** Check for a 'die' tag in the config file, and abort if found
 	 * @return Depending on the configuration, this function may never return
@@ -733,7 +733,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param socket The file descriptor of a user
 	 * @return A pointer to the user if the user exists locally on this descriptor
 	 */
-	caller1<userrec*, int> FindDescriptor;
+	caller1<User*, int> FindDescriptor;
 
 	/** Add a new mode to this server's mode parser
 	 * @param mh The modehandler to add
@@ -785,7 +785,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param pcnt The number of items you have given in the first parameter
 	 * @param user The user to send error messages to
 	 */
-	void SendMode(const char **parameters, int pcnt, userrec *user);
+	void SendMode(const char **parameters, int pcnt, User *user);
 
 	/** Match two strings using pattern matching.
 	 * This operates identically to the global function match(),
@@ -803,7 +803,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param user The user to execute the command as
 	 * @return True if the command handler was called successfully
 	 */
-	CmdResult CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user);
+	CmdResult CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user);
 
 	/** Return true if the command is a module-implemented command and the given parameters are valid for it
 	 * @param parameters The mode parameters
@@ -811,7 +811,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param user The user to test-execute the command as
 	 * @return True if the command handler is a module command, and there are enough parameters and the user has permission to the command
 	 */
-	bool IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user);
+	bool IsValidModuleCommand(const std::string &commandname, int pcnt, User* user);
 
 	/** Add a gline and apply it
 	 * @param duration How long the line should last
@@ -897,35 +897,35 @@ class CoreExport InspIRCd : public classbase
 	 * @param The index number of the channel to fetch
 	 * @return A channel record, or NUll if index < 0 or index >= InspIRCd::ChannelCount()
 	 */
-	chanrec* GetChannelIndex(long index);
+	Channel* GetChannelIndex(long index);
 
 	/** Dump text to a user target, splitting it appropriately to fit
 	 * @param User the user to dump the text to
 	 * @param LinePrefix text to prefix each complete line with
 	 * @param TextStream the text to send to the user
 	 */
-	void DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream);
+	void DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream);
 
 	/** Check if the given nickmask matches too many users, send errors to the given user
 	 * @param nick A nickmask to match against
 	 * @param user A user to send error text to
 	 * @return True if the nick matches too many users
 	 */
-	bool NickMatchesEveryone(const std::string &nick, userrec* user);
+	bool NickMatchesEveryone(const std::string &nick, User* user);
 
 	/** Check if the given IP mask matches too many users, send errors to the given user
 	 * @param ip An ipmask to match against
 	 * @param user A user to send error text to
 	 * @return True if the ip matches too many users
 	 */
-	bool IPMatchesEveryone(const std::string &ip, userrec* user);
+	bool IPMatchesEveryone(const std::string &ip, User* user);
 
 	/** Check if the given hostmask matches too many users, send errors to the given user
 	 * @param mask A hostmask to match against
 	 * @param user A user to send error text to
 	 * @return True if the host matches too many users
 	 */
-	bool HostMatchesEveryone(const std::string &mask, userrec* user);
+	bool HostMatchesEveryone(const std::string &mask, User* user);
 
 	/** Calculate a duration in seconds from a string in the form 1y2w3d4h6m5s
 	 * @param str A string containing a time in the form 1y2w3d4h6m5s
@@ -1004,7 +1004,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param numeric Numeric to send
 	 * @param text Text of the numeric
 	 */
-	void SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text);
+	void SendWhoisLine(User* user, User* dest, int numeric, const std::string &text);
 
 	/** Send a line of WHOIS data to a user.
 	 * @param user user to send the line to
@@ -1013,13 +1013,13 @@ class CoreExport InspIRCd : public classbase
 	 * @param format Format string for the numeric
 	 * @param ... Parameters for the format string
 	 */
-	void SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...);
+	void SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...);
 
 	/** Quit a user for excess flood, and if they are not
 	 * fully registered yet, temporarily zline their IP.
 	 * @param current user to quit
 	 */
-	caller1<void, userrec*> FloodQuitUser;
+	caller1<void, User*> FloodQuitUser;
 
 	/** Restart the server.
 	 * This function will not return. If an error occurs,
diff --git a/include/mode.h b/include/mode.h
index c8a315cce..2524c11dd 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -58,7 +58,7 @@ enum ModeMasks
 
 /**
  * These fixed values can be used to proportionally compare module-defined prefixes to known values.
- * For example, if your module queries a chanrec, and is told that user 'joebloggs' has the prefix
+ * For example, if your module queries a Channel, and is told that user 'joebloggs' has the prefix
  * '$', and you dont know what $ means, then you can compare it to these three values to determine
  * its worth against them. For example if '$' had a value of 15000, you would know it is of higher
  * status than voice, but lower status than halfop.
@@ -186,7 +186,7 @@ class CoreExport ModeHandler : public Extensible
 	 * Get the 'value' of this modes prefix.
 	 * determines which to display when there are multiple.
 	 * The mode with the highest value is ranked first. See the
-	 * PrefixModeValue enum and chanrec::GetPrefixValue() for
+	 * PrefixModeValue enum and Channel::GetPrefixValue() for
 	 * more information.
 	 */
 	virtual unsigned int GetPrefixRank();
@@ -223,21 +223,21 @@ class CoreExport ModeHandler : public Extensible
 	 * @param adding This value is true when the mode is being set, or false when it is being unset.
 	 * @return MODEACTION_ALLOW to allow the mode, or MODEACTION_DENY to prevent the mode, also see the description of 'parameter'.
 	 */
-	virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding); /* Can change the mode parameter as its a ref */
+	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding); /* Can change the mode parameter as its a ref */
 	/**
 	 * If your mode is a listmode, then this method will be called for displaying an item list, e.g. on MODE #channel +modechar
 	 * without any parameter or other modes in the command.
 	 * @param user The user issuing the command
 	 * @param channel The channel they're requesting an item list of (e.g. a banlist, or an exception list etc)
 	 */
-	virtual void DisplayList(userrec* user, chanrec* channel);
+	virtual void DisplayList(User* user, Channel* channel);
 
 	/**
 	 * If your mode is a listmode, this method will be called to display an empty list (just the end of list numeric)
 	 * @param user The user issuing the command
 	 * @param channel The channel tehy're requesting an item list of (e.g. a banlist, or an exception list etc)
 	 */
-	virtual void DisplayEmptyList(userrec* user, chanrec* channel);
+	virtual void DisplayEmptyList(User* user, Channel* channel);
 
 	/**
 	 * If your mode needs special action during a server sync to determine which side wins when comparing timestamps,
@@ -251,7 +251,7 @@ class CoreExport ModeHandler : public Extensible
 	 * @param channel The channel we are checking against
 	 * @return True if the other side wins the merge, false if we win the merge for this mode.
 	 */
-	virtual bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel);
+	virtual bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
 
 	/**
 	 * When a remote server needs to bounce a set of modes, it will call this method for every mode
@@ -266,7 +266,7 @@ class CoreExport ModeHandler : public Extensible
 	 * the current setting for this mode set locally, when the bool is true, or, the parameter given.
 	 * This allows the local server to enforce our locally set parameters back to a remote server.
 	 */
-	virtual ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	virtual ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 
 	/**
 	 * When a MODETYPE_USER mode handler is being removed, the server will call this method for every user on the server.
@@ -276,7 +276,7 @@ class CoreExport ModeHandler : public Extensible
 	 * your mode properly from each user.
 	 * @param user The user which the server wants to remove your mode from
 	 */
-	virtual void RemoveMode(userrec* user);
+	virtual void RemoveMode(User* user);
 
 	/**
 	 * When a MODETYPE_CHANNEL mode handler is being removed, the server will call this method for every channel on the server.
@@ -286,7 +286,7 @@ class CoreExport ModeHandler : public Extensible
 	 * your mode properly from each channel. Note that in the case of listmodes, you should remove the entire list of items.
 	 * @param channel The channel which the server wants to remove your mode from
 	 */
-	virtual void RemoveMode(chanrec* channel);
+	virtual void RemoveMode(Channel* channel);
 };
 
 /**
@@ -345,7 +345,7 @@ class CoreExport ModeWatcher : public Extensible
 	 * @return True to allow the mode change to go ahead, false to abort it. If you abort the
 	 * change, the mode handler (and ModeWatcher::AfterMode()) will never see the mode change.
 	 */
-	virtual bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding, ModeType type);
+	virtual bool BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type);
 	/**
 	 * After the mode character has been processed by the ModeHandler, this method will be called.
 	 * @param source The sender of the mode
@@ -356,7 +356,7 @@ class CoreExport ModeWatcher : public Extensible
 	 * @param adding True if the mode is being added and false if it is being removed
 	 * @type The mode type, either MODETYPE_USER or MODETYPE_CHANNEL
 	 */
-	virtual void AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter, bool adding, ModeType type);
+	virtual void AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type);
 };
 
 typedef std::vector<ModeWatcher*>::iterator ModeWatchIter;
@@ -387,7 +387,7 @@ class CoreExport ModeParser : public classbase
 	/** Displays the current modes of a channel or user.
 	 * Used by ModeParser::Process.
 	 */
-	void DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text);
+	void DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text);
 
 	/** The string representing the last set of modes to be parsed.
 	 * Use GetLastParse() to get this value, to be used for  display purposes.
@@ -403,13 +403,13 @@ class CoreExport ModeParser : public classbase
 	/** Used to check if user 'd' should be allowed to do operation 'MASK' on channel 'chan'.
 	 * for example, should 'user A' be able to 'op' on 'channel B'.
 	 */
-	userrec* SanityChecks(userrec *user,const char *dest,chanrec *chan,int status);
+	User* SanityChecks(User *user,const char *dest,Channel *chan,int status);
 	/** Grant a built in privilage (e.g. ops, halfops, voice) to a user on a channel
 	 */
-	const char* Grant(userrec *d,chanrec *chan,int MASK);
+	const char* Grant(User *d,Channel *chan,int MASK);
 	/** Revoke a built in privilage (e.g. ops, halfops, voice) to a user on a channel
 	 */
-	const char* Revoke(userrec *d,chanrec *chan,int MASK);
+	const char* Revoke(User *d,Channel *chan,int MASK);
 	/** Tidy a banmask. This makes a banmask 'acceptable' if fields are left out.
 	 * E.g.
 	 *
@@ -466,11 +466,11 @@ class CoreExport ModeParser : public classbase
 	 * they would be from a MODE command.
 	 * @param pcnt The number of items in the parameters array
 	 * @param user The user setting or removing the modes. When the modes are set
-	 * by a server, an 'uninitialized' userrec is used, where *user::nick == NULL
+	 * by a server, an 'uninitialized' User is used, where *user::nick == NULL
 	 * and *user->server == NULL.
 	 * @param servermode True if a server is setting the mode.
 	 */
-	void Process(const char** parameters, int pcnt, userrec *user, bool servermode);
+	void Process(const char** parameters, int pcnt, User *user, bool servermode);
 
 	/** Find the mode handler for a given mode and type.
 	 * @param modeletter mode letter to search for
@@ -520,7 +520,7 @@ class CoreExport ModeParser : public classbase
 	 * @param channel The channel name to look up the privilages of the user for
 	 * @return The mode string.
 	 */
-	std::string ModeString(userrec* user, chanrec* channel);
+	std::string ModeString(User* user, Channel* channel);
 };
 
 #endif
diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h
index 417480777..c7d349541 100644
--- a/include/modes/cmode_b.h
+++ b/include/modes/cmode_b.h
@@ -24,13 +24,13 @@ class ModeChannelBan : public ModeHandler
 	BanItem b;
  public:
 	ModeChannelBan(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string& AddBan(userrec *user,std::string& dest,chanrec *chan,int status);
-	std::string& DelBan(userrec *user,std::string& dest,chanrec *chan,int status);
-	void DisplayList(userrec* user, chanrec* channel);
-	void DisplayEmptyList(userrec* user, chanrec* channel);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	void RemoveMode(userrec* user);
-	void RemoveMode(chanrec* channel);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string& AddBan(User *user,std::string& dest,Channel *chan,int status);
+	std::string& DelBan(User *user,std::string& dest,Channel *chan,int status);
+	void DisplayList(User* user, Channel* channel);
+	void DisplayEmptyList(User* user, Channel* channel);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	void RemoveMode(User* user);
+	void RemoveMode(Channel* channel);
 };
 
diff --git a/include/modes/cmode_h.h b/include/modes/cmode_h.h
index 77d1d57ae..cd524196e 100644
--- a/include/modes/cmode_h.h
+++ b/include/modes/cmode_h.h
@@ -23,12 +23,12 @@ class ModeChannelHalfOp : public ModeHandler
  private:
  public:
 	ModeChannelHalfOp(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddHalfOp(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddHalfOp(User *user,const char *dest,Channel *chan,int status);
+	std::string DelHalfOp(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
 
diff --git a/include/modes/cmode_i.h b/include/modes/cmode_i.h
index fb177dc0f..560c7dc14 100644
--- a/include/modes/cmode_i.h
+++ b/include/modes/cmode_i.h
@@ -21,5 +21,5 @@ class ModeChannelInviteOnly : public ModeHandler
 {
  public:
 	ModeChannelInviteOnly(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h
index 51e8ffcaa..c8a1fc20e 100644
--- a/include/modes/cmode_k.h
+++ b/include/modes/cmode_k.h
@@ -21,9 +21,9 @@ class ModeChannelKey : public ModeHandler
 {
  public:
 	ModeChannelKey(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel);
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index 63b4a1ef1..06d53069a 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -21,7 +21,7 @@ class ModeChannelLimit : public ModeHandler
 {
  public:
 	ModeChannelLimit(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modes/cmode_m.h b/include/modes/cmode_m.h
index 52288de4c..eb3844fad 100644
--- a/include/modes/cmode_m.h
+++ b/include/modes/cmode_m.h
@@ -21,5 +21,5 @@ class ModeChannelModerated : public ModeHandler
 {
  public:
 	ModeChannelModerated(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_n.h b/include/modes/cmode_n.h
index 953e0d671..6e51cdd69 100644
--- a/include/modes/cmode_n.h
+++ b/include/modes/cmode_n.h
@@ -21,5 +21,5 @@ class ModeChannelNoExternal : public ModeHandler
 {
  public:
 	ModeChannelNoExternal(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_o.h b/include/modes/cmode_o.h
index c86fb4586..cc0b295db 100644
--- a/include/modes/cmode_o.h
+++ b/include/modes/cmode_o.h
@@ -23,12 +23,12 @@ class ModeChannelOp : public ModeHandler
  private:
  public:
 	ModeChannelOp(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddOp(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelOp(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddOp(User *user,const char *dest,Channel *chan,int status);
+	std::string DelOp(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
 
diff --git a/include/modes/cmode_p.h b/include/modes/cmode_p.h
index ad3f3ae89..d2a67f975 100644
--- a/include/modes/cmode_p.h
+++ b/include/modes/cmode_p.h
@@ -21,5 +21,5 @@ class ModeChannelPrivate : public ModeHandler
 {
  public:
 	ModeChannelPrivate(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_s.h b/include/modes/cmode_s.h
index 0bc229c37..0a9f709d6 100644
--- a/include/modes/cmode_s.h
+++ b/include/modes/cmode_s.h
@@ -21,5 +21,5 @@ class ModeChannelSecret : public ModeHandler
 {
  public:
 	ModeChannelSecret(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_t.h b/include/modes/cmode_t.h
index 8a7517ee3..049cb60d3 100644
--- a/include/modes/cmode_t.h
+++ b/include/modes/cmode_t.h
@@ -21,5 +21,5 @@ class ModeChannelTopicOps : public ModeHandler
 {
  public:
 	ModeChannelTopicOps(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/cmode_v.h b/include/modes/cmode_v.h
index 75420a6d5..e6666311d 100644
--- a/include/modes/cmode_v.h
+++ b/include/modes/cmode_v.h
@@ -23,12 +23,12 @@ class ModeChannelVoice : public ModeHandler
  private:
  public:
 	ModeChannelVoice(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddVoice(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelVoice(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddVoice(User *user,const char *dest,Channel *chan,int status);
+	std::string DelVoice(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(userrec* user);
-	void RemoveMode(chanrec* channel);
+	void RemoveMode(User* user);
+	void RemoveMode(Channel* channel);
 };
 
diff --git a/include/modes/umode_i.h b/include/modes/umode_i.h
index cc7d15102..e6a27d8c7 100644
--- a/include/modes/umode_i.h
+++ b/include/modes/umode_i.h
@@ -21,6 +21,6 @@ class ModeUserInvisible : public ModeHandler
 {
  public:
 	ModeUserInvisible(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_n.h b/include/modes/umode_n.h
index cd1275acc..d75b843c3 100644
--- a/include/modes/umode_n.h
+++ b/include/modes/umode_n.h
@@ -21,5 +21,5 @@ class ModeUserServerNoticeMask : public ModeHandler
 {
  public:
 	ModeUserServerNoticeMask(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 };
diff --git a/include/modes/umode_o.h b/include/modes/umode_o.h
index 7dfdb4128..57b3e8ac8 100644
--- a/include/modes/umode_o.h
+++ b/include/modes/umode_o.h
@@ -21,6 +21,6 @@ class ModeUserOperator : public ModeHandler
 {
  public:
 	ModeUserOperator(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h
index cda223eee..aa788b353 100644
--- a/include/modes/umode_s.h
+++ b/include/modes/umode_s.h
@@ -21,6 +21,6 @@ class ModeUserServerNotice : public ModeHandler
 {
  public:
 	ModeUserServerNotice(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_w.h b/include/modes/umode_w.h
index 271e959c4..d6f2c0ca7 100644
--- a/include/modes/umode_w.h
+++ b/include/modes/umode_w.h
@@ -21,6 +21,6 @@ class ModeUserWallops : public ModeHandler
 {
  public:
 	ModeUserWallops(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	unsigned int GetCount();
 };
diff --git a/include/modules.h b/include/modules.h
index 0aaa06c34..025f35bf3 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -449,43 +449,43 @@ class CoreExport Module : public Extensible
 	virtual Priority Prioritize();
 
 	/** Called when a user connects.
-	 * The details of the connecting user are available to you in the parameter userrec *user
+	 * The details of the connecting user are available to you in the parameter User *user
 	 * @param user The user who is connecting
 	 */
-	virtual void OnUserConnect(userrec* user);
+	virtual void OnUserConnect(User* user);
 
 	/** Called when a user quits.
-	 * The details of the exiting user are available to you in the parameter userrec *user
+	 * The details of the exiting user are available to you in the parameter User *user
 	 * This event is only called when the user is fully registered when they quit. To catch
 	 * raw disconnections, use the OnUserDisconnect method.
 	 * @param user The user who is quitting
 	 * @param message The user's quit message (as seen by non-opers)
 	 * @param oper_message The user's quit message (as seen by opers)
 	 */
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message);
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message);
 
 	/** Called whenever a user's socket is closed.
-	 * The details of the exiting user are available to you in the parameter userrec *user
+	 * The details of the exiting user are available to you in the parameter User *user
 	 * This event is called for all users, registered or not, as a cleanup method for modules
 	 * which might assign resources to user, such as dns lookups, objects and sockets.
 	 * @param user The user who is disconnecting
 	 */
-	virtual void OnUserDisconnect(userrec* user);
+	virtual void OnUserDisconnect(User* user);
 
 	/** Called whenever a channel is deleted, either by QUIT, KICK or PART.
 	 * @param chan The channel being deleted
 	 */
-	virtual void OnChannelDelete(chanrec* chan);
+	virtual void OnChannelDelete(Channel* chan);
 
 	/** Called when a user joins a channel.
-	 * The details of the joining user are available to you in the parameter userrec *user,
-	 * and the details of the channel they have joined is available in the variable chanrec *channel
+	 * The details of the joining user are available to you in the parameter User *user,
+	 * and the details of the channel they have joined is available in the variable Channel *channel
 	 * @param user The user who is joining
 	 * @param channel The channel being joined
 	 * @param silent Change this to true if you want to conceal the JOIN command from the other users
 	 * of the channel (useful for modules such as auditorium)
 	 */
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent);
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent);
 
 	/** Called after a user joins a channel
 	 * Identical to OnUserJoin, but called immediately afterwards, when any linking module has
@@ -493,18 +493,18 @@ class CoreExport Module : public Extensible
 	 * @param user The user who is joining
 	 * @param channel The channel being joined
 	 */
-	virtual void OnPostJoin(userrec* user, chanrec* channel);
+	virtual void OnPostJoin(User* user, Channel* channel);
 
 	/** Called when a user parts a channel.
-	 * The details of the leaving user are available to you in the parameter userrec *user,
-	 * and the details of the channel they have left is available in the variable chanrec *channel
+	 * The details of the leaving user are available to you in the parameter User *user,
+	 * and the details of the channel they have left is available in the variable Channel *channel
 	 * @param user The user who is parting
 	 * @param channel The channel being parted
 	 * @param partmessage The part message, or an empty string
 	 * @param silent Change this to true if you want to conceal the PART command from the other users
 	 * of the channel (useful for modules such as auditorium)
 	 */
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent);
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent);
 
 	/** Called on rehash.
 	 * This method is called prior to a /REHASH or when a SIGHUP is received from the operating
@@ -515,20 +515,20 @@ class CoreExport Module : public Extensible
 	 * value of this variable will be NULL.
 	 * @param parameter The (optional) parameter given to REHASH from the user.
 	 */
- 	virtual void OnRehash(userrec* user, const std::string &parameter);
+ 	virtual void OnRehash(User* user, const std::string &parameter);
 
 	/** Called when a raw command is transmitted or received.
 	 * This method is the lowest level of handler available to a module. It will be called with raw
 	 * data which is passing through a connected socket. If you wish, you may munge this data by changing
 	 * the string parameter "raw". If you do this, after your function exits it will immediately be
 	 * cut down to 510 characters plus a carriage return and linefeed. For INBOUND messages only (where
-	 * inbound is set to true) the value of user will be the userrec of the connection sending the
+	 * inbound is set to true) the value of user will be the User of the connection sending the
 	 * data. This is not possible for outbound data because the data may be being routed to multiple targets.
 	 * @param raw The raw string in RFC1459 format
 	 * @param inbound A flag to indicate wether the data is coming into the daemon or going out to the user
 	 * @param user The user record sending the text, when inbound == true.
 	 */
- 	virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user);
+ 	virtual void OnServerRaw(std::string &raw, bool inbound, User* user);
 
 	/** Called whenever a user is about to join a channel, before any processing is done.
 	 * Returning a value of 1 from this function stops the process immediately, causing no
@@ -539,7 +539,7 @@ class CoreExport Module : public Extensible
 	 * IMPORTANT NOTE!
 	 *
 	 * If the user joins a NEW channel which does not exist yet, OnUserPreJoin will be called BEFORE the channel
-	 * record is created. This will cause chanrec* chan to be NULL. There is very little you can do in form of
+	 * record is created. This will cause Channel* chan to be NULL. There is very little you can do in form of
 	 * processing on the actual channel record at this point, however the channel NAME will still be passed in
 	 * char* cname, so that you could for example implement a channel blacklist or whitelist, etc.
 	 * @param user The user joining the channel
@@ -549,7 +549,7 @@ class CoreExport Module : public Extensible
 	 * You may alter this string to alter the user's modes on the channel.
 	 * @return 1 To prevent the join, 0 to allow it.
 	 */
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs);
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs);
 	
 	/** Called whenever a user is about to be kicked.
 	 * Returning a value of 1 from this function stops the process immediately, causing no
@@ -561,7 +561,7 @@ class CoreExport Module : public Extensible
 	 * @param reason The kick reason
 	 * @return 1 to prevent the kick, 0 to continue normally, -1 to explicitly allow the kick regardless of normal operation
 	 */
-	virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason);
+	virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason);
 
 	/** Called whenever a user is kicked.
 	 * If this method is called, the kick is already underway and cannot be prevented, so
@@ -573,15 +573,15 @@ class CoreExport Module : public Extensible
 	 * @param silent Change this to true if you want to conceal the PART command from the other users
 	 * of the channel (useful for modules such as auditorium)
 	 */
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent);
+	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent);
 
 	/** Called whenever a user opers locally.
-	 * The userrec will contain the oper mode 'o' as this function is called after any modifications
+	 * The User will contain the oper mode 'o' as this function is called after any modifications
 	 * are made to the user's structure by the core.
 	 * @param user The user who is opering up
 	 * @param opertype The opers type name
 	 */
-	virtual void OnOper(userrec* user, const std::string &opertype);
+	virtual void OnOper(User* user, const std::string &opertype);
 
 	/** Called after a user opers locally.
 	 * This is identical to Module::OnOper(), except it is called after OnOper so that other modules
@@ -590,10 +590,10 @@ class CoreExport Module : public Extensible
 	 * @param user The user who is opering up
 	 * @param opertype The opers type name
 	 */
-	virtual void OnPostOper(userrec* user, const std::string &opertype);
+	virtual void OnPostOper(User* user, const std::string &opertype);
 	
 	/** Called whenever a user types /INFO.
-	 * The userrec will contain the information of the user who typed the command. Modules may use this
+	 * The User will contain the information of the user who typed the command. Modules may use this
 	 * method to output their own credits in /INFO (which is the ircd's version of an about box).
 	 * It is purposefully not possible to modify any info that has already been output, or halt the list.
 	 * You must write a 371 numeric to the user, containing your info in the following format:
@@ -602,7 +602,7 @@ class CoreExport Module : public Extensible
 	 *
 	 * @param user The user issuing /INFO
 	 */
-	virtual void OnInfo(userrec* user);
+	virtual void OnInfo(User* user);
 	
 	/** Called whenever a /WHOIS is performed on a local user.
 	 * The source parameter contains the details of the user who issued the WHOIS command, and
@@ -610,7 +610,7 @@ class CoreExport Module : public Extensible
 	 * @param source The user issuing the WHOIS command
 	 * @param dest The user who is being WHOISed
 	 */
-	virtual void OnWhois(userrec* source, userrec* dest);
+	virtual void OnWhois(User* source, User* dest);
 	
 	/** Called whenever a user is about to invite another user into a channel, before any processing is done.
 	 * Returning 1 from this function stops the process immediately, causing no
@@ -621,7 +621,7 @@ class CoreExport Module : public Extensible
 	 * @param channel The channel the user is being invited to
 	 * @return 1 to deny the invite, 0 to allow
 	 */
-	virtual int OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel);
+	virtual int OnUserPreInvite(User* source,User* dest,Channel* channel);
 	
 	/** Called after a user has been successfully invited to a channel.
 	 * You cannot prevent the invite from occuring using this function, to do that,
@@ -630,17 +630,17 @@ class CoreExport Module : public Extensible
 	 * @param dest The user being invited
 	 * @param channel The channel the user is being invited to
 	 */
-	virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel);
+	virtual void OnUserInvite(User* source,User* dest,Channel* channel);
 	
 	/** Called whenever a user is about to PRIVMSG A user or a channel, before any processing is done.
 	 * Returning any nonzero value from this function stops the process immediately, causing no
 	 * output to be sent to the user by the core. If you do this you must produce your own numerics,
 	 * notices etc. This is useful for modules which may want to filter or redirect messages.
 	 * target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user,
-	 * you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details
+	 * you must cast dest to a User* otherwise you must cast it to a Channel*, this is the details
 	 * of where the message is destined to be sent.
 	 * @param user The user sending the message
-	 * @param dest The target of the message (chanrec* or userrec*)
+	 * @param dest The target of the message (Channel* or User*)
 	 * @param target_type The type of target (TYPE_USER or TYPE_CHANNEL)
 	 * @param text Changeable text being sent by the user
 	 * @param status The status being used, e.g. PRIVMSG @#chan has status== '@', 0 to send to everyone.
@@ -648,20 +648,20 @@ class CoreExport Module : public Extensible
 	 * It will be ignored for private messages.
 	 * @return 1 to deny the NOTICE, 0 to allow it
 	 */
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list);
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list);
 
 	/** Called whenever a user is about to NOTICE A user or a channel, before any processing is done.
 	 * Returning any nonzero value from this function stops the process immediately, causing no
 	 * output to be sent to the user by the core. If you do this you must produce your own numerics,
 	 * notices etc. This is useful for modules which may want to filter or redirect messages.
 	 * target_type can be one of TYPE_USER or TYPE_CHANNEL. If the target_type value is a user,
-	 * you must cast dest to a userrec* otherwise you must cast it to a chanrec*, this is the details
+	 * you must cast dest to a User* otherwise you must cast it to a Channel*, this is the details
 	 * of where the message is destined to be sent.
 	 * You may alter the message text as you wish before relinquishing control to the next module
 	 * in the chain, and if no other modules block the text this altered form of the text will be sent out
 	 * to the user and possibly to other servers.
 	 * @param user The user sending the message
-	 * @param dest The target of the message (chanrec* or userrec*)
+	 * @param dest The target of the message (Channel* or User*)
 	 * @param target_type The type of target (TYPE_USER or TYPE_CHANNEL)
 	 * @param text Changeable text being sent by the user
 	 * @param status The status being used, e.g. PRIVMSG @#chan has status== '@', 0 to send to everyone.
@@ -669,7 +669,7 @@ class CoreExport Module : public Extensible
 	 * It will be ignored for private notices.
 	 * @return 1 to deny the NOTICE, 0 to allow it
 	 */
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list);
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list);
 
 	/** Called whenever the server wants to build the exemption list for a channel, but is not directly doing a PRIVMSG or NOTICE.
 	 * For example, the spanningtree protocol will call this event when passing a privmsg on (but not processing it directly).
@@ -680,11 +680,11 @@ class CoreExport Module : public Extensible
 	 * @param exempt_list The exempt list to be populated
 	 * @param text The original message text causing the exempt list to be built
 	 */
-	virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text);
+	virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text);
 	
 	/** Called before any nickchange, local or remote. This can be used to implement Q-lines etc.
 	 * Please note that although you can see remote nickchanges through this function, you should
-	 * NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc.
+	 * NOT make any changes to the User if the user is a remote user as this may cause a desnyc.
 	 * check user->server before taking any action (including returning nonzero from the method).
 	 * If your method returns nonzero, the nickchange is silently forbidden, and it is down to your
 	 * module to generate some meaninful output.
@@ -692,10 +692,10 @@ class CoreExport Module : public Extensible
 	 * @param newnick Their new nickname
 	 * @return 1 to deny the change, 0 to allow
 	 */
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick);
+	virtual int OnUserPreNick(User* user, const std::string &newnick);
 
 	/** Called after any PRIVMSG sent from a user.
-	 * The dest variable contains a userrec* if target_type is TYPE_USER and a chanrec*
+	 * The dest variable contains a User* if target_type is TYPE_USER and a Channel*
 	 * if target_type is TYPE_CHANNEL.
 	 * @param user The user sending the message
 	 * @param dest The target of the message
@@ -703,10 +703,10 @@ class CoreExport Module : public Extensible
 	 * @param text the text being sent by the user
 	 * @param status The status being used, e.g. PRIVMSG @#chan has status== '@', 0 to send to everyone.
 	 */
-	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
+	virtual void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
 
 	/** Called after any NOTICE sent from a user.
-	 * The dest variable contains a userrec* if target_type is TYPE_USER and a chanrec*
+	 * The dest variable contains a User* if target_type is TYPE_USER and a Channel*
 	 * if target_type is TYPE_CHANNEL.
 	 * @param user The user sending the message
 	 * @param dest The target of the message
@@ -714,18 +714,18 @@ class CoreExport Module : public Extensible
 	 * @param text the text being sent by the user
 	 * @param status The status being used, e.g. NOTICE @#chan has status== '@', 0 to send to everyone.
 	 */
-	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
+	virtual void OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
 
 	/** Called after every MODE command sent from a user
-	 * The dest variable contains a userrec* if target_type is TYPE_USER and a chanrec*
+	 * The dest variable contains a User* if target_type is TYPE_USER and a Channel*
 	 * if target_type is TYPE_CHANNEL. The text variable contains the remainder of the
 	 * mode string after the target, e.g. "+wsi" or "+ooo nick1 nick2 nick3".
 	 * @param user The user sending the MODEs
-	 * @param dest The target of the modes (userrec* or chanrec*)
+	 * @param dest The target of the modes (User* or Channel*)
 	 * @param target_type The type of target (TYPE_USER or TYPE_CHANNEL)
 	 * @param text The actual modes and their parameters if any
 	 */
-	virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text);
+	virtual void OnMode(User* user, void* dest, int target_type, const std::string &text);
 
 	/** Allows modules to alter or create server descriptions
 	 * Whenever a module requires a server description, for example for display in
@@ -749,7 +749,7 @@ class CoreExport Module : public Extensible
 	 * @param proto A pointer to the module handling network protocol
 	 * @param opaque An opaque pointer set by the protocol module, should not be modified!
 	 */
-	virtual void OnSyncUser(userrec* user, Module* proto, void* opaque);
+	virtual void OnSyncUser(User* user, Module* proto, void* opaque);
 
 	/** Allows modules to synchronize data which relates to channels during a netburst.
 	 * When this function is called, it will be called from the module which implements
@@ -766,11 +766,11 @@ class CoreExport Module : public Extensible
 	 * @param proto A pointer to the module handling network protocol
 	 * @param opaque An opaque pointer set by the protocol module, should not be modified!
 	 */
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque);
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque);
 
 	/* Allows modules to syncronize metadata related to channels over the network during a netburst.
 	 * Whenever the linking module wants to send out data, but doesnt know what the data
-	 * represents (e.g. it is Extensible metadata, added to a userrec or chanrec by a module) then
+	 * represents (e.g. it is Extensible metadata, added to a User or Channel by a module) then
 	 * this method is called.You should use the ProtoSendMetaData function after you've
 	 * correctly decided how the data should be represented, to send the metadata on its way if it belongs
 	 * to your module. For a good example of how to use this method, see src/modules/m_swhois.cpp.
@@ -781,11 +781,11 @@ class CoreExport Module : public Extensible
 	 * @param displayable If this value is true, the data is going to be displayed to a user,
 	 * and not sent across the network. Use this to determine wether or not to show sensitive data.
 	 */
-	virtual void OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable = false);
+	virtual void OnSyncChannelMetaData(Channel* chan, Module* proto,void* opaque, const std::string &extname, bool displayable = false);
 
 	/* Allows modules to syncronize metadata related to users over the network during a netburst.
 	 * Whenever the linking module wants to send out data, but doesnt know what the data
-	 * represents (e.g. it is Extensible metadata, added to a userrec or chanrec by a module) then
+	 * represents (e.g. it is Extensible metadata, added to a User or Channel by a module) then
 	 * this method is called. You should use the ProtoSendMetaData function after you've
 	 * correctly decided how the data should be represented, to send the metadata on its way if
 	 * if it belongs to your module.
@@ -796,11 +796,11 @@ class CoreExport Module : public Extensible
 	 * @param displayable If this value is true, the data is going to be displayed to a user,
 	 * and not sent across the network. Use this to determine wether or not to show sensitive data.
 	 */
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable = false);
+	virtual void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable = false);
 
 	/* Allows modules to syncronize metadata not related to users or channels, over the network during a netburst.
 	 * Whenever the linking module wants to send out data, but doesnt know what the data
-	 * represents (e.g. it is Extensible metadata, added to a userrec or chanrec by a module) then
+	 * represents (e.g. it is Extensible metadata, added to a User or Channel by a module) then
 	 * this method is called. You should use the ProtoSendMetaData function after you've
 	 * correctly decided how the data should be represented, to send the metadata on its way if
 	 * if it belongs to your module.
@@ -814,7 +814,7 @@ class CoreExport Module : public Extensible
 	/** Allows module data, sent via ProtoSendMetaData, to be decoded again by a receiving module.
 	 * Please see src/modules/m_swhois.cpp for a working example of how to use this method call.
 	 * @param target_type The type of item to decode data for, TYPE_USER or TYPE_CHANNEL
-	 * @param target The chanrec* or userrec* that data should be added to
+	 * @param target The Channel* or User* that data should be added to
 	 * @param extname The extension name which is being sent
 	 * @param extdata The extension data, encoded at the other end by an identical module through OnSyncChannelMetaData or OnSyncUserMetaData
 	 */
@@ -830,7 +830,7 @@ class CoreExport Module : public Extensible
 	 *
 	 * @param opaque An opaque pointer set by the protocol module, should not be modified!
 	 * @param target_type The type of item to decode data for, TYPE_USER or TYPE_CHANNEL
-	 * @param target The chanrec* or userrec* that modes should be sent for
+	 * @param target The Channel* or User* that modes should be sent for
 	 * @param modeline The modes and parameters to be sent
 	 */
 	virtual void ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline);
@@ -845,7 +845,7 @@ class CoreExport Module : public Extensible
 	 * how to use this function.
 	 * @param opaque An opaque pointer set by the protocol module, should not be modified!
 	 * @param target_type The type of item to decode data for, TYPE_USER or TYPE_CHANNEL
-	 * @param target The chanrec* or userrec* that metadata should be sent for
+	 * @param target The Channel* or User* that metadata should be sent for
 	 * @param extname The extension name to send metadata for
 	 * @param extdata Encoded data for this extension name, which will be encoded at the oppsite end by an identical module using OnDecodeMetaData
 	 */
@@ -855,21 +855,21 @@ class CoreExport Module : public Extensible
 	 * @param user The user sending the WALLOPS
 	 * @param text The content of the WALLOPS message
 	 */
-	virtual void OnWallops(userrec* user, const std::string &text);
+	virtual void OnWallops(User* user, const std::string &text);
 
 	/** Called whenever a user's hostname is changed.
 	 * This event triggers after the host has been set.
 	 * @param user The user whos host is being changed
 	 * @param newhost The new hostname being set
 	 */
-	virtual void OnChangeHost(userrec* user, const std::string &newhost);
+	virtual void OnChangeHost(User* user, const std::string &newhost);
 
 	/** Called whenever a user's GECOS (realname) is changed.
 	 * This event triggers after the name has been set.
 	 * @param user The user who's GECOS is being changed
 	 * @param gecos The new GECOS being set on the user
 	 */
-	virtual void OnChangeName(userrec* user, const std::string &gecos);
+	virtual void OnChangeName(User* user, const std::string &gecos);
 
 	/** Called whenever a gline is added by a local user.
 	 * This method is triggered after the line is added.
@@ -878,7 +878,7 @@ class CoreExport Module : public Extensible
 	 * @param reason The reason text to be displayed
 	 * @param hostmask The hostmask to add
 	 */
-	virtual void OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask);
+	virtual void OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask);
 
 	/** Called whenever a zline is added by a local user.
 	 * This method is triggered after the line is added.
@@ -887,7 +887,7 @@ class CoreExport Module : public Extensible
 	 * @param reason The reason text to be displayed
 	 * @param ipmask The hostmask to add
 	 */
-	virtual void OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask);
+	virtual void OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask);
 
 	/** Called whenever a kline is added by a local user.
 	 * This method is triggered after the line is added.
@@ -896,7 +896,7 @@ class CoreExport Module : public Extensible
 	 * @param reason The reason text to be displayed
 	 * @param hostmask The hostmask to add
 	 */
-	virtual void OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask);
+	virtual void OnAddKLine(long duration, User* source, const std::string &reason, const std::string &hostmask);
 
 	/** Called whenever a qline is added by a local user.
 	 * This method is triggered after the line is added.
@@ -905,7 +905,7 @@ class CoreExport Module : public Extensible
 	 * @param reason The reason text to be displayed
 	 * @param nickmask The hostmask to add
 	 */
-	virtual void OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask);
+	virtual void OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask);
 
 	/** Called whenever a eline is added by a local user.
 	 * This method is triggered after the line is added.
@@ -914,49 +914,49 @@ class CoreExport Module : public Extensible
 	 * @param reason The reason text to be displayed
 	 * @param hostmask The hostmask to add
 	 */
-	virtual void OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask);
+	virtual void OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask);
 
 	/** Called whenever a gline is deleted.
 	 * This method is triggered after the line is deleted.
 	 * @param source The user removing the line
 	 * @param hostmask The hostmask to delete
 	 */
-	virtual void OnDelGLine(userrec* source, const std::string &hostmask);
+	virtual void OnDelGLine(User* source, const std::string &hostmask);
 
 	/** Called whenever a zline is deleted.
 	 * This method is triggered after the line is deleted.
 	 * @param source The user removing the line
 	 * @param hostmask The hostmask to delete
 	 */
-	virtual void OnDelZLine(userrec* source, const std::string &ipmask);
+	virtual void OnDelZLine(User* source, const std::string &ipmask);
 
 	/** Called whenever a kline is deleted.
 	 * This method is triggered after the line is deleted.
 	 * @param source The user removing the line
 	 * @param hostmask The hostmask to delete
 	 */
-	virtual void OnDelKLine(userrec* source, const std::string &hostmask);
+	virtual void OnDelKLine(User* source, const std::string &hostmask);
 	
 	/** Called whenever a qline is deleted.
 	 * This method is triggered after the line is deleted.
 	 * @param source The user removing the line
 	 * @param hostmask The hostmask to delete
 	 */
-	virtual void OnDelQLine(userrec* source, const std::string &nickmask);
+	virtual void OnDelQLine(User* source, const std::string &nickmask);
 
 	/** Called whenever a eline is deleted.
 	 * This method is triggered after the line is deleted.
 	 * @param source The user removing the line
 	 * @param hostmask The hostmask to delete
 	 */
-	virtual void OnDelELine(userrec* source, const std::string &hostmask);
+	virtual void OnDelELine(User* source, const std::string &hostmask);
 
 	/** Called before your module is unloaded to clean up Extensibles.
 	 * This method is called once for every user and channel on the network,
 	 * so that when your module unloads it may clear up any remaining data
 	 * in the form of Extensibles added using Extensible::Extend().
 	 * If the target_type variable is TYPE_USER, then void* item refers to
-	 * a userrec*, otherwise it refers to a chanrec*.
+	 * a User*, otherwise it refers to a Channel*.
 	 * @param target_type The type of item being cleaned
 	 * @param item A pointer to the item's class
 	 */
@@ -964,14 +964,14 @@ class CoreExport Module : public Extensible
 
 	/** Called after any nickchange, local or remote. This can be used to track users after nickchanges
 	 * have been applied. Please note that although you can see remote nickchanges through this function, you should
-	 * NOT make any changes to the userrec if the user is a remote user as this may cause a desnyc.
+	 * NOT make any changes to the User if the user is a remote user as this may cause a desnyc.
 	 * check user->server before taking any action (including returning nonzero from the method).
 	 * Because this method is called after the nickchange is taken place, no return values are possible
 	 * to indicate forbidding of the nick change. Use OnUserPreNick for this.
 	 * @param user The user changing their nick
 	 * @param oldnick The old nickname of the user before the nickchange
 	 */
-	virtual void OnUserPostNick(userrec* user, const std::string &oldnick);
+	virtual void OnUserPostNick(User* user, const std::string &oldnick);
 
 	/** Called before an action which requires a channel privilage check.
 	 * This function is called before many functions which check a users status on a channel, for example
@@ -998,7 +998,7 @@ class CoreExport Module : public Extensible
 	 * @param channel The channel which is being checked
 	 * @param access_type See above
 	 */
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type);
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type);
 
 	/** Called when a 005 numeric is about to be output.
 	 * The module should modify the 005 numeric if needed to indicate its features.
@@ -1019,14 +1019,14 @@ class CoreExport Module : public Extensible
 	 * @param reason The kill reason
 	 * @return 1 to prevent the kill, 0 to allow
 	 */
-	virtual int OnKill(userrec* source, userrec* dest, const std::string &reason);
+	virtual int OnKill(User* source, User* dest, const std::string &reason);
 
 	/** Called when an oper wants to disconnect a remote user via KILL
 	 * @param source The user sending the KILL
 	 * @param dest The user being killed
 	 * @param reason The kill reason
 	 */
-	virtual void OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason);
+	virtual void OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason);
 
 	/** Called whenever a module is loaded.
 	 * mod will contain a pointer to the module, and string will contain its name,
@@ -1081,7 +1081,7 @@ class CoreExport Module : public Extensible
 	 * @param original_line The entire original line as passed to the parser from the user
 	 * @return 1 to block the command, 0 to allow
 	 */
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line);
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
 
 	/** Called after any command has been executed.
 	 * This event occurs for all registered commands, wether they are registered in the core,
@@ -1095,7 +1095,7 @@ class CoreExport Module : public Extensible
 	 * @param result The return code given by the command handler, one of CMD_SUCCESS or CMD_FAILURE
 	 * @param original_line The entire original line as passed to the parser from the user
 	 */
-	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line);
+	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
 
 	/** Called to check if a user who is connecting can now be allowed to register
 	 * If any modules return false for this function, the user is held in the waiting
@@ -1107,7 +1107,7 @@ class CoreExport Module : public Extensible
 	 * @param user The user to check
 	 * @return true to indicate readiness, false if otherwise
 	 */
-	virtual bool OnCheckReady(userrec* user);
+	virtual bool OnCheckReady(User* user);
 
 	/** Called whenever a user is about to register their connection (e.g. before the user
 	 * is sent the MOTD etc). Modules can use this method if they are performing a function
@@ -1118,7 +1118,7 @@ class CoreExport Module : public Extensible
 	 * @param user The user registering
 	 * @return 1 to indicate user quit, 0 to continue
 	 */
-	virtual int OnUserRegister(userrec* user);
+	virtual int OnUserRegister(User* user);
 
 	/** Called whenever a user joins a channel, to determine if invite checks should go ahead or not.
 	 * This method will always be called for each join, wether or not the channel is actually +i, and
@@ -1128,7 +1128,7 @@ class CoreExport Module : public Extensible
 	 * @param chan The channel being joined
 	 * @return 1 to explicitly allow the join, 0 to proceed as normal
 	 */
-	virtual int OnCheckInvite(userrec* user, chanrec* chan);
+	virtual int OnCheckInvite(User* user, Channel* chan);
 
 	/** Called whenever a user joins a channel, to determine if key checks should go ahead or not.
 	 * This method will always be called for each join, wether or not the channel is actually +k, and
@@ -1139,7 +1139,7 @@ class CoreExport Module : public Extensible
 	 * @param chan The channel being joined
 	 * @return 1 to explicitly allow the join, 0 to proceed as normal
 	 */
-	virtual int OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven);
+	virtual int OnCheckKey(User* user, Channel* chan, const std::string &keygiven);
 
 	/** Called whenever a user joins a channel, to determine if channel limit checks should go ahead or not.
 	 * This method will always be called for each join, wether or not the channel is actually +l, and
@@ -1149,7 +1149,7 @@ class CoreExport Module : public Extensible
 	 * @param chan The channel being joined
 	 * @return 1 to explicitly allow the join, 0 to proceed as normal
 	 */
-	virtual int OnCheckLimit(userrec* user, chanrec* chan);
+	virtual int OnCheckLimit(User* user, Channel* chan);
 
 	/** Called whenever a user joins a channel, to determine if banlist checks should go ahead or not.
 	 * This method will always be called for each join, wether or not the user actually matches a channel ban, and
@@ -1159,7 +1159,7 @@ class CoreExport Module : public Extensible
 	 * @param chan The channel being joined
 	 * @return 1 to explicitly allow the join, 0 to proceed as normal
 	 */
-	virtual int OnCheckBan(userrec* user, chanrec* chan);
+	virtual int OnCheckBan(User* user, Channel* chan);
 
 	/** Called on all /STATS commands
 	 * This method is triggered for all /STATS use, including stats symbols handled by the core.
@@ -1170,7 +1170,7 @@ class CoreExport Module : public Extensible
 	 * work when remote STATS queries are received.
 	 * @return 1 to block the /STATS from being processed by the core, 0 to allow it
 	 */
-	virtual int OnStats(char symbol, userrec* user, string_list &results);
+	virtual int OnStats(char symbol, User* user, string_list &results);
 
 	/** Called whenever a change of a local users displayed host is attempted.
 	 * Return 1 to deny the host change, or 0 to allow it.
@@ -1178,7 +1178,7 @@ class CoreExport Module : public Extensible
 	 * @param newhost The new hostname
 	 * @return 1 to deny the host change, 0 to allow
 	 */
-	virtual int OnChangeLocalUserHost(userrec* user, const std::string &newhost);
+	virtual int OnChangeLocalUserHost(User* user, const std::string &newhost);
 
 	/** Called whenever a change of a local users GECOS (fullname field) is attempted.
 	 * return 1 to deny the name change, or 0 to allow it.
@@ -1186,7 +1186,7 @@ class CoreExport Module : public Extensible
 	 * @param newhost The new GECOS
 	 * @return 1 to deny the GECOS change, 0 to allow
 	 */
-	virtual int OnChangeLocalUserGECOS(userrec* user, const std::string &newhost); 
+	virtual int OnChangeLocalUserGECOS(User* user, const std::string &newhost); 
 
 	/** Called whenever a topic is changed by a local user.
 	 * Return 1 to deny the topic change, or 0 to allow it.
@@ -1195,7 +1195,7 @@ class CoreExport Module : public Extensible
 	 * @param topic The actual topic text
 	 * @param 1 to block the topic change, 0 to allow
 	 */
-	virtual int OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic);
+	virtual int OnLocalTopicChange(User* user, Channel* chan, const std::string &topic);
 
 	/** Called whenever a local topic has been changed.
 	 * To block topic changes you must use OnLocalTopicChange instead.
@@ -1203,7 +1203,7 @@ class CoreExport Module : public Extensible
 	 * @param chan The channels who's topic is being changed
 	 * @param topic The actual topic text
 	 */
-	virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic);
+	virtual void OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic);
 
 	/** Called whenever an Event class is sent to all module by another module.
 	 * Please see the documentation of Event::Send() for further information. The Event sent can
@@ -1240,7 +1240,7 @@ class CoreExport Module : public Extensible
 	 * servermodes out to reverse mode changes.
 	 * @param user The user who is opering
 	 */
-	virtual void OnGlobalOper(userrec* user);
+	virtual void OnGlobalOper(User* user);
 
 	/** Called after a user has fully connected and all modules have executed OnUserConnect
 	 * This event is informational only. You should not change any user information in this
@@ -1248,7 +1248,7 @@ class CoreExport Module : public Extensible
 	 * This is called for both local and remote users.
 	 * @param user The user who is connecting
 	 */
-	virtual void OnPostConnect(userrec* user);
+	virtual void OnPostConnect(User* user);
 
 	/** Called whenever a ban is added to a channel's list.
 	 * Return a non-zero value to 'eat' the mode change and prevent the ban from being added.
@@ -1257,7 +1257,7 @@ class CoreExport Module : public Extensible
 	 * @param banmask The ban mask being added
 	 * @return 1 to block the ban, 0 to continue as normal
 	 */
-	virtual int OnAddBan(userrec* source, chanrec* channel,const std::string &banmask);
+	virtual int OnAddBan(User* source, Channel* channel,const std::string &banmask);
 
 	/** Called whenever a ban is removed from a channel's list.
 	 * Return a non-zero value to 'eat' the mode change and prevent the ban from being removed.
@@ -1266,7 +1266,7 @@ class CoreExport Module : public Extensible
 	 * @param banmask The ban mask being deleted
 	 * @return 1 to block the unban, 0 to continue as normal
 	 */
-	virtual int OnDelBan(userrec* source, chanrec* channel,const std::string &banmask);
+	virtual int OnDelBan(User* source, Channel* channel,const std::string &banmask);
 
 	/** Called immediately after any  connection is accepted. This is intended for raw socket
 	 * processing (e.g. modules which wrap the tcp connection within another library) and provides
@@ -1322,15 +1322,15 @@ class CoreExport Module : public Extensible
 
 	/** Called whenever a user sets away.
 	 * This method has no parameter for the away message, as it is available in the
-	 * user record as userrec::awaymsg.
+	 * user record as User::awaymsg.
 	 * @param user The user setting away
 	 */
-	virtual void OnSetAway(userrec* user);
+	virtual void OnSetAway(User* user);
 
 	/** Called when a user cancels their away state.
 	 * @param user The user returning from away
 	 */
-	virtual void OnCancelAway(userrec* user);
+	virtual void OnCancelAway(User* user);
 
 	/** Called whenever a NAMES list is requested.
 	 * You can produce the nameslist yourself, overriding the current list,
@@ -1343,12 +1343,12 @@ class CoreExport Module : public Extensible
 	 * point the pointer at your copy)
 	 * @return 1 to prevent the user list being sent to the client, 0 to allow it
 	 */
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist);
+	virtual int OnUserList(User* user, Channel* Ptr, CUList* &userlist);
 
 	/** Called whenever a line of WHOIS output is sent to a user.
 	 * You may change the numeric and the text of the output by changing
 	 * the values numeric and text, but you cannot change the user the
-	 * numeric is sent to. You may however change the user's userrec values.
+	 * numeric is sent to. You may however change the user's User values.
 	 * @param user The user the numeric is being sent to
 	 * @param dest The user being WHOISed
 	 * @param numeric The numeric of the line being sent
@@ -1356,7 +1356,7 @@ class CoreExport Module : public Extensible
 	 * @return nonzero to drop the line completely so that the user does not
 	 * receive it, or zero to allow the line to be sent.
 	 */
-	virtual int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text);
+	virtual int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text);
 
 	/** Called at intervals for modules to garbage-collect any hashes etc.
 	 * Certain data types such as hash_map 'leak' buckets, which must be
@@ -1372,7 +1372,7 @@ class CoreExport Module : public Extensible
 	 * data which is being spooled in a controlled manner, e.g. LIST lines.
 	 * @param user The user who's buffer is now empty.
 	 */
-	virtual void OnBufferFlushed(userrec* user);
+	virtual void OnBufferFlushed(User* user);
 };
 
 
@@ -1496,7 +1496,7 @@ class CoreExport ConfigReader : public classbase
 	 * if bool is false AND user is false, the error report will be spooled to all opers
 	 * by means of a NOTICE to all opers.
 	 */
-	void DumpErrors(bool bail,userrec* user);
+	void DumpErrors(bool bail,User* user);
 
 	/** Returns the number of items within a tag.
 	 * For example if the tag was &lt;test tag="blah" data="foo"&gt; then this
diff --git a/include/socket.h b/include/socket.h
index 861acc1f1..832523ba7 100644
--- a/include/socket.h
+++ b/include/socket.h
@@ -141,7 +141,7 @@ namespace irc
 }
 
 /** This class handles incoming connections on client ports.
- * It will create a new userrec for every valid connection
+ * It will create a new User for every valid connection
  * and assign it a file descriptor.
  */
 class CoreExport ListenSocket : public EventHandler
diff --git a/include/typedefs.h b/include/typedefs.h
index f101e1615..359db50f5 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -28,17 +28,17 @@
 #ifndef WIN32
 /** User hash (POSIX systems with GCC)
  */
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, User*, nspace::hash<string>, irc::StrHashComp> user_hash;
 /** Channel hash (POSIX systems with GCC)
  */
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<std::string, Channel*, nspace::hash<string>, irc::StrHashComp> chan_hash;
 #else
 /** User hash (windows systems with visual studio)
  */
-typedef nspace::hash_map<std::string, userrec*, nspace::hash_compare<string, less<string> > > user_hash;
+typedef nspace::hash_map<std::string, User*, nspace::hash_compare<string, less<string> > > user_hash;
 /** Channel hash (windows systems with visual studio)
  */
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash_compare<string, less<string> > > chan_hash;
+typedef nspace::hash_map<std::string, Channel*, nspace::hash_compare<string, less<string> > > chan_hash;
 #endif
 
 /** Server name cache
diff --git a/include/u_listmode.h b/include/u_listmode.h
index 6b4fba889..9d78fe64b 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -64,8 +64,8 @@ typedef std::vector<ListLimit> limitlist;
 class ListModeRequest : public Request
 {
  public:
-	userrec* user;
-	chanrec* chan;
+	User* user;
+	Channel* chan;
 
 	/** Check if a user is on a channel's list.
 	 * The Event::Send() event returns true if the user is on the channel's list.
@@ -74,7 +74,7 @@ class ListModeRequest : public Request
 	 * @param u User to check against
 	 * @param c Channel to check against
 	 */
-	ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
+	ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
 	{
 	}
 
@@ -132,7 +132,7 @@ class ListModeBase : public ModeHandler
 
 	/** See mode.h 
 	 */
-	std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	std::pair<bool,std::string> ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		modelist* el;
 		channel->GetExt(infokey, el);
@@ -153,7 +153,7 @@ class ListModeBase : public ModeHandler
 	 * @param user The user to send the list to
 	 * @param channel The channel the user is requesting the list for
 	 */
-	virtual void DisplayList(userrec* user, chanrec* channel)
+	virtual void DisplayList(User* user, Channel* channel)
 	{
 		modelist* el;
 		channel->GetExt(infokey, el);
@@ -167,7 +167,7 @@ class ListModeBase : public ModeHandler
 		user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
 	}
 
-	virtual void DisplayEmptyList(userrec* user, chanrec* channel)
+	virtual void DisplayEmptyList(User* user, Channel* channel)
 	{
 		user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
 	}
@@ -176,7 +176,7 @@ class ListModeBase : public ModeHandler
 	 * See mode.h
 	 * @param channel The channel to remove all instances of the mode from
 	 */
-	virtual void RemoveMode(chanrec* channel)
+	virtual void RemoveMode(Channel* channel)
 	{
 		modelist* el;
 		channel->GetExt(infokey, el);
@@ -206,7 +206,7 @@ class ListModeBase : public ModeHandler
 
 	/** See mode.h
 	 */
-	virtual void RemoveMode(userrec* user)
+	virtual void RemoveMode(User* user)
 	{
 		/* Listmodes dont get set on users */
 	}
@@ -248,7 +248,7 @@ class ListModeBase : public ModeHandler
 	/** Handle the list mode.
 	 * See mode.h
 	 */
-	virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		// Try and grab the list
 		modelist* el;
@@ -375,7 +375,7 @@ class ListModeBase : public ModeHandler
 	 * See modules.h.
 	 * @param chan Channel being deleted
 	 */
-	virtual void DoChannelDelete(chanrec* chan)
+	virtual void DoChannelDelete(Channel* chan)
 	{
 		modelist* list;
 		chan->GetExt(infokey, list);
@@ -393,7 +393,7 @@ class ListModeBase : public ModeHandler
 	 * @param proto Protocol module pointer
 	 * @param opaque Opaque connection handle
 	 */
-	virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		modelist* list;
 		chan->GetExt(infokey, list);
@@ -429,7 +429,7 @@ class ListModeBase : public ModeHandler
 	 * @param parameter The actual parameter being added
 	 * @return true if the parameter is valid
 	 */
-	virtual bool ValidateParam(userrec* source, chanrec* channel, std::string &parameter)
+	virtual bool ValidateParam(User* source, Channel* channel, std::string &parameter)
 	{
 		return true;
 	}
@@ -441,7 +441,7 @@ class ListModeBase : public ModeHandler
 	 * @param parameter The actual parameter being added
 	 * @return Ignored
 	 */
-	virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string &parameter)
+	virtual bool TellListTooLong(User* source, Channel* channel, std::string &parameter)
 	{
 		return false;
 	}
@@ -452,7 +452,7 @@ class ListModeBase : public ModeHandler
 	 * @param channel Channel the parameter is being added to
 	 * @param parameter The actual parameter being added
 	 */
-	virtual void TellAlreadyOnList(userrec* source, chanrec* channel, std::string &parameter)
+	virtual void TellAlreadyOnList(User* source, Channel* channel, std::string &parameter)
 	{
 	}
 	
@@ -462,7 +462,7 @@ class ListModeBase : public ModeHandler
 	 * @param channel Channel the parameter is being removed from
 	 * @param parameter The actual parameter being removed
 	 */
-	virtual void TellNotSet(userrec* source, chanrec* channel, std::string &parameter)
+	virtual void TellNotSet(User* source, Channel* channel, std::string &parameter)
 	{
 	}
 };
diff --git a/include/users.h b/include/users.h
index 28bc895a5..915a23c0d 100644
--- a/include/users.h
+++ b/include/users.h
@@ -85,7 +85,7 @@ class CoreExport UserResolver : public Resolver
  private:
 	/** User this class is 'attached' to.
 	 */
-	userrec* bound_user;
+	User* bound_user;
 	/** File descriptor teh lookup is bound to
 	 */
 	int bound_fd;
@@ -100,7 +100,7 @@ class CoreExport UserResolver : public Resolver
 	 * @param qt The query type
 	 * @param cache Modified by the constructor if the result was cached
 	 */
-	UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache);
+	UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache);
 
 	/** Called on successful lookup
 	 * @param result Result string
@@ -395,7 +395,7 @@ typedef std::vector<ConnectClass> ClassVector;
 
 /** Typedef for the list of user-channel records for a user
  */
-typedef std::map<chanrec*, char> UserChanList;
+typedef std::map<Channel*, char> UserChanList;
 
 /** Shorthand for an iterator into a UserChanList
  */
@@ -403,10 +403,10 @@ typedef UserChanList::iterator UCListIter;
 
 /* Required forward declaration
  */
-class userrec;
+class User;
 
 /** Visibility data for a user.
- * If a user has a non-null instance of this class in their userrec,
+ * If a user has a non-null instance of this class in their User,
  * then it is used to determine if this user is visible to other users
  * or not.
  */
@@ -423,7 +423,7 @@ class CoreExport VisData
 	 * @param user The other user to compare to
 	 * @return true True if the user is visible to the other user, false if not
 	 */
-	virtual bool VisibleTo(userrec* user);
+	virtual bool VisibleTo(User* user);
 };
 
 /** Holds all information about a user
@@ -433,12 +433,12 @@ class CoreExport VisData
  * by nickname, or the FindDescriptor method of the InspIRCd class to find a specific user by their
  * file descriptor value.
  */
-class CoreExport userrec : public connection
+class CoreExport User : public connection
 {
  private:
 	/** Pointer to creator.
 	 * This is required to make use of core functions
-	 * from within the userrec class.
+	 * from within the User class.
 	 */
 	InspIRCd* ServerInstance;
 
@@ -485,14 +485,14 @@ class CoreExport userrec : public connection
  public:
 	/** Resolvers for looking up this users IP address
 	 * This will occur if and when res_reverse completes.
-	 * When this class completes its lookup, userrec::dns_done
+	 * When this class completes its lookup, User::dns_done
 	 * will be set from false to true.
 	 */
 	UserResolver* res_forward;
 
 	/** Resolvers for looking up this users hostname
-	 * This is instantiated by userrec::StartDNSLookup(),
-	 * and on success, instantiates userrec::res_reverse.
+	 * This is instantiated by User::StartDNSLookup(),
+	 * and on success, instantiates User::res_reverse.
 	 */
 	UserResolver* res_reverse;
 
@@ -506,7 +506,7 @@ class CoreExport userrec : public connection
 
 	/** Starts a DNS lookup of the user's IP.
 	 * This will cause two UserResolver classes to be instantiated.
-	 * When complete, these objects set userrec::dns_done to true.
+	 * When complete, these objects set User::dns_done to true.
 	 */
 	void StartDNSLookup();
 
@@ -529,7 +529,7 @@ class CoreExport userrec : public connection
 	char ident[IDENTMAX+2];
 
 	/** The host displayed to non-opers (used for cloaking etc).
-	 * This usually matches the value of userrec::host.
+	 * This usually matches the value of User::host.
 	 */
 	char dhost[65];
 
@@ -542,7 +542,7 @@ class CoreExport userrec : public connection
 	 * this is an array of values in a similar way to channel modes.
 	 * A value of 1 in field (modeletter-65) indicates that the mode is
 	 * set, for example, to work out if mode +s is set, we  check the field
-	 * userrec::modes['s'-65] != 0.
+	 * User::modes['s'-65] != 0.
 	 * The following RFC characters o, w, s, i have constants defined via an
 	 * enum, such as UM_SERVERNOTICE and UM_OPETATOR.
 	 */
@@ -692,7 +692,7 @@ class CoreExport userrec : public connection
 	 * @param Instance Creator instance
 	 * @param uid User UUID, or empty to allocate one automatically
 	 */
-	userrec(InspIRCd* Instance, const std::string &uid = "");
+	User(InspIRCd* Instance, const std::string &uid = "");
 
 	/** Returns the full displayed host of the user
 	 * This member function returns the hostname of the user as seen by other users
@@ -775,7 +775,7 @@ class CoreExport userrec : public connection
 	virtual void RemoveInvite(const irc::string &channel);
 
 	/** Returns true or false for if a user can execute a privilaged oper command.
-	 * This is done by looking up their oper type from userrec::oper, then referencing
+	 * This is done by looking up their oper type from User::oper, then referencing
 	 * this to their oper classes and checking the commands they can execute.
 	 * @param command A command (should be all CAPS)
 	 * @return True if this user can execute the command
@@ -885,7 +885,7 @@ class CoreExport userrec : public connection
 	 * @param oreason The quit reason to show to opers
 	 * @return Although this function has no return type, on exit the user provided will no longer exist.
 	 */
-	static void QuitUser(InspIRCd* Instance, userrec *user, const std::string &r, const char* oreason = "");
+	static void QuitUser(InspIRCd* Instance, User *user, const std::string &r, const char* oreason = "");
 
 	/** Add the user to WHOWAS system
 	 */
@@ -910,9 +910,9 @@ class CoreExport userrec : public connection
 	 * You should not call this function directly. It is used by the core
 	 * to update the users hash entry on a nickchange.
 	 * @param New new user_hash key
-	 * @return Pointer to userrec in hash (usually 'this')
+	 * @return Pointer to User in hash (usually 'this')
 	 */
-	userrec* UpdateNickHash(const char* New);
+	User* UpdateNickHash(const char* New);
 
 	/** Force a nickname change.
 	 * If the nickname change fails (for example, because the nick in question
@@ -924,7 +924,7 @@ class CoreExport userrec : public connection
 	bool ForceNickChange(const char* newnick);
 
 	/** Add a client to the system.
-	 * This will create a new userrec, insert it into the user_hash,
+	 * This will create a new User, insert it into the user_hash,
 	 * initialize it as not yet registered, and add it to the socket engine.
 	 * @param Instance a pointer to the server instance
 	 * @param socket The socket id (file descriptor) this user is on
@@ -952,7 +952,7 @@ class CoreExport userrec : public connection
 
 	/** Remove all clone counts from the user, you should
 	 * use this if you change the user's IP address in
-	 * userrec::ip after they have registered.
+	 * User::ip after they have registered.
 	 */
 	void RemoveCloneCounts();
 
@@ -982,27 +982,27 @@ class CoreExport userrec : public connection
 	 * @param user The user to prepend the :nick!user@host of
 	 * @param text A std::string to send to the user
 	 */
-	void WriteFrom(userrec *user, const std::string &text);
+	void WriteFrom(User *user, const std::string &text);
 
 	/** Write text to this user, appending CR/LF and prepending :nick!user@host of the user provided in the first parameter.
 	 * @param user The user to prepend the :nick!user@host of
 	 * @param text The format string for text to send to the user
 	 * @param ... POD-type format arguments
 	 */
-	void WriteFrom(userrec *user, const char* text, ...);
+	void WriteFrom(User *user, const char* text, ...);
 
 	/** Write text to the user provided in the first parameter, appending CR/LF, and prepending THIS user's :nick!user@host.
 	 * @param dest The user to route the message to
 	 * @param text A std::string to send to the user
 	 */
-	void WriteTo(userrec *dest, const std::string &data);
+	void WriteTo(User *dest, const std::string &data);
 
 	/** Write text to the user provided in the first parameter, appending CR/LF, and prepending THIS user's :nick!user@host.
 	 * @param dest The user to route the message to
 	 * @param text The format string for text to send to the user
 	 * @param ... POD-type format arguments
 	 */
-	void WriteTo(userrec *dest, const char *data, ...);
+	void WriteTo(User *dest, const char *data, ...);
 
 	/** Write to all users that can see this user (including this user in the list), appending CR/LF
 	 * @param text A std::string to send to the users
@@ -1026,7 +1026,7 @@ class CoreExport userrec : public connection
 	 */
 	void WriteCommonExcept(const std::string &text);
 
-	/** Write a quit message to all common users, as in userrec::WriteCommonExcept but with a specific
+	/** Write a quit message to all common users, as in User::WriteCommonExcept but with a specific
 	 * quit message for opers only.
 	 * @param normal_text Normal user quit message
 	 * @param oper_text Oper only quit message
@@ -1050,10 +1050,10 @@ class CoreExport userrec : public connection
 	 * @param other The other user to compare the channel list against
 	 * @return True if the given user shares at least one channel with this user
 	 */
-	bool SharesChannelWith(userrec *other);
+	bool SharesChannelWith(User *other);
 
 	/** Change the displayed host of a user.
-	 * ALWAYS use this function, rather than writing userrec::dhost directly,
+	 * ALWAYS use this function, rather than writing User::dhost directly,
 	 * as this triggers module events allowing the change to be syncronized to
 	 * remote servers. This will also emulate a QUIT and rejoin (where configured)
 	 * before setting their host field.
@@ -1063,7 +1063,7 @@ class CoreExport userrec : public connection
 	bool ChangeDisplayedHost(const char* host);
 
 	/** Change the ident (username) of a user.
-	 * ALWAYS use this function, rather than writing userrec::ident directly,
+	 * ALWAYS use this function, rather than writing User::ident directly,
 	 * as this correctly causes the user to seem to quit (where configured)
 	 * before setting their ident field.
 	 * @param host The new ident to set
@@ -1072,7 +1072,7 @@ class CoreExport userrec : public connection
 	bool ChangeIdent(const char* newident);
 
 	/** Change a users realname field.
-	 * ALWAYS use this function, rather than writing userrec::fullname directly,
+	 * ALWAYS use this function, rather than writing User::fullname directly,
 	 * as this triggers module events allowing the change to be syncronized to
 	 * remote servers.
 	 * @param gecos The user's new realname
@@ -1095,14 +1095,14 @@ class CoreExport userrec : public connection
 	 * @param The user to send the channel list to if it is not too long
 	 * @return This user's channel list
 	 */
-	std::string ChannelList(userrec* source);
+	std::string ChannelList(User* source);
 
 	/** Split the channel list in cl which came from dest, and spool it to this user
 	 * Used internally by WHOIS
 	 * @param dest The user the original channel list came from
-	 * @param cl The  channel list as a string obtained from userrec::ChannelList()
+	 * @param cl The  channel list as a string obtained from User::ChannelList()
 	 */
-	void SplitChanList(userrec* dest, const std::string &cl);
+	void SplitChanList(User* dest, const std::string &cl);
 
 	/** Remove this user from all channels they are on, and delete any that are now empty.
 	 * This is used by QUIT, and will not send part messages!
@@ -1142,7 +1142,7 @@ class CoreExport userrec : public connection
 
 	/** Default destructor
 	 */
-	virtual ~userrec();
+	virtual ~User();
 };
 
 /* Configuration callbacks */
diff --git a/include/xline.h b/include/xline.h
index bb59a9735..5853e13c4 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -440,7 +440,7 @@ class CoreExport XLineManager
 	 * @param user The user to check against
 	 * @return The reason for the line if there is a match, or NULL if there is no match
 	 */
-	GLine* matches_gline(userrec* user, bool permonly = false);
+	GLine* matches_gline(User* user, bool permonly = false);
 
 	/** Check if a IP matches a ZLine
 	 * @param ipaddr The IP to check against
@@ -452,13 +452,13 @@ class CoreExport XLineManager
 	 * @param user The user to check against
 	 * @return The reason for the line if there is a match, or NULL if there is no match
 	 */
-	KLine* matches_kline(userrec* user, bool permonly = false);
+	KLine* matches_kline(User* user, bool permonly = false);
 
 	/** Check if a hostname matches a ELine
 	 * @param user The user to check against
 	 * @return The reason for the line if there is a match, or NULL if there is no match
 	 */
-	ELine* matches_exception(userrec* user, bool permonly = false);
+	ELine* matches_exception(User* user, bool permonly = false);
 
 	/** Expire any pending non-permenant lines
 	 */
@@ -475,31 +475,31 @@ class CoreExport XLineManager
 	 * @param user The username making the query
 	 * @param results The string_list to receive the results
 	 */
-	void stats_k(userrec* user, string_list &results);
+	void stats_k(User* user, string_list &results);
 
 	/** Handle /STATS G
 	 * @param user The username making the query
 	 * @param results The string_list to receive the results
 	 */
-	void stats_g(userrec* user, string_list &results);
+	void stats_g(User* user, string_list &results);
 
 	/** Handle /STATS Q
 	 * @param user The username making the query
 	 * @param results The string_list to receive the results
 	 */
-	void stats_q(userrec* user, string_list &results);
+	void stats_q(User* user, string_list &results);
 
 	/** Handle /STATS Z
 	 * @param user The username making the query
 	 * @param results The string_list to receive the results
 	 */
-	void stats_z(userrec* user, string_list &results);
+	void stats_z(User* user, string_list &results);
 
 	/** Handle /STATS E
 	 * @param user The username making the query
 	 * @param results The string_list to receive the results
 	 */
-	void stats_e(userrec* user, string_list &results);
+	void stats_e(User* user, string_list &results);
 
 	/** Change creation time of a GLine
 	 * @param host The hostname to change
diff --git a/src/channels.cpp b/src/channels.cpp
index 5169fbf63..8f0d2d744 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -16,7 +16,7 @@
 #include "wildcard.h"
 #include "mode.h"
 
-chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	*name = *topic = *setby = *key = 0;
 	maxbans = created = topicset = limit = 0;
@@ -24,7 +24,7 @@ chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 	age = ServerInstance->Time(true);
 }
 
-void chanrec::SetMode(char mode,bool mode_on)
+void Channel::SetMode(char mode,bool mode_on)
 {
 	modes[mode-65] = mode_on;
 	if (!mode_on)
@@ -32,7 +32,7 @@ void chanrec::SetMode(char mode,bool mode_on)
 }
 
 
-void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
 	CustomModeList::iterator n = custom_mode_params.find(mode);	
 
@@ -51,12 +51,12 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 	}
 }
 
-bool chanrec::IsModeSet(char mode)
+bool Channel::IsModeSet(char mode)
 {
 	return modes[mode-65];
 }
 
-std::string chanrec::GetModeParameter(char mode)
+std::string Channel::GetModeParameter(char mode)
 {
 	switch (mode)
 	{
@@ -73,17 +73,17 @@ std::string chanrec::GetModeParameter(char mode)
 	}
 }
 
-long chanrec::GetUserCounter()
+long Channel::GetUserCounter()
 {
 	return (this->internal_userlist.size());
 }
 
-void chanrec::AddUser(userrec* user)
+void Channel::AddUser(User* user)
 {
 	internal_userlist[user] = user->nick;
 }
 
-unsigned long chanrec::DelUser(userrec* user)
+unsigned long Channel::DelUser(User* user)
 {
 	CUListIter a = internal_userlist.find(user);
 	
@@ -99,17 +99,17 @@ unsigned long chanrec::DelUser(userrec* user)
 	return internal_userlist.size();
 }
 
-bool chanrec::HasUser(userrec* user)
+bool Channel::HasUser(User* user)
 {
 	return (internal_userlist.find(user) != internal_userlist.end());
 }
 
-void chanrec::AddOppedUser(userrec* user)
+void Channel::AddOppedUser(User* user)
 {
 	internal_op_userlist[user] = user->nick;
 }
 
-void chanrec::DelOppedUser(userrec* user)
+void Channel::DelOppedUser(User* user)
 {
 	CUListIter a = internal_op_userlist.find(user);
 	if (a != internal_op_userlist.end())
@@ -119,12 +119,12 @@ void chanrec::DelOppedUser(userrec* user)
 	}
 }
 
-void chanrec::AddHalfoppedUser(userrec* user)
+void Channel::AddHalfoppedUser(User* user)
 {
 	internal_halfop_userlist[user] = user->nick;
 }
 
-void chanrec::DelHalfoppedUser(userrec* user)
+void Channel::DelHalfoppedUser(User* user)
 {
 	CUListIter a = internal_halfop_userlist.find(user);
 
@@ -134,12 +134,12 @@ void chanrec::DelHalfoppedUser(userrec* user)
 	}
 }
 
-void chanrec::AddVoicedUser(userrec* user)
+void Channel::AddVoicedUser(User* user)
 {
 	internal_voice_userlist[user] = user->nick;
 }
 
-void chanrec::DelVoicedUser(userrec* user)
+void Channel::DelVoicedUser(User* user)
 {
 	CUListIter a = internal_voice_userlist.find(user);
 	
@@ -149,27 +149,27 @@ void chanrec::DelVoicedUser(userrec* user)
 	}
 }
 
-CUList* chanrec::GetUsers()
+CUList* Channel::GetUsers()
 {
 	return &internal_userlist;
 }
 
-CUList* chanrec::GetOppedUsers()
+CUList* Channel::GetOppedUsers()
 {
 	return &internal_op_userlist;
 }
 
-CUList* chanrec::GetHalfoppedUsers()
+CUList* Channel::GetHalfoppedUsers()
 {
 	return &internal_halfop_userlist;
 }
 
-CUList* chanrec::GetVoicedUsers()
+CUList* Channel::GetVoicedUsers()
 {
 	return &internal_voice_userlist;
 }
 
-void chanrec::SetDefaultModes()
+void Channel::SetDefaultModes()
 {
 	irc::spacesepstream list(ServerInstance->Config->DefaultModes);
 	std::string modeseq;
@@ -196,7 +196,7 @@ void chanrec::SetDefaultModes()
  * add a channel to a user, creating the record for it if needed and linking
  * it to the user record 
  */
-chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS)
+Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, time_t TS)
 {
 	if (!user || !cn)
 		return NULL;
@@ -204,7 +204,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 	char cname[MAXBUF];
 	int MOD_RESULT = 0;
 	std::string privs;
-	chanrec *Ptr;
+	Channel *Ptr;
 
 	/*
 	 * We don't restrict the number of channels that remote users or users that are override-joining may be in.
@@ -254,7 +254,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 		if (!IS_LOCAL(user))
 		{
 			if (!TS)
-				Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+				Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
 		}
 		else
 		{
@@ -270,7 +270,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 		}
 
 		/* create a new one */
-		Ptr = new chanrec(Instance);
+		Ptr = new Channel(Instance);
 		(*(Instance->chanlist))[cname] = Ptr;
 
 		strlcpy(Ptr->name, cname,CHANMAX);
@@ -357,10 +357,10 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 		}
 	}
 
-	return chanrec::ForceChan(Instance, Ptr, user, privs);
+	return Channel::ForceChan(Instance, Ptr, user, privs);
 }
 
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs)
 {
 	std::string nick = user->nick;
 	bool silent = false;
@@ -427,7 +427,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, con
 	return Ptr;
 }
 
-bool chanrec::IsBanned(userrec* user)
+bool Channel::IsBanned(User* user)
 {
 	char mask[MAXBUF];
 	int MOD_RESULT = 0;
@@ -450,11 +450,11 @@ bool chanrec::IsBanned(userrec* user)
 	return false;
 }
 
-/* chanrec::PartUser
+/* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
- * Therefore, if this function returns 0 the caller should delete the chanrec.
+ * Therefore, if this function returns 0 the caller should delete the Channel.
  */
-long chanrec::PartUser(userrec *user, const char* reason)
+long Channel::PartUser(User *user, const char* reason)
 {
 	bool silent = false;
 
@@ -488,7 +488,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
 	return this->GetUserCounter();
 }
 
-long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
+long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
 {
 	bool silent = false;
 
@@ -534,7 +534,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 	return this->GetUserCounter();
 }
 
-long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
+long Channel::KickUser(User *src, User *user, const char* reason)
 {
 	bool silent = false;
 
@@ -612,7 +612,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 	return this->GetUserCounter();
 }
 
-void chanrec::WriteChannel(userrec* user, char* text, ...)
+void Channel::WriteChannel(User* user, char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -627,7 +627,7 @@ void chanrec::WriteChannel(userrec* user, char* text, ...)
 	this->WriteChannel(user, std::string(textbuffer));
 }
 
-void chanrec::WriteChannel(userrec* user, const std::string &text)
+void Channel::WriteChannel(User* user, const std::string &text)
 {
 	CUList *ulist = this->GetUsers();
 	char tb[MAXBUF];
@@ -645,7 +645,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text)
 	}
 }
 
-void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -660,7 +660,7 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
 	this->WriteChannelWithServ(ServName, std::string(textbuffer));
 }
 
-void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
+void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
 {
 	CUList *ulist = this->GetUsers();
 	char tb[MAXBUF];
@@ -677,7 +677,7 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text
 
 /* write formatted text from a source user to all users on a channel except
  * for the sender (for privmsg etc) */
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -692,7 +692,7 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status
 	this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
 }
 
-void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -707,7 +707,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
 	this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
 }
 
-void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string &text)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
 {
 	CUList *ulist;
 	char tb[MAXBUF];
@@ -743,7 +743,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
 	}
 }
 
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
 {
 	CUList except_list;
 	except_list[user] = user->nick;
@@ -754,7 +754,7 @@ void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status
  * return a count of the users on a specific channel accounting for
  * invisible users who won't increase the count. e.g. for /LIST
  */
-int chanrec::CountInvisible()
+int Channel::CountInvisible()
 {
 	int count = 0;
 	CUList *ulist= this->GetUsers();
@@ -767,7 +767,7 @@ int chanrec::CountInvisible()
 	return count;
 }
 
-char* chanrec::ChanModes(bool showkey)
+char* Channel::ChanModes(bool showkey)
 {
 	static char scratch[MAXBUF];
 	static char sparam[MAXBUF];
@@ -777,7 +777,7 @@ char* chanrec::ChanModes(bool showkey)
 	*scratch = '\0';
 	*sparam = '\0';
 
-	/* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */
+	/* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */
 	for(int n = 0; n < 64; n++)
 	{
 		if(this->modes[n])
@@ -821,7 +821,7 @@ char* chanrec::ChanModes(bool showkey)
 /* compile a userlist of a channel into a string, each nick seperated by
  * spaces and op, voice etc status shown as @ and +, and send it to 'user'
  */
-void chanrec::UserList(userrec *user, CUList *ulist)
+void Channel::UserList(User *user, CUList *ulist)
 {
 	char list[MAXBUF];
 	size_t dlen, curlen;
@@ -893,7 +893,7 @@ void chanrec::UserList(userrec *user, CUList *ulist)
 	user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
 }
 
-long chanrec::GetMaxBans()
+long Channel::GetMaxBans()
 {
 	/* Return the cached value if there is one */
 	if (this->maxbans)
@@ -914,7 +914,7 @@ long chanrec::GetMaxBans()
 	return this->maxbans;
 }
 
-void chanrec::ResetMaxBans()
+void Channel::ResetMaxBans()
 {
 	this->maxbans = 0;
 }
@@ -923,7 +923,7 @@ void chanrec::ResetMaxBans()
  * % for halfop etc. If the user has several modes set, the highest mode
  * the user has must be returned.
  */
-const char* chanrec::GetPrefixChar(userrec *user)
+const char* Channel::GetPrefixChar(User *user)
 {
 	static char pf[2] = {0, 0};
 	
@@ -946,7 +946,7 @@ const char* chanrec::GetPrefixChar(userrec *user)
 	return pf;
 }
 
-const char* chanrec::GetAllPrefixChars(userrec* user)
+const char* Channel::GetAllPrefixChars(User* user)
 {
 	static char prefix[MAXBUF];
 	int ctr = 0;
@@ -966,7 +966,7 @@ const char* chanrec::GetAllPrefixChars(userrec* user)
 	return prefix;
 }
 
-unsigned int chanrec::GetPrefixValue(userrec* user)
+unsigned int Channel::GetPrefixValue(User* user)
 {
 	prefixlist::iterator n = prefixes.find(user);
 	if (n != prefixes.end())
@@ -977,7 +977,7 @@ unsigned int chanrec::GetPrefixValue(userrec* user)
 	return 0;
 }
 
-int chanrec::GetStatusFlags(userrec *user)
+int Channel::GetStatusFlags(User *user)
 {
 	UCListIter i = user->chans.find(this);
 	if (i != user->chans.end())
@@ -987,7 +987,7 @@ int chanrec::GetStatusFlags(userrec *user)
 	return 0;
 }
 
-int chanrec::GetStatus(userrec *user)
+int Channel::GetStatus(User *user)
 {
 	if (ServerInstance->ULine(user->server))
 		return STATUS_OP;
@@ -1012,7 +1012,7 @@ int chanrec::GetStatus(userrec *user)
 	return STATUS_NORMAL;
 }
 
-void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
+void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding)
 {
 	prefixlist::iterator n = prefixes.find(user);
 	prefixtype pfx = std::make_pair(prefix,prefix_value);
@@ -1035,7 +1035,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b
 		{
 			pfxcontainer one;
 			one.push_back(pfx);
-			prefixes.insert(std::make_pair<userrec*,pfxcontainer>(user, one));
+			prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
 		}
 	}
 	else
@@ -1049,7 +1049,7 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b
 	}
 }
 
-void chanrec::RemoveAllPrefixes(userrec* user)
+void Channel::RemoveAllPrefixes(User* user)
 {
 	prefixlist::iterator n = prefixes.find(user);
 	if (n != prefixes.end())
diff --git a/src/cmd_admin.cpp b/src/cmd_admin.cpp
index a7a72c0f8..427342cfb 100644
--- a/src/cmd_admin.cpp
+++ b/src/cmd_admin.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ADMIN
  */
-CmdResult cmd_admin::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_admin::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName);
 	if (*ServerInstance->Config->AdminName)
diff --git a/src/cmd_away.cpp b/src/cmd_away.cpp
index c27ce222a..c237a94fd 100644
--- a/src/cmd_away.cpp
+++ b/src/cmd_away.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /AWAY
  */
-CmdResult cmd_away::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_away::Handle (const char** parameters, int pcnt, User *user)
 {
 	if ((pcnt) && (*parameters[0]))
 	{
diff --git a/src/cmd_clearcache.cpp b/src/cmd_clearcache.cpp
index 0a08498e8..aed05c093 100644
--- a/src/cmd_clearcache.cpp
+++ b/src/cmd_clearcache.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /CLEARCACHE
  */
-CmdResult cmd_clearcache::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_clearcache::Handle (const char** parameters, int pcnt, User *user)
 {
 	int n = ServerInstance->Res->ClearCache();
 	user->WriteServ("NOTICE %s :*** Cleared DNS cache of %d items.", user->nick, n);
diff --git a/src/cmd_commands.cpp b/src/cmd_commands.cpp
index 41f68690e..bfdafb6ad 100644
--- a/src/cmd_commands.cpp
+++ b/src/cmd_commands.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_commands(Instance);
 }
 
-CmdResult cmd_commands::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_commands::Handle (const char** parameters, int pcnt, User *user)
 {
 	for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 	{
diff --git a/src/cmd_connect.cpp b/src/cmd_connect.cpp
index 63afa02a2..eff8a23f0 100644
--- a/src/cmd_connect.cpp
+++ b/src/cmd_connect.cpp
@@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /CONNECT
  */
-CmdResult cmd_connect::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_connect::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_SUCCESS;
diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 4772c9d17..3193a19e1 100644
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /DIE
  */
-CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_die::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (!strcmp(parameters[0],ServerInstance->Config->diepass))
 	{
diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index d28f72418..6a4db99dd 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ELINE
  */
-CmdResult cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_eline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index 2dff4902e..1cd4bcb48 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /GLINE
  */
-CmdResult cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_gline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_info.cpp b/src/cmd_info.cpp
index 29085afb7..447834a7f 100644
--- a/src/cmd_info.cpp
+++ b/src/cmd_info.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INFO
  */
-CmdResult cmd_info::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_info::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "371 %s :                   -/\\- \2InspIRCd\2 -\\/-", user->nick);
 	user->WriteServ( "371 %s :                 November 2002 - Present", user->nick);
diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index a1e3fb24b..49382deb8 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -21,14 +21,14 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INVITE
  */
-CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_invite::Handle (const char** parameters, int pcnt, User *user)
 {
 	int MOD_RESULT = 0;
 
 	if (pcnt == 2)
 	{
-		userrec* u = ServerInstance->FindNick(parameters[0]);
-		chanrec* c = ServerInstance->FindChan(parameters[1]);
+		User* u = ServerInstance->FindNick(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[1]);
 
 		if ((!c) || (!u))
 		{
diff --git a/src/cmd_ison.cpp b/src/cmd_ison.cpp
index 4c5542cd8..94221f152 100644
--- a/src/cmd_ison.cpp
+++ b/src/cmd_ison.cpp
@@ -21,10 +21,10 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ISON
  */
-CmdResult cmd_ison::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_ison::Handle (const char** parameters, int pcnt, User *user)
 {
-	std::map<userrec*,userrec*> ison_already;
-	userrec *u;
+	std::map<User*,User*> ison_already;
+	User *u;
 	std::string reply = std::string("303 ") + user->nick + " :";
 
 	for (int i = 0; i < pcnt; i++)
diff --git a/src/cmd_join.cpp b/src/cmd_join.cpp
index 171f90bba..0c5c3f157 100644
--- a/src/cmd_join.cpp
+++ b/src/cmd_join.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /JOIN
  */
-CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_join::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt > 1)
 	{
@@ -30,7 +30,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
-			chanrec::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
+			Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1]);
 			return CMD_SUCCESS;
 		}
 	}
@@ -41,7 +41,7 @@ CmdResult cmd_join::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (ServerInstance->IsChannel(parameters[0]))
 		{
-			chanrec::JoinUser(ServerInstance, user, parameters[0], false, "");
+			Channel::JoinUser(ServerInstance, user, parameters[0], false, "");
 			return CMD_SUCCESS;
 		}
 	}
diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 78edb177d..c4eeaf609 100644
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -21,11 +21,11 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KICK
  */
-CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_kick::Handle (const char** parameters, int pcnt, User *user)
 {
 	char reason[MAXKICK];
-	chanrec* c = ServerInstance->FindChan(parameters[0]);
-	userrec* u = ServerInstance->FindNick(parameters[1]);
+	Channel* c = ServerInstance->FindChan(parameters[0]);
+	User* u = ServerInstance->FindNick(parameters[1]);
 
 	if (!u || !c)
 	{
@@ -49,7 +49,7 @@ CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
 	}
 
 	if (!c->KickUser(user, u, reason))
-		/* Nobody left here, delete the chanrec */
+		/* Nobody left here, delete the Channel */
 		delete c;
 
 	return CMD_SUCCESS;
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index a2e76ce45..e137e1ab2 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -21,13 +21,13 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KILL
  */
-CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_kill::Handle (const char** parameters, int pcnt, User *user)
 {
 	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return CMD_SUCCESS;
 
-	userrec *u = ServerInstance->FindNick(parameters[0]);
+	User *u = ServerInstance->FindNick(parameters[0]);
 	char killreason[MAXBUF];
 	int MOD_RESULT = 0;
 
@@ -103,7 +103,7 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 
 		// send the quit out
-		userrec::QuitUser(ServerInstance, u, killreason);
+		User::QuitUser(ServerInstance, u, killreason);
 	}
 	else
 	{
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 75a868577..5dbdf2b2e 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KLINE
  */
-CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_kline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_links.cpp b/src/cmd_links.cpp
index 2576b63e9..0bf8a19de 100644
--- a/src/cmd_links.cpp
+++ b/src/cmd_links.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LINKS
  */
-CmdResult cmd_links::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_links::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("364 %s %s %s :0 %s",user->nick,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc);
 	user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index e77feeb66..ff4715bec 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_list(Instance);
 }
 
-CmdResult cmd_list::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_list::Handle (const char** parameters, int pcnt, User *user)
 {
 	int minusers = 0, maxusers = 0;
 
diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp
index 0c5cb139b..a16a58789 100644
--- a/src/cmd_loadmodule.cpp
+++ b/src/cmd_loadmodule.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LOADMODULE
  */
-CmdResult cmd_loadmodule::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_loadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Load(parameters[0]))
 	{
diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index cc66ba435..1ea6f2f42 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LUSERS
  */
-CmdResult cmd_lusers::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_lusers::Handle (const char** parameters, int pcnt, User *user)
 {
 	// this lusers command shows one server at all times because
 	// a protocol module must override it to show those stats.
diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp
index 471f53a1a..05bd0cbef 100644
--- a/src/cmd_map.cpp
+++ b/src/cmd_map.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MAP
  */
-CmdResult cmd_map::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_map::Handle (const char** parameters, int pcnt, User *user)
 {
 	// as with /LUSERS this does nothing without a linking
 	// module to override its behaviour and display something
diff --git a/src/cmd_mode.cpp b/src/cmd_mode.cpp
index 5680e1b05..e5240b00d 100644
--- a/src/cmd_mode.cpp
+++ b/src/cmd_mode.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MODE
  */
-CmdResult cmd_mode::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_mode::Handle (const char** parameters, int pcnt, User *user)
 {
 	ServerInstance->Modes->Process(parameters, pcnt, user, false);
 	return CMD_SUCCESS;
diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index 12697a68f..fd86254e5 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -38,7 +38,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MODULES
  */
-CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_modules::Handle (const char** parameters, int pcnt, User *user)
 {
   	for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
 	{
diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp
index 53d140a9d..019b13228 100644
--- a/src/cmd_motd.cpp
+++ b/src/cmd_motd.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MOTD
  */
-CmdResult cmd_motd::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_motd::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->ShowMOTD();
 	return CMD_SUCCESS;
diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 21ab2f3ed..29d448f28 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -21,9 +21,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /NAMES
  */
-CmdResult cmd_names::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_names::Handle (const char** parameters, int pcnt, User *user)
 {
-	chanrec* c;
+	Channel* c;
 
 	if (!pcnt)
 	{
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 6eb72349b..d350b26b6 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_nick::Handle (const char** parameters, int pcnt, User *user)
 {
 	char oldnick[NICKMAX];
 
@@ -73,7 +73,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		 * the nickname too, we force a nickchange on the older user (Simply the one who was
 		 * here first, no TS checks need to take place here)
 		 */
-		userrec* InUse = ServerInstance->FindNickOnly(parameters[0]);
+		User* InUse = ServerInstance->FindNickOnly(parameters[0]);
 		if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
 		{
 			if (InUse->registered != REG_ALL)
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 7c0f06b40..cf4d7b44a 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -20,10 +20,10 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_notice(Instance);
 }
 
-CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_notice::Handle (const char** parameters, int pcnt, User *user)
 {
-	userrec *dest;
-	chanrec *chan;
+	User *dest;
+	Channel *chan;
 
 	CUList exempt_list;
 
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index cc2ae6e65..1af42fffa 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -35,7 +35,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_oper(Instance);
 }
 
-CmdResult cmd_oper::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_oper::Handle (const char** parameters, int pcnt, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];
diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 9088ec21d..18e8d19d9 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -19,12 +19,12 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_part(Instance);
 }
 
-CmdResult cmd_part::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_part::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
 		return CMD_SUCCESS;
 
-	chanrec* c = ServerInstance->FindChan(parameters[0]);
+	Channel* c = ServerInstance->FindChan(parameters[0]);
 	
 	if (c)
 	{
diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index 78bf1a2cf..db84eb051 100644
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_pass(Instance);
 }
 
-CmdResult cmd_pass::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_pass::Handle (const char** parameters, int pcnt, User *user)
 {
 	// Check to make sure they havnt registered -- Fix by FCS
 	if (user->registered == REG_ALL)
diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp
index ff16f2e44..735f9c3be 100644
--- a/src/cmd_ping.cpp
+++ b/src/cmd_ping.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_ping(Instance);
 }
 
-CmdResult cmd_ping::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_ping::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("PONG %s :%s",ServerInstance->Config->ServerName,parameters[0]);
 	return CMD_SUCCESS;
diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp
index dab4de720..aca317078 100644
--- a/src/cmd_pong.cpp
+++ b/src/cmd_pong.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_pong(Instance);
 }
 
-CmdResult cmd_pong::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_pong::Handle (const char** parameters, int pcnt, User *user)
 {
 	// set the user as alive so they survive to next ping
 	user->lastping = 1;
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 2c54a770a..fddf810d2 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -20,10 +20,10 @@ extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 	return new cmd_privmsg(Instance);
 }
 
-CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, User *user)
 {
-	userrec *dest;
-	chanrec *chan;
+	User *dest;
+	Channel *chan;
 	CUList except_list;
 
 	user->idle_lastmsg = ServerInstance->Time();
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 1d4f8d089..4f843cb5e 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_qline(Instance);
 }
 
-CmdResult cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_qline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 8626db1ef..ae3d68296 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_quit(Instance);
 }
 
-CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_quit::Handle (const char** parameters, int pcnt, User *user)
 {
 
 	std::string quitmsg;
@@ -38,7 +38,7 @@ CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 	else
 		quitmsg = pcnt ? parameters[0] : "Client exited";
 
-	userrec::QuitUser(ServerInstance, user, quitmsg);
+	User::QuitUser(ServerInstance, user, quitmsg);
 
 	return CMD_SUCCESS;
 }
diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index a1292f19f..5612f59fa 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_rehash(Instance);
 }
 
-CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rehash::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 	std::string parameter;
diff --git a/src/cmd_reloadmodule.cpp b/src/cmd_reloadmodule.cpp
index b1201ef6e..a08dc7fec 100644
--- a/src/cmd_reloadmodule.cpp
+++ b/src/cmd_reloadmodule.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_reloadmodule(Instance);
 }
 
-CmdResult cmd_reloadmodule::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_reloadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Unload(parameters[0]))
 	{
diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 8da98f77e..6880d5e28 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_restart(Instance);
 }
 
-CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_restart::Handle (const char** parameters, int pcnt, User *user)
 {
 	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
 	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp
index 7c47607db..668a207b7 100644
--- a/src/cmd_rules.cpp
+++ b/src/cmd_rules.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_rules(Instance);
 }
 
-CmdResult cmd_rules::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rules::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->ShowRULES();
 	return CMD_SUCCESS;
diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp
index 837c94067..7781d3331 100644
--- a/src/cmd_server.cpp
+++ b/src/cmd_server.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_server(Instance);
 }
 
-CmdResult cmd_server::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_server::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick);
 	ServerInstance->WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick);
diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp
index a29ddbaef..3f8175093 100644
--- a/src/cmd_squit.cpp
+++ b/src/cmd_squit.cpp
@@ -24,7 +24,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_squit(Instance);
 }
 
-CmdResult cmd_squit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_squit::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_FAILURE;
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 4b93d5f5f..38cae03cf 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -31,7 +31,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_stats(Instance);
 }
 
-CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_stats::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (IS_LOCAL(user))
 	{
@@ -44,7 +44,7 @@ CmdResult cmd_stats::Handle (const char** parameters, int pcnt, userrec *user)
 	return CMD_SUCCESS;
 }
 
-DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user, string_list &results)
+DllExport void DoStats(InspIRCd* ServerInstance, char statschar, User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 
@@ -173,8 +173,8 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 		case 'z':
 		{
 			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+" :Users(HASH_MAP) "+ConvToStr(ServerInstance->clientlist->size())+" ("+ConvToStr(ServerInstance->clientlist->size()*sizeof(User))+" bytes)");
+			results.push_back(sn+" 249 "+user->nick+" :Channels(HASH_MAP) "+ConvToStr(ServerInstance->chanlist->size())+" ("+ConvToStr(ServerInstance->chanlist->size()*sizeof(Channel))+" 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)
@@ -259,9 +259,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 		/* stats l (show user I/O stats) */
 		case 'l':
 			results.push_back(sn+" 211 "+user->nick+" :nick[ident@host] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-		  	for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+		  	for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
 			{
-				userrec* i = *n;
+				User* i = *n;
 				if (ServerInstance->IsNick(i->nick))
 				{
 					results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->dhost+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
@@ -272,9 +272,9 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 	/* stats L (show user I/O stats with IP addresses) */
 		case 'L':
 			results.push_back(sn+" 211 "+user->nick+" :nick[ident@ip] sendq cmds_out bytes_out cmds_in bytes_in time_open");
-			for (std::vector<userrec*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
+			for (std::vector<User*>::iterator n = ServerInstance->local_users.begin(); n != ServerInstance->local_users.end(); n++)
 			{
-				userrec* i = *n;
+				User* i = *n;
 				if (ServerInstance->IsNick(i->nick))
 				{
 					results.push_back(sn+" 211 "+user->nick+" "+i->nick+"["+i->ident+"@"+i->GetIPString()+"] "+ConvToStr(i->sendq.length())+" "+ConvToStr(i->cmds_out)+" "+ConvToStr(i->bytes_out)+" "+ConvToStr(i->cmds_in)+" "+ConvToStr(i->bytes_in)+" "+ConvToStr(ServerInstance->Time() - i->age));
diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp
index 926d69204..ddeb0b190 100644
--- a/src/cmd_time.cpp
+++ b/src/cmd_time.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_time(Instance);
 }
 
-CmdResult cmd_time::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_time::Handle (const char** parameters, int pcnt, User *user)
 {
 	struct tm* timeinfo;
 	time_t local = ServerInstance->Time();
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 3318972fb..b3034ba39 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -20,9 +20,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_topic(Instance);
 }
 
-CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_topic::Handle (const char** parameters, int pcnt, User *user)
 {
-	chanrec* Ptr;
+	Channel* Ptr;
 
 	if (pcnt == 1)
 	{
diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index a71bb42bf..5899c6832 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** XXX: This is crap. someone fix this when you have time, to be more useful.
  */
-CmdResult cmd_trace::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_trace::Handle (const char** parameters, int pcnt, User *user)
 {
 	for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
 	{
diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index 5cb410950..d0b35f69f 100644
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_unloadmodule(Instance);
 }
 
-CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_unloadmodule::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (ServerInstance->Modules->Unload(parameters[0]))
 	{
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index f2240bb92..a3d10a723 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_user(Instance);
 }
 
-CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, User *user)
 {
 	/* A user may only send the USER command once */
 	if (!(user->registered & REG_USER))
diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index dd1a2d819..78d435a39 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -19,14 +19,14 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_userhost(Instance);
 }
 
-CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, User *user)
 {
 	std::string retbuf = std::string("302 ") + user->nick + " :";
 
 	
 	for (int i = 0; i < pcnt; i++)
 	{
-		userrec *u = ServerInstance->FindNick(parameters[i]);
+		User *u = ServerInstance->FindNick(parameters[i]);
 
 		if ((u) && (u->registered == REG_ALL))
 		{
diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index c355717f7..86fde3210 100644
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_version(Instance);
 }
 
-CmdResult cmd_version::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_version::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str());
 	ServerInstance->Config->Send005(user);
diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp
index 90a7d8bde..14924e56b 100644
--- a/src/cmd_wallops.cpp
+++ b/src/cmd_wallops.cpp
@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_wallops(Instance);
 }
 
-CmdResult cmd_wallops::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_wallops::Handle (const char** parameters, int pcnt, User *user)
 {
 	user->WriteWallOps(std::string(parameters[0]));
 	FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0]));
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 91c651bcc..0ebe20d10 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -15,7 +15,7 @@
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-static char *get_first_visible_channel(userrec *u)
+static char *get_first_visible_channel(User *u)
 {
 	UCListIter i = u->chans.begin();
 	if (i != u->chans.end())
@@ -27,7 +27,7 @@ static char *get_first_visible_channel(userrec *u)
 	return "*";
 }
 
-bool cmd_who::whomatch(userrec* user, const char* matchtext)
+bool cmd_who::whomatch(User* user, const char* matchtext)
 {
 	bool realhost = false;
 	bool realname = false;
@@ -112,7 +112,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_who(Instance);
 }
 
-bool cmd_who::CanView(chanrec* chan, userrec* user)
+bool cmd_who::CanView(Channel* chan, User* user)
 {
 	if (!user || !chan)
 		return false;
@@ -132,10 +132,10 @@ bool cmd_who::CanView(chanrec* chan, userrec* user)
 	return false;
 }
 
-void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults)
+void cmd_who::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
 {
 	std::string lcn = get_first_visible_channel(u);
-	chanrec* chlast = ServerInstance->FindChan(lcn);
+	Channel* chlast = ServerInstance->FindChan(lcn);
 
 	/* Not visible to this user */
 	if (u->Visibility && !u->Visibility->VisibleTo(user))
@@ -165,7 +165,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch
 	whoresults.push_back(wholine);
 }
 
-CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_who::Handle (const char** parameters, int pcnt, User *user)
 {
 	/*
 	 * XXX - RFC says:
@@ -187,7 +187,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 	opt_local = false;
 	opt_far = false;
 
-	chanrec *ch = NULL;
+	Channel *ch = NULL;
 	std::vector<std::string> whoresults;
 	std::string initial = "352 " + std::string(user->nick) + " ";
 
@@ -295,9 +295,9 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 		if (opt_viewopersonly)
 		{
 			/* Showing only opers */
-			for (std::list<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+			for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
 			{
-				userrec* oper = *i;
+				User* oper = *i;
 
 				if (whomatch(oper, matchtext))
 				{
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 508200cb6..f861dde36 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -15,7 +15,7 @@
 #include "commands/cmd_whois.h"
 #include "hashcomp.h"
 
-void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned long signon, unsigned long idle, const char* nick)
+void do_whois(InspIRCd* ServerInstance, User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick)
 {
 	if (dest->Visibility && !dest->Visibility->VisibleTo(user))
 	{
@@ -91,9 +91,9 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_whois(Instance);
 }
 
-CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_whois::Handle (const char** parameters, int pcnt, User *user)
 {
-	userrec *dest;
+	User *dest;
 	int userindex = 0;
 	unsigned long idle = 0, signon = 0;
 
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index f982d4873..de13d5b26 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -29,7 +29,7 @@ cmd_whowas::cmd_whowas(InspIRCd* Instance)
 	Instance->Timers->AddTimer(timer);
 }
 
-CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, userrec* user)
+CmdResult cmd_whowas::Handle (const char** parameters, int pcnt, User* user)
 {
 	/* if whowas disabled in config */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
@@ -92,7 +92,7 @@ CmdResult cmd_whowas::HandleInternal(const unsigned int id, const std::deque<cla
 	switch (id)
 	{
 		case WHOWAS_ADD:
-			AddToWhoWas((userrec*)parameters[0]);
+			AddToWhoWas((User*)parameters[0]);
 		break;
 
 		case WHOWAS_STATS:
@@ -131,7 +131,7 @@ void cmd_whowas::GetStats(Extensible* ext)
 	ext->Extend("stats", stats.c_str());
 }
 
-void cmd_whowas::AddToWhoWas(userrec* user)
+void cmd_whowas::AddToWhoWas(User* user)
 {
 	/* if whowas disabled */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
@@ -316,7 +316,7 @@ cmd_whowas::~cmd_whowas()
 	}
 }
 
-WhoWasGroup::WhoWasGroup(userrec* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
+WhoWasGroup::WhoWasGroup(User* user) : host(NULL), dhost(NULL), ident(NULL), server(NULL), gecos(NULL), signon(user->signon)
 {
 	this->host = strdup(user->host);
 	this->dhost = strdup(user->dhost);
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index cb0167f4e..a1d22e32a 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new cmd_zline(Instance);
 }
 
-CmdResult cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_zline::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 68555ec8b..462b50d88 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* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(User* 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* CommandObj, const char** par
 	return 1;
 }
 
-int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+int CommandParser::LoopCall(User* 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.
@@ -209,7 +209,7 @@ int CommandParser::LoopCall(userrec* user, Command* CommandObj, const char** par
 	return 1;
 }
 
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user)
 {
 	Commandable::iterator n = cmdlist.find(commandname);
 
@@ -244,7 +244,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 // calls a handler function for a command
 
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user)
 {
 	Commandable::iterator n = cmdlist.find(commandname);
 
@@ -280,7 +280,7 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char**
 	return CMD_INVALID;
 }
 
-void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
+void CommandParser::ProcessCommand(User *user, std::string &cmd)
 {
 	const char *command_p[MAXPARAMETERS];
 	int items = 0;
@@ -409,7 +409,7 @@ void CommandParser::RemoveCommand(Commandable::iterator safei, const char* sourc
 	}
 }
 
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
+void CommandParser::ProcessBuffer(std::string &buffer,User *user)
 {
 	std::string::size_type a;
 
@@ -470,7 +470,7 @@ bool CommandParser::FindSym(void** v, void* h, const std::string &name)
 	return true;
 }
 
-bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
+bool CommandParser::ReloadCommand(const char* cmd, User* user)
 {
 	char filename[MAXBUF];
 	char commandname[MAXBUF];
@@ -511,7 +511,7 @@ bool CommandParser::ReloadCommand(const char* cmd, userrec* user)
 	return false;
 }
 
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_reload::Handle(const char** parameters, int pcnt, User *user)
 {
 	user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
 	if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
@@ -558,7 +558,7 @@ const char* CommandParser::LoadCommand(const char* name)
 	return NULL;
 }
 
-void CommandParser::SetupCommandTable(userrec* user)
+void CommandParser::SetupCommandTable(User* user)
 {
 	RFCCommands.clear();
 
@@ -607,7 +607,7 @@ void CommandParser::SetupCommandTable(userrec* user)
 
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
 {
-	userrec* user = NULL;
+	User* user = NULL;
 	std::string item;
 	int translations = 0;
 
diff --git a/src/commands.cpp b/src/commands.cpp
index 7f74471c8..edb8a529e 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -18,7 +18,7 @@
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
 {
 	char itrigger[MAXBUF];
 	long matches = 0;
@@ -49,7 +49,7 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 	return false;
 }
 
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
 {
 	char itrigger[MAXBUF];
 	long matches = 0;
@@ -78,7 +78,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 	return false;
 }
 
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
 {
 	char itrigger[MAXBUF];
 	long matches = 0;
diff --git a/src/configreader.cpp b/src/configreader.cpp
index daf1b04de..0bb4587b3 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -143,13 +143,13 @@ void ServerConfig::Update005()
 	}
 }
 
-void ServerConfig::Send005(userrec* user)
+void ServerConfig::Send005(User* user)
 {
 	for (std::vector<std::string>::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++)
 		user->WriteServ("005 %s %s", user->nick, line->c_str());
 }
 
-bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+bool ServerConfig::CheckOnce(char* tag, bool bail, User* user)
 {
 	int count = ConfValueEnum(this->config_data, tag);
 
@@ -586,7 +586,7 @@ bool DoneMaxBans(ServerConfig* conf, const char* tag)
 	return true;
 }
 
-void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user)
+void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user)
 {
 	ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str());
 	if (bail)
@@ -625,7 +625,7 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
 	}
 }
 
-void ServerConfig::Read(bool bail, userrec* user)
+void ServerConfig::Read(bool bail, User* user)
 {
 	static char debug[MAXBUF];	/* Temporary buffer for debugging value */
 	static char maxkeep[MAXBUF];	/* Temporary buffer for WhoWasMaxKeep value */
diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 0da622cb1..188c3a8e6 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "cull_list.h"
 
-CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
+CullItem::CullItem(User* u, std::string &r, const char* o_reason)
 {
 	this->user = u;
 	this->reason = r;
@@ -26,7 +26,7 @@ CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
 		this->oper_reason = r;
 }
 
-CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
+CullItem::CullItem(User* u, const char* r, const char* o_reason)
 {
 	this->user = u;
 	this->reason = r;
@@ -52,7 +52,7 @@ CullItem::~CullItem()
 {
 }
 
-userrec* CullItem::GetUser()
+User* CullItem::GetUser()
 {
 	return this->user;
 }
@@ -73,13 +73,13 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 	exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason)
+void CullList::AddItem(User* user, std::string &reason, const char* o_reason)
 {
 	AddItem(user, reason.c_str(), o_reason);
 }
 
 
-void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
+void CullList::AddItem(User* user, const char* reason, const char* o_reason)
 {
 	if (exempt.find(user) == exempt.end())
 	{
@@ -89,7 +89,7 @@ void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
 	}
 }
 
-void CullList::MakeSilent(userrec* user)
+void CullList::MakeSilent(User* user)
 {
 	for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
 	{
@@ -110,7 +110,7 @@ int CullList::Apply()
 		std::vector<CullItem>::iterator a = list.begin();
 
 		user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
-		std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
+		std::map<User*, User*>::iterator exemptiter = exempt.find(a->GetUser());
 		const char* preset_reason = a->GetUser()->GetOperQuit();
 		std::string reason = a->GetReason();
 		std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
@@ -184,7 +184,7 @@ int CullList::Apply()
 		{
 			if (IS_LOCAL(a->GetUser()))
 			{
-				std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
+				std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
 				if (x != ServerInstance->local_users.end())
 					ServerInstance->local_users.erase(x);
 			}
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 1cad143c5..a90dd0105 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -114,9 +114,9 @@ void InspIRCd::WriteOpers(const char* text, ...)
 
 void InspIRCd::WriteOpers(const std::string &text)
 {
-	for (std::list<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
+	for (std::list<User*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
 	{
-		userrec* a = *i;
+		User* a = *i;
 		if (IS_LOCAL(a) && a->IsModeSet('s'))
 		{
 			// send server notices to all with +s
@@ -139,9 +139,9 @@ void InspIRCd::ServerNoticeAll(char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
 
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
-		userrec* t = *i;
+		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));
 	}
 }
@@ -160,9 +160,9 @@ void InspIRCd::ServerPrivmsgAll(char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
 
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
-		userrec* t = *i;
+		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));
 	}
 }
@@ -186,9 +186,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 
 	if (flags == WM_AND)
 	{
-		for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+		for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 		{
-			userrec* t = *i;
+			User* t = *i;
 			bool send_to_user = true;
 
 			for (int n = 0; n < modelen; n++)
@@ -207,9 +207,9 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 	}
 	else if (flags == WM_OR)
 	{
-		for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+		for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 		{
-			userrec* t = *i;
+			User* t = *i;
 			bool send_to_user = false;
 
 			for (int n = 0; n < modelen; n++)
@@ -230,7 +230,7 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 }
 
 /* Find a user record by nickname and return a pointer to it */
-userrec* InspIRCd::FindNick(const std::string &nick)
+User* InspIRCd::FindNick(const std::string &nick)
 {
 	if (!nick.empty() && isdigit(*nick.begin()))
 		return FindUUID(nick);
@@ -244,7 +244,7 @@ userrec* InspIRCd::FindNick(const std::string &nick)
 	return iter->second;
 }
 
-userrec* InspIRCd::FindNick(const char* nick)
+User* InspIRCd::FindNick(const char* nick)
 {
 	if (isdigit(*nick))
 		return FindUUID(nick);
@@ -257,7 +257,7 @@ userrec* InspIRCd::FindNick(const char* nick)
 	return iter->second;
 }
 
-userrec* InspIRCd::FindNickOnly(const std::string &nick)
+User* InspIRCd::FindNickOnly(const std::string &nick)
 {
 	user_hash::iterator iter = clientlist->find(nick);
 
@@ -267,7 +267,7 @@ userrec* InspIRCd::FindNickOnly(const std::string &nick)
 	return iter->second;
 }
 
-userrec* InspIRCd::FindNickOnly(const char* nick)
+User* InspIRCd::FindNickOnly(const char* nick)
 {
 	user_hash::iterator iter = clientlist->find(nick);
 
@@ -277,12 +277,12 @@ userrec* InspIRCd::FindNickOnly(const char* nick)
 	return iter->second;
 }
 
-userrec *InspIRCd::FindUUID(const std::string &uid)
+User *InspIRCd::FindUUID(const std::string &uid)
 {
 	return FindUUID(uid.c_str());
 }
 
-userrec *InspIRCd::FindUUID(const char *uid)
+User *InspIRCd::FindUUID(const char *uid)
 {
 	user_hash::iterator finduuid = uuidlist->find(uid);
 
@@ -293,7 +293,7 @@ userrec *InspIRCd::FindUUID(const char *uid)
 }
 
 /* find a channel record by channel name and return a pointer to it */
-chanrec* InspIRCd::FindChan(const char* chan)
+Channel* InspIRCd::FindChan(const char* chan)
 {
 	chan_hash::iterator iter = chanlist->find(chan);
 
@@ -304,7 +304,7 @@ chanrec* InspIRCd::FindChan(const char* chan)
 	return iter->second;
 }
 
-chanrec* InspIRCd::FindChan(const std::string &chan)
+Channel* InspIRCd::FindChan(const std::string &chan)
 {
 	chan_hash::iterator iter = chanlist->find(chan);
 
@@ -318,7 +318,7 @@ chanrec* InspIRCd::FindChan(const std::string &chan)
 /* Send an error notice to all users, registered or not */
 void InspIRCd::SendError(const std::string &s)
 {
-	for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
 	{
 		if ((*i)->registered == REG_ALL)
 		{
@@ -527,7 +527,7 @@ void InspIRCd::CheckDie()
 	}
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
 	std::string copy_text = text;
 
@@ -538,7 +538,7 @@ void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const st
 		user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index cf062e397..d16938818 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -82,7 +82,7 @@ void InspIRCd::Cleanup()
 	}
 
 	/* Close all client sockets, or the new process inherits them */
-	for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
 	{
 		(*i)->SetWriteError("Server shutdown");
 		(*i)->CloseSocket();
@@ -463,7 +463,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->InitialiseUID();
 
 	/* set up fake client */
-	this->FakeClient = new userrec(this);
+	this->FakeClient = new User(this);
 	this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
 	if (!do_root)
@@ -721,7 +721,7 @@ int main(int argc, char** argv)
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)
  */
-bool InspIRCd::AllModulesReportReady(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
 {
 	if (!Config->global_implementation[I_OnCheckReady])
 		return true;
@@ -753,7 +753,7 @@ int InspIRCd::SetTimeDelta(int delta)
 	return old;
 }
 
-void InspIRCd::AddLocalClone(userrec* user)
+void InspIRCd::AddLocalClone(User* user)
 {
 	clonemap::iterator x = local_clones.find(user->GetIPString());
 	if (x != local_clones.end())
@@ -762,7 +762,7 @@ void InspIRCd::AddLocalClone(userrec* user)
 		local_clones[user->GetIPString()] = 1;
 }
 
-void InspIRCd::AddGlobalClone(userrec* user)
+void InspIRCd::AddGlobalClone(User* user)
 {
 	clonemap::iterator y = global_clones.find(user->GetIPString());
 	if (y != global_clones.end())
diff --git a/src/mode.cpp b/src/mode.cpp
index acfd16da9..1f6cc08b9 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -104,12 +104,12 @@ char ModeHandler::GetModeChar()
 	return mode;
 }
 
-ModeAction ModeHandler::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	return MODEACTION_DENY;
 }
 
-ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeHandler::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
 	if (dest)
 	{
@@ -121,15 +121,15 @@ ModePair ModeHandler::ModeSet(userrec* source, userrec* dest, chanrec* channel,
 	}
 }
 
-void ModeHandler::DisplayList(userrec* user, chanrec* channel)
+void ModeHandler::DisplayList(User* user, Channel* channel)
 {
 }
 
-void ModeHandler::DisplayEmptyList(userrec* user, chanrec* channel)
+void ModeHandler::DisplayEmptyList(User* user, Channel* channel)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 {
 	return (ours < theirs);
 }
@@ -152,18 +152,18 @@ ModeType ModeWatcher::GetModeType()
 	return m_type;
 }
 
-bool ModeWatcher::BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding, ModeType type)
+bool ModeWatcher::BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type)
 {
 	return true;
 }
 
-void ModeWatcher::AfterMode(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter, bool adding, ModeType type)
+void ModeWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type)
 {
 }
 
-userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,int status)
+User* ModeParser::SanityChecks(User *user,const char *dest,Channel *chan,int status)
 {
-	userrec *d;
+	User *d;
 	if ((!user) || (!dest) || (!chan) || (!*dest))
 	{
 		return NULL;
@@ -177,7 +177,7 @@ userrec* ModeParser::SanityChecks(userrec *user,const char *dest,chanrec *chan,i
 	return d;
 }
 
-const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
+const char* ModeParser::Grant(User *d,Channel *chan,int MASK)
 {
 	if (!chan)
 		return "";
@@ -207,7 +207,7 @@ const char* ModeParser::Grant(userrec *d,chanrec *chan,int MASK)
 	return "";
 }
 
-const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
+const char* ModeParser::Revoke(User *d,Channel *chan,int MASK)
 {
 	if (!chan)
 		return "";
@@ -237,7 +237,7 @@ const char* ModeParser::Revoke(userrec *d,chanrec *chan,int MASK)
 	return "";
 }
 
-void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text)
+void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text)
 {
 	if (targetchannel)
 	{
@@ -274,13 +274,13 @@ void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec
 	return;
 }
 
-void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
+void ModeParser::Process(const char** parameters, int pcnt, User *user, bool servermode)
 {
 	std::string target = parameters[0];
 	ModeType type = MODETYPE_USER;
 	unsigned char mask = 0;
-	chanrec* targetchannel = ServerInstance->FindChan(parameters[0]);
-	userrec* targetuser  = ServerInstance->FindNick(parameters[0]);
+	Channel* targetchannel = ServerInstance->FindChan(parameters[0]);
+	User* targetuser  = ServerInstance->FindNick(parameters[0]);
 
 	LastParse.clear();
 
@@ -577,7 +577,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 									/* Does this mode have a prefix? */
 									if (modehandlers[handler_id]->GetPrefix() && targetchannel)
 									{
-										userrec* user_to_prefix = ServerInstance->FindNick(parameter);
+										User* user_to_prefix = ServerInstance->FindNick(parameter);
 										if (user_to_prefix)
 											targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(),
 													modehandlers[handler_id]->GetPrefixRank(), adding);
@@ -833,7 +833,7 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
 	return NULL;
 }
 
-std::string ModeParser::ModeString(userrec* user, chanrec* channel)
+std::string ModeParser::ModeString(User* user, Channel* channel)
 {
 	std::string types;
 	std::string pars;
@@ -996,7 +996,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 
 /** This default implementation can remove simple user modes
  */
-void ModeHandler::RemoveMode(userrec* user)
+void ModeHandler::RemoveMode(User* user)
 {
 	char moderemove[MAXBUF];
 	const char* parameters[] = { user->nick, moderemove };
@@ -1011,7 +1011,7 @@ void ModeHandler::RemoveMode(userrec* user)
 /** This default implementation can remove simple channel modes
  * (no parameters)
  */
-void ModeHandler::RemoveMode(chanrec* channel)
+void ModeHandler::RemoveMode(Channel* channel)
 {
 	char moderemove[MAXBUF];
 	const char* parameters[] = { channel->name, moderemove };
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 1c6fe3fa5..4192a95ce 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -29,7 +29,7 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b',
 {
 }
 
-ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelBan::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	int status = channel->GetStatus(source);
 	/* Call the correct method depending on wether we're adding or removing the mode */
@@ -49,7 +49,7 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec*
 	return MODEACTION_ALLOW;
 }
 
-void ModeChannelBan::RemoveMode(chanrec* channel)
+void ModeChannelBan::RemoveMode(Channel* channel)
 {
 	BanList copy;
 	char moderemove[MAXBUF];
@@ -67,11 +67,11 @@ void ModeChannelBan::RemoveMode(chanrec* channel)
 	}
 }
 
-void ModeChannelBan::RemoveMode(userrec* user)
+void ModeChannelBan::RemoveMode(User* user)
 {
 }
 
-void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
+void ModeChannelBan::DisplayList(User* user, Channel* channel)
 {
 	/* Display the channel banlist */
 	for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
@@ -82,12 +82,12 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
 	return;
 }
 
-void ModeChannelBan::DisplayEmptyList(userrec* user, chanrec* channel)
+void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
 {
 	user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
 }
 
-std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status)
+std::string& ModeChannelBan::AddBan(User *user,std::string &dest,Channel *chan,int status)
 {
 	if ((!user) || (!chan))
 	{
@@ -142,7 +142,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 	return dest;
 }
 
-ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelBan::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
 	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 	{
@@ -154,7 +154,7 @@ ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channe
         return std::make_pair(false, parameter);
 }
 
-std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status)
+std::string& ModeChannelBan::DelBan(User *user,std::string& dest,Channel *chan,int status)
 {
 	if ((!user) || (!chan))
 	{
diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index 831ec809c..98187b089 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelHalfOp::GetPrefixRank()
 	return HALFOP_VALUE;
 }
 
-ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelHalfOp::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
 		if (channel->GetStatusFlags(x) & UCMODE_HOP)
@@ -45,7 +45,7 @@ ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* cha
 	return std::make_pair(false, parameter);
 }
 
-void ModeChannelHalfOp::RemoveMode(chanrec* channel)
+void ModeChannelHalfOp::RemoveMode(Channel* channel)
 {
 	CUList* list = channel->GetHalfoppedUsers();
 	CUList copy;
@@ -53,7 +53,7 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->first;
+		User* n = i->first;
 		copy.insert(std::make_pair(n,n->nick));
 	}
 
@@ -66,11 +66,11 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
 
 }
 
-void ModeChannelHalfOp::RemoveMode(userrec* user)
+void ModeChannelHalfOp::RemoveMode(User* user)
 {
 }
 
-ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelHalfOp::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* If halfops are not enabled in the conf, we don't execute
 	 * anything in this class at all.
@@ -103,9 +103,9 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
 		return MODEACTION_DENY;
 }
 
-std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::AddHalfOp(User *user,const char* dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -131,9 +131,9 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
 	return "";
 }
 
-std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::DelHalfOp(User *user,const char *dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
diff --git a/src/modes/cmode_i.cpp b/src/modes/cmode_i.cpp
index 12bdb18b8..550ea24d1 100644
--- a/src/modes/cmode_i.cpp
+++ b/src/modes/cmode_i.cpp
@@ -21,7 +21,7 @@ ModeChannelInviteOnly::ModeChannelInviteOnly(InspIRCd* Instance) : ModeHandler(I
 {
 }
 
-ModeAction ModeChannelInviteOnly::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelInviteOnly::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_INVITEONLY] != adding)
 	{
diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index f6a29af35..34d8a6452 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -21,7 +21,7 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k',
 {
 }
 
-ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelKey::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {       
         if (channel->modes[CM_KEY])
         {
@@ -33,7 +33,7 @@ ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channe
         }
 }
 
-void ModeChannelKey::RemoveMode(chanrec* channel)
+void ModeChannelKey::RemoveMode(Channel* channel)
 {
 	/** +k needs a parameter when being removed,
 	 * so we have a special-case RemoveMode here for it
@@ -48,17 +48,17 @@ void ModeChannelKey::RemoveMode(chanrec* channel)
 	}
 }
 
-void ModeChannelKey::RemoveMode(userrec* user)
+void ModeChannelKey::RemoveMode(User* user)
 {
 }
 
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 {
 	/* When TS is equal, the alphabetically later channel key wins */
 	return (their_param < our_param);
 }
 
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
 	{
diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 1a57a440d..50ee28683 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -21,7 +21,7 @@ ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, '
 {
 }
 
-ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
 	if (channel->limit)
 	{
@@ -33,13 +33,13 @@ ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* chan
 	}
 }
 
-bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 {
 	/* When TS is equal, the higher channel limit wins */
 	return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
 }
 
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
diff --git a/src/modes/cmode_m.cpp b/src/modes/cmode_m.cpp
index 520248fda..ad17d5d30 100644
--- a/src/modes/cmode_m.cpp
+++ b/src/modes/cmode_m.cpp
@@ -21,7 +21,7 @@ ModeChannelModerated::ModeChannelModerated(InspIRCd* Instance) : ModeHandler(Ins
 {
 }
 
-ModeAction ModeChannelModerated::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelModerated::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_MODERATED] != adding)
 	{
diff --git a/src/modes/cmode_n.cpp b/src/modes/cmode_n.cpp
index ddc2e1bbd..1bad2f92f 100644
--- a/src/modes/cmode_n.cpp
+++ b/src/modes/cmode_n.cpp
@@ -21,7 +21,7 @@ ModeChannelNoExternal::ModeChannelNoExternal(InspIRCd* Instance) : ModeHandler(I
 {
 }
 
-ModeAction ModeChannelNoExternal::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelNoExternal::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_NOEXTERNAL] != adding)
 	{
diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 27bc62100..a43eaeac9 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelOp::GetPrefixRank()
 	return OP_VALUE;
 }
 
-ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
 		if (channel->GetStatusFlags(x) & UCMODE_OP)
@@ -46,7 +46,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
 }
 
 
-void ModeChannelOp::RemoveMode(chanrec* channel)
+void ModeChannelOp::RemoveMode(Channel* channel)
 {
 	CUList* list = channel->GetOppedUsers();
 	CUList copy;
@@ -54,7 +54,7 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->first;
+		User* n = i->first;
 		copy.insert(std::make_pair(n,n->nick));
 	}
 
@@ -66,11 +66,11 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
 	}
 }
 
-void ModeChannelOp::RemoveMode(userrec* user)
+void ModeChannelOp::RemoveMode(User* user)
 {
 }
 
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelOp::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	int status = channel->GetStatus(source);
 
@@ -94,9 +94,9 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
 		return MODEACTION_DENY;
 }
 
-std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -122,9 +122,9 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
 	return "";
 }
 
-std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp
index 15c33222e..c9749dc38 100644
--- a/src/modes/cmode_p.cpp
+++ b/src/modes/cmode_p.cpp
@@ -21,7 +21,7 @@ ModeChannelPrivate::ModeChannelPrivate(InspIRCd* Instance) : ModeHandler(Instanc
 {
 }
 
-ModeAction ModeChannelPrivate::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelPrivate::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_PRIVATE] != adding)
 	{
diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp
index 135291592..47e66d139 100644
--- a/src/modes/cmode_s.cpp
+++ b/src/modes/cmode_s.cpp
@@ -21,7 +21,7 @@ ModeChannelSecret::ModeChannelSecret(InspIRCd* Instance) : ModeHandler(Instance,
 {
 }
 
-ModeAction ModeChannelSecret::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelSecret::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_SECRET] != adding)
 	{
diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp
index 2a6c06b42..7124ecec4 100644
--- a/src/modes/cmode_t.cpp
+++ b/src/modes/cmode_t.cpp
@@ -21,7 +21,7 @@ ModeChannelTopicOps::ModeChannelTopicOps(InspIRCd* Instance) : ModeHandler(Insta
 {
 }
 
-ModeAction ModeChannelTopicOps::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelTopicOps::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (channel->modes[CM_TOPICLOCK] != adding)
 	{
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 0ea887073..b472cb1fc 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelVoice::GetPrefixRank()
 	return VOICE_VALUE;
 }
 
-ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelVoice::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 {
-	userrec* x = ServerInstance->FindNick(parameter);
+	User* x = ServerInstance->FindNick(parameter);
 	if (x)
 	{
 		if (channel->GetStatusFlags(x) & UCMODE_VOICE)
@@ -45,7 +45,7 @@ ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* chan
 	return std::make_pair(false, parameter);
 }
 
-void ModeChannelVoice::RemoveMode(chanrec* channel)
+void ModeChannelVoice::RemoveMode(Channel* channel)
 {
 	CUList* list = channel->GetVoicedUsers();
 	CUList copy;
@@ -53,7 +53,7 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
 
 	for (CUList::iterator i = list->begin(); i != list->end(); i++)
 	{
-		userrec* n = i->first;
+		User* n = i->first;
 		copy.insert(std::make_pair(n,n->nick));
 	}
 
@@ -65,11 +65,11 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
 	}
 }
 
-void ModeChannelVoice::RemoveMode(userrec* user)
+void ModeChannelVoice::RemoveMode(User* user)
 {
 }
 
-ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelVoice::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	int status = channel->GetStatus(source);
 
@@ -93,9 +93,9 @@ ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanre
 		return MODEACTION_DENY;
 }
 
-std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelVoice::AddVoice(User *user,const char* dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
@@ -121,9 +121,9 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c
 	return "";
 }
 
-std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan,int status)
 {
-	userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+	User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
 	if (d)
 	{
diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp
index a599f8f6f..e6a142459 100644
--- a/src/modes/umode_i.cpp
+++ b/src/modes/umode_i.cpp
@@ -21,7 +21,7 @@ ModeUserInvisible::ModeUserInvisible(InspIRCd* Instance) : ModeHandler(Instance,
 {
 }
 
-ModeAction ModeUserInvisible::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* Only opers can change other users modes */
 	if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index c9c9e312e..0ffffac10 100644
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -21,7 +21,7 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
 {
 }
 
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* Only opers can change other users modes */
 	if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 30ed089f6..2415a940a 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -21,7 +21,7 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
 {
 }
 
-ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* Only opers can execute this class at all */
 	if (!*source->oper)
@@ -35,7 +35,7 @@ ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanre
 	 * Note that oper status is only given in cmd_oper.cpp
 	 * NOT here. It is impossible to directly set +o without
 	 * verifying as an oper and getting an opertype assigned
-	 * to your userrec!
+	 * to your User!
 	 */
 	ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick, source->nick);
 	dest->UnOper();
diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index faf6348de..01e57da5b 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -21,7 +21,7 @@ ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Ins
 {
 }
 
-ModeAction ModeUserServerNotice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* Only opers can change other users modes */
 	if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp
index 3f1cd90c8..914327cbd 100644
--- a/src/modes/umode_w.cpp
+++ b/src/modes/umode_w.cpp
@@ -21,7 +21,7 @@ ModeUserWallops::ModeUserWallops(InspIRCd* Instance) : ModeHandler(Instance, 'w'
 {
 }
 
-ModeAction ModeUserWallops::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* Only opers can change other users modes */
 	if ((source != dest) && (!*source->oper))
diff --git a/src/modules.cpp b/src/modules.cpp
index b95dcd59d..8da123b05 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -104,96 +104,96 @@ std::string Event::GetEventID()
 
 		Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
 		Module::~Module() { }
-void		Module::OnUserConnect(userrec* user) { }
-void		Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { }
-void		Module::OnUserDisconnect(userrec* user) { }
-void		Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { }
-void		Module::OnPostJoin(userrec* user, chanrec* channel) { }
-void		Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { }
-void		Module::OnRehash(userrec* user, const std::string &parameter) { }
-void		Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int		Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
-void		Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { }
+void		Module::OnUserConnect(User* user) { }
+void		Module::OnUserQuit(User* user, const std::string& message, const std::string &oper_message) { }
+void		Module::OnUserDisconnect(User* user) { }
+void		Module::OnUserJoin(User* user, Channel* channel, bool &silent) { }
+void		Module::OnPostJoin(User* user, Channel* channel) { }
+void		Module::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { }
+void		Module::OnRehash(User* user, const std::string &parameter) { }
+void		Module::OnServerRaw(std::string &raw, bool inbound, User* user) { }
+int		Module::OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { return 0; }
+void		Module::OnMode(User* user, void* dest, int target_type, const std::string &text) { }
 Version		Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
-void		Module::OnOper(userrec* user, const std::string &opertype) { }
-void		Module::OnPostOper(userrec* user, const std::string &opertype) { }
-void		Module::OnInfo(userrec* user) { }
-void		Module::OnWhois(userrec* source, userrec* dest) { }
-int		Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; }
-int		Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }
-int		Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }
-int		Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; }
-void		Module::OnUserPostNick(userrec* user, const std::string &oldnick) { }
-int		Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; }
+void		Module::OnOper(User* user, const std::string &opertype) { }
+void		Module::OnPostOper(User* user, const std::string &opertype) { }
+void		Module::OnInfo(User* user) { }
+void		Module::OnWhois(User* source, User* dest) { }
+int		Module::OnUserPreInvite(User* source,User* dest,Channel* channel) { return 0; }
+int		Module::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }
+int		Module::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; }
+int		Module::OnUserPreNick(User* user, const std::string &newnick) { return 0; }
+void		Module::OnUserPostNick(User* user, const std::string &oldnick) { }
+int		Module::OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { return ACR_DEFAULT; }
 void		Module::On005Numeric(std::string &output) { }
-int		Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; }
+int		Module::OnKill(User* source, User* dest, const std::string &reason) { return 0; }
 void		Module::OnLoadModule(Module* mod,const std::string &name) { }
 void		Module::OnUnloadModule(Module* mod,const std::string &name) { }
 void		Module::OnBackgroundTimer(time_t curtime) { }
-int		Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { return 0; }
-void		Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { }
-bool		Module::OnCheckReady(userrec* user) { return true; }
-int		Module::OnUserRegister(userrec* user) { return 0; }
-int		Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; }
-void		Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { }
-int		Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; }
-int		Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; }
-int		Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; }
-int		Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; }
-int		Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; }
-int		Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; }
-int		Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; }
-int		Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; }
+int		Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { return 0; }
+void		Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line) { }
+bool		Module::OnCheckReady(User* user) { return true; }
+int		Module::OnUserRegister(User* user) { return 0; }
+int		Module::OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { return 0; }
+void		Module::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { }
+int		Module::OnCheckInvite(User* user, Channel* chan) { return 0; }
+int		Module::OnCheckKey(User* user, Channel* chan, const std::string &keygiven) { return 0; }
+int		Module::OnCheckLimit(User* user, Channel* chan) { return 0; }
+int		Module::OnCheckBan(User* user, Channel* chan) { return 0; }
+int		Module::OnStats(char symbol, User* user, string_list &results) { return 0; }
+int		Module::OnChangeLocalUserHost(User* user, const std::string &newhost) { return 0; }
+int		Module::OnChangeLocalUserGECOS(User* user, const std::string &newhost) { return 0; }
+int		Module::OnLocalTopicChange(User* user, Channel* chan, const std::string &topic) { return 0; }
 void		Module::OnEvent(Event* event) { return; }
 char*		Module::OnRequest(Request* request) { return NULL; }
 int		Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; }
-void		Module::OnGlobalOper(userrec* user) { }
-void		Module::OnPostConnect(userrec* user) { }
-int		Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; }
-int		Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; }
+void		Module::OnGlobalOper(User* user) { }
+void		Module::OnPostConnect(User* user) { }
+int		Module::OnAddBan(User* source, Channel* channel,const std::string &banmask) { return 0; }
+int		Module::OnDelBan(User* source, Channel* channel,const std::string &banmask) { return 0; }
 void		Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { }
 int		Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; }
 void		Module::OnRawSocketClose(int fd) { }
 void		Module::OnRawSocketConnect(int fd) { }
 int		Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; }
-void		Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }
-void		Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }
-void 		Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason) { }
-void		Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { }
-void		Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { }
+void		Module::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }
+void		Module::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }
+void 		Module::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason) { }
+void		Module::OnUserInvite(User* source,User* dest,Channel* channel) { }
+void		Module::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) { }
 void		Module::OnGetServerDescription(const std::string &servername,std::string &description) { }
-void		Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { }
-void		Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { }
+void		Module::OnSyncUser(User* user, Module* proto, void* opaque) { }
+void		Module::OnSyncChannel(Channel* chan, Module* proto, void* opaque) { }
 void		Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { }
-void		Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { }
-void		Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { }
+void		Module::OnSyncChannelMetaData(Channel* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { }
+void		Module::OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { }
 void		Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { }
 void		Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { }
 void		Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { }
-void		Module::OnWallops(userrec* user, const std::string &text) { }
-void		Module::OnChangeHost(userrec* user, const std::string &newhost) { }
-void		Module::OnChangeName(userrec* user, const std::string &gecos) { }
-void		Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }
-void		Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { }
-void		Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }
-void		Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { }
-void		Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { }
-void		Module::OnDelGLine(userrec* source, const std::string &hostmask) { }
-void		Module::OnDelZLine(userrec* source, const std::string &ipmask) { }
-void		Module::OnDelKLine(userrec* source, const std::string &hostmask) { }
-void		Module::OnDelQLine(userrec* source, const std::string &nickmask) { }
-void		Module::OnDelELine(userrec* source, const std::string &hostmask) { }
+void		Module::OnWallops(User* user, const std::string &text) { }
+void		Module::OnChangeHost(User* user, const std::string &newhost) { }
+void		Module::OnChangeName(User* user, const std::string &gecos) { }
+void		Module::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { }
+void		Module::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask) { }
+void		Module::OnAddKLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { }
+void		Module::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask) { }
+void		Module::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask) { }
+void		Module::OnDelGLine(User* source, const std::string &hostmask) { }
+void		Module::OnDelZLine(User* source, const std::string &ipmask) { }
+void		Module::OnDelKLine(User* source, const std::string &hostmask) { }
+void		Module::OnDelQLine(User* source, const std::string &nickmask) { }
+void		Module::OnDelELine(User* source, const std::string &hostmask) { }
 void 		Module::OnCleanup(int target_type, void* item) { }
 void		Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; }
-void		Module::OnChannelDelete(chanrec* chan) { }
+void		Module::OnChannelDelete(Channel* chan) { }
 Priority	Module::Prioritize() { return PRIORITY_DONTCARE; }
-void		Module::OnSetAway(userrec* user) { }
-void		Module::OnCancelAway(userrec* user) { }
-int		Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; }
-int		Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; }
-void		Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text) { }
+void		Module::OnSetAway(User* user) { }
+void		Module::OnCancelAway(User* user) { }
+int		Module::OnUserList(User* user, Channel* Ptr, CUList* &userlist) { return 0; }
+int		Module::OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { return 0; }
+void		Module::OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { }
 void		Module::OnGarbageCollect() { }
-void		Module::OnBufferFlushed(userrec* user) { }
+void		Module::OnBufferFlushed(User* user) { }
 
 
 ModuleManager::ModuleManager(InspIRCd* Ins)
@@ -759,7 +759,7 @@ const std::string& ModuleManager::GetModuleName(Module* m)
  * m_safelist possible, initially).
  */
 
-chanrec* InspIRCd::GetChannelIndex(long index)
+Channel* InspIRCd::GetChannelIndex(long index)
 {
 	int target = 0;
 	for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
@@ -775,12 +775,12 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
 	return match(sliteral.c_str(),spattern.c_str());
 }
 
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user)
 {
 	return this->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
 
-bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
 {
 	return this->Parser->IsValidCommand(commandname, pcnt, user);
 }
@@ -794,12 +794,12 @@ void InspIRCd::AddCommand(Command *f)
 	}
 }
 
-void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
+void InspIRCd::SendMode(const char** parameters, int pcnt, User *user)
 {
 	this->Modes->Process(parameters,pcnt,user,true);
 }
 
-void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream)
 {
 	std::string CompleteLine = LinePrefix;
 	std::string Word;
@@ -815,9 +815,9 @@ void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstre
 	User->WriteServ(CompleteLine);
 }
 
-userrec* FindDescriptorHandler::Call(int socket)
+User* FindDescriptorHandler::Call(int socket)
 {
-	return reinterpret_cast<userrec*>(Server->SE->GetRef(socket));
+	return reinterpret_cast<User*>(Server->SE->GetRef(socket));
 }
 
 bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
@@ -1044,7 +1044,7 @@ long ConfigReader::GetError()
 	return olderr;
 }
 
-void ConfigReader::DumpErrors(bool bail, userrec* user)
+void ConfigReader::DumpErrors(bool bail, User* user)
 {
 	ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
 }
diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 6fe79a981..43a767a1c 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -61,7 +61,7 @@ class ModuleFilterPCRE : public FilterBase
 	{
 	}
 
-	virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
+	virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
 	{
 		for (std::vector<PCREFilter>::iterator index = filters.begin(); index != filters.end(); index++)
 		{
@@ -131,7 +131,7 @@ class ModuleFilterPCRE : public FilterBase
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{		
 		ConfigReader MyConf(ServerInstance);
 
@@ -164,7 +164,7 @@ class ModuleFilterPCRE : public FilterBase
 		}
 	}
 
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol == 's')
 		{
diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp
index 41a0b162e..e27f4dcf7 100644
--- a/src/modules/extra/m_httpclienttest.cpp
+++ b/src/modules/extra/m_httpclienttest.cpp
@@ -43,7 +43,7 @@ public:
 		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		// method called when a user joins a channel
 
@@ -71,7 +71,7 @@ public:
 		return NULL;
 	}
 
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 	{
 	}
 
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index a78e8c61b..53d852f72 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -796,7 +796,7 @@ class ModuleSQL : public Module
 		return NULL;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		rehashing = true;
 	}
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 0bc7dfd1c..afa32d3d8 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -755,7 +755,7 @@ class ModulePgSQL : public Module
 		List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConf();
 	}
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 01d5733af..8eb451f47 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -65,7 +65,7 @@ public:
 		List[I_OnUserDisconnect] = List[I_OnCheckReady] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		
@@ -86,7 +86,7 @@ public:
 		}
 	}	
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		if ((!allowpattern.empty()) && (ServerInstance->MatchText(user->nick,allowpattern)))
 		{
@@ -96,20 +96,20 @@ public:
 		
 		if (!CheckCredentials(user))
 		{
-			userrec::QuitUser(ServerInstance,user,killreason);
+			User::QuitUser(ServerInstance,user,killreason);
 			return 1;
 		}
 		return 0;
 	}
 
-	bool CheckCredentials(userrec* user)
+	bool CheckCredentials(User* user)
 	{
 		SQLrequest req = SQLreq(this, SQLprovider, databaseid, "SELECT ? FROM ? WHERE ? = '?' AND ? = ?'?')", userfield, usertable, userfield, user->nick, passfield, encryption, user->password);
 			
 		if(req.Send())
 		{
 			/* When we get the query response from the service provider we will be given an ID to play with,
-			 * just an ID number which is unique to this query. We need a way of associating that ID with a userrec
+			 * just an ID number which is unique to this query. We need a way of associating that ID with a User
 			 * so we insert it into a map mapping the IDs to users.
 			 * Thankfully m_sqlutils provides this, it will associate a ID with a user or channel, and if the user quits it removes the
 			 * association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling
@@ -133,7 +133,7 @@ public:
 		{
 			SQLresult* res = static_cast<SQLresult*>(request);
 
-			userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
+			User* user = GetAssocUser(this, SQLutils, res->id).S().user;
 			UnAssociate(this, SQLutils, res->id).S();
 			
 			if(user)
@@ -165,20 +165,20 @@ public:
 
 			if (!user->GetExt("sqlauthed"))
 			{
-				userrec::QuitUser(ServerInstance,user,killreason);
+				User::QuitUser(ServerInstance,user,killreason);
 			}
 			return SQLSUCCESS;
 		}		
 		return NULL;
 	}
 	
-	virtual void OnUserDisconnect(userrec* user)
+	virtual void OnUserDisconnect(User* user)
 	{
 		user->Shrink("sqlauthed");
 		user->Shrink("sqlauth_failed");		
 	}
 	
-	virtual bool OnCheckReady(userrec* user)
+	virtual bool OnCheckReady(User* user)
 	{
 		return user->GetExt("sqlauthed");
 	}
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index f37e52324..9795e9f8b 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -610,7 +610,7 @@ class ModuleSQLite3 : public Module
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConf();
 	}
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index fc929b94f..6194e502d 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -220,7 +220,7 @@ class ModuleSQLLog : public Module
 		dbid = Conf.ReadValue("sqllog","dbid",0);	// database id of a database configured in sql module
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConfig();
 	}
@@ -263,23 +263,23 @@ class ModuleSQLLog : public Module
 		}
 	}
 
-	virtual void OnOper(userrec* user, const std::string &opertype)
+	virtual void OnOper(User* user, const std::string &opertype)
 	{
 		AddLogEntry(LT_OPER,user->nick,user->host,user->server);
 	}
 
-	virtual void OnGlobalOper(userrec* user)
+	virtual void OnGlobalOper(User* user)
 	{
 		AddLogEntry(LT_OPER,user->nick,user->host,user->server);
 	}
 
-	virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
+	virtual int OnKill(User* source, User* dest, const std::string &reason)
 	{
 		AddLogEntry(LT_KILL,dest->nick,dest->host,source->nick);
 		return 0;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		if ((command == "GLINE" || command == "KLINE" || command == "ELINE" || command == "ZLINE") && validated)
 		{
@@ -288,12 +288,12 @@ class ModuleSQLLog : public Module
 		return 0;
 	}
 
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		AddLogEntry(LT_CONNECT,user->nick,user->host,user->server);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server);
 	}
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index d1bece343..c697d6a9b 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -63,14 +63,14 @@ public:
 		List[I_OnRequest] = List[I_OnRehash] = List[I_OnPreCommand] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		
 		databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		if ((validated) && (command == "OPER"))
 		{
@@ -87,7 +87,7 @@ public:
 		return 0;
 	}
 
-	bool LookupOper(userrec* user, const std::string &username, const std::string &password)
+	bool LookupOper(User* user, const std::string &username, const std::string &password)
 	{
 		Module* target;
 		
@@ -109,7 +109,7 @@ public:
 			if (req.Send())
 			{
 				/* When we get the query response from the service provider we will be given an ID to play with,
-				 * just an ID number which is unique to this query. We need a way of associating that ID with a userrec
+				 * just an ID number which is unique to this query. We need a way of associating that ID with a User
 				 * so we insert it into a map mapping the IDs to users.
 				 * Thankfully m_sqlutils provides this, it will associate a ID with a user or channel, and if the user quits it removes the
 				 * association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling
@@ -140,7 +140,7 @@ public:
 		{
 			SQLresult* res = static_cast<SQLresult*>(request);
 
-			userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
+			User* user = GetAssocUser(this, SQLutils, res->id).S().user;
 			UnAssociate(this, SQLutils, res->id).S();
 
 			char* tried_user = NULL;
@@ -225,7 +225,7 @@ public:
 		return NULL;
 	}
 
-	void LoginFail(userrec* user, const std::string &username, const std::string &pass)
+	void LoginFail(User* user, const std::string &username, const std::string &pass)
 	{
 		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
 
@@ -240,7 +240,7 @@ public:
 		}
 	}
 
-	bool OperUser(userrec* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type)
+	bool OperUser(User* user, const std::string &username, const std::string &password, const std::string &pattern, const std::string &type)
 	{
 		ConfigReader Conf(ServerInstance);
 		
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 2edf28263..b53186f71 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -23,8 +23,8 @@
 /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */
 /* $ModDep: m_sqlutils.h */
 
-typedef std::map<unsigned long, userrec*> IdUserMap;
-typedef std::map<unsigned long, chanrec*> IdChanMap;
+typedef std::map<unsigned long, User*> IdUserMap;
+typedef std::map<unsigned long, Channel*> IdChanMap;
 typedef std::list<unsigned long> AssocIdList;
 
 class ModuleSQLutils : public Module
@@ -105,7 +105,7 @@ public:
 		return SQLUTILSUCCESS;
 	}
 	
-	virtual void OnUserDisconnect(userrec* user)
+	virtual void OnUserDisconnect(User* user)
 	{
 		/* A user is disconnecting, first we need to check if they have a list of queries associated with them.
 		 * Then, if they do, we need to erase each of them from our IdUserMap (iduser) so when the module that
@@ -125,7 +125,7 @@ public:
 				{
 					if(iter->second != user)
 					{
-						ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same userrec* associated with it in the map (erasing anyway)", user->nick);
+						ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same User* associated with it in the map (erasing anyway)", user->nick);
 					}
 
 					iduser.erase(iter);
@@ -192,7 +192,7 @@ public:
 		}
 	}
 	
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		/* A channel is being destroyed, first we need to check if it has a list of queries associated with it.
 		 * Then, if it does, we need to erase each of them from our IdChanMap (idchan) so when the module that
@@ -212,7 +212,7 @@ public:
 				{
 					if(iter->second != chan)
 					{
-						ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same chanrec* associated with it in the map (erasing anyway)", chan->name);
+						ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same Channel* associated with it in the map (erasing anyway)", chan->name);
 					}
 					idchan.erase(iter);					
 				}
diff --git a/src/modules/extra/m_sqlutils.h b/src/modules/extra/m_sqlutils.h
index 92fbdf5c7..27433e254 100644
--- a/src/modules/extra/m_sqlutils.h
+++ b/src/modules/extra/m_sqlutils.h
@@ -33,9 +33,9 @@ public:
 	unsigned long id;
 	/** User
 	 */
-	userrec* user;
+	User* user;
 	
-	AssociateUser(Module* s, Module* d, unsigned long i, userrec* u)
+	AssociateUser(Module* s, Module* d, unsigned long i, User* u)
 	: Request(s, d, SQLUTILAU), id(i), user(u)
 	{
 	}
@@ -57,9 +57,9 @@ public:
 	unsigned long id;
 	/** Channel
 	 */
-	chanrec* chan;
+	Channel* chan;
 	
-	AssociateChan(Module* s, Module* d, unsigned long i, chanrec* u)
+	AssociateChan(Module* s, Module* d, unsigned long i, Channel* u)
 	: Request(s, d, SQLUTILAC), id(i), chan(u)
 	{
 	}
@@ -102,7 +102,7 @@ public:
 	unsigned long id;
 	/** The user
 	 */
-	userrec* user;
+	User* user;
 
 	GetAssocUser(Module* s, Module* d, unsigned long i)
 	: Request(s, d, SQLUTILGU), id(i), user(NULL)
@@ -126,7 +126,7 @@ public:
 	unsigned long id;
 	/** The channel
 	 */
-	chanrec* chan;
+	Channel* chan;
 
 	GetAssocChan(Module* s, Module* d, unsigned long i)
 	: Request(s, d, SQLUTILGC), id(i), chan(NULL)
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 4af425e0b..a7a52d910 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -111,7 +111,7 @@ class ModuleSSLGnuTLS : public Module
 		gnutls_certificate_set_dh_params(x509_cred, dh_params);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		if(param != "ssl")
 			return;
@@ -247,13 +247,13 @@ class ModuleSSLGnuTLS : public Module
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 
 			if(user->GetExt("ssl", dummy) && isin(user->GetPort(), listenports))
 			{
 				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
 				// Potentially there could be multiple SSL modules loaded at once on different ports.
-				userrec::QuitUser(ServerInstance, user, "SSL module unloading");
+				User::QuitUser(ServerInstance, user, "SSL module unloading");
 			}
 			if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
 			{
@@ -578,7 +578,7 @@ class ModuleSSLGnuTLS : public Module
 	}
 
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if (!clientactive)
 			return;
@@ -590,7 +590,7 @@ class ModuleSSLGnuTLS : public Module
 		}
 	}
 
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if(extname == "ssl")
@@ -610,7 +610,7 @@ class ModuleSSLGnuTLS : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "ssl"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an ssl flag, accept the remote server's
 			if (!dest->GetExt(extname, dummy))
 			{
@@ -654,7 +654,7 @@ class ModuleSSLGnuTLS : public Module
 		{
 			// Handshake complete.
 			// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-			userrec* extendme = ServerInstance->FindDescriptor(session->fd);
+			User* extendme = ServerInstance->FindDescriptor(session->fd);
 			if (extendme)
 			{
 				if (!extendme->GetExt("ssl", dummy))
@@ -671,7 +671,7 @@ class ModuleSSLGnuTLS : public Module
 		}
 	}
 
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		// This occurs AFTER OnUserConnect so we can be sure the
 		// protocol module has propagated the NICK message.
@@ -706,7 +706,7 @@ class ModuleSSLGnuTLS : public Module
 			ServerInstance->SE->WantWrite(eh);
 	}
 
-	virtual void OnBufferFlushed(userrec* user)
+	virtual void OnBufferFlushed(User* user)
 	{
 		if (user->GetExt("ssl"))
 		{
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 76270c650..4ce21c805 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -152,7 +152,7 @@ class ModuleSSLOpenSSL : public Module
 		OnRehash(NULL,"ssl");
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		if (param != "ssl")
 			return;
@@ -301,13 +301,13 @@ class ModuleSSLOpenSSL : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 
 			if (user->GetExt("ssl", dummy) && IS_LOCAL(user) && isin(user->GetPort(), listenports))
 			{
 				// User is using SSL, they're a local user, and they're using one of *our* SSL ports.
 				// Potentially there could be multiple SSL modules loaded at once on different ports.
-				userrec::QuitUser(ServerInstance, user, "SSL module unloading");
+				User::QuitUser(ServerInstance, user, "SSL module unloading");
 			}
 			if (user->GetExt("ssl_cert", dummy) && isin(user->GetPort(), listenports))
 			{
@@ -676,7 +676,7 @@ class ModuleSSLOpenSSL : public Module
 	}
 
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if (!clientactive)
 			return;
@@ -688,7 +688,7 @@ class ModuleSSLOpenSSL : public Module
 		}
 	}
 
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if (extname == "ssl")
@@ -708,7 +708,7 @@ class ModuleSSLOpenSSL : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "ssl"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an ssl flag, accept the remote server's
 			if (!dest->GetExt(extname, dummy))
 			{
@@ -756,7 +756,7 @@ class ModuleSSLOpenSSL : public Module
 		{
 			// Handshake complete.
 			// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
-			userrec* u = ServerInstance->FindDescriptor(session->fd);
+			User* u = ServerInstance->FindDescriptor(session->fd);
 			if (u)
 			{
 				if (!u->GetExt("ssl", dummy))
@@ -782,7 +782,7 @@ class ModuleSSLOpenSSL : public Module
 		return true;
 	}
 
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		// This occurs AFTER OnUserConnect so we can be sure the
 		// protocol module has propagated the NICK message.
@@ -812,7 +812,7 @@ class ModuleSSLOpenSSL : public Module
 			ServerInstance->SE->WantWrite(eh);
 	}
 
-	virtual void OnBufferFlushed(userrec* user)
+	virtual void OnBufferFlushed(User* user)
 	{
 		if (user->GetExt("ssl"))
 		{
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index e95447b6d..3d0e81928 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -33,9 +33,9 @@ class cmd_fingerprint : public Command
 		syntax = "<nickname>";
 	}       
 	          
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* target = ServerInstance->FindNick(parameters[0]);
+		User* target = ServerInstance->FindNick(parameters[0]);
 		if (target)
 		{
 			ssl_cert* cert;
@@ -94,7 +94,7 @@ class ModuleOperSSLCert : public Module
 		List[I_OnPreCommand] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		delete cf;
 		cf = new ConfigReader(ServerInstance);
@@ -115,7 +115,7 @@ class ModuleOperSSLCert : public Module
 	}
 
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		irc::string cmd = command.c_str();
 		
diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index 008608f03..0d3dce2eb 100644
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -33,9 +33,9 @@ class cmd_sslinfo : public Command
 		this->syntax = "<nick>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* target = ServerInstance->FindNick(parameters[0]);
+		User* target = ServerInstance->FindNick(parameters[0]);
 		ssl_cert* cert;
 
 		if (target)
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 7f7453240..90da97856 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -218,7 +218,7 @@ class ModuleZLib : public Module
 	}
 
 	/* Handle stats z (misc stats) */
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol == 'z')
 		{
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 7f09de134..90517255e 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -127,9 +127,9 @@ class ModuleAlias : public Module
 		}
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
-		userrec *u = NULL;
+		User *u = NULL;
 
 		/* If theyre not registered yet, we dont want
 		 * to know.
@@ -210,7 +210,7 @@ class ModuleAlias : public Module
 		return 0;
 	}
 
-	void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+	void DoCommand(std::string newline, User* user, const std::string &original_line)
 	{
 		for (int v = 1; v < 10; v++)
 		{
@@ -260,7 +260,7 @@ class ModuleAlias : public Module
 		ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
 	}
  
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadAliases();
  	}
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 7afa71803..1b48c237f 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -25,7 +25,7 @@ class cmd_alltime : public Command
 		translation.push_back(TR_END);
 	}
 
-	CmdResult Handle(const char **parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char **parameters, int pcnt, User *user)
 	{
 		char fmtdate[64];
 		char fmtdate2[64];
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 0e254d00c..5690572ce 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -40,7 +40,7 @@ class ModuleAntiBear : public Module
 		List[I_OnUserRegister] = List[I_OnPreCommand] = 1;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		if (command == "NOTICE" && !validated && pcnt > 1 && user->GetExt("antibear_timewait"))
 		{
@@ -62,7 +62,7 @@ class ModuleAntiBear : public Module
 		return 0;
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		user->WriteServ("439 %s :This server has anti-spambot mechanisms enabled.", user->nick);
 		user->WriteServ("931 %s :Malicious bots, spammers, and other automated systems of dubious origin are NOT welcome here.", user->nick);
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 56ad9da05..cef990a71 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -39,7 +39,7 @@ class ModuleAntiBottler : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		char data[MAXBUF];
 		strlcpy(data,original_line.c_str(),MAXBUF);
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index aa5e18438..b91538ace 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -20,7 +20,7 @@ class AuditoriumMode : public ModeHandler
  public:
 	AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (channel->IsModeSet('u') != adding)
 		{
@@ -65,7 +65,7 @@ class ModuleAuditorium : public Module
 		DELETE(aum);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader conf(ServerInstance);
 		ShowOps = conf.ReadFlag("auditorium", "showops", 0);
@@ -87,7 +87,7 @@ class ModuleAuditorium : public Module
 		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnRehash] = 1;
 	}
 
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &nameslist)
+	virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
 	{
 		if (Ptr->IsModeSet('u'))
 		{
@@ -119,7 +119,7 @@ class ModuleAuditorium : public Module
 		return 0;
 	}
 	
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		if (channel->IsModeSet('u'))
 		{
@@ -131,7 +131,7 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+	void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 	{
 		if (channel->IsModeSet('u'))
 		{
@@ -148,7 +148,7 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+	void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 	{
 		if (chan->IsModeSet('u'))
 		{
@@ -162,7 +162,7 @@ class ModuleAuditorium : public Module
 		}
 	}
 
-	void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		Command* parthandler = ServerInstance->Parser->GetHandler("PART");
 		std::vector<std::string> to_leave;
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 4f36fb8c9..4c0e93dea 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -62,7 +62,7 @@ public:
 		output.append(" EXCEPTS=e");
 	}
 
-	virtual int OnCheckBan(userrec* user, chanrec* chan)
+	virtual int OnCheckBan(User* user, Channel* chan)
 	{
 		if (chan != NULL)
 		{
@@ -93,17 +93,17 @@ public:
 		be->DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		be->DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		be->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		be->DoRehash();
 	}
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 9ac440d5e..60bd1bba4 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -44,7 +44,7 @@ class BanRedirect : public ModeWatcher
 	{
 	}
 
-	bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &param, bool adding, ModeType type)
+	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
 	{
 		/* nick!ident@host -> nick!ident@host
 		 * nick!ident@host#chan -> nick!ident@host#chan
@@ -204,7 +204,7 @@ class ModuleBanRedirect : public Module
 		List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1;
 	}
 	
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		OnCleanup(TYPE_CHANNEL, chan);
 	}
@@ -213,7 +213,7 @@ class ModuleBanRedirect : public Module
 	{
 		if(target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = static_cast<chanrec*>(item);
+			Channel* chan = static_cast<Channel*>(item);
 			BanRedirectList* redirects;
 			
 			if(chan->GetExt("banredirects", redirects))
@@ -251,12 +251,12 @@ class ModuleBanRedirect : public Module
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		/* This prevents recursion when a user sets multiple ban redirects in a chain
 		 * (thanks Potter)
@@ -293,7 +293,7 @@ class ModuleBanRedirect : public Module
 					if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask))
 					{
 						/* tell them they're banned and are being transferred */
-						chanrec* destchan = ServerInstance->FindChan(redir->targetchan);
+						Channel* destchan = ServerInstance->FindChan(redir->targetchan);
 						
 						if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
 						{
@@ -305,7 +305,7 @@ class ModuleBanRedirect : public Module
 							user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name);
 							user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
 							nofollow = true;
-							chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
+							Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true));
 							nofollow = false;
 							return 1;
 						}
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index bcef01fd2..44f59f347 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -65,7 +65,7 @@ class ModuleBlockAmsg : public Module
 		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		
@@ -88,7 +88,7 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		// Don't do anything with unregistered users, or remote ones.
 		if(!user || (user->registered != REG_ALL) || !IS_LOCAL(user))
@@ -144,7 +144,7 @@ class ModuleBlockAmsg : public Module
 					ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick);
 
 				if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
-					userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
+					User::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected");
 				else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
 					user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick);
 									
@@ -171,7 +171,7 @@ class ModuleBlockAmsg : public Module
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			BlockedMessage* m;
 			user->GetExt("amsgblock", m);
 			if(m)
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 893981283..167a12bec 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -23,7 +23,7 @@ class BlockCaps : public ModeHandler
  public:
 	BlockCaps(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -67,19 +67,19 @@ public:
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		ReadConf();
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			if ((!IS_LOCAL(user)) || (text.length() < minlen))
 				return 0;
 
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 
 			if (c->IsModeSet('P'))
 			{
@@ -96,7 +96,7 @@ public:
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index d46e5a9d6..1635815ce 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -22,7 +22,7 @@ class BlockColor : public ModeHandler
  public:
 	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -64,11 +64,11 @@ class ModuleBlockColour : public Module
 	}
 
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			
 			if(c->IsModeSet('c'))
 			{
@@ -95,7 +95,7 @@ class ModuleBlockColour : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 86dc9ea00..b055c83ee 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -22,7 +22,7 @@ class BotMode : public ModeHandler
  public:
 	BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -75,7 +75,7 @@ class ModuleBotMode : public Module
 		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* src, userrec* dst)
+	virtual void OnWhois(User* src, User* dst)
 	{
 		if (dst->IsModeSet('B'))
 		{
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 6d56b62bc..b02e892d3 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -54,7 +54,7 @@ class cmd_cban : public Command
 		TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		/* syntax: CBAN #channel time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -134,7 +134,7 @@ class ModuleCBan : public Module
 		List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
 	}
 	
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		ExpireBans();
 	
@@ -150,7 +150,7 @@ class ModuleCBan : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
+	virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
 	{
 		ExpireBans();
 	
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 1159febf8..f220b0710 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -27,7 +27,7 @@ class CensorUser : public ModeHandler
  public:
 	CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -57,7 +57,7 @@ class CensorChannel : public ModeHandler
  public:
 	CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -128,7 +128,7 @@ class ModuleCensor : public Module
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
@@ -136,9 +136,9 @@ class ModuleCensor : public Module
 		bool active = false;
 
 		if (target_type == TYPE_USER)
-			active = ((userrec*)dest)->IsModeSet('G');
+			active = ((User*)dest)->IsModeSet('G');
 		else if (target_type == TYPE_CHANNEL)
-			active = ((chanrec*)dest)->IsModeSet('G');
+			active = ((Channel*)dest)->IsModeSet('G');
 
 		if (!active)
 			return 0;
@@ -150,7 +150,7 @@ class ModuleCensor : public Module
 			{
 				if (index->second.empty())
 				{
-					user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str());
+					user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
 					return 1;
 				}
 				
@@ -161,12 +161,12 @@ class ModuleCensor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		/*
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index eb497dea4..b30b9316b 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -51,7 +51,7 @@ class cmd_webirc : public Command
 			this->source = "m_cgiirc.so";
 			this->syntax = "password client hostname ip";
 		}
-		CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+		CmdResult Handle(const char** parameters, int pcnt, User *user)
 		{
 			if(user->registered == REG_ALL)
 				return CMD_FAILURE;
@@ -83,10 +83,10 @@ class CGIResolver : public Resolver
 {
 	std::string typ;
 	int theirfd;
-	userrec* them;
+	User* them;
 	bool notify;
  public:
-	CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
+	CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
 		: Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
 	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
@@ -146,7 +146,7 @@ public:
 		return PRIORITY_FIRST;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		
@@ -198,7 +198,7 @@ public:
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			std::string* realhost;
 			std::string* realip;
 			
@@ -216,7 +216,7 @@ public:
 		}
 	}
 	
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
 		{
@@ -233,7 +233,7 @@ public:
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			std::string* bleh;
 			if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
 			{
@@ -242,13 +242,13 @@ public:
 		}
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		OnCleanup(TYPE_USER, user);
 	}
 	
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{	
 		for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
 		{			
@@ -283,7 +283,7 @@ public:
 		return 0;
 	}
 
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		std::string *webirc_hostname, *webirc_ip;
 		if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
@@ -317,7 +317,7 @@ public:
 		}
 	}
 
-	bool CheckPass(userrec* user)
+	bool CheckPass(User* user)
 	{
 		if(IsValidHost(user->password))
 		{
@@ -376,7 +376,7 @@ public:
 		return false;
 	}
 	
-	bool CheckIdent(userrec* user)
+	bool CheckIdent(User* user)
 	{
 		int ip[4];
 		char* ident;
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 232d55314..d2b0b4e45 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -40,7 +40,7 @@ class ModuleChanCreate : public Module
 		List[I_OnUserJoin] = 1;
 	}
 	
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		if (channel->GetUserCounter() == 1)
 		{
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 19e1fe3d9..994c71a2a 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,7 +27,7 @@ class ChanFilter : public ListModeBase
  public:
 	ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
 	
-	virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word)
+	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
 		if ((word.length() > 35) || (word.empty()))
 		{
@@ -38,18 +38,18 @@ class ChanFilter : public ListModeBase
 		return true;
 	}
 	
-	virtual bool TellListTooLong(userrec* user, chanrec* chan, std::string &word)
+	virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
 		return true;
 	}
 	
-	virtual void TellAlreadyOnList(userrec* user, chanrec* chan, std::string &word)
+	virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
 	}
 	
-	virtual void TellNotSet(userrec* user, chanrec* chan, std::string &word)
+	virtual void TellNotSet(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name);
 	}
@@ -76,17 +76,17 @@ class ModuleChanFilter : public Module
 		List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		cf->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		cf->DoRehash();
 	}
 
-	virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
+	virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
 		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
 			return 0;
@@ -112,11 +112,11 @@ class ModuleChanFilter : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			return ProcessMessages(user,(chanrec*)dest,text);
+			return ProcessMessages(user,(Channel*)dest,text);
 		}
 		else return 0;
 	}
@@ -126,12 +126,12 @@ class ModuleChanFilter : public Module
 		cf->DoCleanup(target_type, item);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		cf->DoSyncChannel(chan, proto, opaque);
 	}
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index fb545f58f..325069d0b 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -47,9 +47,9 @@ class FounderProtectBase
 	{
 	}
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
-		userrec* x = MyInstance->FindNick(parameter);
+		User* x = MyInstance->FindNick(parameter);
 		if (x)
 		{
 			if (!channel->HasUser(x))
@@ -72,7 +72,7 @@ class FounderProtectBase
 		return std::make_pair(false, parameter);
 	}
 
-	void RemoveMode(chanrec* channel, char mc)
+	void RemoveMode(Channel* channel, char mc)
 	{
 		unload_kludge = true;
 		CUList* cl = channel->GetUsers();
@@ -102,7 +102,7 @@ class FounderProtectBase
 		unload_kludge = false;
 	}
 
-	void DisplayList(userrec* user, chanrec* channel)
+	void DisplayList(User* user, Channel* channel)
 	{
 		CUList* cl = channel->GetUsers();
 		std::string item = extend+std::string(channel->name);
@@ -116,9 +116,9 @@ class FounderProtectBase
 		user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
 	}
 
-	userrec* FindAndVerify(std::string &parameter, chanrec* channel)
+	User* FindAndVerify(std::string &parameter, Channel* channel)
 	{
-		userrec* theuser = MyInstance->FindNick(parameter);
+		User* theuser = MyInstance->FindNick(parameter);
 		if ((!theuser) || (!channel->HasUser(theuser)))
 		{
 			parameter.clear();
@@ -127,13 +127,13 @@ class FounderProtectBase
 		return theuser;
 	}
 
-	bool CanRemoveOthers(userrec* u1, userrec* u2, chanrec* c)
+	bool CanRemoveOthers(User* u1, User* u2, Channel* c)
 	{
 		std::string item = extend+std::string(c->name);
 		return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr));
 	}
 
-	ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string &parameter)
+	ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string &parameter)
 	{
 		std::string item = extend+std::string(channel->name);
 
@@ -174,23 +174,23 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
 		return FOUNDER_VALUE;
 	}
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		return FounderProtectBase::ModeSet(source, dest, channel, parameter);
 	}
 
-	void RemoveMode(chanrec* channel)
+	void RemoveMode(Channel* channel)
 	{
 		FounderProtectBase::RemoveMode(channel, this->GetModeChar());
 	}
 
-	void RemoveMode(userrec* user)
+	void RemoveMode(User* user)
 	{
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+		User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
 
 		if (!theuser)
 		{
@@ -215,7 +215,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
 		}
 	}
 
-	void DisplayList(userrec* user, chanrec* channel)
+	void DisplayList(User* user, Channel* channel)
 	{
 		FounderProtectBase::DisplayList(user,channel);
 	}
@@ -236,23 +236,23 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
 		return PROTECT_VALUE;
 	}
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		return FounderProtectBase::ModeSet(source, dest, channel, parameter);
 	}
 
-	void RemoveMode(chanrec* channel)
+	void RemoveMode(Channel* channel)
 	{
 		FounderProtectBase::RemoveMode(channel, this->GetModeChar());
 	}
 
-	void RemoveMode(userrec* user)
+	void RemoveMode(User* user)
 	{
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+		User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
 
 		if (!theuser)
 			return MODEACTION_DENY;
@@ -276,7 +276,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
 		}
 	}
 
-	virtual void DisplayList(userrec* user, chanrec* channel)
+	virtual void DisplayList(User* user, Channel* channel)
 	{
 		FounderProtectBase::DisplayList(user, channel);
 	}
@@ -318,21 +318,21 @@ class ModuleChanProtect : public Module
 		List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnPostJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
 	}
 
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 	{
 		// FIX: when someone gets kicked from a channel we must remove their Extensibles!
 		user->Shrink("cm_founder_"+std::string(chan->name));
 		user->Shrink("cm_protect_"+std::string(chan->name));
 	}
 
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason, bool &silent)
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent)
 	{
 		// FIX: when someone parts a channel we must remove their Extensibles!
 		user->Shrink("cm_founder_"+std::string(channel->name));
 		user->Shrink("cm_protect_"+std::string(channel->name));
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		/* Create a configreader class and read our flag,
 		 * in old versions this was heap-allocated and the
@@ -367,7 +367,7 @@ class ModuleChanProtect : public Module
 		}
 	}
 	
-	virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
+	virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
 	{
 		// if the user is the first user into the channel, mark them as the founder, but only if
 		// the config option for it is set
@@ -378,7 +378,7 @@ class ModuleChanProtect : public Module
 		return 0;
 	}
 	
-	virtual void OnPostJoin(userrec *user, chanrec *channel)
+	virtual void OnPostJoin(User *user, Channel *channel)
 	{
 		// This *must* be in PostJoin, not UserJoin - the former will make it appear to happen
 		// before the client is in the channel
@@ -392,7 +392,7 @@ class ModuleChanProtect : public Module
 			user->WriteServ("MODE %s +q %s", channel->name, user->nick);
 	}
 	
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
 		// here we perform access checks, this is the important bit that actually stops kicking/deopping
 		// etc of protected users. There are many types of access check, we're going to handle
@@ -488,7 +488,7 @@ class ModuleChanProtect : public Module
 		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		/* NOTE: If +qa prefix is on, this is propagated by the channel join,
 		 * so we dont need to propagate it manually
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 7a48a3d45..24024e2f9 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -27,10 +27,10 @@ class cmd_check : public Command
 		syntax = "<nickname>|<ip>|<hostmask>|<channel>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec *targuser;
-		chanrec *targchan;
+		User *targuser;
+		Channel *targchan;
 		std::string checkstr;
 		std::string chliststr;
 
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index db8094aa2..4b53e7c12 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -29,7 +29,7 @@ class cmd_chghost : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
  
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		const char * x = parameters[1];
 
@@ -52,7 +52,7 @@ class cmd_chghost : public Command
 			user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick);
 			return CMD_FAILURE;
 		}
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
@@ -91,7 +91,7 @@ class ModuleChgHost : public Module
 		List[I_OnRehash] = 1;
 	}
 	
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 0561c5156..7ae98b37d 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -27,9 +27,9 @@ class cmd_chgident : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 31467459c..987678b5b 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -27,9 +27,9 @@ class cmd_chgname : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 
 		if (!dest)
 		{
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index d10f02ce4..86f120d20 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -67,7 +67,7 @@ class CloakUser : public ModeHandler
 	{
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (source != dest)
 			return MODEACTION_DENY;
@@ -347,7 +347,7 @@ class ModuleCloaking : public Module
 		return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		cu->DoRehash();
 	}
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index a8644f6ed..82fdf535f 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -36,7 +36,7 @@ class cmd_clones : public Command
 		return "<?>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 
 		std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index da52dd7d9..4b91ca789 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -24,15 +24,15 @@ class cmd_close : public Command
 		this->source = "m_close.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		std::map<std::string,int> closed;
 
-		for (std::vector<userrec*>::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++)
+		for (std::vector<User*>::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++)
 		{
 			if ((*u)->registered != REG_ALL)
 			{
-				userrec::QuitUser(ServerInstance, *u, "Closing all unknown connections per request");
+				User::QuitUser(ServerInstance, *u, "Closing all unknown connections per request");
 				std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetPort());
 				closed[key]++;
 			}
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index e9af24ad0..4cc11b725 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -22,7 +22,7 @@ class PrivacyMode : public ModeHandler
  public:
 	PrivacyMode(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -72,11 +72,11 @@ class ModulePrivacyMode : public Module
 		return Version(1,1,0,0, VF_COMMON|VF_VENDOR, API_VERSION);
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* t = (userrec*)dest;
+			User* t = (User*)dest;
 			if (!IS_OPER(user) && (t->IsModeSet('c')) && (!ServerInstance->ULine(user->server)) && !user->SharesChannelWith(t))
 			{
 				user->WriteServ("531 %s %s :You are not permitted to send private messages to this user (+c set)", user->nick, t->nick);
@@ -86,7 +86,7 @@ class ModulePrivacyMode : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index d65fdf7e0..5abee8303 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -58,7 +58,7 @@ class ModuleConnJoin : public Module
 			List[I_OnPostConnect] = List[I_OnRehash] = 1;
 		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ConfigReader* conf = new ConfigReader(ServerInstance);
 			JoinChan = conf->ReadValue("autojoin", "channel", 0);
@@ -77,14 +77,14 @@ class ModuleConnJoin : public Module
 			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual void OnPostConnect(userrec* user)
+		virtual void OnPostConnect(User* user)
 		{
 			if (!IS_LOCAL(user))
 				return;
 
 			for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
 		}
 
 };
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 23b5d8280..34e1fd34d 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -35,7 +35,7 @@ class ModuleModesOnConnect : public Module
 		List[I_OnPostConnect] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		DELETE(Conf);
 		Conf = new ConfigReader(ServerInstance);
@@ -51,7 +51,7 @@ class ModuleModesOnConnect : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		if (!IS_LOCAL(user))
 			return;
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 11e55cf68..4ab3ed793 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -28,7 +28,7 @@ class ModuleWaitPong : public Module
 		OnRehash(NULL,"");
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		ConfigReader Conf(ServerInstance);
 		
@@ -58,7 +58,7 @@ class ModuleWaitPong : public Module
 		return (char*)out;
 	}
 	
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		char* pingrpl = RandString(10);
 		
@@ -71,7 +71,7 @@ class ModuleWaitPong : public Module
 		return 0;
 	}
 	
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User* user, bool validated, const std::string &original_line)
 	{
 		if (command == "PONG")
 		{
@@ -89,7 +89,7 @@ class ModuleWaitPong : public Module
 				else
 				{
 					if(killonbadreply)
-						userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+						User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
 					return 1;
 				}
 			}
@@ -97,13 +97,13 @@ class ModuleWaitPong : public Module
 		return 0;
 	}
 
-	virtual bool OnCheckReady(userrec* user)
+	virtual bool OnCheckReady(User* user)
 	{
 		char* pingrpl;
 		return (!user->GetExt(extenstr, pingrpl));
 	}
 	
-	virtual void OnUserDisconnect(userrec* user)
+	virtual void OnUserDisconnect(User* user)
 	{
 		char* pingrpl;
 		user->GetExt(extenstr, pingrpl);
@@ -119,7 +119,7 @@ class ModuleWaitPong : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			char* pingrpl;
 			user->GetExt(extenstr, pingrpl);
 			
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index e3fea0521..d6d9eee0f 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -64,7 +64,7 @@ public:
 		first = ServerInstance->Time();
 	}
  
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		time_t next = ServerInstance->Time();
 		
@@ -86,7 +86,7 @@ public:
 				ServerInstance->WriteOpers("*** Connection throttle deactivated");
 				return 0;
 			}
-			userrec::QuitUser(ServerInstance, user, quitmsg);
+			User::QuitUser(ServerInstance, user, quitmsg);
 			return 1;
 		}
 
@@ -96,7 +96,7 @@ public:
 			{
 				throttled = 1;
 				ServerInstance->WriteOpers("*** Connection throttle activated");
-				userrec::QuitUser(ServerInstance, user, quitmsg);
+				User::QuitUser(ServerInstance, user, quitmsg);
 				return 1;
 			}
 		}
@@ -108,7 +108,7 @@ public:
 		return 0;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		InitConf();
 	}
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index ca277c3ae..bd165034f 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -43,7 +43,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
     return false;
 }
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec* user)
+	CmdResult Handle(const char** parameters, int pcnt, User* user)
 	{
 		if (!IS_LOCAL(user))
 			return CMD_LOCALONLY;
@@ -126,7 +126,7 @@ class ModuleCustomTitle : public Module
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -144,11 +144,11 @@ class ModuleCustomTitle : public Module
 	}
 
 	// Whenever the linking module wants to send out data, but doesnt know what the data
-	// represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+	// represents (e.g. it is metadata, added to a User or Channel by a module) then
 	// this method is called. We should use the ProtoSendMetaData function after we've
 	// corrected decided how the data should look, to send the metadata on its way if
 	// it is ours.
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if (extname == "ctitle")
@@ -166,7 +166,7 @@ class ModuleCustomTitle : public Module
 	}
 
 	// when a user quits, tidy up their metadata
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* ctitle;
 		user->GetExt("ctitle", ctitle);
@@ -182,7 +182,7 @@ class ModuleCustomTitle : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			std::string* ctitle;
 			user->GetExt("ctitle", ctitle);
 			if (ctitle)
@@ -205,7 +205,7 @@ class ModuleCustomTitle : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "ctitle"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an ctitle field, accept the remote server's
 			std::string* text;
 			if (!dest->GetExt("ctitle", text))
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 06361c692..554bcd17d 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -27,9 +27,9 @@ class cmd_cycle : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		chanrec* channel = ServerInstance->FindChan(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		std::string reason = ConvToStr("Cycling");
 			
 		if (pcnt > 1)
@@ -58,11 +58,11 @@ class cmd_cycle : public Command
 					return CMD_FAILURE;
 				}
 				
-				/* XXX in the future, this may move to a static chanrec method (the delete.) -- w00t */
+				/* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */
 				if (!channel->PartUser(user, reason.c_str()))
 					delete channel;
 				
-				chanrec::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
+				Channel::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
 			}
 
 			return CMD_LOCALONLY;
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 7ddce8ab0..ebd3b8630 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -37,7 +37,7 @@ class DCCAllow
 	DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
 };
 
-typedef std::vector<userrec *> userlist;
+typedef std::vector<User *> userlist;
 userlist ul;
 typedef std::vector<DCCAllow> dccallowlist;
 dccallowlist* dl;
@@ -54,7 +54,7 @@ class cmd_dccallow : public Command
 		/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
 	}
 
-	CmdResult Handle(const char **parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char **parameters, int pcnt, User *user)
 	{
 		/* syntax: DCCALLOW [+|-]<nick> (<time>) */
 		if (!pcnt)
@@ -85,7 +85,7 @@ class cmd_dccallow : public Command
 			}
 			
 			std::string nick = parameters[0] + 1;
-			userrec *target = ServerInstance->FindNick(nick);
+			User *target = ServerInstance->FindNick(nick);
 	
 			if (target)
 			{
@@ -118,7 +118,7 @@ class cmd_dccallow : public Command
 						// remove from userlist
 						for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
 						{
-							userrec* u = (userrec*)(*j);
+							User* u = (User*)(*j);
 							if (u == user)
 							{
 								ul.erase(j);
@@ -200,7 +200,7 @@ class cmd_dccallow : public Command
 		return CMD_FAILURE;
 	}
 
-	void DisplayHelp(userrec* user)
+	void DisplayHelp(User* user)
 	{
 		user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
 		user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
@@ -224,7 +224,7 @@ class cmd_dccallow : public Command
 		user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
 	}
 	
-	void DisplayDCCAllowList(userrec* user)
+	void DisplayDCCAllowList(User* user)
 	{
 		 // display current DCCALLOW list
 		user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
@@ -262,13 +262,13 @@ class ModuleDCCAllow : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		dccallowlist* dl;
 	
@@ -287,25 +287,25 @@ class ModuleDCCAllow : public Module
 	}
 
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
 		RemoveNick(user);
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
 	}
 
-	virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
 
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 
 			/* Always allow a user to dcc themselves (although... why?) */
 			if (user == u)
@@ -384,7 +384,7 @@ class ModuleDCCAllow : public Module
 	{
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			userrec* u = (userrec*)(*iter);
+			User* u = (User*)(*iter);
 			u->GetExt("dccallow_list", dl);
 	
 			if (dl)
@@ -413,12 +413,12 @@ class ModuleDCCAllow : public Module
 		}
 	}
 	
-	void RemoveNick(userrec* user)
+	void RemoveNick(User* user)
 	{
 		/* Iterate through all DCCALLOW lists and remove user */
 		for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
 		{
-			userrec *u = (userrec*)(*iter);
+			User *u = (User*)(*iter);
 			u->GetExt("dccallow_list", dl);
 	
 			if (dl)
@@ -445,12 +445,12 @@ class ModuleDCCAllow : public Module
 		}
 	}
 
-	void RemoveFromUserlist(userrec *user)
+	void RemoveFromUserlist(User *user)
 	{
 		// remove user from userlist
 		for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
 		{
-			userrec* u = (userrec*)(*j);
+			User* u = (User*)(*j);
 			if (u == user)
 			{
 				ul.erase(j);
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 1689f843c..ced6adece 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -25,7 +25,7 @@ class User_d : public ModeHandler
  public:
 	User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -71,7 +71,7 @@ class ModuleDeaf : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = List[I_OnBuildExemptList] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string&)
+	virtual void OnRehash(User* user, const std::string&)
 	{
 		ConfigReader* conf = new ConfigReader(ServerInstance);
 		deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
@@ -80,11 +80,11 @@ class ModuleDeaf : public Module
 		DELETE(conf);
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = (chanrec*)dest;
+			Channel* chan = (Channel*)dest;
 			if (chan)
 				this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
 		}
@@ -92,11 +92,11 @@ class ModuleDeaf : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = (chanrec*)dest;
+			Channel* chan = (Channel*)dest;
 			if (chan)
 				this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
 		}
@@ -104,12 +104,12 @@ class ModuleDeaf : public Module
 		return 0;
 	}
 
-	virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text)
+	virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
 	{
 		BuildDeafList(message_type, chan, sender, status, text, exempt_list);
 	}
 
-	virtual void BuildDeafList(MessageType message_type, chanrec* chan, userrec* sender, char status, const std::string &text, CUList &exempt_list)
+	virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
 	{
 		CUList *ulist;
 		bool is_a_uline;
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 1b72c52c3..d345570c0 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -30,7 +30,7 @@ class ModuleDenyChannels : public Module
 		Conf = new ConfigReader(ServerInstance);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		DELETE(Conf);
 		Conf = new ConfigReader(ServerInstance);
@@ -51,7 +51,7 @@ class ModuleDenyChannels : public Module
 		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		for (int j =0; j < Conf->Enumerate("badchan"); j++)
 		{
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 3056bdaff..553d3dfeb 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -32,9 +32,9 @@ class cmd_devoice : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		chanrec* c = ServerInstance->FindChan(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[0]);
 		if (c && c->HasUser(user))
 		{
 			const char* modes[3];
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index bfa511da2..c92a2c111 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -46,12 +46,12 @@ class DNSBLConfEntry
 class DNSBLResolver : public Resolver
 {
 	int theirfd;
-	userrec* them;
+	User* them;
 	DNSBLConfEntry *ConfEntry;
 
  public:
 
-	DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, userrec* u, int userfd, DNSBLConfEntry *conf, bool &cached)
+	DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached)
 		: Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
 	{
 		theirfd = userfd;
@@ -108,7 +108,7 @@ class DNSBLResolver : public Resolver
 					{
 						case DNSBLConfEntry::I_KILL:
 						{
-							userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
+							User::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")");
 							break;
 						}
 						case DNSBLConfEntry::I_KLINE:
@@ -290,12 +290,12 @@ class ModuleDNSBL : public Module
 		delete MyConf;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConf();
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		/* only do lookups on local users */
 		if (IS_LOCAL(user))
@@ -354,7 +354,7 @@ class ModuleDNSBL : public Module
 		return 0;
 	}
 	
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol != 'd')
 			return 0;
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 68ec48891..129bce276 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -35,7 +35,7 @@ class ModuleFilter : public FilterBase
 	{
 	}
 
-	virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
+	virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
 	{
 		for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
 		{
@@ -91,7 +91,7 @@ class ModuleFilter : public FilterBase
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 
@@ -114,7 +114,7 @@ class ModuleFilter : public FilterBase
 		DELETE(MyConf);
 	}
 
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		if (symbol == 's')
 		{
diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index e0faafc98..941576f79 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -98,22 +98,22 @@ class FilterBase : public Module
 	FilterBase(InspIRCd* Me, const std::string &source);
 	virtual ~FilterBase();
 	virtual void Implements(char* List);
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-	virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags) = 0;
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
+	virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) = 0;
 	virtual bool DeleteFilter(const std::string &freeform) = 0;
 	virtual void SyncFilters(Module* proto, void* opaque) = 0;
 	virtual void SendFilter(Module* proto, void* opaque, FilterResult* iter);
 	virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) = 0;
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-	virtual void OnRehash(userrec* user, const std::string &parameter);
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
+	virtual void OnRehash(User* user, const std::string &parameter);
 	virtual Version GetVersion();
 	std::string EncodeFilter(FilterResult* filter);
 	FilterResult DecodeFilter(const std::string &data);
 	virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable = false);
 	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata);
-	virtual int OnStats(char symbol, userrec* user, string_list &results) = 0;
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line);
-	bool AppliesToMe(userrec* user, FilterResult* filter, int flags);
+	virtual int OnStats(char symbol, User* user, string_list &results) = 0;
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
+	bool AppliesToMe(User* user, FilterResult* filter, int flags);
 };
 
 class cmd_filter : public Command
@@ -126,7 +126,7 @@ class cmd_filter : public Command
 		this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		if (pcnt == 1)
 		{
@@ -200,13 +200,13 @@ class cmd_filter : public Command
 		}
 	}
 
-	void TooFewParams(userrec* user, const std::string &extra_text)
+	void TooFewParams(User* user, const std::string &extra_text)
 	{
 		user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick, extra_text.c_str());
 	}
 };
 
-bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags)
+bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags)
 {
 	if ((filter->flag_no_opers) && IS_OPER(user))
 		return false;
@@ -236,13 +236,13 @@ void FilterBase::Implements(char* List)
 	List[I_OnPreCommand] = List[I_OnStats] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
 }
 
-int FilterBase::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
 	flags = FLAG_PRIVMSG;
 	return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 }
 
-int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
 	if (!flags)
 		flags = FLAG_NOTICE;
@@ -257,12 +257,12 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s
 		std::string target = "";
 		if (target_type == TYPE_USER)
 		{
-			userrec* t = (userrec*)dest;
+			User* t = (User*)dest;
 			target = std::string(t->nick);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* t = (chanrec*)dest;
+			Channel* t = (Channel*)dest;
 			target = std::string(t->name);
 		}
 		if (f->action == "block")
@@ -276,7 +276,7 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s
 		}
 		if (f->action == "kill")
 		{
-			userrec::QuitUser(ServerInstance,user,"Filtered: "+f->reason);
+			User::QuitUser(ServerInstance,user,"Filtered: "+f->reason);
 		}
 		if (f->action == "gline")
 		{
@@ -293,7 +293,7 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s
 	return 0;
 }
 
-int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 {
 	flags = 0;
 	if ((validated == 1) && (IS_LOCAL(user)))
@@ -360,7 +360,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 				if ((parting) && (f->action == "kill"))
 				{
 					user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
-					userrec::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
+					User::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
 				}
 				if (f->action == "gline")
 				{
@@ -382,7 +382,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 	return 0;
 }
 
-void FilterBase::OnRehash(userrec* user, const std::string &parameter)
+void FilterBase::OnRehash(User* user, const std::string &parameter)
 {
 }
 	
diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index b086eb345..91afe9df7 100644
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -54,7 +54,7 @@ class ModuleFoobar : public Module
 		List[I_OnUserConnect] = List[I_OnUserQuit] = List[I_OnUserJoin] = List[I_OnUserPart] = 1;
 	}
 	
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		// method called when a user connects
 	
@@ -62,7 +62,7 @@ class ModuleFoobar : public Module
 		ServerInstance->Log(DEBUG,"Foobar: User connecting: "+b);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		// method called when a user disconnects
 	
@@ -70,7 +70,7 @@ class ModuleFoobar : public Module
 		ServerInstance->Log(DEBUG,"Foobar: User quitting: "+b);
 	}
 	
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		// method called when a user joins a channel
 	
@@ -79,7 +79,7 @@ class ModuleFoobar : public Module
 		ServerInstance->Log(DEBUG,"Foobar: User "+b+" joined "+c);
 	}
 
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason, bool &silent)
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent)
 	{
 		// method called when a user parts a channel
 	
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 0e7ff2e6d..df439b989 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -27,7 +27,7 @@ class cmd_gloadmodule : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		std::string servername = pcnt > 1 ? parameters[1] : "*";
 
@@ -61,7 +61,7 @@ class cmd_gunloadmodule : public Command
 		syntax = "<modulename> [servermask]";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		std::string servername = pcnt > 1 ? parameters[1] : "*";
 
@@ -95,7 +95,7 @@ class cmd_greloadmodule : public Command
 		syntax = "<modulename> [servermask]";
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		std::string servername = pcnt > 1 ? parameters[1] : "*";
 
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 1d870a7c2..b95f455dc 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -29,7 +29,7 @@ class cmd_globops : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		std::string line = "From " + std::string(user->nick) + ": ";
 		for (int i = 0; i < pcnt; i++)
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 86866f7fb..a2a64cc26 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -24,7 +24,7 @@ class Helpop : public ModeHandler
  public:
 	Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -58,7 +58,7 @@ class cmd_helpop : public Command
 		syntax = "<any-text>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		irc::string parameter("start");
 		if (pcnt > 0)
@@ -158,12 +158,12 @@ class ModuleHelpop : public Module
 			List[I_OnRehash] = List[I_OnWhois] = 1;
 		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ReadConfig();
 		}
 
-		virtual void OnWhois(userrec* src, userrec* dst)
+		virtual void OnWhois(User* src, User* dst)
 		{
 			if (dst->IsModeSet('h'))
 			{
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 8d2c6b4eb..2637968a9 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -22,7 +22,7 @@ class HideChans : public ModeHandler
  public:
 	HideChans(InspIRCd* Instance) : ModeHandler(Instance, 'I', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		/* Only opers can change other users modes */
 		if (source != dest)
@@ -79,7 +79,7 @@ class ModuleHideChans : public Module
 		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* Dont display channels if they have +I set and the
 		 * person doing the WHOIS is not an oper
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 1e4f7ae85..fd39cde0f 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -22,7 +22,7 @@ class HideOper : public ModeHandler
  public:
 	HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (source != dest)
 			return MODEACTION_DENY;
@@ -78,7 +78,7 @@ class ModuleHideOper : public Module
 		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
 		 * person doing the WHOIS is not an oper
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index 327732651..17c597e71 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -62,7 +62,7 @@ class ModuleHostChange : public Module
 		List[I_OnRehash] = List[I_OnUserConnect] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		MySuffix = Conf.ReadValue("host","suffix",0);
@@ -94,7 +94,7 @@ class ModuleHostChange : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
 		{
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 445af1826..2d022ad30 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -137,7 +137,7 @@ class ModuleHttpStats : public Module
 
 				for (SortedIter a = so->begin(); a != so->end(); a++)
 				{
-					chanrec* c = ServerInstance->FindChan(a->second.c_str());
+					Channel* c = ServerInstance->FindChan(a->second.c_str());
 					if (c && !c->IsModeSet('s') && !c->IsModeSet('p'))
 					{
 						data << "<channel>";
@@ -176,7 +176,7 @@ class ModuleHttpStats : public Module
 		}
 	}
 
-	void OnChannelDelete(chanrec* chan)
+	void OnChannelDelete(Channel* chan)
 	{
 		StatsIter a = sh->find(chan->name);
 		if (a != sh->end())
@@ -186,7 +186,7 @@ class ModuleHttpStats : public Module
 		this->changed = true;
 	}
 
-	void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		StatsIter a = sh->find(channel->name);
 		if (a != sh->end())
@@ -201,7 +201,7 @@ class ModuleHttpStats : public Module
 		this->changed = true;
 	}
 
-	void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+	void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 	{
 		StatsIter a = sh->find(channel->name);
 		if (a != sh->end())
@@ -211,11 +211,11 @@ class ModuleHttpStats : public Module
 		this->changed = true;
 	}
 
-	void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
 		{
-			chanrec* c = v->first;
+			Channel* c = v->first;
 			StatsIter a = sh->find(c->name);
 			if (a != sh->end())
 			{
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 6f0f3b557..5e7e6ccd0 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -21,10 +21,10 @@
 class IdentRequestSocket : public InspSocket
 {
  private:
-	userrec *user;
+	User *user;
 	int original_fd;
  public:
-	IdentRequestSocket(InspIRCd *Server, userrec *user, int timeout, const std::string &bindip)
+	IdentRequestSocket(InspIRCd *Server, User *user, int timeout, const std::string &bindip)
 		: InspSocket(Server, user->GetIPString(), 113, false, timeout, bindip), user(user)
 	{
 		original_fd = user->GetFd();
@@ -210,7 +210,7 @@ class ModuleIdent : public Module
 		List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnCleanup] = List[I_OnUserDisconnect] = 1;
 	}
 	
-	virtual void OnRehash(userrec *user, const std::string &param)
+	virtual void OnRehash(User *user, const std::string &param)
 	{
 		ConfigReader MyConf(ServerInstance);
 		
@@ -219,9 +219,9 @@ class ModuleIdent : public Module
 			RequestTimeout = 5;
 	}
 	
-	virtual int OnUserRegister(userrec *user)
+	virtual int OnUserRegister(User *user)
 	{
-		/* userrec::ident is currently the username field from USER; with m_ident loaded, that
+		/* User::ident is currently the username field from USER; with m_ident loaded, that
 		 * should be preceded by a ~. The field is actually IDENTMAX+2 characters wide. */
 		memmove(user->ident + 1, user->ident, IDENTMAX);
 		user->ident[0] = '~';
@@ -263,7 +263,7 @@ class ModuleIdent : public Module
 		return 0;
 	}
 	
-	virtual bool OnCheckReady(userrec *user)
+	virtual bool OnCheckReady(User *user)
 	{
 		return (!user->GetExt("ident_socket"));
 	}
@@ -273,7 +273,7 @@ class ModuleIdent : public Module
 		if (target_type == TYPE_USER)
 		{
 			IdentRequestSocket *isock;
-			userrec *user = (userrec*)item;
+			User *user = (User*)item;
 			if (user->GetExt("ident_socket", isock))
 			{
 				int *fd;
@@ -293,7 +293,7 @@ class ModuleIdent : public Module
 		}
 	}
 
-	virtual void OnUserDisconnect(userrec *user)
+	virtual void OnUserDisconnect(User *user)
 	{
 		IdentRequestSocket *isock;
 		if (user->GetExt("ident_socket", isock))
diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 47e9f595c..2ec8439cf 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -29,7 +29,7 @@ class QuietOper : public VisData
 	{
 	}
 
-	virtual bool VisibleTo(userrec* user)
+	virtual bool VisibleTo(User* user)
 	{
 		return IS_OPER(user);
 	}
@@ -53,7 +53,7 @@ class InvisibleMode : public ModeHandler
 		delete qo;
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (source != dest)
 			return MODEACTION_DENY;
@@ -135,7 +135,7 @@ class InvisibleDeOper : public ModeWatcher
 	{
 	}
 
-	bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &param, bool adding, ModeType type)
+	bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
 	{
 		/* Users who are opers and have +Q get their +Q removed when they deoper */
 		if ((!adding) && (dest->IsModeSet('Q')))
@@ -188,7 +188,7 @@ class ModuleInvisible : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
 	}
 	
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		if (user->IsModeSet('Q'))
 		{
@@ -199,13 +199,13 @@ class ModuleInvisible : public Module
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		DELETE(conf);
 		conf = new ConfigReader(ServerInstance);
 	}
 
-	void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+	void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 	{
 		if (user->IsModeSet('Q'))
 		{
@@ -217,7 +217,7 @@ class ModuleInvisible : public Module
 		}
 	}
 
-	void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		if (user->IsModeSet('Q'))
 		{
@@ -240,11 +240,11 @@ class ModuleInvisible : public Module
 	}
 
 	/* No privmsg response when hiding - submitted by Eric at neowin */
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
 		{
-			userrec* target = (userrec*)dest;
+			User* target = (User*)dest;
 			if(target->IsModeSet('Q') && !*user->oper)
 			{
 				user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
@@ -254,13 +254,13 @@ class ModuleInvisible : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
 	}
 
 	/* Fix by Eric @ neowin.net, thanks :) -- Brain */
-	void WriteCommonFrom(userrec *user, chanrec* channel, const char* text, ...)
+	void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
 	{
 		va_list argsPtr;
 		char textbuffer[MAXBUF];
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index c689af320..7e1267995 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -60,7 +60,7 @@ public:
 		output.append(" INVEX=I");
 	}
 	 
-	virtual int OnCheckInvite(userrec* user, chanrec* chan)
+	virtual int OnCheckInvite(User* user, Channel* chan)
 	{
 		if(chan != NULL)
 		{
@@ -115,17 +115,17 @@ public:
 		ie->DoCleanup(target_type, item);
 	}
 
-	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		ie->DoSyncChannel(chan, proto, opaque);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		ie->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 		ie->DoRehash();
 	}
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 72d79361b..6840e155c 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -90,7 +90,7 @@ class JoinFlood : public ModeHandler
  public:
 	JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		joinfloodsettings* x;
 		if (channel->GetExt("joinflood",x))
@@ -99,13 +99,13 @@ class JoinFlood : public ModeHandler
 			return std::make_pair(false, parameter);
 	} 
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		joinfloodsettings* dummy;
 
@@ -220,7 +220,7 @@ class ModuleJoinFlood : public Module
 			throw ModuleException("Could not add new modes!");
 	}
 	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
@@ -237,7 +237,7 @@ class ModuleJoinFlood : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
 	{
 		joinfloodsettings *f;
 		if (channel->GetExt("joinflood",f))
@@ -252,7 +252,7 @@ class ModuleJoinFlood : public Module
 		}
 	}
 
-	void OnChannelDelete(chanrec* chan)
+	void OnChannelDelete(Channel* chan)
 	{
 		joinfloodsettings *f;
 		if (chan->GetExt("joinflood",f))
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 600b8f70f..94367f696 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -37,7 +37,7 @@ class cmd_jumpserver : public Command
 		redirect_all_immediately = redirect_new_users = false;
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		int n_done = 0;
 		reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3];
@@ -84,13 +84,13 @@ class cmd_jumpserver : public Command
 		if (redirect_all_immediately)
 		{
 			/* Redirect everyone but the oper sending the command */
-			for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+			for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
 			{
-				userrec* t = *i;
+				User* t = *i;
 				if (!IS_OPER(t))
 				{
 					t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
-					userrec::QuitUser(ServerInstance, t, reason);
+					User::QuitUser(ServerInstance, t, reason);
 					n_done++;
 				}
 			}
@@ -135,12 +135,12 @@ class ModuleJumpServer : public Module
 	{
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		if (js->port && js->redirect_new_users)
 		{
 			user->WriteServ("010 %s %s %d :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
-			userrec::QuitUser(ServerInstance, user, js->reason);
+			User::QuitUser(ServerInstance, user, js->reason);
 			return 0;
 		}
 		return 0;
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 6a684206f..0096c1719 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -23,7 +23,7 @@ inline int strtoint(const std::string &str)
 	return result;
 }
 
-typedef std::map<userrec*, time_t> delaylist;
+typedef std::map<User*, time_t> delaylist;
 
 /** Handles channel mode +J
  */
@@ -32,7 +32,7 @@ class KickRejoin : public ModeHandler
  public:
 	KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		if (channel->IsModeSet('J'))
 			return std::make_pair(true, channel->GetModeParameter('J'));
@@ -40,13 +40,13 @@ class KickRejoin : public ModeHandler
 			return std::make_pair(false, parameter);
 	} 
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 	
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (!adding)
 		{
@@ -128,14 +128,14 @@ public:
 			throw ModuleException("Could not add new modes!");
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
 			delaylist* dl;
 			if (chan->GetExt("norejoinusers", dl))
 			{
-				std::vector<userrec*> itemstoremove;
+				std::vector<User*> itemstoremove;
 			
 				for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
 				{
@@ -168,7 +168,7 @@ public:
 		return 0;
 	}
 		
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 	{
 		if (chan->IsModeSet('J') && (source != user))
 		{
@@ -182,7 +182,7 @@ public:
 		}
 	}
 	
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		delaylist* dl;
 			
@@ -196,7 +196,7 @@ public:
 	virtual void OnCleanup(int target_type, void* item)
 	{
 		if(target_type == TYPE_CHANNEL)
-			OnChannelDelete((chanrec*)item);
+			OnChannelDelete((Channel*)item);
 	}
 
 	virtual void Implements(char* List)
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index fd8256641..f4a3335e6 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -27,9 +27,9 @@ class cmd_knock : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		chanrec* c = ServerInstance->FindChan(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[0]);
 
 		if (!c)
 		{
@@ -70,7 +70,7 @@ class Knock : public ModeHandler
  public:
 	Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index a4b794050..f14e437ee 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -34,7 +34,7 @@ public:
 		syntax.clear();
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		locked = true;
 		user->WriteServ("988 %s %s :Closed for new connections", user->nick, user->server);
@@ -57,7 +57,7 @@ public:
 		syntax.clear();
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		locked = false;
 		user->WriteServ("989 %s %s :Open for new connections", user->nick, user->server);
@@ -99,22 +99,22 @@ public:
 		List[I_OnUserRegister] = List[I_OnRehash] = List[I_OnCheckReady] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ResetLocked();
 	}
 
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		if (locked)
 		{
-			userrec::QuitUser(ServerInstance, user, "Server is temporarily closed. Please try again later.");
+			User::QuitUser(ServerInstance, user, "Server is temporarily closed. Please try again later.");
 			return 1;
 		}
 		return 0;
 	}
 
-	virtual bool OnCheckReady(userrec* user)
+	virtual bool OnCheckReady(User* user)
 	{
 		return !locked;
 	}
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 51e20fe7e..e7dd6e272 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -24,7 +24,7 @@ class floodsettings : public classbase
 	int secs;
 	int lines;
 	time_t reset;
-	std::map<userrec*,int> counters;
+	std::map<User*,int> counters;
 
 	floodsettings() : ban(0), secs(0), lines(0) {};
 	floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
@@ -32,9 +32,9 @@ class floodsettings : public classbase
 		reset = time(NULL) + secs;
 	};
 
-	void addmessage(userrec* who)
+	void addmessage(User* who)
 	{
-		std::map<userrec*,int>::iterator iter = counters.find(who);
+		std::map<User*,int>::iterator iter = counters.find(who);
 		if (iter != counters.end())
 		{
 			iter->second++;
@@ -50,9 +50,9 @@ class floodsettings : public classbase
 		}
 	}
 
-	bool shouldkick(userrec* who)
+	bool shouldkick(User* who)
 	{
-		std::map<userrec*,int>::iterator iter = counters.find(who);
+		std::map<User*,int>::iterator iter = counters.find(who);
 		if (iter != counters.end())
 		{
 			return (iter->second >= this->lines);
@@ -60,9 +60,9 @@ class floodsettings : public classbase
 		else return false;
 	}
 
-	void clear(userrec* who)
+	void clear(User* who)
 	{
-		std::map<userrec*,int>::iterator iter = counters.find(who);
+		std::map<User*,int>::iterator iter = counters.find(who);
 		if (iter != counters.end())
 		{
 			counters.erase(iter);
@@ -77,7 +77,7 @@ class MsgFlood : public ModeHandler
  public:
 	MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		floodsettings* x;
 		if (channel->GetExt("flood",x))
@@ -86,13 +86,13 @@ class MsgFlood : public ModeHandler
 			return std::make_pair(false, parameter);
 	}
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		floodsettings *f;
 
@@ -213,7 +213,7 @@ class ModuleMsgFlood : public Module
 			throw ModuleException("Could not add new modes!");
 	}
 	
-	int ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
+	int ProcessMessages(User* user,Channel* dest, const std::string &text)
 	{
 		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
 		{
@@ -261,23 +261,23 @@ class ModuleMsgFlood : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-			return ProcessMessages(user,(chanrec*)dest,text);
+			return ProcessMessages(user,(Channel*)dest,text);
 		
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-			return ProcessMessages(user,(chanrec*)dest,text);
+			return ProcessMessages(user,(Channel*)dest,text);
 			
 		return 0;
 	}
 
-	void OnChannelDelete(chanrec* chan)
+	void OnChannelDelete(Channel* chan)
 	{
 		floodsettings* f;
 		if (chan->GetExt("flood", f))
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index e97ec8e1b..65fb6c6c2 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -35,7 +35,7 @@ class ModuleNamesX : public Module
 	{
 	}
 
-	void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
 	{
 		if ((displayable) && (extname == "NAMESX"))
 			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -51,7 +51,7 @@ class ModuleNamesX : public Module
 		output.append(" NAMESX");
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		irc::string c = command.c_str();
 		/* We don't actually create a proper command handler class for PROTOCTL,
@@ -70,7 +70,7 @@ class ModuleNamesX : public Module
 		return 0;
 	}
 
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+	virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
 	{
 		if (user->GetExt("NAMESX"))
 		{
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index e8e25fe52..cd9d76c5b 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -90,7 +90,7 @@ class NickFlood : public ModeHandler
  public:
 	NickFlood(InspIRCd* Instance) : ModeHandler(Instance, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		nickfloodsettings* x;
 		if (channel->GetExt("nickflood",x))
@@ -99,13 +99,13 @@ class NickFlood : public ModeHandler
 			return std::make_pair(false, parameter);
 	} 
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		nickfloodsettings* dummy;
 
@@ -219,14 +219,14 @@ class ModuleNickFlood : public Module
 			throw ModuleException("Could not add new modes!");
 	}
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
 		if (isdigit(newnick[0])) /* allow switches to UID */
 			return 0;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
-			chanrec *channel = i->first;
+			Channel *channel = i->first;
 
 			nickfloodsettings *f;
 			if (channel->GetExt("nickflood", f))
@@ -254,7 +254,7 @@ class ModuleNickFlood : public Module
 		return 0;
 	}
 	
-	void OnChannelDelete(chanrec* chan)
+	void OnChannelDelete(Channel* chan)
 	{
 		nickfloodsettings *f;
 		if (chan->GetExt("nickflood",f))
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index e21ea9b90..c2c02f629 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -28,9 +28,9 @@ class cmd_nicklock : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
+		User* source = ServerInstance->FindNick(parameters[0]);
 		irc::string server;
 		irc::string me;
 
@@ -59,7 +59,7 @@ class cmd_nicklock : public Command
 		if (!source->ForceNickChange(parameters[1]))
 		{
 			// ugh, nickchange failed for some reason -- possibly existing nick?
-			userrec::QuitUser(ServerInstance, source, "Nickname collision");
+			User::QuitUser(ServerInstance, source, "Nickname collision");
 		}
 
 		// give them a lock flag
@@ -81,9 +81,9 @@ class cmd_nickunlock : public Command
 		syntax = "<locked-nick>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
+		User* source = ServerInstance->FindNick(parameters[0]);
 		if (source)
 		{
 			source->Shrink("nick_locked");
@@ -127,7 +127,7 @@ class ModuleNickLock : public Module
 		List[I_OnUserPreNick] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
 	}
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
 		if (isdigit(newnick[0])) /* allow a switch to a UID */
 			return 0;
@@ -140,7 +140,7 @@ class ModuleNickLock : public Module
 		return 0;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		user->Shrink("nick_locked");
 	}
@@ -149,7 +149,7 @@ class ModuleNickLock : public Module
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			user->Shrink("nick_locked");
 		}
 	}
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index b2d15f9d7..cb11dd5ad 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,7 +20,7 @@ class NoCTCP : public ModeHandler
  public:
 	NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -64,16 +64,16 @@ class ModuleNoCTCP : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			if (c->IsModeSet('C'))
 			{
 				if ((text.length()) && (text[0] == '\1'))
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index c1d7f0d6f..5447d0d60 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -20,7 +20,7 @@ class NoInvite : public ModeHandler
  public:
 	NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -60,7 +60,7 @@ class ModuleNoInvite : public Module
 		List[I_OnUserPreInvite] = 1;
 	}
 
-	virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+	virtual int OnUserPreInvite(User* user,User* dest,Channel* channel)
 	{
 		if (channel->IsModeSet('V'))
 		{
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 93ab2bd1d..c09d2203b 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -20,7 +20,7 @@ class NoKicks : public ModeHandler
  public:
 	NoKicks(InspIRCd* Instance) : ModeHandler(Instance, 'Q', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -64,7 +64,7 @@ class ModuleNoKicks : public Module
 		List[I_OnAccessCheck] = 1;
 	}
 
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
 		if (access_type == AC_KICK)
 		{
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 3adc9e160..66d8d4601 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -20,7 +20,7 @@ class NoNicks : public ModeHandler
  public:
 	NoNicks(InspIRCd* Instance) : ModeHandler(Instance, 'N', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -71,7 +71,7 @@ class ModuleNoNickChange : public Module
 		List[I_OnUserPreNick] = 1;
 	}
 
-	virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+	virtual int OnUserPreNick(User* user, const std::string &newnick)
 	{
 		if (IS_LOCAL(user))
 		{
@@ -80,7 +80,7 @@ class ModuleNoNickChange : public Module
 
 			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 			{
-				chanrec* curr = i->first;
+				Channel* curr = i->first;
 
 				if (curr->IsModeSet('N'))
 				{
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index fdec61a7e..314a7c8fe 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -20,7 +20,7 @@ class NoNotice : public ModeHandler
  public:
 	NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -63,11 +63,11 @@ class ModuleNoNotice : public Module
 		List[I_OnUserPreNotice] = 1;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			if (c->IsModeSet('T'))
 			{
 				if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index 66fa1e61e..cc2afbe54 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -34,7 +34,7 @@ class cmd_mkpasswd : public Command
 		syntax = "<hashtype> <any-text>";
 	}
 
-	void MakeHash(userrec* user, const char* algo, const char* stuff)
+	void MakeHash(User* user, const char* algo, const char* stuff)
 	{
 		/* Lets see if they gave us an algorithm which has been implemented */
 		hashymodules::iterator x = hashers.find(algo);
@@ -52,7 +52,7 @@ class cmd_mkpasswd : public Command
 		}
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		MakeHash(user, parameters[0], parameters[1]);
 		/* NOTE: Don't propagate this across the network!
@@ -120,7 +120,7 @@ class ModuleOperHash : public Module
 		List[I_OnRehash] = List[I_OnOperCompare] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		/* Re-read configuration file */
 		if (Conf)
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 24772aea7..4c3ae4798 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -21,7 +21,7 @@ class OperChans : public ModeHandler
 	/* This is an oper-only mode */
 	OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -63,7 +63,7 @@ class ModuleOperChans : public Module
 		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (!IS_OPER(user))
 		{
diff --git a/src/modules/m_operflood.cpp b/src/modules/m_operflood.cpp
index 390dd1fe1..7e336eb8b 100644
--- a/src/modules/m_operflood.cpp
+++ b/src/modules/m_operflood.cpp
@@ -32,7 +32,7 @@ public:
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);

 	}

 

-	void OnPostOper(userrec* user, const std::string &opertype)

+	void OnPostOper(User* user, const std::string &opertype)

 	{

 		if(!IS_LOCAL(user))

 			return;

diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 45fcf6be8..ae92a1255 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -51,7 +51,7 @@ class ModuleOperjoin : public Module
 			List[I_OnPostOper] = List[I_OnRehash] = 1;
 		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			ConfigReader* conf = new ConfigReader(ServerInstance);
 
@@ -72,14 +72,14 @@ class ModuleOperjoin : public Module
 			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual void OnPostOper(userrec* user, const std::string &opertype)
+		virtual void OnPostOper(User* user, const std::string &opertype)
 		{
 			if (!IS_LOCAL(user))
 				return;
 
 			for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++)
 				if (ServerInstance->IsChannel(it->c_str()))
-					chanrec::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
+					Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true));
 		}
 
 };
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 4c4047caa..c7fa0a642 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -45,7 +45,7 @@ class ModuleOperLevels : public Module
 			List[I_OnRehash] = List[I_OnKill] = 1;
 		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
 			DELETE(conf);
 			conf = new ConfigReader(ServerInstance);
@@ -56,7 +56,7 @@ class ModuleOperLevels : public Module
 			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
+		virtual int OnKill(User* source, User* dest, const std::string &reason)
 		{
 			long dest_level = 0,source_level = 0;
 
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 09395fccb..0ca13b2da 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -39,7 +39,7 @@ class ModuleOperLog : public Module
 		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index fea793c04..1904b3f01 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -35,7 +35,7 @@ class ModuleModesOnOper : public Module
 		List[I_OnPostOper] = List[I_OnRehash] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		DELETE(Conf);
 		Conf = new ConfigReader(ServerInstance);
@@ -51,7 +51,7 @@ class ModuleModesOnOper : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnPostOper(userrec* user, const std::string &opertype)
+	virtual void OnPostOper(User* user, const std::string &opertype)
 	{
 		// whenever a user opers, go through the oper types, find their <type:modes>,
 		// and if they have one apply their modes. The mode string can contain +modes
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 2ae4c30b5..ef3ae98c4 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -17,7 +17,7 @@
 
 static FileReader* opermotd;
 
-CmdResult ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(User* user)
 {
 	if(!opermotd->FileSize())
 	{
@@ -49,7 +49,7 @@ class cmd_opermotd : public Command
 		syntax = "[<servername>]";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec* user)
+	CmdResult Handle (const char** parameters, int pcnt, User* user)
 	{
 		return ShowOperMOTD(user);
 	}
@@ -99,12 +99,12 @@ class ModuleOpermotd : public Module
 		List[I_OnRehash] = List[I_OnOper] = 1;
 	}
 
-	virtual void OnOper(userrec* user, const std::string &opertype)
+	virtual void OnOper(User* user, const std::string &opertype)
 	{
 		ShowOperMOTD(user);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		LoadOperMOTD();
 	}
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 0f8922854..41b57b327 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -38,7 +38,7 @@ class ModuleOverride : public Module
 		OverOps = OverDeops = OverVoices = OverDevoices = OverHalfops = OverDehalfops = 0;
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		// on a rehash we delete our classes for good measure and create them again.
 		ConfigReader* Conf = new ConfigReader(ServerInstance);
@@ -61,7 +61,7 @@ class ModuleOverride : public Module
 		List[I_OnRehash] = List[I_OnAccessCheck] = List[I_On005Numeric] = List[I_OnUserPreJoin] = List[I_OnUserPreKick] = List[I_OnPostCommand] = 1;
 	}
 
-	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((NoisyOverride) && (OverriddenMode) && (irc::string(command.c_str()) == "MODE") && (result == CMD_SUCCESS))
 		{
@@ -86,7 +86,7 @@ class ModuleOverride : public Module
 		output.append(" OVERRIDE");
 	}
 
-	virtual bool CanOverride(userrec* source, const char* token)
+	virtual bool CanOverride(User* source, const char* token)
 	{
 		// checks to see if the oper's type has <type:override>
 		override_t::iterator j = overrides.find(source->oper);
@@ -101,7 +101,7 @@ class ModuleOverride : public Module
 		return false;
 	}
 
-	virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+	virtual int OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason)
 	{
 		if (IS_OPER(source) && CanOverride(source,"KICK"))
 		{
@@ -115,7 +115,7 @@ class ModuleOverride : public Module
 		return 0;
 	}
 	
-	virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+	virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
 	{
 		if (IS_OPER(source))
 		{
@@ -226,7 +226,7 @@ class ModuleOverride : public Module
 		return ACR_DEFAULT;
 	}
 	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (IS_OPER(user))
 		{
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 96ed2758e..435c41453 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -31,7 +31,7 @@ class cmd_randquote : public Command
 		this->source = "m_randquote.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcntl, userrec *user)
+	CmdResult Handle (const char** parameters, int pcntl, User *user)
 	{
 		std::string str;
 		int fsize;
@@ -125,7 +125,7 @@ class ModuleRandQuote : public Module
 		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 	}
 	
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		if (mycommand)
 			mycommand->Handle(NULL, 0, user);
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 097929456..46b8fbe19 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -22,7 +22,7 @@ class Redirect : public ModeHandler
  public:
 	Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		if (channel->IsModeSet('L'))
 			return std::make_pair(true, channel->GetModeParameter('L'));
@@ -30,17 +30,17 @@ class Redirect : public ModeHandler
 			return std::make_pair(false, parameter);
 	}
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 	
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
-			chanrec* c = NULL;
+			Channel* c = NULL;
 
 			if (!ServerInstance->IsChannel(parameter.c_str()))
 			{
@@ -114,7 +114,7 @@ class ModuleRedirect : public Module
 		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
@@ -125,7 +125,7 @@ class ModuleRedirect : public Module
 					std::string channel = chan->GetModeParameter('L');
 
 					/* sometimes broken ulines can make circular or chained +L, avoid this */
-					chanrec* destchan = NULL;
+					Channel* destchan = NULL;
 					destchan = ServerInstance->FindChan(channel);
 					if (destchan && destchan->IsModeSet('L'))
 					{
@@ -134,7 +134,7 @@ class ModuleRedirect : public Module
 					}
 
 					user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick, cname, channel.c_str());
-					chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true));
+					Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true));
 					return 1;
 				}
 			}
diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index c712b396b..b02f9a391 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -28,7 +28,7 @@ class ModuleRegOnlyCreate : public Module
 		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 			return 0;
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 9de0942c1..22e4b6490 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -69,12 +69,12 @@ class RemoveBase
 		}
 	}
 	
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
+	CmdResult Handle (const char** parameters, int pcnt, User *user, bool neworder)
 	{
 		const char* channame;
 		const char* username;
-		userrec* target;
-		chanrec* channel;
+		User* target;
+		Channel* channel;
 		ModeLevel tlevel;
 		ModeLevel ulevel;
 		std::string reason;
@@ -213,7 +213,7 @@ class cmd_remove : public Command, public RemoveBase
 		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 	
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		return RemoveBase::Handle(parameters, pcnt, user, false);
 	}
@@ -230,7 +230,7 @@ class cmd_fpart : public Command, public RemoveBase
 		syntax = "<channel> <nick> [<reason>]";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		return RemoveBase::Handle(parameters, pcnt, user, true);
 	}
@@ -264,7 +264,7 @@ class ModuleRemove : public Module
 		output.append(" REMOVE");
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string&)
+	virtual void OnRehash(User* user, const std::string&)
 	{
 		ConfigReader conf(ServerInstance);
 		supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
diff --git a/src/modules/m_restrictbanned.cpp b/src/modules/m_restrictbanned.cpp
index a5ab337ad..a5a5ab1ae 100644
--- a/src/modules/m_restrictbanned.cpp
+++ b/src/modules/m_restrictbanned.cpp
@@ -37,7 +37,7 @@ class ModuleRestrictBanned : public Module
 		List[I_OnLocalTopicChange] = List[I_OnUserPreNick] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
 	}
 
-	int CheckRestricted(userrec *user, chanrec *channel, const std::string &action)
+	int CheckRestricted(User *user, Channel *channel, const std::string &action)
 	{
 		/* aren't local? we don't care. */
 		if (!IS_LOCAL(user))
@@ -53,7 +53,7 @@ class ModuleRestrictBanned : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNick(userrec *user, const std::string &newnick)
+	virtual int OnUserPreNick(User *user, const std::string &newnick)
 	{
 		/* if they aren't local, we don't care */
 		if (!IS_LOCAL(user))
@@ -73,21 +73,21 @@ class ModuleRestrictBanned : public Module
 		return 0;
 	}
 
-	virtual int OnLocalTopicChange(userrec *user, chanrec *channel, const std::string &topic)
+	virtual int OnLocalTopicChange(User *user, Channel *channel, const std::string &topic)
 	{
 		return CheckRestricted(user, channel, "change the topic");
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec *channel = (chanrec *)dest;
+			Channel *channel = (Channel *)dest;
 
 			return CheckRestricted(user, channel, "message the channel");
 		}
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 69e503861..e61e8ac0d 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -43,7 +43,7 @@ class ModuleRestrictChans : public Module
 		ReadConfig();
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ReadConfig();
 	}
@@ -53,7 +53,7 @@ class ModuleRestrictChans : public Module
 		List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
 	}
 	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		irc::string x = cname;
 		// user is not an oper and its not in the allow list
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index b5f10eb24..b63d7c7b7 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -32,11 +32,11 @@ class ModuleRestrictMsg : public Module
 		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 
 			// message allowed if:
 			// (1) the sender is opered
@@ -54,7 +54,7 @@ class ModuleRestrictMsg : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 40b8d1b0f..a2135bd6b 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -48,7 +48,7 @@ class ModuleSafeList : public Module
 	{
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader MyConf(ServerInstance);
 		ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true);
@@ -71,7 +71,7 @@ class ModuleSafeList : public Module
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */ 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
@@ -88,7 +88,7 @@ class ModuleSafeList : public Module
 	 * HandleList()
 	 *   Handle (override) the LIST command.
 	 */
-	int HandleList(const char** parameters, int pcnt, userrec* user)
+	int HandleList(const char** parameters, int pcnt, User* user)
 	{
 		int minusers = 0, maxusers = 0;
 
@@ -161,13 +161,13 @@ class ModuleSafeList : public Module
 		return 1;
 	}
 
-	virtual void OnBufferFlushed(userrec* user)
+	virtual void OnBufferFlushed(User* user)
 	{
 		char buffer[MAXBUF];
 		ListData* ld;
 		if (user->GetExt("safelist_cache", ld))
 		{
-			chanrec* chan = NULL;
+			Channel* chan = NULL;
 			long amount_sent = 0;
 			do
 			{
@@ -231,7 +231,7 @@ class ModuleSafeList : public Module
 	{
 		if(target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)item;
+			User* u = (User*)item;
 			ListData* ld;
 			u->GetExt("safelist_cache", ld);
 			if (ld)
@@ -255,7 +255,7 @@ class ModuleSafeList : public Module
 		output.append(" SAFELIST");
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		this->OnCleanup(TYPE_USER,user);
 	}
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 03bf7c47c..1627f945f 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -27,9 +27,9 @@ class cmd_sajoin : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			if (ServerInstance->ULine(dest->server))
@@ -50,9 +50,9 @@ class cmd_sajoin : public Command
 			 */
 			if (IS_LOCAL(dest))
 			{
-				chanrec::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
+				Channel::JoinUser(ServerInstance, dest, parameters[1], true, "", ServerInstance->Time(true));
 				/* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propagate */
-				chanrec* n = ServerInstance->FindChan(parameters[1]);
+				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (n)
 				{
 					if (n->HasUser(dest))
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a083f4305..b67730e27 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -26,7 +26,7 @@ class cmd_samode : public Command
 		syntax = "<target> <modes> {<mode-parameters>}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		/*
 		 * Handles an SAMODE request. Notifies all +s users.
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index e4f2006c4..859db7b37 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -27,9 +27,9 @@ class cmd_sanick : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* source = ServerInstance->FindNick(parameters[0]);
+		User* source = ServerInstance->FindNick(parameters[0]);
 		if (source)
 		{
 			if (ServerInstance->ULine(source->server))
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 0c4d061e1..f0e795980 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -27,10 +27,10 @@ class cmd_sapart : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
-		chanrec* channel = ServerInstance->FindChan(parameters[1]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[1]);
 		if (dest && channel)
 		{
 			if (ServerInstance->ULine(dest->server))
@@ -47,7 +47,7 @@ class cmd_sapart : public Command
 			{
 				if (!channel->PartUser(dest, dest->nick))
 					delete channel;
-				chanrec* n = ServerInstance->FindChan(parameters[1]);
+				Channel* n = ServerInstance->FindChan(parameters[1]);
 				if (!n)
 				{
 					ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 7f4212d80..4711c612c 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -27,9 +27,9 @@ class cmd_saquit : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			if (ServerInstance->ULine(dest->server))
@@ -46,7 +46,7 @@ class cmd_saquit : public Command
 			if (!IS_LOCAL(dest))
 				return CMD_SUCCESS;
 			
-			userrec::QuitUser(ServerInstance, dest, line);
+			User::QuitUser(ServerInstance, dest, line);
 			return CMD_SUCCESS;
 		}
 		else
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index e4fc76478..30b339630 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -35,7 +35,7 @@ class ModuleSecureList : public Module
 		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		allowlist.clear();
@@ -56,7 +56,7 @@ class ModuleSecureList : public Module
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */ 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index c0b6473eb..82deda0cd 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -41,7 +41,7 @@ class ModuleSeeNicks : public Module
 		List[I_OnUserPostNick] = 1;
 	}
 
-	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+	virtual void OnUserPostNick(User* user, const std::string &oldnick)
 	{
 		ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick);
 	}
diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index c1152b7de..88a6b8fb9 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -25,7 +25,7 @@ class Channel_r : public ModeHandler
  public:
 	Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		// only a u-lined server may add or remove the +r mode.
 		if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
@@ -49,7 +49,7 @@ class User_r : public ModeHandler
  public:
 	User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
 		{
@@ -75,7 +75,7 @@ class Channel_R : public ModeHandler
  public:
 	Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -105,7 +105,7 @@ class User_R : public ModeHandler
  public:
 	User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -135,7 +135,7 @@ class Channel_M : public ModeHandler
  public:
 	Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -189,7 +189,7 @@ class ModuleServices : public Module
 	}
 
 	/* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if (dest->IsModeSet('r'))
 		{
@@ -203,7 +203,7 @@ class ModuleServices : public Module
 		List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+	virtual void OnUserPostNick(User* user, const std::string &oldnick)
 	{
 		/* On nickchange, if they have +r, remove it */
 		if (user->IsModeSet('r') && irc::string(user->nick) != oldnick)
@@ -217,14 +217,14 @@ class ModuleServices : public Module
 		}
 	}
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
 
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
 			{
 				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
@@ -239,7 +239,7 @@ class ModuleServices : public Module
 		}
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 			if ((u->IsModeSet('R')) && (!user->IsModeSet('r')))
 			{
 				if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
@@ -255,12 +255,12 @@ class ModuleServices : public Module
 		return 0;
 	}
  	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
 	}
  	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 74e445376..5aa86a910 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -22,7 +22,7 @@ class AChannel_R : public ModeHandler
  public:
 	AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -52,7 +52,7 @@ class AUser_R : public ModeHandler
  public:
 	AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -82,7 +82,7 @@ class AChannel_M : public ModeHandler
  public:
 	AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -123,7 +123,7 @@ class ModuleServicesAccount : public Module
 	}
 
 	/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		std::string *account;
 		dest->GetExt("accountname", account);
@@ -140,7 +140,7 @@ class ModuleServicesAccount : public Module
 		List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		std::string *account;
 
@@ -151,7 +151,7 @@ class ModuleServicesAccount : public Module
 		
 		if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			
 			if ((c->IsModeSet('M')) && (!account))
 			{
@@ -168,7 +168,7 @@ class ModuleServicesAccount : public Module
 		}
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 			
 			if ((u->modes['R'-65]) && (!account))
 			{
@@ -186,12 +186,12 @@ class ModuleServicesAccount : public Module
 		return 0;
 	}
 	 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
 	 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		std::string *account;
 		user->GetExt("accountname", account);
@@ -217,11 +217,11 @@ class ModuleServicesAccount : public Module
 	}
 	
 	// Whenever the linking module wants to send out data, but doesnt know what the data
-	// represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+	// represents (e.g. it is metadata, added to a User or Channel by a module) then
 	// this method is called. We should use the ProtoSendMetaData function after we've
 	// corrected decided how the data should look, to send the metadata on its way if
 	// it is ours.
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if (extname == "accountname")
@@ -242,7 +242,7 @@ class ModuleServicesAccount : public Module
 	}
 
 	// when a user quits, tidy up their metadata
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* account;
 		user->GetExt("accountname", account);
@@ -258,7 +258,7 @@ class ModuleServicesAccount : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			std::string* account;
 			user->GetExt("accountname", account);
 			if (account)
@@ -281,7 +281,7 @@ class ModuleServicesAccount : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "accountname"))
 		{	
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			
 			/* logging them out? */
 			if (extdata.empty())
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index d1ea08c73..852ad6d3f 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -28,7 +28,7 @@ class ServProtectMode : public ModeHandler
  public:
 	ServProtectMode(InspIRCd* Instance) : ModeHandler(Instance, 'k', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		return MODEACTION_DENY;
 	}
@@ -66,7 +66,7 @@ class ModuleServProtectMode : public Module
 		return Version(1,1,0,0,VF_COMMON,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* src, userrec* dst)
+	virtual void OnWhois(User* src, User* dst)
 	{
 		if (dst->IsModeSet('k'))
 		{
@@ -74,7 +74,7 @@ class ModuleServProtectMode : public Module
 		}
 	}
 
-	virtual int OnKill(userrec* src, userrec* dst, const std::string &reason)
+	virtual int OnKill(User* src, User* dst, const std::string &reason)
 	{
 		if (src == NULL)
 			return 0;
@@ -88,7 +88,7 @@ class ModuleServProtectMode : public Module
 		return 0;
 	}
 
-	virtual int OnWhoisLine(userrec* src, userrec* dst, int &numeric, std::string &text)
+	virtual int OnWhoisLine(User* src, User* dst, int &numeric, std::string &text)
 	{
 		return ((src != dst) && (numeric == 319) && dst->IsModeSet('k'));
 	}
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 59b48fbc1..7ea03ebbc 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -29,7 +29,7 @@ class cmd_sethost : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		size_t len = 0;
 		for (const char* x = parameters[0]; *x; x++, len++)
@@ -79,7 +79,7 @@ class ModuleSetHost : public Module
 		List[I_OnRehash] = 1;
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 4a19b8412..0eae1c7be 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -27,7 +27,7 @@ class cmd_setident : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		if (!*parameters[0])
 		{
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 6dbcae711..a676eedb4 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -27,7 +27,7 @@ class cmd_setidle : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		time_t idle = ServerInstance->Duration(parameters[0]);
 		if (idle < 1)
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 80179c8cb..04e101fa3 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -27,7 +27,7 @@ class cmd_setname : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		if (!*parameters[0])
 		{
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 02ac49d22..5acb9b513 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -22,7 +22,7 @@ class SeeWhois : public ModeHandler
  public:
 	SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		/* Only opers can change other users modes */
 		if (source != dest)
@@ -80,7 +80,7 @@ class ModuleShowwhois : public Module
 		return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if ((dest->IsModeSet('W')) && (source != dest))
 		{
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 1bea10b70..240752099 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -32,7 +32,7 @@ class cmd_silence : public Command
 		TRANSLATE2(TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		if (!pcnt)
 		{
@@ -142,7 +142,7 @@ class ModuleSilence : public Module
 		List[I_OnRehash] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
@@ -150,7 +150,7 @@ class ModuleSilence : public Module
 			maxsilence = 32;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		// when the user quits tidy up any silence list they might have just to keep things tidy
 		// and to prevent a HONKING BIG MEMORY LEAK!
@@ -169,7 +169,7 @@ class ModuleSilence : public Module
 		output = output + " SILENCE=" + ConvToStr(maxsilence);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		// im not sure how unreal's silence operates but ours is sensible. It blocks notices and
 		// privmsgs from people on the silence list, directed privately at the user.
@@ -177,7 +177,7 @@ class ModuleSilence : public Module
 		// a channel when you've set an ignore on the two most talkative people?)
 		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 			silencelist* sl;
 			u->GetExt("silence_list", sl);
 			if (sl)
@@ -194,7 +194,7 @@ class ModuleSilence : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
 	}
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index e9a4fdc78..c6fbcdbdc 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -62,7 +62,7 @@ class cmd_silence : public Command
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		if (!pcnt)
 		{
@@ -243,7 +243,7 @@ class ModuleSilence : public Module
 		ServerInstance->AddCommand(mycommand);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
@@ -256,7 +256,7 @@ class ModuleSilence : public Module
 		List[I_OnRehash] = List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		// when the user quits tidy up any silence list they might have just to keep things tidy
 		silencelist* sl;
@@ -274,7 +274,7 @@ class ModuleSilence : public Module
 		output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence);
 	}
 
-	virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text)
+	virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
 	{
 		int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
 		CUList *ulist;
@@ -306,18 +306,18 @@ class ModuleSilence : public Module
 		}
 	}
 
-	virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
+	virtual int PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
 
 		if (target_type == TYPE_USER)
 		{
-			return MatchPattern((userrec*)dest, user, silence_type);
+			return MatchPattern((User*)dest, user, silence_type);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* chan = (chanrec*)dest;
+			Channel* chan = (Channel*)dest;
 			if (chan)
 			{
 				this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list, "");
@@ -326,22 +326,22 @@ class ModuleSilence : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_PRIVATE);
 	}
 
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_NOTICE);
 	}
 
-	virtual int OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel)
+	virtual int OnUserPreInvite(User* source,User* dest,Channel* channel)
 	{
 		return MatchPattern(dest, source, SILENCE_INVITE);
 	}
 
-	int MatchPattern(userrec* dest, userrec* source, int pattern)
+	int MatchPattern(User* dest, User* source, int pattern)
 	{
 		silencelist* sl;
 		dest->GetExt("silence_list", sl);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 4a31d7007..62f288fb3 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -54,7 +54,7 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
 	ServerInstance->Timers->AddTimer(RefreshTimer);
 }
 
-void ModuleSpanningTree::ShowLinks(TreeServer* Current, userrec* user, int hops)
+void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
 {
 	std::string Parent = Utils->TreeRoot->GetName();
 	if (Current->GetParent())
@@ -98,14 +98,14 @@ int ModuleSpanningTree::CountServs()
 	return Utils->serverlist.size();
 }
 
-void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, User* user)
 {
 	ShowLinks(Utils->TreeRoot,user,0);
 	user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
 	return;
 }
 
-void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* user)
 {
 	unsigned int n_users = ServerInstance->UserCount();
 
@@ -299,7 +299,7 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 	}
 }
 
-int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* user)
 {
 	// we've already checked if pcnt > 0, so this is safe
 	TreeServer* found = Utils->FindServerMask(parameters[0]);
@@ -326,7 +326,7 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec
  * If the user is NULL, then the notice is sent locally via WriteToSnoMask with snomask 'l',
  * and remotely via SNONOTICE with mask 'l'.
  */
-void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
+void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
 {
 	/* This could cause an infinite loop, because DoOneToMany() will, on error,
 	 * call TreeSocket::OnError(), which in turn will call this function to
@@ -369,7 +369,7 @@ void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
 	SendingRemoteMessage = false;
 }
 	
-int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* user)
 {
 	for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
 	{
@@ -413,7 +413,7 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st
 	}
 }
 
-void ModuleSpanningTree::OnUserInvite(userrec* source,userrec* dest,chanrec* channel)
+void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel)
 {
 	if (IS_LOCAL(source))
 	{
@@ -424,7 +424,7 @@ void ModuleSpanningTree::OnUserInvite(userrec* source,userrec* dest,chanrec* cha
 	}
 }
 
-void ModuleSpanningTree::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic)
+void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic)
 {
 	std::deque<std::string> params;
 	params.push_back(chan->name);
@@ -432,7 +432,7 @@ void ModuleSpanningTree::OnPostLocalTopicChange(userrec* user, chanrec* chan, co
 	Utils->DoOneToMany(user->uuid,"TOPIC",params);
 }
 
-void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
+void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
 {
 	if (IS_LOCAL(user))
 	{
@@ -442,11 +442,11 @@ void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
 	}
 }
 
-void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 {
 	if (target_type == TYPE_USER)
 	{
-		userrec* d = (userrec*)dest;
+		User* d = (User*)dest;
 		if ((d->GetFd() < 0) && (IS_LOCAL(user)))
 		{
 			std::deque<std::string> params;
@@ -460,7 +460,7 @@ void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type
 	{
 		if (IS_LOCAL(user))
 		{
-			chanrec *c = (chanrec*)dest;
+			Channel *c = (Channel*)dest;
 			if (c)
 			{
 				std::string cname = c->name;
@@ -490,13 +490,13 @@ void ModuleSpanningTree::OnUserNotice(userrec* user, void* dest, int target_type
 	}
 }
 
-void ModuleSpanningTree::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
 {
 	if (target_type == TYPE_USER)
 	{
 		// route private messages which are targetted at clients only to the server
 		// which needs to receive them
-		userrec* d = (userrec*)dest;
+		User* d = (User*)dest;
 		if ((d->GetFd() < 0) && (IS_LOCAL(user)))
 		{
 			std::deque<std::string> params;
@@ -510,7 +510,7 @@ void ModuleSpanningTree::OnUserMessage(userrec* user, void* dest, int target_typ
 	{
 		if (IS_LOCAL(user))
 		{
-			chanrec *c = (chanrec*)dest;
+			Channel *c = (Channel*)dest;
 			if (c)
 			{
 				std::string cname = c->name;
@@ -546,7 +546,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 	DoPingChecks(curtime);
 }
 
-void ModuleSpanningTree::OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool &silent)
 {
 	// Only do this for local users
 	if (IS_LOCAL(user))
@@ -576,7 +576,7 @@ void ModuleSpanningTree::OnUserJoin(userrec* user, chanrec* channel, bool &silen
 	}
 }
 
-void ModuleSpanningTree::OnChangeHost(userrec* user, const std::string &newhost)
+void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
 {
 	// only occurs for local clients
 	if (user->registered != REG_ALL)
@@ -586,7 +586,7 @@ void ModuleSpanningTree::OnChangeHost(userrec* user, const std::string &newhost)
 	Utils->DoOneToMany(user->uuid,"FHOST",params);
 }
 
-void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
+void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 {
 	// only occurs for local clients
 	if (user->registered != REG_ALL)
@@ -596,7 +596,7 @@ void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
 	Utils->DoOneToMany(user->uuid,"FNAME",params);
 }
 
-void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
 {
 	if (IS_LOCAL(user))
 	{
@@ -608,7 +608,7 @@ void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::
 	}
 }
 
-void ModuleSpanningTree::OnUserConnect(userrec* user)
+void ModuleSpanningTree::OnUserConnect(User* user)
 {
 	if (IS_LOCAL(user))
 	{
@@ -633,7 +633,7 @@ void ModuleSpanningTree::OnUserConnect(userrec* user)
 	}
 }
 
-void ModuleSpanningTree::OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 {
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
@@ -656,7 +656,7 @@ void ModuleSpanningTree::OnUserQuit(userrec* user, const std::string &reason, co
 	}
 }
 
-void ModuleSpanningTree::OnUserPostNick(userrec* user, const std::string &oldnick)
+void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 {
 	if (IS_LOCAL(user))
 	{
@@ -673,7 +673,7 @@ void ModuleSpanningTree::OnUserPostNick(userrec* user, const std::string &oldnic
 	}
 }
 
-void ModuleSpanningTree::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 {
 	if ((source) && (IS_LOCAL(source)))
 	{
@@ -693,7 +693,7 @@ void ModuleSpanningTree::OnUserKick(userrec* source, userrec* user, chanrec* cha
 	}
 }
 
-void ModuleSpanningTree::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason)
+void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
 {
 	std::deque<std::string> params;
 	params.push_back(":"+reason);
@@ -705,7 +705,7 @@ void ModuleSpanningTree::OnRemoteKill(userrec* source, userrec* dest, const std:
 	Utils->DoOneToMany(source->uuid,"KILL",params);
 }
 
-void ModuleSpanningTree::OnRehash(userrec* user, const std::string &parameter)
+void ModuleSpanningTree::OnRehash(User* user, const std::string &parameter)
 {
 	if (!parameter.empty())
 	{
@@ -726,7 +726,7 @@ void ModuleSpanningTree::OnRehash(userrec* user, const std::string &parameter)
 // note: the protocol does not allow direct umode +o except
 // via NICK with 8 params. sending OPERTYPE infers +o modechange
 // locally.
-void ModuleSpanningTree::OnOper(userrec* user, const std::string &opertype)
+void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
 {
 	if (IS_LOCAL(user))
 	{
@@ -736,7 +736,7 @@ void ModuleSpanningTree::OnOper(userrec* user, const std::string &opertype)
 	}
 }
 
-void ModuleSpanningTree::OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
+void ModuleSpanningTree::OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
 {
 	if (!source)
 	{
@@ -775,47 +775,47 @@ void ModuleSpanningTree::OnLine(userrec* source, const std::string &host, bool a
 	}
 }
 
-void ModuleSpanningTree::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
+void ModuleSpanningTree::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask)
 {
 	OnLine(source,hostmask,true,'G',duration,reason);
 }
 	
-void ModuleSpanningTree::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask)
+void ModuleSpanningTree::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask)
 {
 	OnLine(source,ipmask,true,'Z',duration,reason);
 }
 
-void ModuleSpanningTree::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask)
+void ModuleSpanningTree::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask)
 {
 	OnLine(source,nickmask,true,'Q',duration,reason);
 }
 
-void ModuleSpanningTree::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
+void ModuleSpanningTree::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask)
 {
 	OnLine(source,hostmask,true,'E',duration,reason);
 }
 
-void ModuleSpanningTree::OnDelGLine(userrec* source, const std::string &hostmask)
+void ModuleSpanningTree::OnDelGLine(User* source, const std::string &hostmask)
 {
 	OnLine(source,hostmask,false,'G',0,"");
 }
 
-void ModuleSpanningTree::OnDelZLine(userrec* source, const std::string &ipmask)
+void ModuleSpanningTree::OnDelZLine(User* source, const std::string &ipmask)
 {
 	OnLine(source,ipmask,false,'Z',0,"");
 }
 
-void ModuleSpanningTree::OnDelQLine(userrec* source, const std::string &nickmask)
+void ModuleSpanningTree::OnDelQLine(User* source, const std::string &nickmask)
 {
 	OnLine(source,nickmask,false,'Q',0,"");
 }
 
-void ModuleSpanningTree::OnDelELine(userrec* source, const std::string &hostmask)
+void ModuleSpanningTree::OnDelELine(User* source, const std::string &hostmask)
 {
 	OnLine(source,hostmask,false,'E',0,"");
 }
 
-void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, const std::string &text)
+void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text)
 {
 	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
 	{
@@ -827,14 +827,14 @@ void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, cons
 
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)dest;
+			User* u = (User*)dest;
 			params.push_back(u->uuid);
 			params.push_back(output_text);
 			command = "MODE";
 		}
 		else
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			params.push_back(c->name);
 			params.push_back(ConvToStr(c->age));
 			params.push_back(output_text);
@@ -845,7 +845,7 @@ void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, cons
 	}
 }
 
-void ModuleSpanningTree::OnSetAway(userrec* user)
+void ModuleSpanningTree::OnSetAway(User* user)
 {
 	if (IS_LOCAL(user))
 	{
@@ -855,7 +855,7 @@ void ModuleSpanningTree::OnSetAway(userrec* user)
 	}
 }
 
-void ModuleSpanningTree::OnCancelAway(userrec* user)
+void ModuleSpanningTree::OnCancelAway(User* user)
 {
 	if (IS_LOCAL(user))
 	{
@@ -876,12 +876,12 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* targ
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)target;
+			User* u = (User*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+u->uuid+" "+ConvToStr(u->age)+" "+output_text);
 		}
 		else
 		{
-			chanrec* c = (chanrec*)target;
+			Channel* c = (Channel*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
 		}
 	}
@@ -894,12 +894,12 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void*
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* u = (userrec*)target;
+			User* u = (User*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* c = (chanrec*)target;
+			Channel* c = (Channel*)target;
 			s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
 		}
 	}
@@ -932,7 +932,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
 	{
 		if (params->size() < 2)
 			return;
-		// Insert the TS value of the object, either userrec or chanrec
+		// Insert the TS value of the object, either User or Channel
 		time_t ourTS = 0;
 		std::string output_text;
 
@@ -940,7 +940,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
 		for (size_t n = 0; n < params->size(); n++)
 			ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
 
-		userrec* a = ServerInstance->FindNick((*params)[0]);
+		User* a = ServerInstance->FindNick((*params)[0]);
 		if (a)
 		{
 			ourTS = a->age;
@@ -949,7 +949,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
 		}
 		else
 		{
-			chanrec* a = ServerInstance->FindChan((*params)[0]);
+			Channel* a = ServerInstance->FindChan((*params)[0]);
 			if (a)
 			{
 				ourTS = a->age;
@@ -996,7 +996,7 @@ void ModuleSpanningTree::OnEvent(Event* event)
 		if (params->size() < 2)
 			return;
 			
-		userrec *a = ServerInstance->FindNick((*params)[0]);
+		User *a = ServerInstance->FindNick((*params)[0]);
 			
 		if (!a)
 			return;
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 9b697a89f..dab1b2420 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -63,7 +63,7 @@ class ModuleSpanningTree : public Module
 
 	/** Shows /LINKS
 	 */
-	void ShowLinks(TreeServer* Current, userrec* user, int hops);
+	void ShowLinks(TreeServer* Current, User* user, int hops);
 
 	/** Counts local servers
 	 */
@@ -75,47 +75,47 @@ class ModuleSpanningTree : public Module
 
 	/** Handle LINKS command
 	 */
-	void HandleLinks(const char** parameters, int pcnt, userrec* user);
+	void HandleLinks(const char** parameters, int pcnt, User* user);
 
 	/** Handle LUSERS command
 	 */
-	void HandleLusers(const char** parameters, int pcnt, userrec* user);
+	void HandleLusers(const char** parameters, int pcnt, User* user);
 
 	/** Show MAP output to a user (recursive)
 	 */
-	void ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][128], float &totusers, float &totservers);
+	void ShowMap(TreeServer* Current, User* user, int depth, char matrix[128][128], float &totusers, float &totservers);
 
 	/** Handle remote MOTD
 	 */
-	int HandleMotd(const char** parameters, int pcnt, userrec* user);
+	int HandleMotd(const char** parameters, int pcnt, User* user);
 
 	/** Handle remote ADMIN
 	 */
-	int HandleAdmin(const char** parameters, int pcnt, userrec* user);
+	int HandleAdmin(const char** parameters, int pcnt, User* user);
 
 	/** Handle remote STATS
 	 */
-	int HandleStats(const char** parameters, int pcnt, userrec* user);
+	int HandleStats(const char** parameters, int pcnt, User* user);
 
 	/** Handle MAP command
 	 */
-	void HandleMap(const char** parameters, int pcnt, userrec* user);
+	void HandleMap(const char** parameters, int pcnt, User* user);
 
 	/** Handle SQUIT
 	 */
-	int HandleSquit(const char** parameters, int pcnt, userrec* user);
+	int HandleSquit(const char** parameters, int pcnt, User* user);
 
 	/** Handle TIME
 	 */
-	int HandleTime(const char** parameters, int pcnt, userrec* user);
+	int HandleTime(const char** parameters, int pcnt, User* user);
 
 	/** Handle remote WHOIS
 	 */
-	int HandleRemoteWhois(const char** parameters, int pcnt, userrec* user);
+	int HandleRemoteWhois(const char** parameters, int pcnt, User* user);
 
 	/** Handle remote MODULES
 	 */
-	int HandleModules(const char** parameters, int pcnt, userrec* user);
+	int HandleModules(const char** parameters, int pcnt, User* user);
 
 	/** Ping all local servers
 	 */
@@ -131,11 +131,11 @@ class ModuleSpanningTree : public Module
 
 	/** Handle remote VERSON
 	 */
-	int HandleVersion(const char** parameters, int pcnt, userrec* user);
+	int HandleVersion(const char** parameters, int pcnt, User* user);
 
 	/** Handle CONNECT
 	 */
-	int HandleConnect(const char** parameters, int pcnt, userrec* user);
+	int HandleConnect(const char** parameters, int pcnt, User* user);
 
 	/** Send out time sync to all servers
 	 */
@@ -143,7 +143,7 @@ class ModuleSpanningTree : public Module
 
 	/** Attempt to send a message to a user
 	 */
-	void RemoteMessage(userrec* user, const char* format, ...);
+	void RemoteMessage(User* user, const char* format, ...);
 
 	/** Returns oper-specific MAP information
 	 */
@@ -157,39 +157,39 @@ class ModuleSpanningTree : public Module
 	 ** *** MODULE EVENTS ***
 	 **/
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line);
-	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line);
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
+	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
 	virtual void OnGetServerDescription(const std::string &servername,std::string &description);
-	virtual void OnUserInvite(userrec* source,userrec* dest,chanrec* channel);
-	virtual void OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic);
-	virtual void OnWallops(userrec* user, const std::string &text);
-	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
-	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
+	virtual void OnUserInvite(User* source,User* dest,Channel* channel);
+	virtual void OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic);
+	virtual void OnWallops(User* user, const std::string &text);
+	virtual void OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
+	virtual void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
 	virtual void OnBackgroundTimer(time_t curtime);
-	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent);
-	virtual void OnChangeHost(userrec* user, const std::string &newhost);
-	virtual void OnChangeName(userrec* user, const std::string &gecos);
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent);
-	virtual void OnUserConnect(userrec* user);
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message);
-	virtual void OnUserPostNick(userrec* user, const std::string &oldnick);
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent);
-	virtual void OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason);
-	virtual void OnRehash(userrec* user, const std::string &parameter);
-	virtual void OnOper(userrec* user, const std::string &opertype);
-	void OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason);
-	virtual void OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask);
-	virtual void OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask);
-	virtual void OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask);
-	virtual void OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask);
-	virtual void OnDelGLine(userrec* source, const std::string &hostmask);
-	virtual void OnDelZLine(userrec* source, const std::string &ipmask);
-	virtual void OnDelQLine(userrec* source, const std::string &nickmask);
-	virtual void OnDelELine(userrec* source, const std::string &hostmask);
-	virtual void OnMode(userrec* user, void* dest, int target_type, const std::string &text);
-	virtual int OnStats(char statschar, userrec* user, string_list &results);
-	virtual void OnSetAway(userrec* user);
-	virtual void OnCancelAway(userrec* user);
+	virtual void OnUserJoin(User* user, Channel* channel, bool &silent);
+	virtual void OnChangeHost(User* user, const std::string &newhost);
+	virtual void OnChangeName(User* user, const std::string &gecos);
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent);
+	virtual void OnUserConnect(User* user);
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message);
+	virtual void OnUserPostNick(User* user, const std::string &oldnick);
+	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent);
+	virtual void OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason);
+	virtual void OnRehash(User* user, const std::string &parameter);
+	virtual void OnOper(User* user, const std::string &opertype);
+	void OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason);
+	virtual void OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask);
+	virtual void OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask);
+	virtual void OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask);
+	virtual void OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask);
+	virtual void OnDelGLine(User* source, const std::string &hostmask);
+	virtual void OnDelZLine(User* source, const std::string &ipmask);
+	virtual void OnDelQLine(User* source, const std::string &nickmask);
+	virtual void OnDelELine(User* source, const std::string &hostmask);
+	virtual void OnMode(User* user, void* dest, int target_type, const std::string &text);
+	virtual int OnStats(char statschar, User* user, string_list &results);
+	virtual void OnSetAway(User* user);
+	virtual void OnCancelAway(User* user);
 	virtual void ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline);
 	virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata);
 	virtual void OnEvent(Event* event);
diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp
index 41bb66570..0a122a780 100644
--- a/src/modules/m_spanningtree/override_admin.cpp
+++ b/src/modules/m_spanningtree/override_admin.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, User* user)
 {
 	if (pcnt > 0)
 	{
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index d6f39e6a8..d0940936a 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -40,7 +40,7 @@ const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
 }	       
 		
 // WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
-void ModuleSpanningTree::ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][128], float &totusers, float &totservers)
+void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, char matrix[128][128], float &totusers, float &totservers)
 {	       
 	if (line < 128)
 	{	       
@@ -104,7 +104,7 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, userrec* user, int depth,
 // and divisons, we instead render the map onto a backplane of characters
 // (a character matrix), then draw the branches as a series of "L" shapes
 // from the nodes. This is not only friendlier on CPU it uses less stack.
-void ModuleSpanningTree::HandleMap(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleMap(const char** parameters, int pcnt, User* user)
 {
 	// This array represents a virtual screen which we will
 	// "scratch" draw to, as the console device of an irc
diff --git a/src/modules/m_spanningtree/override_modules.cpp b/src/modules/m_spanningtree/override_modules.cpp
index 21f6f7350..f32e3ced0 100644
--- a/src/modules/m_spanningtree/override_modules.cpp
+++ b/src/modules/m_spanningtree/override_modules.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleModules(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleModules(const char** parameters, int pcnt, User* user)
 {
 	if (pcnt > 0)
 	{
diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp
index df8331cb7..78e030429 100644
--- a/src/modules/m_spanningtree/override_motd.cpp
+++ b/src/modules/m_spanningtree/override_motd.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, User* user)
 {
 	if (pcnt > 0)
 	{
diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index ce58744b7..8db459411 100644
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleSquit(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleSquit(const char** parameters, int pcnt, User* user)
 {
 	TreeServer* s = Utils->FindServerMask(parameters[0]);
 	if (s)
diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index 05a8da8af..d9dca2827 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, User* user)
 {
 	if (pcnt > 1)
 	{
@@ -61,7 +61,7 @@ int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, userrec*
 	return 0;
 }
 
-int ModuleSpanningTree::OnStats(char statschar, userrec* user, string_list &results)
+int ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results)
 {
 	if ((statschar == 'c') || (statschar == 'n'))
 	{
diff --git a/src/modules/m_spanningtree/override_time.cpp b/src/modules/m_spanningtree/override_time.cpp
index 6c093ba98..359275dfd 100644
--- a/src/modules/m_spanningtree/override_time.cpp
+++ b/src/modules/m_spanningtree/override_time.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleTime(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleTime(const char** parameters, int pcnt, User* user)
 {
 	if ((IS_LOCAL(user)) && (pcnt))
 	{
diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 493735f6a..214c20da3 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -33,11 +33,11 @@
 	
 /* $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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, userrec* user)
+int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, User* user)
 {
 	if ((IS_LOCAL(user)) && (pcnt > 1))
 	{
-		userrec* remote = ServerInstance->FindNick(parameters[1]);
+		User* remote = ServerInstance->FindNick(parameters[1]);
 		if ((remote) && (remote->GetFd() < 0))
 		{
 			std::deque<std::string> params;
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index f538e2963..bf4232b96 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line)
 {
 	if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
 	{
diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp
index c9afef795..1c854a1c1 100644
--- a/src/modules/m_spanningtree/precommand.cpp
+++ b/src/modules/m_spanningtree/precommand.cpp
@@ -33,7 +33,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 m_spanningtree/rsquit.h */
 
-int ModuleSpanningTree::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+int ModuleSpanningTree::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 {
 	/* If the command doesnt appear to be valid, we dont want to mess with it. */
 	if (!validated)
diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 25bf833e1..a984472d1 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -36,7 +36,7 @@ cmd_rconnect::cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUt
 	syntax = "<remote-server-mask> <target-server-mask>";
 }
 
-CmdResult cmd_rconnect::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rconnect::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (IS_LOCAL(user))
 	{
diff --git a/src/modules/m_spanningtree/rconnect.h b/src/modules/m_spanningtree/rconnect.h
index 080d2aad6..ec33445ab 100644
--- a/src/modules/m_spanningtree/rconnect.h
+++ b/src/modules/m_spanningtree/rconnect.h
@@ -22,7 +22,7 @@ class cmd_rconnect : public Command
         SpanningTreeUtilities* Utils;	/* Utility class */
  public:
         cmd_rconnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util);
-        CmdResult Handle (const char** parameters, int pcnt, userrec *user);
+        CmdResult Handle (const char** parameters, int pcnt, User *user);
 };
 
 #endif
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 8c7e9d7f9..62f22bc4f 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -36,7 +36,7 @@ cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilit
 	syntax = "<remote-server-mask> [target-server-mask]";
 }
 
-CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, User *user)
 {
 	if (IS_LOCAL(user))
 	{
@@ -103,7 +103,7 @@ CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, userrec *user)
 	return CMD_SUCCESS;
 }
 
-void cmd_rsquit::NoticeUser(userrec* user, const std::string &msg)
+void cmd_rsquit::NoticeUser(User* user, const std::string &msg)
 {
 	if (IS_LOCAL(user))
 	{
diff --git a/src/modules/m_spanningtree/rsquit.h b/src/modules/m_spanningtree/rsquit.h
index d6285b83f..af2d347b1 100644
--- a/src/modules/m_spanningtree/rsquit.h
+++ b/src/modules/m_spanningtree/rsquit.h
@@ -22,8 +22,8 @@ class cmd_rsquit : public Command
         SpanningTreeUtilities* Utils;	/* Utility class */
  public:
         cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util);
-        CmdResult Handle (const char** parameters, int pcnt, userrec *user);
-        void NoticeUser(userrec* user, const std::string &msg);
+        CmdResult Handle (const char** parameters, int pcnt, User *user);
+        void NoticeUser(User* user, const std::string &msg);
 };
 
 #endif
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 4bedf8388..635d2cc18 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -149,7 +149,7 @@ bool TreeServer::DuplicateID()
 int TreeServer::QuitUsers(const std::string &reason)
 {
 	const char* reason_s = reason.c_str();
-	std::vector<userrec*> time_to_die;
+	std::vector<User*> time_to_die;
 	for (user_hash::iterator n = ServerInstance->clientlist->begin(); n != ServerInstance->clientlist->end(); n++)
 	{
 		if (!strcmp(n->second->server, this->ServerName.c_str()))
@@ -157,15 +157,15 @@ int TreeServer::QuitUsers(const std::string &reason)
 			time_to_die.push_back(n->second);
 		}
 	}
-	for (std::vector<userrec*>::iterator n = time_to_die.begin(); n != time_to_die.end(); n++)
+	for (std::vector<User*>::iterator n = time_to_die.begin(); n != time_to_die.end(); n++)
 	{
-		userrec* a = (userrec*)*n;
+		User* a = (User*)*n;
 		if (!IS_LOCAL(a))
 		{
 			if (ServerInstance->Config->HideSplits)
-				userrec::QuitUser(ServerInstance, a, "*.net *.split", reason_s);
+				User::QuitUser(ServerInstance, a, "*.net *.split", reason_s);
 			else
-				userrec::QuitUser(ServerInstance, a, reason_s);
+				User::QuitUser(ServerInstance, a, reason_s);
 
 			if (this->Utils->quiet_bursts)
 				ServerInstance->GlobalCulls.MakeSilent(a);
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index a798976d2..08e308dfb 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -228,7 +228,7 @@ class TreeSocket : public InspSocket
 	bool ForceJoin(const std::string &source, std::deque<std::string> &params);
 
 	/* Used on nick collision ... XXX ugly function HACK */
-	int DoCollision(userrec *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid);
+	int DoCollision(User *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid);
 
 	/** UID command */
 	bool ParseUID(const std::string &source, std::deque<std::string> &params);
@@ -237,7 +237,7 @@ class TreeSocket : public InspSocket
 	 * If the length of a single line is more than 480-NICKMAX
 	 * in length, it is split over multiple lines.
 	 */
-	void SendFJoins(TreeServer* Current, chanrec* c);
+	void SendFJoins(TreeServer* Current, Channel* c);
 
 	/** Send G, Q, Z and E lines */
 	void SendXLines(TreeServer* Current);
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index f75362bd3..4f6dae56a 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -622,7 +622,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	bool smode = false;
 	std::string sourceserv;
 	/* Are we dealing with an FMODE from a user, or from a server? */
-	userrec* who = this->Instance->FindNick(source);
+	User* who = this->Instance->FindNick(source);
 	if (who)
 	{
 		/* FMODE from a user, set sourceserv to the users server name */
@@ -632,7 +632,7 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 	{
 		/* FMODE from a server, use a fake user to receive mode feedback */
 		who = this->Instance->FakeClient;
-		smode = true;	   /* Setting this flag tells us we should free the userrec later */
+		smode = true;	   /* Setting this flag tells us we should free the User later */
 		sourceserv = source;    /* Set sourceserv to the actual source string */
 	}
 	const char* modelist[64];
@@ -656,9 +656,9 @@ bool TreeSocket::ForceMode(const std::string &source, std::deque<std::string> &p
 		}
 
 	}
-	/* Extract the TS value of the object, either userrec or chanrec */
-	userrec* dst = this->Instance->FindNick(params[0]);
-	chanrec* chan = NULL;
+	/* Extract the TS value of the object, either User or Channel */
+	User* dst = this->Instance->FindNick(params[0]);
+	Channel* chan = NULL;
 	time_t ourTS = 0;
 	if (dst)
 	{
@@ -713,7 +713,7 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 		return true;
 	time_t ts = atoi(params[1].c_str());
 	std::string nsource = source;
-	chanrec* c = this->Instance->FindChan(params[0]);
+	Channel* c = this->Instance->FindChan(params[0]);
 	if (c)
 	{
 		if ((ts >= c->topicset) || (!*c->topic))
@@ -728,7 +728,7 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 			 */
 			if (oldtopic != params[3])
 			{
-				userrec* user = this->Instance->FindNick(source);
+				User* user = this->Instance->FindNick(source);
 				if (!user)
 				{
 					c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name, c->topic);
@@ -789,12 +789,12 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 		return true;
 
 	irc::modestacker modestack(true);				/* Modes to apply from the users in the user list */
-	userrec* who = NULL;		   				/* User we are currently checking */
+	User* who = NULL;		   				/* User we are currently checking */
 	std::string channel = params[0];				/* Channel name, as a string */
 	time_t TS = atoi(params[1].c_str());    			/* Timestamp given to us for remote side */
 	irc::tokenstream users(params[2]);				/* Users from the user list */
 	bool apply_other_sides_modes = true;				/* True if we are accepting the other side's modes */
-	chanrec* chan = this->Instance->FindChan(channel);		/* The channel we're sending joins to */
+	Channel* chan = this->Instance->FindChan(channel);		/* The channel we're sending joins to */
 	time_t ourTS = chan ? chan->age : Instance->Time(true)+600;	/* The TS of our side of the link */
 	bool created = !chan;						/* True if the channel doesnt exist here yet */
 	std::string item;						/* One item in the list of nicks */
@@ -866,7 +866,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 				for (std::string::iterator x = modes.begin(); x != modes.end(); ++x)
 					modestack.Push(*x, who->nick);
 
-				chanrec::JoinUser(this->Instance, who, channel.c_str(), true, "", TS);
+				Channel::JoinUser(this->Instance, who, channel.c_str(), true, "", TS);
 			}
 			else
 			{
@@ -898,11 +898,11 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
 
 /*
  * Yes, this function looks a little ugly.
- * However, in some circumstances we may not have a userrec, so we need to do things this way.
+ * However, in some circumstances we may not have a User, so we need to do things this way.
  * Returns 1 if colliding local client, 2 if colliding remote, 3 if colliding both.
  * Sends SVSNICKs as appropriate and forces nickchanges too.
  */
-int TreeSocket::DoCollision(userrec *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid)
+int TreeSocket::DoCollision(User *u, time_t remotets, const char *remoteident, const char *remoteip, const char *remoteuid)
 {
 	/*
 	 *  Under old protocol rules, we would have had to kill both clients.
@@ -924,7 +924,7 @@ int TreeSocket::DoCollision(userrec *u, time_t remotets, const char *remoteident
 	bool bChangeLocal = true;
 	bool bChangeRemote = true;
 
-	/* for brevity, don't use the userrec */
+	/* for brevity, don't use the User */
 	time_t localts = u->age;
 	const char *localident = u->ident;
 	const char *localip = u->GetIPString();
@@ -980,7 +980,7 @@ int TreeSocket::DoCollision(userrec *u, time_t remotets, const char *remoteident
 		 * have 928AAAB's nick set to that.
 		 *   -- w00t
 		 */
-		userrec *remote = this->Instance->FindUUID(remoteuid);
+		User *remote = this->Instance->FindUUID(remoteuid);
 
 		if (remote)
 		{
@@ -1066,10 +1066,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 	/* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
 	 * sets it up in the UUID hash for us.
 	 */
-	userrec* _new = NULL;
+	User* _new = NULL;
 	try
 	{
-		_new = new userrec(this->Instance, params[0]);
+		_new = new User(this->Instance, params[0]);
 	}
 	catch (...)
 	{
@@ -1142,7 +1142,7 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
  * If the length of a single line is more than 480-NICKMAX
  * in length, it is split over multiple lines.
  */
-void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
+void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
 {
 	std::string buffer;
 	char list[MAXBUF];
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index becfc785b..0c2e99041 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -67,7 +67,7 @@ bool TreeSocket::Modules(const std::string &prefix, std::deque<std::string> &par
 	par.push_back(prefix);
 	par.push_back("");
 
-	userrec* source = this->Instance->FindNick(prefix);
+	User* source = this->Instance->FindNick(prefix);
 	if (!source)
 		return true;
 
@@ -114,7 +114,7 @@ bool TreeSocket::Motd(const std::string &prefix, std::deque<std::string> &params
 		{
 			/* It's for our server */
 			string_list results;
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 
 			if (source)
 			{
@@ -145,7 +145,7 @@ bool TreeSocket::Motd(const std::string &prefix, std::deque<std::string> &params
 		else
 		{
 			/* Pass it on */
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 			if (source)
 				Utils->DoOneToOne(prefix, "MOTD", params, params[0]);
 		}
@@ -162,7 +162,7 @@ bool TreeSocket::Admin(const std::string &prefix, std::deque<std::string> &param
 		{
 			/* It's for our server */
 			string_list results;
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 			if (source)
 			{
 				std::deque<std::string> par;
@@ -181,7 +181,7 @@ bool TreeSocket::Admin(const std::string &prefix, std::deque<std::string> &param
 		else
 		{
 			/* Pass it on */
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 			if (source)
 				Utils->DoOneToOne(prefix, "ADMIN", params, params[0]);
 		}
@@ -200,7 +200,7 @@ bool TreeSocket::Stats(const std::string &prefix, std::deque<std::string> &param
 		{
 			/* It's for our server */
 			string_list results;
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 			if (source)
 			{
 				std::deque<std::string> par;
@@ -217,7 +217,7 @@ bool TreeSocket::Stats(const std::string &prefix, std::deque<std::string> &param
 		else
 		{
 			/* Pass it on */
-			userrec* source = this->Instance->FindNick(prefix);
+			User* source = this->Instance->FindNick(prefix);
 			if (source)
 				Utils->DoOneToOne(source->uuid, "STATS", params, params[1]);
 		}
@@ -234,7 +234,7 @@ bool TreeSocket::OperType(const std::string &prefix, std::deque<std::string> &pa
 	if (params.size() != 1)
 		return true;
 	std::string opertype = params[0];
-	userrec* u = this->Instance->FindNick(prefix);
+	User* u = this->Instance->FindNick(prefix);
 	if (u)
 	{
 		if (!u->IsModeSet('o'))
@@ -276,7 +276,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
 	if (params.size() < 3)
 		return true;
 
-	userrec* u = this->Instance->FindNick(params[0]);
+	User* u = this->Instance->FindNick(params[0]);
 
 	if (u)
 	{
@@ -292,7 +292,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
 				/* buh. UID them */
 				if (!u->ForceNickChange(u->uuid))
 				{
-					userrec::QuitUser(this->Instance, u, "Nickname collision");
+					User::QuitUser(this->Instance, u, "Nickname collision");
 					return true;
 				}
 			}
@@ -309,7 +309,7 @@ bool TreeSocket::OperQuit(const std::string &prefix, std::deque<std::string> &pa
 	if (params.size() < 1)
 		return true;
 
-	userrec* u = this->Instance->FindNick(prefix);
+	User* u = this->Instance->FindNick(prefix);
 
 	if (u)
 	{
@@ -328,13 +328,13 @@ bool TreeSocket::ServiceJoin(const std::string &prefix, std::deque<std::string>
 	if (!this->Instance->IsChannel(params[1].c_str()))
 		return true;
 
-	userrec* u = this->Instance->FindNick(params[0]);
+	User* u = this->Instance->FindNick(params[0]);
 
 	if (u)
 	{
 		/* only join if it's local, otherwise just pass it on! */
 		if (IS_LOCAL(u))
-			chanrec::JoinUser(this->Instance, u, params[1].c_str(), false, "", Instance->Time());
+			Channel::JoinUser(this->Instance, u, params[1].c_str(), false, "", Instance->Time());
 		Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
 	}
 	return true;
@@ -348,8 +348,8 @@ bool TreeSocket::ServicePart(const std::string &prefix, std::deque<std::string>
 	if (!this->Instance->IsChannel(params[1].c_str()))
 		return true;
 
-	userrec* u = this->Instance->FindNick(params[0]);
-	chanrec* c = this->Instance->FindChan(params[1]);
+	User* u = this->Instance->FindNick(params[0]);
+	Channel* c = this->Instance->FindChan(params[1]);
 
 	if (u)
 	{
@@ -386,7 +386,7 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
 	if (params.size() != 2)
 		return true;
 
-	userrec* who = this->Instance->FindNick(params[0]);
+	User* who = this->Instance->FindNick(params[0]);
 
 	if (who)
 	{
@@ -401,7 +401,7 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
 		// NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix.
 		// in short this is not executed for USERS.
 		who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick, prefix.c_str(), reason.c_str());
-		userrec::QuitUser(this->Instance,who,reason);
+		User::QuitUser(this->Instance,who,reason);
 	}
 	return true;
 }
@@ -434,7 +434,7 @@ bool TreeSocket::LocalPong(const std::string &prefix, std::deque<std::string> &p
 			 * dump the PONG reply back to their fd. If its a server, do nowt.
 			 * Services might want to send these s->s, but we dont need to yet.
 			 */
-			userrec* u = this->Instance->FindNick(prefix);
+			User* u = this->Instance->FindNick(prefix);
 			if (u)
 			{
 				u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
@@ -467,7 +467,7 @@ bool TreeSocket::MetaData(const std::string &prefix, std::deque<std::string> &pa
 		}
 		else if (*(params[0].c_str()) == '#')
 		{
-			chanrec* c = this->Instance->FindChan(params[0]);
+			Channel* c = this->Instance->FindChan(params[0]);
 			if (c)
 			{
 				FOREACH_MOD_I(this->Instance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2]));
@@ -475,7 +475,7 @@ bool TreeSocket::MetaData(const std::string &prefix, std::deque<std::string> &pa
 		}
 		else if (*(params[0].c_str()) != '#')
 		{
-			userrec* u = this->Instance->FindNick(params[0]);
+			User* u = this->Instance->FindNick(params[0]);
 			if (u)
 			{
 				FOREACH_MOD_I(this->Instance,I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2]));
@@ -508,7 +508,7 @@ bool TreeSocket::ChangeHost(const std::string &prefix, std::deque<std::string> &
 {
 	if (params.size() < 1)
 		return true;
-	userrec* u = this->Instance->FindNick(prefix);
+	User* u = this->Instance->FindNick(prefix);
 
 	if (u)
 	{
@@ -587,7 +587,7 @@ bool TreeSocket::ChangeName(const std::string &prefix, std::deque<std::string> &
 {
 	if (params.size() < 1)
 		return true;
-	userrec* u = this->Instance->FindNick(prefix);
+	User* u = this->Instance->FindNick(prefix);
 	if (u)
 	{
 		u->ChangeName(params[0].c_str());
@@ -601,16 +601,16 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
 {
 	if (params.size() < 1)
 		return true;
-	userrec* u = this->Instance->FindNick(prefix);
+	User* u = this->Instance->FindNick(prefix);
 	if (u)
 	{
 		// an incoming request
 		if (params.size() == 1)
 		{
-			userrec* x = this->Instance->FindNick(params[0]);
+			User* x = this->Instance->FindNick(params[0]);
 			if ((x) && (IS_LOCAL(x)))
 			{
-				userrec* x = this->Instance->FindNick(params[0]);
+				User* x = this->Instance->FindNick(params[0]);
 				char signon[MAXBUF];
 				char idle[MAXBUF];
 				snprintf(signon, MAXBUF, "%lu", (unsigned long)x->signon);
@@ -632,7 +632,7 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
 		else if (params.size() == 3)
 		{
 			std::string who_did_the_whois = params[0];
-			userrec* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
+			User* who_to_send_to = this->Instance->FindNick(who_did_the_whois);
 			if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
 			{
 				// an incoming reply to a whois we sent out
@@ -659,7 +659,7 @@ bool TreeSocket::Push(const std::string &prefix, std::deque<std::string> &params
 {
 	if (params.size() < 2)
 		return true;
-	userrec* u = this->Instance->FindNick(params[0]);
+	User* u = this->Instance->FindNick(params[0]);
 	if (!u)
 		return true;
 	if (IS_LOCAL(u))
@@ -710,7 +710,7 @@ bool TreeSocket::Time(const std::string &prefix, std::deque<std::string> &params
 		// someone querying our time?
 		if (this->Instance->Config->ServerName == params[0] || this->Instance->Config->GetSID() == params[0])
 		{
-			userrec* u = this->Instance->FindNick(params[1]);
+			User* u = this->Instance->FindNick(params[1]);
 			if (u)
 			{
 				params.push_back(ConvToStr(Instance->Time(false)));
@@ -721,7 +721,7 @@ bool TreeSocket::Time(const std::string &prefix, std::deque<std::string> &params
 		else
 		{
 			// not us, pass it on
-			userrec* u = this->Instance->FindNick(params[1]);
+			User* u = this->Instance->FindNick(params[1]);
 			if (u)
 				Utils->DoOneToOne(prefix,"TIME",params,params[0]);
 		}
@@ -729,7 +729,7 @@ bool TreeSocket::Time(const std::string &prefix, std::deque<std::string> &params
 	else if (params.size() == 3)
 	{
 		// a response to a previous TIME
-		userrec* u = this->Instance->FindNick(params[1]);
+		User* u = this->Instance->FindNick(params[1]);
 		if ((u) && (IS_LOCAL(u)))
 		{
 			time_t rawtime = atol(params[2].c_str());
@@ -784,7 +784,7 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
 {
 	if (params.size() < 1)
 		return true;
-	chanrec* c = Instance->FindChan(params[0]);
+	Channel* c = Instance->FindChan(params[0]);
 	if (c)
 	{
 		for (char modeletter = 'A'; modeletter <= 'z'; modeletter++)
@@ -1208,7 +1208,7 @@ bool TreeSocket::ProcessLine(std::string &line)
 			{
 				std::string direction = prefix;
 
-				userrec *t = this->Instance->FindUUID(prefix);
+				User *t = this->Instance->FindUUID(prefix);
 				if (t)
 				{
 					direction = t->server;
@@ -1239,10 +1239,10 @@ bool TreeSocket::ProcessLine(std::string &line)
 
 			if ((command == "MODE") && (params.size() >= 2))
 			{
-				chanrec* channel = Instance->FindChan(params[0]);
+				Channel* channel = Instance->FindChan(params[0]);
 				if (channel)
 				{
-					userrec* x = Instance->FindNick(prefix);
+					User* x = Instance->FindNick(prefix);
 					if (x)
 					{
 						if (warned.find(x->server) == warned.end())
@@ -1421,8 +1421,8 @@ bool TreeSocket::ProcessLine(std::string &line)
 				std::string sourceserv = this->myhost;
 				if (params.size() == 3)
 				{
-					userrec* user = this->Instance->FindNick(params[1]);
-					chanrec* chan = this->Instance->FindChan(params[0]);
+					User* user = this->Instance->FindNick(params[1]);
+					Channel* chan = this->Instance->FindChan(params[0]);
 					if (user && chan)
 					{
 						if (!chan->ServerKickUser(user, params[2].c_str(), false))
@@ -1504,7 +1504,7 @@ bool TreeSocket::ProcessLine(std::string &line)
 				 * Not a special s2s command. Emulate the user doing it.
 				 * This saves us having a huge ugly command parser again.
 				 */
-				userrec *who = this->Instance->FindUUID(prefix);
+				User *who = this->Instance->FindUUID(prefix);
 
 				std::string sourceserv = this->myhost;
 				if (!this->InboundServerName.empty())
@@ -1539,7 +1539,7 @@ bool TreeSocket::ProcessLine(std::string &line)
 						 * already exist here. If it does, kill their copy,
 						 * and our copy.
 						 */
-						userrec* x = this->Instance->FindNickOnly(params[0]);
+						User* x = this->Instance->FindNickOnly(params[0]);
 						if ((x) && (x != who))
 						{
 							int collideret = 0;
@@ -1567,11 +1567,11 @@ Old nickname collision logic..
 							p.push_back(prefix);
 							p.push_back(":Nickname collision");
 							Utils->DoOneToMany(this->Instance->Config->ServerName,"KILL",p);
-							userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")");
-							userrec* y = this->Instance->FindNick(prefix);
+							User::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")");
+							User* y = this->Instance->FindNick(prefix);
 							if (y)
 							{
-								userrec::QuitUser(this->Instance,y,"Nickname collision");
+								User::QuitUser(this->Instance,y,"Nickname collision");
 							}
 							return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
 */
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index abc251ab0..4814013e6 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -230,7 +230,7 @@ void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &li
 }
 
 /* returns a list of DIRECT servernames for a specific channel */
-void SpanningTreeUtilities::GetListOfServersForChannel(chanrec* c, TreeServerList &list, char status, const CUList &exempt_list)
+void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list)
 {
 	CUList *ulist;
 	switch (status)
@@ -277,7 +277,7 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons
 			if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$'))
 			{
 				// special routing for private messages/notices
-				userrec* d = ServerInstance->FindNick(params[0]);
+				User* d = ServerInstance->FindNick(params[0]);
 				if (d)
 				{
 					std::deque<std::string> par;
@@ -297,8 +297,8 @@ bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, cons
 			}
 			else
 			{
-				chanrec* c = ServerInstance->FindChan(params[0]);
-				userrec* u = ServerInstance->FindNick(prefix);
+				Channel* c = ServerInstance->FindChan(params[0]);
+				User* u = ServerInstance->FindNick(prefix);
 				if (c && u)
 				{
 					CUList elist;
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 0203e7602..aeb89c6be 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -158,7 +158,7 @@ class SpanningTreeUtilities
 	void AddThisServer(TreeServer* server, TreeServerList &list);
 	/** Compile a list of servers which contain members of channel c
 	 */
-	void GetListOfServersForChannel(chanrec* c, TreeServerList &list, char status, const CUList &exempt_list);
+	void GetListOfServersForChannel(Channel* c, TreeServerList &list, char status, const CUList &exempt_list);
 	/** Find a server by name
 	 */
 	TreeServer* FindServer(const std::string &ServerName);
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 8e42f9c75..76ae8cfa4 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -16,7 +16,7 @@
 #include "inspircd.h"
 #include "wildcard.h"
 
-void spy_userlist(userrec *user, chanrec *c)
+void spy_userlist(User *user, Channel *c)
 {
 	char list[MAXBUF];
 	size_t dlen, curlen;
@@ -72,7 +72,7 @@ class cmd_spylist : public Command
 		syntax.clear();
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		ServerInstance->WriteOpers("*** Oper %s used SPYLIST to list +s/+p channels and keys.",user->nick);
 		user->WriteServ("321 %s Channel :Users Name",user->nick);
@@ -100,9 +100,9 @@ class cmd_spynames : public Command
 		syntax = "{<channel>{,<channel>}}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		chanrec* c = NULL;
+		Channel* c = NULL;
 
 		if (!pcnt)
 		{
diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp
index 6b9f6d46c..4a91feada 100644
--- a/src/modules/m_ssl_dummy.cpp
+++ b/src/modules/m_ssl_dummy.cpp
@@ -41,7 +41,7 @@ class ModuleSSLDummy : public Module
 	}
 
 	// :kenny.chatspike.net 320 Om Epy|AFK :is a Secure Connection
-	virtual void OnWhois(userrec* source, userrec* dest)
+	virtual void OnWhois(User* source, User* dest)
 	{
 		if(dest->GetExt("ssl", dummy))
 		{
@@ -49,7 +49,7 @@ class ModuleSSLDummy : public Module
 		}
 	}
 	
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if(extname == "ssl")
@@ -69,7 +69,7 @@ class ModuleSSLDummy : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "ssl"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an ssl flag, accept the remote server's
 			if (!dest->GetExt(extname, dummy))
 			{
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index a9c5b89b3..e31d41c0b 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -24,7 +24,7 @@ class SSLMode : public ModeHandler
  public:
 	SSLMode(InspIRCd* Instance) : ModeHandler(Instance, 'z', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -84,7 +84,7 @@ class ModuleSSLModes : public Module
 		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if(chan && chan->IsModeSet('z'))
 		{
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index ba8913600..8ed4bb49b 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -22,7 +22,7 @@ class ChannelStripColor : public ModeHandler
  public:
 	ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -52,7 +52,7 @@ class UserStripColor : public ModeHandler
  public:
 	UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		/* Only opers can change other users modes */
 		if (source != dest)
@@ -138,7 +138,7 @@ class ModuleStripColor : public Module
 		}
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
@@ -146,12 +146,12 @@ class ModuleStripColor : public Module
 		bool active = false;
 		if (target_type == TYPE_USER)
 		{
-			userrec* t = (userrec*)dest;
+			User* t = (User*)dest;
 			active = t->IsModeSet('S');
 		}
 		else if (target_type == TYPE_CHANNEL)
 		{
-			chanrec* t = (chanrec*)dest;
+			Channel* t = (Channel*)dest;
 
 			// check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
 			// note: short circut logic here, don't wreck it. -- w00t
@@ -167,7 +167,7 @@ class ModuleStripColor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index f26454d3e..7988d73ba 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -57,7 +57,7 @@ class cmd_svshold : public Command
 		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, User *user)
 	{
 		/* syntax: svshold nickname time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -166,7 +166,7 @@ class ModuleSVSHold : public Module
 		List[I_OnUserPreNick] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
 	}
 	
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		ExpireBans();
 	
@@ -182,7 +182,7 @@ class ModuleSVSHold : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNick(userrec *user, const std::string &newnick)
+	virtual int OnUserPreNick(User *user, const std::string &newnick)
 	{
 		ExpireBans();
 	
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 3e8c53ea1..196c43553 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -28,9 +28,9 @@ class cmd_swhois : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec* user)
+	CmdResult Handle(const char** parameters, int pcnt, User* user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		
 		if (!dest)
 		{
@@ -110,7 +110,7 @@ class ModuleSWhois : public Module
 		ServerInstance->AddCommand(mycommand);
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		DELETE(Conf);
 		Conf = new ConfigReader(ServerInstance);
@@ -122,7 +122,7 @@ class ModuleSWhois : public Module
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -140,11 +140,11 @@ class ModuleSWhois : public Module
 	}
 
 	// Whenever the linking module wants to send out data, but doesnt know what the data
-	// represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+	// represents (e.g. it is metadata, added to a User or Channel by a module) then
 	// this method is called. We should use the ProtoSendMetaData function after we've
 	// corrected decided how the data should look, to send the metadata on its way if
 	// it is ours.
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if (extname == "swhois")
@@ -162,7 +162,7 @@ class ModuleSWhois : public Module
 	}
 
 	// when a user quits, tidy up their metadata
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* swhois;
 		user->GetExt("swhois", swhois);
@@ -178,7 +178,7 @@ class ModuleSWhois : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			std::string* swhois;
 			user->GetExt("swhois", swhois);
 			if (swhois)
@@ -201,7 +201,7 @@ class ModuleSWhois : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "swhois"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an swhois field, accept the remote server's
 			std::string* text;
 			if (!dest->GetExt("swhois", text))
@@ -212,7 +212,7 @@ class ModuleSWhois : public Module
 		}
 	}
 	
-	virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+	virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((command != "OPER") || (result != CMD_SUCCESS))
 			return;
diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index da8ad9749..bf77c5812 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -29,9 +29,9 @@ class cmd_taxonomy : public Command
 		syntax = "<nickname>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		if (dest)
 		{
 			std::deque<std::string> list;
@@ -76,7 +76,7 @@ class ModuleTaxonomy : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* spool = (userrec*)opaque;
+			User* spool = (User*)opaque;
 			std::string taxstr = "304 " + std::string(spool->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
 			spool->WriteServ(taxstr);
 			claimed = true;
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index d99a51c7d..58fd466df 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -26,7 +26,7 @@ class cmd_dalinfo : public Command
 		this->source = "m_testcommand.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		user->WriteServ("NOTICE %s :*** DALNet had nothing to do with it.", user->nick);
 		return CMD_FAILURE;
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 714b8b40a..a226b9747 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -40,9 +40,9 @@ class cmd_tban : public Command
 		TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		chanrec* channel = ServerInstance->FindChan(parameters[0]);
+		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		if (channel)
 		{
 			int cm = channel->GetStatus(user);
@@ -125,7 +125,7 @@ class ModuleTimedBans : public Module
 		List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
 	}
 
-	virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
+	virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
 	{
 		irc::string listitem = banmask.c_str();
 		irc::string thischan = chan->name;
@@ -152,7 +152,7 @@ class ModuleTimedBans : public Module
 			{
 				if (curtime > i->expire)
 				{
-					chanrec* cr = ServerInstance->FindChan(i->channel);
+					Channel* cr = ServerInstance->FindChan(i->channel);
 					again = true;
 					if (cr)
 					{
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index bfeeb202e..c246cc811 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -27,7 +27,7 @@ class cmd_tline : public Command
 		this->syntax = "<mask>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		float n_counted = 0;
 		float n_matched = 0;
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 41534eca4..830be12e8 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -36,7 +36,7 @@ class ModuleUHNames : public Module
 	{
 	}
 
-	void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
 	{
 		if ((displayable) && (extname == "UHNAMES"))
 			proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
@@ -57,7 +57,7 @@ class ModuleUHNames : public Module
 		return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line)
 	{
 		irc::string c = command.c_str();
 		/* We don't actually create a proper command handler class for PROTOCTL,
@@ -77,7 +77,7 @@ class ModuleUHNames : public Module
 	}
 
 	/* IMPORTANT: This must be prioritized above NAMESX! */
-	virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+	virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
 	{
 		if (user->GetExt("UHNAMES"))
 		{
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 7e13a63f9..9fbd6dfb0 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -27,10 +27,10 @@ class cmd_uninvite : public Command
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* u = ServerInstance->FindNick(parameters[0]);
-		chanrec* c = ServerInstance->FindChan(parameters[1]);
+		User* u = ServerInstance->FindNick(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[1]);
 			 
 		if ((!c) || (!u))
 		{	
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 949ce758e..829a535e3 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -26,13 +26,13 @@ class cmd_userip : public Command
 		syntax = "<nick>{,<nick>}";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		std::string retbuf = std::string("340 ") + user->nick + " :";
 
 		for (int i = 0; i < pcnt; i++)
 		{
-			userrec *u = ServerInstance->FindNick(parameters[i]);
+			User *u = ServerInstance->FindNick(parameters[i]);
 			if ((u) && (u->registered == REG_ALL))
 			{
 				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 92aeb3401..0827343de 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -26,7 +26,7 @@ class cmd_vhost : public Command
 		syntax = "<username> <password>";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		ConfigReader *Conf = new ConfigReader(ServerInstance);
 
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index a090487f3..6cc96d0f9 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -30,7 +30,7 @@
  * and Om by reading their 'watched by' list. When this occurs, their online status
  * in each of these users lists (see below) is also updated.
  *
- * Each user also has a seperate (smaller) map attached to their userrec whilst they
+ * Each user also has a seperate (smaller) map attached to their User whilst they
  * have any watch entries, which is managed by class Extensible. When they add or remove
  * a watch entry from their list, it is inserted here, as well as the main list being
  * maintained. This map also contains the user's online status. For users that are
@@ -62,9 +62,9 @@
  * Yes, it's horrid. Blame cl for being different. -- w00t
  */
 #ifdef WINDOWS
-typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash_compare<irc::string, less<irc::string> > > watchentries;
+typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash_compare<irc::string, less<irc::string> > > watchentries;
 #else
-typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
+typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash<irc::string> > watchentries;
 #endif
 typedef std::map<irc::string, std::string> watchlist;
 
@@ -80,7 +80,7 @@ class cmd_watch : public Command
 {
 	unsigned int& MAX_WATCH;
  public:
-	CmdResult remove_watch(userrec* user, const char* nick)
+	CmdResult remove_watch(User* user, const char* nick)
 	{
 		// removing an item from the list
 		if (!ServerInstance->IsNick(nick))
@@ -114,7 +114,7 @@ class cmd_watch : public Command
 			if (x != whos_watching_me->end())
 			{
 				/* People are watching this user, am i one of them? */
-				std::deque<userrec*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
+				std::deque<User*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
 				if (n != x->second.end())
 					/* I'm no longer watching you... */
 					x->second.erase(n);
@@ -131,7 +131,7 @@ class cmd_watch : public Command
 		return CMD_FAILURE;
 	}
 
-	CmdResult add_watch(userrec* user, const char* nick)
+	CmdResult add_watch(User* user, const char* nick)
 	{
 		if (!ServerInstance->IsNick(nick))
 		{
@@ -164,12 +164,12 @@ class cmd_watch : public Command
 			}
 			else
 			{
-				std::deque<userrec*> newlist;
+				std::deque<User*> newlist;
 				newlist.push_back(user);
 				(*(whos_watching_me))[nick] = newlist;
 			}
 
-			userrec* target = ServerInstance->FindNick(nick);
+			User* target = ServerInstance->FindNick(nick);
 			if (target)
 			{
 				if (target->Visibility && !target->Visibility->VisibleTo(user))
@@ -199,7 +199,7 @@ class cmd_watch : public Command
 		TRANSLATE2(TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
 		if (!pcnt)
 		{
@@ -231,7 +231,7 @@ class cmd_watch : public Command
 							if (x != whos_watching_me->end())
 							{
 								/* People are watching this user, am i one of them? */
-								std::deque<userrec*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
+								std::deque<User*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
 								if (n != x->second.end())
 									/* I'm no longer watching you... */
 									x->second.erase(n);
@@ -314,7 +314,7 @@ class Modulewatch : public Module
 		ServerInstance->AddCommand(mycommand);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
@@ -327,12 +327,12 @@ class Modulewatch : public Module
 		List[I_OnRehash] = List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		watchentries::iterator x = whos_watching_me->find(user->nick);
 		if (x != whos_watching_me->end())
 		{
-			for (std::deque<userrec*>::iterator n = x->second.begin(); n != x->second.end(); n++)
+			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
 				if (!user->Visibility || user->Visibility->VisibleTo(user))
 					(*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time());
@@ -355,7 +355,7 @@ class Modulewatch : public Module
 				if (x != whos_watching_me->end())
 				{
 						/* People are watching this user, am i one of them? */
-						std::deque<userrec*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
+						std::deque<User*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
 						if (n != x->second.end())
 							/* I'm no longer watching you... */
 							x->second.erase(n);
@@ -386,7 +386,7 @@ class Modulewatch : public Module
 		if (target_type == TYPE_USER)
 		{
 			watchlist* wl;
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 
 			if (user->GetExt("watchlist", wl))
 			{
@@ -396,12 +396,12 @@ class Modulewatch : public Module
 		}
 	}
 
-	virtual void OnPostConnect(userrec* user)
+	virtual void OnPostConnect(User* user)
 	{
 		watchentries::iterator x = whos_watching_me->find(user->nick);
 		if (x != whos_watching_me->end())
 		{
-			for (std::deque<userrec*>::iterator n = x->second.begin(); n != x->second.end(); n++)
+			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
 				if (!user->Visibility || user->Visibility->VisibleTo(user))
 					(*n)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age);
@@ -414,14 +414,14 @@ class Modulewatch : public Module
 		}
 	}
 
-	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+	virtual void OnUserPostNick(User* user, const std::string &oldnick)
 	{
 		watchentries::iterator new_offline = whos_watching_me->find(assign(oldnick));
 		watchentries::iterator new_online = whos_watching_me->find(user->nick);
 
 		if (new_offline != whos_watching_me->end())
 		{
-			for (std::deque<userrec*>::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++)
+			for (std::deque<User*>::iterator n = new_offline->second.begin(); n != new_offline->second.end(); n++)
 			{
 				watchlist* wl;
 				if ((*n)->GetExt("watchlist", wl))
@@ -435,7 +435,7 @@ class Modulewatch : public Module
 
 		if (new_online != whos_watching_me->end())
 		{
-			for (std::deque<userrec*>::iterator n = new_online->second.begin(); n != new_online->second.end(); n++)
+			for (std::deque<User*>::iterator n = new_online->second.begin(); n != new_online->second.end(); n++)
 			{
 				watchlist* wl;
 				if ((*n)->GetExt("watchlist", wl))
diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp
index d97d40f87..6d1e99d31 100644
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -28,7 +28,7 @@ class ModuleXMLSocket : public Module
 		OnRehash(NULL,"");
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
 
 		Conf = new ConfigReader(ServerInstance);
@@ -107,7 +107,7 @@ class ModuleXMLSocket : public Module
 
 	virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
 	{
-		userrec* user = dynamic_cast<userrec*>(ServerInstance->FindDescriptor(fd));
+		User* user = dynamic_cast<User*>(ServerInstance->FindDescriptor(fd));
 
 		if (user == NULL)
 			return -1;
@@ -135,7 +135,7 @@ class ModuleXMLSocket : public Module
 
 	virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
 	{
-		userrec* user = dynamic_cast<userrec*>(ServerInstance->FindDescriptor(fd));
+		User* user = dynamic_cast<User*>(ServerInstance->FindDescriptor(fd));
 
 		if (user == NULL)
 			return -1;
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index df524b51f..070d01d73 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -53,9 +53,9 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
 	if (n != SnoMasks.end())
 	{
 		/* Only opers can receive snotices, so we iterate the oper list */
-		for (std::list<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+		for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
 		{
-			userrec* a = *i;
+			User* a = *i;
 			if (IS_LOCAL(a) && a->IsModeSet('s') && a->IsModeSet('n') && a->IsNoticeMaskSet(n->first))
 			{
 				/* send server notices to all with +ns */
diff --git a/src/socket.cpp b/src/socket.cpp
index 2465506e9..e4d59716a 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -115,7 +115,7 @@ void ListenSocket::HandleEvent(EventType et, int errornum)
 			}
 		}
 		ServerInstance->stats->statsAccept++;
-		userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+		User::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
 	}
 	else
 	{
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 9c8b27267..469fa61d0 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -17,13 +17,13 @@
 #include "socketengine.h"
 #include "command_parse.h"
 
-void FloodQuitUserHandler::Call(userrec* current)
+void FloodQuitUserHandler::Call(User* current)
 {
 	Server->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
 	Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
 			current->registered == REG_ALL ? current->nick : "",
 			current->registered == REG_ALL ? "!" : "", current->ident, current->host);
-	userrec::QuitUser(Server, current, "Excess flood");
+	User::QuitUser(Server, current, "Excess flood");
 	if (current->registered != REG_ALL)
 	{
 		Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
@@ -31,7 +31,7 @@ void FloodQuitUserHandler::Call(userrec* current)
 	}
 }
 
-void ProcessUserHandler::Call(userrec* cu)
+void ProcessUserHandler::Call(User* cu)
 {
 	int result = EAGAIN;
 
@@ -70,7 +70,7 @@ void ProcessUserHandler::Call(userrec* cu)
 
 	if ((result) && (result != -EAGAIN))
 	{
-		userrec *current;
+		User *current;
 		int currfd;
 		int floodlines = 0;
 
@@ -159,7 +159,7 @@ void ProcessUserHandler::Call(userrec* cu)
 
 		if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
 		{
-			userrec::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
+			User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
 			return;
 		}
 	}
@@ -171,7 +171,7 @@ void ProcessUserHandler::Call(userrec* cu)
 	}
 	else if (result == 0)
 	{
-		userrec::QuitUser(Server, cu, "Connection closed");
+		User::QuitUser(Server, cu, "Connection closed");
 		return;
 	}
 }
@@ -192,9 +192,9 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
 		const time_t DUMMY_VALUE = 32768;
 		next_call = TIME + DUMMY_VALUE;
 
-		for (std::vector<userrec*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
+		for (std::vector<User*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
 		{
-			userrec* curr = *count2;
+			User* curr = *count2;
 
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST
@@ -203,7 +203,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
 			if ((TIME > curr->timeout) && (curr->registered != REG_ALL))
 			{
 				curr->muted = true;
-				userrec::QuitUser(this, curr, "Registration timeout");
+				User::QuitUser(this, curr, "Registration timeout");
 				continue;
 			}
 			else
@@ -257,7 +257,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
 					curr->muted = true;
 					curr->lastping = 1;
 					curr->nping = TIME+curr->pingmax;
-					userrec::QuitUser(this, curr, message);
+					User::QuitUser(this, curr, message);
 					continue;
 				}
 				curr->Write("PING :%s",this->Config->ServerName);
diff --git a/src/users.cpp b/src/users.cpp
index d3f6d6075..5141053ba 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -76,7 +76,7 @@ bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
 	return true;
 }
 
-std::string userrec::ProcessNoticeMasks(const char *sm)
+std::string User::ProcessNoticeMasks(const char *sm)
 {
 	bool adding = true, oldadding = false;
 	const char *c = sm;
@@ -133,7 +133,7 @@ std::string userrec::ProcessNoticeMasks(const char *sm)
 	return output;
 }
 
-void userrec::StartDNSLookup()
+void User::StartDNSLookup()
 {
 	try
 	{
@@ -154,7 +154,7 @@ void userrec::StartDNSLookup()
 	}
 }
 
-UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_resolve, QueryType qt, bool &cache) :
+UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) :
 	Resolver(Instance, to_resolve, qt, cache), bound_user(user)
 {
 	this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
@@ -257,17 +257,17 @@ void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 }
 
 
-bool userrec::IsNoticeMaskSet(unsigned char sm)
+bool User::IsNoticeMaskSet(unsigned char sm)
 {
 	return (snomasks[sm-65]);
 }
 
-void userrec::SetNoticeMask(unsigned char sm, bool value)
+void User::SetNoticeMask(unsigned char sm, bool value)
 {
 	snomasks[sm-65] = value;
 }
 
-const char* userrec::FormatNoticeMasks()
+const char* User::FormatNoticeMasks()
 {
 	static char data[MAXBUF];
 	int offset = 0;
@@ -284,17 +284,17 @@ const char* userrec::FormatNoticeMasks()
 
 
 
-bool userrec::IsModeSet(unsigned char m)
+bool User::IsModeSet(unsigned char m)
 {
 	return (modes[m-65]);
 }
 
-void userrec::SetMode(unsigned char m, bool value)
+void User::SetMode(unsigned char m, bool value)
 {
 	modes[m-65] = value;
 }
 
-const char* userrec::FormatModes()
+const char* User::FormatModes()
 {
 	static char data[MAXBUF];
 	int offset = 0;
@@ -307,7 +307,7 @@ const char* userrec::FormatModes()
 	return data;
 }
 
-void userrec::DecrementModes()
+void User::DecrementModes()
 {
 	ServerInstance->Log(DEBUG,"DecrementModes()");
 	for (unsigned char n = 'A'; n <= 'z'; n++)
@@ -325,7 +325,7 @@ void userrec::DecrementModes()
 	}
 }
 
-userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
+User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
 	*password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = *uuid = 0;
 	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
@@ -359,10 +359,10 @@ userrec::userrec(InspIRCd* Instance, const std::string &uid) : ServerInstance(In
 	if (finduuid == Instance->uuidlist->end())
 		(*Instance->uuidlist)[uuid] = this;
 	else
-		throw CoreException("Duplicate UUID "+std::string(uuid)+" in userrec constructor");
+		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
 
-void userrec::RemoveCloneCounts()
+void User::RemoveCloneCounts()
 {
 	clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
 	if (x != ServerInstance->local_clones.end())
@@ -385,7 +385,7 @@ void userrec::RemoveCloneCounts()
 	}
 }
 
-userrec::~userrec()
+User::~User()
 {
 	this->InvalidateCache();
 	this->DecrementModes();
@@ -410,7 +410,7 @@ userrec::~userrec()
 	ServerInstance->uuidlist->erase(uuid);
 }
 
-char* userrec::MakeHost()
+char* User::MakeHost()
 {
 	if (this->cached_makehost)
 		return this->cached_makehost;
@@ -430,7 +430,7 @@ char* userrec::MakeHost()
 	return this->cached_makehost;
 }
 
-char* userrec::MakeHostIP()
+char* User::MakeHostIP()
 {
 	if (this->cached_hostip)
 		return this->cached_hostip;
@@ -450,13 +450,13 @@ char* userrec::MakeHostIP()
 	return this->cached_hostip;
 }
 
-void userrec::CloseSocket()
+void User::CloseSocket()
 {
 	ServerInstance->SE->Shutdown(this, 2);
 	ServerInstance->SE->Close(this);
 }
 
-char* userrec::GetFullHost()
+char* User::GetFullHost()
 {
 	if (this->cached_fullhost)
 		return this->cached_fullhost;
@@ -478,7 +478,7 @@ char* userrec::GetFullHost()
 	return this->cached_fullhost;
 }
 
-char* userrec::MakeWildHost()
+char* User::MakeWildHost()
 {
 	static char nresult[MAXBUF];
 	char* t = nresult;
@@ -490,7 +490,7 @@ char* userrec::MakeWildHost()
 	return nresult;
 }
 
-int userrec::ReadData(void* buffer, size_t size)
+int User::ReadData(void* buffer, size_t size)
 {
 	if (IS_LOCAL(this))
 	{
@@ -505,7 +505,7 @@ int userrec::ReadData(void* buffer, size_t size)
 }
 
 
-char* userrec::GetFullRealHost()
+char* User::GetFullRealHost()
 {
 	if (this->cached_fullrealhost)
 		return this->cached_fullrealhost;
@@ -527,7 +527,7 @@ char* userrec::GetFullRealHost()
 	return this->cached_fullrealhost;
 }
 
-bool userrec::IsInvited(const irc::string &channel)
+bool User::IsInvited(const irc::string &channel)
 {
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
@@ -539,17 +539,17 @@ bool userrec::IsInvited(const irc::string &channel)
 	return false;
 }
 
-InvitedList* userrec::GetInviteList()
+InvitedList* User::GetInviteList()
 {
 	return &invites;
 }
 
-void userrec::InviteTo(const irc::string &channel)
+void User::InviteTo(const irc::string &channel)
 {
 	invites.push_back(channel);
 }
 
-void userrec::RemoveInvite(const irc::string &channel)
+void User::RemoveInvite(const irc::string &channel)
 {
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
@@ -561,7 +561,7 @@ void userrec::RemoveInvite(const irc::string &channel)
 	}
 }
 
-bool userrec::HasPermission(const std::string &command)
+bool User::HasPermission(const std::string &command)
 {
 	char* mycmd;
 	char* savept;
@@ -618,7 +618,7 @@ bool userrec::HasPermission(const std::string &command)
  * something we can change anyway. Makes sense to just let
  * the compiler do that copy for us.
  */
-bool userrec::AddBuffer(std::string a)
+bool User::AddBuffer(std::string a)
 {
 	try
 	{
@@ -645,22 +645,22 @@ bool userrec::AddBuffer(std::string a)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::AddBuffer()");
+		ServerInstance->Log(DEBUG,"Exception in User::AddBuffer()");
 		return false;
 	}
 }
 
-bool userrec::BufferIsReady()
+bool User::BufferIsReady()
 {
 	return (recvq.find('\n') != std::string::npos);
 }
 
-void userrec::ClearBuffer()
+void User::ClearBuffer()
 {
 	recvq.clear();
 }
 
-std::string userrec::GetBuffer()
+std::string User::GetBuffer()
 {
 	try
 	{
@@ -695,12 +695,12 @@ std::string userrec::GetBuffer()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::GetBuffer()");
+		ServerInstance->Log(DEBUG,"Exception in User::GetBuffer()");
 		return "";
 	}
 }
 
-void userrec::AddWriteBuf(const std::string &data)
+void User::AddWriteBuf(const std::string &data)
 {
 	if (*this->GetWriteError())
 		return;
@@ -732,7 +732,7 @@ void userrec::AddWriteBuf(const std::string &data)
 }
 
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
-void userrec::FlushWriteBuf()
+void User::FlushWriteBuf()
 {
 	try
 	{
@@ -778,7 +778,7 @@ void userrec::FlushWriteBuf()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::FlushWriteBuf()");
+		ServerInstance->Log(DEBUG,"Exception in User::FlushWriteBuf()");
 	}
 
 	if (this->sendq.empty())
@@ -787,7 +787,7 @@ void userrec::FlushWriteBuf()
 	}
 }
 
-void userrec::SetWriteError(const std::string &error)
+void User::SetWriteError(const std::string &error)
 {
 	try
 	{
@@ -798,16 +798,16 @@ void userrec::SetWriteError(const std::string &error)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::SetWriteError()");
+		ServerInstance->Log(DEBUG,"Exception in User::SetWriteError()");
 	}
 }
 
-const char* userrec::GetWriteError()
+const char* User::GetWriteError()
 {
 	return this->WriteError.c_str();
 }
 
-void userrec::Oper(const std::string &opertype)
+void User::Oper(const std::string &opertype)
 {
 	try
 	{
@@ -822,11 +822,11 @@ void userrec::Oper(const std::string &opertype)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::Oper()");
+		ServerInstance->Log(DEBUG,"Exception in User::Oper()");
 	}
 }
 
-void userrec::UnOper()
+void User::UnOper()
 {
 	try
 	{
@@ -843,11 +843,11 @@ void userrec::UnOper()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::UnOper()");
+		ServerInstance->Log(DEBUG,"Exception in User::UnOper()");
 	}
 }
 
-void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &quitreason, const char* operreason)
+void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
 {
 	user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, operreason);
 	user->muted = true;
@@ -855,7 +855,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user, const std::string &qui
 }
 
 /* adds or updates an entry in the whowas list */
-void userrec::AddToWhoWas()
+void User::AddToWhoWas()
 {
 	Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS");
 	if (whowas_command)
@@ -867,15 +867,15 @@ void userrec::AddToWhoWas()
 }
 
 /* add a client connection to the sockets list */
-void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
+void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
 {
-	/* NOTE: Calling this one parameter constructor for userrec automatically
+	/* NOTE: Calling this one parameter constructor for User automatically
 	 * allocates a new UUID and places it in the hash_map.
 	 */
-	userrec* New = NULL;
+	User* New = NULL;
 	try
 	{
-		New = new userrec(Instance);
+		New = new User(Instance);
 	}
 	catch (...)
 	{
@@ -928,12 +928,12 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 
 	if (!i)
 	{
-		userrec::QuitUser(Instance, New, "Access denied by configuration");
+		User::QuitUser(Instance, New, "Access denied by configuration");
 		return;
 	}
 
 	/*
-	 * Check connect class settings and initialise settings into userrec.
+	 * Check connect class settings and initialise settings into User.
 	 * This will be done again after DNS resolution. -- w00t
 	 */
 	New->CheckClass();
@@ -943,7 +943,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 	if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
 	{
 		Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
-		userrec::QuitUser(Instance, New,"No more connections allowed");
+		User::QuitUser(Instance, New,"No more connections allowed");
 		return;
 	}
 
@@ -960,7 +960,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 #ifndef WINDOWS
 	if ((unsigned int)socket >= MAX_DESCRIPTORS)
 	{
-		userrec::QuitUser(Instance, New, "Server is full");
+		User::QuitUser(Instance, New, "Server is full");
 		return;
 	}
 #endif
@@ -975,7 +975,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 			if (*Instance->Config->MoronBanner)
 				New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
 			snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
-			userrec::QuitUser(Instance, New, reason);
+			User::QuitUser(Instance, New, reason);
 			return;
 		}
 	}
@@ -984,7 +984,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
         {
                 if (!Instance->SE->AddFd(New))
                 {
-			userrec::QuitUser(Instance, New, "Internal error handling connection");
+			User::QuitUser(Instance, New, "Internal error handling connection");
                 }
         }
 
@@ -994,7 +994,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 	New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
 }
 
-unsigned long userrec::GlobalCloneCount()
+unsigned long User::GlobalCloneCount()
 {
 	clonemap::iterator x = ServerInstance->global_clones.find(this->GetIPString());
 	if (x != ServerInstance->global_clones.end())
@@ -1003,7 +1003,7 @@ unsigned long userrec::GlobalCloneCount()
 		return 0;
 }
 
-unsigned long userrec::LocalCloneCount()
+unsigned long User::LocalCloneCount()
 {
 	clonemap::iterator x = ServerInstance->local_clones.find(this->GetIPString());
 	if (x != ServerInstance->local_clones.end())
@@ -1015,24 +1015,24 @@ unsigned long userrec::LocalCloneCount()
 /*
  * Check class restrictions
  */
-void userrec::CheckClass(const std::string &explicit_class)
+void User::CheckClass(const std::string &explicit_class)
 {
 	ConnectClass* a = this->GetClass(explicit_class);
 
 	if ((!a) || (a->GetType() == CC_DENY))
 	{
-		userrec::QuitUser(ServerInstance, this, "Unauthorised connection");
+		User::QuitUser(ServerInstance, this, "Unauthorised connection");
 		return;
 	}
 	else if ((a->GetMaxLocal()) && (this->LocalCloneCount() > a->GetMaxLocal()))
 	{
-		userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
+		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
 		ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (this->GlobalCloneCount() > a->GetMaxGlobal()))
 	{
-		userrec::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
+		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
 		ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
@@ -1047,13 +1047,13 @@ void userrec::CheckClass(const std::string &explicit_class)
 	this->MaxChans = a->GetMaxChans();
 }
 
-void userrec::FullConnect()
+void User::FullConnect()
 {
 	ServerInstance->stats->statsConnects++;
 	this->idle_lastmsg = ServerInstance->Time();
 
 	/*
-	 * You may be thinking "wtf, we checked this in userrec::AddClient!" - and yes, we did, BUT.
+	 * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT.
 	 * At the time AddClient is called, we don't have a resolved host, by here we probably do - which
 	 * may put the user into a totally seperate class with different restrictions! so we *must* check again.
 	 * Don't remove this! -- w00t
@@ -1065,7 +1065,7 @@ void userrec::FullConnect()
 	 */
 	if ((!this->GetClass()->GetPass().empty()) && (!this->haspassed))
 	{
-		userrec::QuitUser(ServerInstance, this, "Invalid password");
+		User::QuitUser(ServerInstance, this, "Invalid password");
 		return;
 	}
 	
@@ -1080,7 +1080,7 @@ void userrec::FullConnect()
 			if (*ServerInstance->Config->MoronBanner)
 				this->WriteServ("NOTICE %s :*** %s", this->nick, ServerInstance->Config->MoronBanner);
 			snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
-			userrec::QuitUser(ServerInstance, this, reason);
+			User::QuitUser(ServerInstance, this, reason);
 			return;
 		}
 
@@ -1093,7 +1093,7 @@ void userrec::FullConnect()
 			if (*ServerInstance->Config->MoronBanner)
 				this->WriteServ("NOTICE %s :*** %s", this, ServerInstance->Config->MoronBanner);
 			snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
-			userrec::QuitUser(ServerInstance, this, reason);
+			User::QuitUser(ServerInstance, this, reason);
 			return;
 		}
 	}
@@ -1134,11 +1134,11 @@ void userrec::FullConnect()
 	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
 }
 
-/** userrec::UpdateNick()
+/** User::UpdateNick()
  * re-allocates a nick in the user_hash after they change nicknames,
  * returns a pointer to the new user as it may have moved
  */
-userrec* userrec::UpdateNickHash(const char* New)
+User* User::UpdateNickHash(const char* New)
 {
 	try
 	{
@@ -1151,7 +1151,7 @@ userrec* userrec::UpdateNickHash(const char* New)
 		if (oldnick == ServerInstance->clientlist->end())
 			return NULL; /* doesnt exist */
 
-		userrec* olduser = oldnick->second;
+		User* olduser = oldnick->second;
 		(*(ServerInstance->clientlist))[New] = olduser;
 		ServerInstance->clientlist->erase(oldnick);
 		return olduser;
@@ -1159,12 +1159,12 @@ userrec* userrec::UpdateNickHash(const char* New)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::UpdateNickHash()");
+		ServerInstance->Log(DEBUG,"Exception in User::UpdateNickHash()");
 		return NULL;
 	}
 }
 
-void userrec::InvalidateCache()
+void User::InvalidateCache()
 {
 	/* Invalidate cache */
 	if (cached_fullhost)
@@ -1178,7 +1178,7 @@ void userrec::InvalidateCache()
 	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
 }
 
-bool userrec::ForceNickChange(const char* newnick)
+bool User::ForceNickChange(const char* newnick)
 {
 	try
 	{
@@ -1217,12 +1217,12 @@ bool userrec::ForceNickChange(const char* newnick)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::ForceNickChange()");
+		ServerInstance->Log(DEBUG,"Exception in User::ForceNickChange()");
 		return false;
 	}
 }
 
-void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
+void User::SetSockAddr(int protocol_family, const char* ip, int port)
 {
 	switch (protocol_family)
 	{
@@ -1252,7 +1252,7 @@ void userrec::SetSockAddr(int protocol_family, const char* ip, int port)
 	}
 }
 
-int userrec::GetPort()
+int User::GetPort()
 {
 	if (this->ip == NULL)
 		return 0;
@@ -1279,7 +1279,7 @@ int userrec::GetPort()
 	return 0;
 }
 
-int userrec::GetProtocolFamily()
+int User::GetProtocolFamily()
 {
 	if (this->ip == NULL)
 		return 0;
@@ -1288,7 +1288,7 @@ int userrec::GetProtocolFamily()
 	return sin->sin_family;
 }
 
-const char* userrec::GetIPString()
+const char* User::GetIPString()
 {
 	static char buf[1024];
 
@@ -1328,7 +1328,7 @@ const char* userrec::GetIPString()
 	return "";
 }
 
-const char* userrec::GetIPString(char* buf)
+const char* User::GetIPString(char* buf)
 {
 	if (this->ip == NULL)
 	{
@@ -1376,7 +1376,7 @@ const char* userrec::GetIPString(char* buf)
  * something we can change anyway. Makes sense to just let
  * the compiler do that copy for us.
  */
-void userrec::Write(std::string text)
+void User::Write(std::string text)
 {
 	if (!ServerInstance->SE->BoundsCheckFd(this))
 		return;
@@ -1392,7 +1392,7 @@ void userrec::Write(std::string text)
 	}
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::Write() std::string::append");
+		ServerInstance->Log(DEBUG,"Exception in User::Write() std::string::append");
 		return;
 	}
 
@@ -1420,7 +1420,7 @@ void userrec::Write(std::string text)
 
 /** Write()
  */
-void userrec::Write(const char *text, ...)
+void User::Write(const char *text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1432,7 +1432,7 @@ void userrec::Write(const char *text, ...)
 	this->Write(std::string(textbuffer));
 }
 
-void userrec::WriteServ(const std::string& text)
+void User::WriteServ(const std::string& text)
 {
 	char textbuffer[MAXBUF];
 
@@ -1443,7 +1443,7 @@ void userrec::WriteServ(const std::string& text)
 /** WriteServ()
  *  Same as Write(), except `text' is prefixed with `:server.name '.
  */
-void userrec::WriteServ(const char* text, ...)
+void User::WriteServ(const char* text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1456,7 +1456,7 @@ void userrec::WriteServ(const char* text, ...)
 }
 
 
-void userrec::WriteFrom(userrec *user, const std::string &text)
+void User::WriteFrom(User *user, const std::string &text)
 {
 	char tb[MAXBUF];
 
@@ -1468,7 +1468,7 @@ void userrec::WriteFrom(userrec *user, const std::string &text)
 
 /* write text from an originating user to originating user */
 
-void userrec::WriteFrom(userrec *user, const char* text, ...)
+void User::WriteFrom(User *user, const char* text, ...)
 {
 	va_list argsPtr;
 	char textbuffer[MAXBUF];
@@ -1483,7 +1483,7 @@ void userrec::WriteFrom(userrec *user, const char* text, ...)
 
 /* write text to an destination user from a source user (e.g. user privmsg) */
 
-void userrec::WriteTo(userrec *dest, const char *data, ...)
+void User::WriteTo(User *dest, const char *data, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1495,13 +1495,13 @@ void userrec::WriteTo(userrec *dest, const char *data, ...)
 	this->WriteTo(dest, std::string(textbuffer));
 }
 
-void userrec::WriteTo(userrec *dest, const std::string &data)
+void User::WriteTo(User *dest, const std::string &data)
 {
 	dest->WriteFrom(this, data);
 }
 
 
-void userrec::WriteCommon(const char* text, ...)
+void User::WriteCommon(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1516,7 +1516,7 @@ void userrec::WriteCommon(const char* text, ...)
 	this->WriteCommon(std::string(textbuffer));
 }
 
-void userrec::WriteCommon(const std::string &text)
+void User::WriteCommon(const std::string &text)
 {
 	try
 	{
@@ -1558,7 +1558,7 @@ void userrec::WriteCommon(const std::string &text)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::WriteCommon()");
+		ServerInstance->Log(DEBUG,"Exception in User::WriteCommon()");
 	}
 }
 
@@ -1567,7 +1567,7 @@ void userrec::WriteCommon(const std::string &text)
  * channel, NOT including the source user e.g. for use in QUIT
  */
 
-void userrec::WriteCommonExcept(const char* text, ...)
+void User::WriteCommonExcept(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1579,7 +1579,7 @@ void userrec::WriteCommonExcept(const char* text, ...)
 	this->WriteCommonExcept(std::string(textbuffer));
 }
 
-void userrec::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
+void User::WriteCommonQuit(const std::string &normal_text, const std::string &oper_text)
 {
 	char tb1[MAXBUF];
 	char tb2[MAXBUF];
@@ -1610,7 +1610,7 @@ void userrec::WriteCommonQuit(const std::string &normal_text, const std::string
 	}
 }
 
-void userrec::WriteCommonExcept(const std::string &text)
+void User::WriteCommonExcept(const std::string &text)
 {
 	char tb1[MAXBUF];
 	std::string out1;
@@ -1640,7 +1640,7 @@ void userrec::WriteCommonExcept(const std::string &text)
 
 }
 
-void userrec::WriteWallOps(const std::string &text)
+void User::WriteWallOps(const std::string &text)
 {
 	if (!IS_OPER(this) && IS_LOCAL(this))
 		return;
@@ -1648,15 +1648,15 @@ void userrec::WriteWallOps(const std::string &text)
 	std::string wallop("WALLOPS :");
 	wallop.append(text);
 
-	for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
 	{
-		userrec* t = *i;
+		User* t = *i;
 		if (t->IsModeSet('w'))
 			this->WriteTo(t,wallop);
 	}
 }
 
-void userrec::WriteWallOps(const char* text, ...)
+void User::WriteWallOps(const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
@@ -1675,12 +1675,12 @@ void userrec::WriteWallOps(const char* text, ...)
  * the first users channels then the second users channels within the outer loop,
  * therefore it was a maximum of x*y iterations (upon returning 0 and checking
  * all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * channel's userlist in the inner loop which is a std::map<User*,User*>
  * and saves us time as we already know what pointer value we are after.
  * Don't quote me on the maths as i am not a mathematician or computer scientist,
  * but i believe this algorithm is now x+(log y) maximum iterations instead.
  */
-bool userrec::SharesChannelWith(userrec *other)
+bool User::SharesChannelWith(User *other)
 {
 	if ((!other) || (this->registered != REG_ALL) || (other->registered != REG_ALL))
 		return false;
@@ -1697,7 +1697,7 @@ bool userrec::SharesChannelWith(userrec *other)
 	return false;
 }
 
-bool userrec::ChangeName(const char* gecos)
+bool User::ChangeName(const char* gecos)
 {
 	if (!strcmp(gecos, this->fullname))
 		return true;
@@ -1715,7 +1715,7 @@ bool userrec::ChangeName(const char* gecos)
 	return true;
 }
 
-bool userrec::ChangeDisplayedHost(const char* host)
+bool User::ChangeDisplayedHost(const char* host)
 {
 	if (!strcmp(host, this->dhost))
 		return true;
@@ -1731,7 +1731,7 @@ bool userrec::ChangeDisplayedHost(const char* host)
 	if (this->ServerInstance->Config->CycleHosts)
 		this->WriteCommonExcept("QUIT :Changing hosts");
 
-	/* Fix by Om: userrec::dhost is 65 long, this was truncating some long hosts */
+	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
 	strlcpy(this->dhost,host,64);
 
 	this->InvalidateCache();
@@ -1753,7 +1753,7 @@ bool userrec::ChangeDisplayedHost(const char* host)
 	return true;
 }
 
-bool userrec::ChangeIdent(const char* newident)
+bool User::ChangeIdent(const char* newident)
 {
 	if (!strcmp(newident, this->ident))
 		return true;
@@ -1779,7 +1779,7 @@ bool userrec::ChangeIdent(const char* newident)
 	return true;
 }
 
-void userrec::SendAll(const char* command, char* text, ...)
+void User::SendAll(const char* command, char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	char formatbuffer[MAXBUF];
@@ -1792,14 +1792,14 @@ void userrec::SendAll(const char* command, char* text, ...)
 	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
 	std::string fmt = formatbuffer;
 
-	for (std::vector<userrec*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
 	{
 		(*i)->Write(fmt);
 	}
 }
 
 
-std::string userrec::ChannelList(userrec* source)
+std::string User::ChannelList(User* source)
 {
 	try
 	{
@@ -1819,12 +1819,12 @@ std::string userrec::ChannelList(userrec* source)
 	}
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::ChannelList()");
+		ServerInstance->Log(DEBUG,"Exception in User::ChannelList()");
 		return "";
 	}
 }
 
-void userrec::SplitChanList(userrec* dest, const std::string &cl)
+void User::SplitChanList(User* dest, const std::string &cl)
 {
 	std::string line;
 	std::ostringstream prefix;
@@ -1865,11 +1865,11 @@ void userrec::SplitChanList(userrec* dest, const std::string &cl)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::SplitChanList()");
+		ServerInstance->Log(DEBUG,"Exception in User::SplitChanList()");
 	}
 }
 
-unsigned int userrec::GetMaxChans()
+unsigned int User::GetMaxChans()
 {
 	return this->MaxChans;
 }
@@ -1879,7 +1879,7 @@ unsigned int userrec::GetMaxChans()
  * then their ip will be taken as 'priority' anyway, so for example,
  * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
  */
-ConnectClass* userrec::GetClass(const std::string &explicit_name)
+ConnectClass* User::GetClass(const std::string &explicit_name)
 {
 	if (!explicit_name.empty())
 	{
@@ -1910,9 +1910,9 @@ ConnectClass* userrec::GetClass(const std::string &explicit_name)
 	return NULL;
 }
 
-void userrec::PurgeEmptyChannels()
+void User::PurgeEmptyChannels()
 {
-	std::vector<chanrec*> to_delete;
+	std::vector<Channel*> to_delete;
 
 	// firstly decrement the count on each channel
 	for (UCListIter f = this->chans.begin(); f != this->chans.end(); f++)
@@ -1927,14 +1927,14 @@ void userrec::PurgeEmptyChannels()
 			}
 			catch (...)
 			{
-				ServerInstance->Log(DEBUG,"Exception in userrec::PurgeEmptyChannels to_delete.push_back()");
+				ServerInstance->Log(DEBUG,"Exception in User::PurgeEmptyChannels to_delete.push_back()");
 			}
 		}
 	}
 
-	for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
+	for (std::vector<Channel*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
 	{
-		chanrec* thischan = *n;
+		Channel* thischan = *n;
 		chan_hash::iterator i2 = ServerInstance->chanlist->find(thischan->name);
 		if (i2 != ServerInstance->chanlist->end())
 		{
@@ -1948,7 +1948,7 @@ void userrec::PurgeEmptyChannels()
 	this->UnOper();
 }
 
-void userrec::ShowMOTD()
+void User::ShowMOTD()
 {
 	if (!ServerInstance->Config->MOTD.size())
 	{
@@ -1963,7 +1963,7 @@ void userrec::ShowMOTD()
 	this->WriteServ("376 %s :End of message of the day.", this->nick);
 }
 
-void userrec::ShowRULES()
+void User::ShowRULES()
 {
 	if (!ServerInstance->Config->RULES.size())
 	{
@@ -1979,7 +1979,7 @@ void userrec::ShowRULES()
 	this->WriteServ("309 %s :End of RULES command.",this->nick);
 }
 
-void userrec::HandleEvent(EventType et, int errornum)
+void User::HandleEvent(EventType et, int errornum)
 {
 	/* WARNING: May delete this user! */
 	int thisfd = this->GetFd();
@@ -2002,7 +2002,7 @@ void userrec::HandleEvent(EventType et, int errornum)
 	}
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in userrec::HandleEvent intercepted");
+		ServerInstance->Log(DEBUG,"Exception in User::HandleEvent intercepted");
 	}
 
 	/* If the user has raised an error whilst being processed, quit them now we're safe to */
@@ -2010,12 +2010,12 @@ void userrec::HandleEvent(EventType et, int errornum)
 	{
 		if (!WriteError.empty())
 		{
-			userrec::QuitUser(ServerInstance, this, GetWriteError());
+			User::QuitUser(ServerInstance, this, GetWriteError());
 		}
 	}
 }
 
-void userrec::SetOperQuit(const std::string &oquit)
+void User::SetOperQuit(const std::string &oquit)
 {
 	if (operquit)
 		return;
@@ -2023,7 +2023,7 @@ void userrec::SetOperQuit(const std::string &oquit)
 	operquit = strdup(oquit.c_str());
 }
 
-const char* userrec::GetOperQuit()
+const char* User::GetOperQuit()
 {
 	return operquit ? operquit : "";
 }
@@ -2036,7 +2036,7 @@ VisData::~VisData()
 {
 }
 
-bool VisData::VisibleTo(userrec* user)
+bool VisData::VisibleTo(User* user)
 {
 	return true;
 }
diff --git a/src/xline.cpp b/src/xline.cpp
index a28e61766..4f9324825 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -416,7 +416,7 @@ QLine* XLineManager::matches_qline(const char* nick, bool permonly)
 
 // returns a pointer to the reason if a host matches a gline, NULL if it didnt match
 
-GLine* XLineManager::matches_gline(userrec* user, bool permonly)
+GLine* XLineManager::matches_gline(User* user, bool permonly)
 {
 	if ((glines.empty()) && (pglines.empty()))
 		return NULL;
@@ -446,7 +446,7 @@ GLine* XLineManager::matches_gline(userrec* user, bool permonly)
 	return NULL;
 }
 
-ELine* XLineManager::matches_exception(userrec* user, bool permonly)
+ELine* XLineManager::matches_exception(User* user, bool permonly)
 {
 	if ((elines.empty()) && (pelines.empty()))
 		return NULL;
@@ -587,7 +587,7 @@ ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)
 
 // returns a pointer to the reason if a host matches a kline, NULL if it didnt match
 
-KLine* XLineManager::matches_kline(userrec* user, bool permonly)
+KLine* XLineManager::matches_kline(User* user, bool permonly)
 {
 	if ((klines.empty()) && (pklines.empty()))
 		return NULL;
@@ -705,9 +705,9 @@ void XLineManager::apply_lines(const int What)
 			return;
 
 		XLine* check = NULL;
-		for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+		for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
 		{
-			userrec* u = (userrec*)(*u2);
+			User* u = (User*)(*u2);
 
 			if (elines.size() || pelines.size())
 				if (matches_exception(u))
@@ -721,9 +721,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
+						User::QuitUser(ServerInstance, u, "G-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -735,9 +735,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
+						User::QuitUser(ServerInstance, u, "K-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -749,9 +749,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
+						User::QuitUser(ServerInstance, u, "Q-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 
@@ -763,9 +763,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
+						User::QuitUser(ServerInstance, u, "Z-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 		}
@@ -779,9 +779,9 @@ void XLineManager::apply_lines(const int What)
 			return;
 
 		XLine* check = NULL;
-		for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+		for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
 		{
-			userrec* u = (userrec*)(*u2);
+			User* u = (User*)(*u2);
 
 			if (elines.size() || pelines.size())
 			{
@@ -797,9 +797,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
+						User::QuitUser(ServerInstance, u, "G-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
@@ -810,9 +810,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
+						User::QuitUser(ServerInstance, u, "K-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
@@ -823,9 +823,9 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
+						User::QuitUser(ServerInstance, u, "Q-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 			if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
@@ -836,16 +836,16 @@ void XLineManager::apply_lines(const int What)
 					if (*ServerInstance->Config->MoronBanner)
 						u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
 					if (ServerInstance->Config->HideBans)
-						userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
+						User::QuitUser(ServerInstance, u, "Z-Lined", reason);
 					else
-						userrec::QuitUser(ServerInstance, u, reason);
+						User::QuitUser(ServerInstance, u, reason);
 				}
 			}
 		}
 	}
 }
 
-void XLineManager::stats_k(userrec* user, string_list &results)
+void XLineManager::stats_k(User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 	for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
@@ -854,7 +854,7 @@ void XLineManager::stats_k(userrec* user, string_list &results)
 		results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_g(userrec* user, string_list &results)
+void XLineManager::stats_g(User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 	for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
@@ -863,7 +863,7 @@ void XLineManager::stats_g(userrec* user, string_list &results)
 		results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_q(userrec* user, string_list &results)
+void XLineManager::stats_q(User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 	for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
@@ -872,7 +872,7 @@ void XLineManager::stats_q(userrec* user, string_list &results)
 		results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_z(userrec* user, string_list &results)
+void XLineManager::stats_z(User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 	for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
@@ -881,7 +881,7 @@ void XLineManager::stats_z(userrec* user, string_list &results)
 		results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);
 }
 
-void XLineManager::stats_e(userrec* user, string_list &results)
+void XLineManager::stats_e(User* user, string_list &results)
 {
 	std::string sn = ServerInstance->Config->ServerName;
 	for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)