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

15 files changed, 68 insertions, 68 deletions

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')
 		{