diff --git a/Chan.cpp b/Chan.cpp
index 58f82191..49ad6529 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -64,7 +64,7 @@ void CChan::Cycle() const {
 	m_pUser->PutIRC("PART " + GetName() + "\r\nJOIN " + GetName() + " " + GetKey());
 }
 
-void CChan::JoinUser(bool bForce, const CString& sKey, CUserSock* pUserSock) {
+void CChan::JoinUser(bool bForce, const CString& sKey, CClient* pClient) {
 	if (!bForce && (!IsOn() || !IsDetached())) {
 		IncClientRequests();
 
@@ -72,11 +72,11 @@ void CChan::JoinUser(bool bForce, const CString& sKey, CUserSock* pUserSock) {
 		return;
 	}
 
-	m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN :" + GetName(), pUserSock);
+	m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN :" + GetName(), pClient);
 
 	if (!GetTopic().empty()) {
-		m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 332 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " :" + GetTopic(), pUserSock);
-		m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 333 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " " + GetTopicOwner() + " " + CString::ToString(GetTopicDate()), pUserSock);
+		m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 332 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " :" + GetTopic(), pClient);
+		m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 333 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " " + GetTopicOwner() + " " + CString::ToString(GetTopicDate()), pClient);
 	}
 
 	CString sPre = ":" + m_pUser->GetIRCServer() + " 353 " + m_pUser->GetIRCNick().GetNick() + " = " + GetName() + " :";
@@ -91,14 +91,14 @@ void CChan::JoinUser(bool bForce, const CString& sKey, CUserSock* pUserSock) {
 		sLine += a->first;
 
 		if (sLine.size() >= 490 || a == (--m_msNicks.end())) {
-			m_pUser->PutUser(sLine, pUserSock);
+			m_pUser->PutUser(sLine, pClient);
 			sLine = sPre;
 		} else {
 			sLine += " ";
 		}
 	}
 
-	m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 366 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " :End of /NAMES list.", pUserSock);
+	m_pUser->PutUser(":" + m_pUser->GetIRCServer() + " 366 " + m_pUser->GetIRCNick().GetNick() + " " + GetName() + " :End of /NAMES list.", pClient);
 	m_bDetached = false;
 
 	// Send Buffer
@@ -106,17 +106,17 @@ void CChan::JoinUser(bool bForce, const CString& sKey, CUserSock* pUserSock) {
 		const vector<CString>& vsBuffer = GetBuffer();
 
 		if (vsBuffer.size()) {
-			m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Buffer Playback...", pUserSock);
+			m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Buffer Playback...", pClient);
 
 			for (unsigned int a = 0; a < vsBuffer.size(); a++) {
-				m_pUser->PutUser(vsBuffer[a], pUserSock);
+				m_pUser->PutUser(vsBuffer[a], pClient);
 			}
 
 			if (!KeepBuffer()) {
 				ClearBuffer();
 			}
 
-			m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Playback Complete.", pUserSock);
+			m_pUser->PutUser(":***!znc@znc.com PRIVMSG " + GetName() + " :Playback Complete.", pClient);
 		}
 	}
 }
diff --git a/Chan.h b/Chan.h
index 0109b952..34a184a1 100644
--- a/Chan.h
+++ b/Chan.h
@@ -5,7 +5,7 @@
 #include "Nick.h"
 #include "String.h"
 #include "FileUtils.h"
-#include "UserSock.h"
+#include "Client.h"
 #include <vector>
 #include <map>
 #include <set>
@@ -49,7 +49,7 @@ public:
 	bool WriteConfig(CFile& File);
 	void Joined();
 	void Cycle() const;
-	void JoinUser(bool bForce = false, const CString& sKey = "", CUserSock* pUserSock = NULL);
+	void JoinUser(bool bForce = false, const CString& sKey = "", CClient* pClient = NULL);
 	void DetachUser();
 	void AttachUser();
 
diff --git a/IRCSock.cpp b/IRCSock.cpp
index 6a6dc5bb..5010519e 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -1,7 +1,7 @@
 #include "znc.h"
 #include "IRCSock.h"
 #include "DCCBounce.h"
-#include "UserSock.h"
+#include "Client.h"
 #include <time.h>
 
 CIRCSock::CIRCSock(CUser* pUser) : Csock() {
@@ -91,15 +91,15 @@ void CIRCSock::ReadLine(const CString& sData) {
 					m_bAuthed = true;
 					m_pUser->PutStatus("Connected!");
 
-					vector<CUserSock*>& vUserSocks = m_pUser->GetUserSocks();
+					vector<CClient*>& vClients = m_pUser->GetClients();
 
-					for (unsigned int a = 0; a < vUserSocks.size(); a++) {
-						CUserSock* pUserSock = vUserSocks[a];
-						CString sClientNick = pUserSock->GetNick();
+					for (unsigned int a = 0; a < vClients.size(); a++) {
+						CClient* pClient = vClients[a];
+						CString sClientNick = pClient->GetNick();
 
 						if (sClientNick.CaseCmp(sNick) != 0) {
 							// If they connected with a nick that doesn't match the one we got on irc, then we need to update them
-							pUserSock->PutServ(":" + sClientNick + "!" + m_Nick.GetIdent() + "@" + m_Nick.GetHost() + " NICK :" + sNick);
+							pClient->PutServ(":" + sClientNick + "!" + m_Nick.GetIdent() + "@" + m_Nick.GetHost() + " NICK :" + sNick);
 						}
 					}
 
@@ -199,12 +199,12 @@ void CIRCSock::ReadLine(const CString& sData) {
 						// :irc.server.net 433 mynick badnick :Nickname is already in use.
 						if ((m_bKeepNick) && (m_pUser->GetKeepNick())) {
 							if (sBadNick.CaseCmp(sConfNick) == 0) {
-								vector<CUserSock*>& vUserSocks = m_pUser->GetUserSocks();
+								vector<CClient*>& vClients = m_pUser->GetClients();
 
-								for (unsigned int a = 0; a < vUserSocks.size(); a++) {
-									CUserSock* pUserSock = vUserSocks[a];
+								for (unsigned int a = 0; a < vClients.size(); a++) {
+									CClient* pClient = vClients[a];
 
-									if (!pUserSock || !pUserSock->DecKeepNickCounter()) {
+									if (!pClient || !pClient->DecKeepNickCounter()) {
 										SetOrigNickPending(false);
 										return;
 									}
diff --git a/Makefile.in b/Makefile.in
index ec399818..58695279 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,8 +4,8 @@ INCLUDES=@INCLUDES@
 LIBS=@LIBS@
 prefix=@prefix@
 
-OBJS=String.o Csocket.o main.o znc.o User.o IRCSock.o UserSock.o DCCBounce.o DCCSock.o Chan.o Nick.o Server.o Modules.o MD5.o Buffer.o Utils.o FileUtils.o HTTPSock.o
-SRCS=String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp UserSock.cpp DCCBounce.cpp DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp FileUtils.cpp HTTPSock.cpp
+OBJS=String.o Csocket.o main.o znc.o User.o IRCSock.o Client.o DCCBounce.o DCCSock.o Chan.o Nick.o Server.o Modules.o MD5.o Buffer.o Utils.o FileUtils.o HTTPSock.o
+SRCS=String.cpp Csocket.cpp main.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp FileUtils.cpp HTTPSock.cpp
 
 all: znc @MODTARGET@
 
diff --git a/Modules.cpp b/Modules.cpp
index 8746579b..59bd14d5 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -164,7 +164,7 @@ CModule::CModule(void* pDLL, CUser* pUser, const CString& sModName) {
 	m_pDLL = pDLL;
 	m_pManager = &(CZNC::Get().GetManager());;
 	m_pUser = pUser;
-	m_pUserSock = NULL;
+	m_pClient = NULL;
 	m_sModName = sModName;
 
 	if (m_pUser) {
@@ -178,7 +178,7 @@ CModule::CModule(void* pDLL, const CString& sModName) {
 	m_pDLL = pDLL;
 	m_pManager = &(CZNC::Get().GetManager());
 	m_pUser = NULL;
-	m_pUserSock = NULL;
+	m_pClient = NULL;
 	m_sModName = sModName;
 
 	m_sSavePath = CZNC::Get().GetZNCPath() + "/moddata/" + m_sModName;
@@ -198,7 +198,7 @@ CModule::~CModule() {
 }
 
 void CModule::SetUser(CUser* pUser) { m_pUser = pUser; }
-void CModule::SetUserSock(CUserSock* pUserSock) { m_pUserSock = pUserSock; }
+void CModule::SetClient(CClient* pClient) { m_pClient = pClient; }
 void CModule::Unload() { throw UNLOAD; }
 
 bool CModule::LoadRegistry() {
@@ -484,16 +484,16 @@ bool CModule::PutIRC(const CString& sLine) {
 	return (m_pUser) ? m_pUser->PutIRC(sLine) : false;
 }
 bool CModule::PutUser(const CString& sLine) {
-	return (m_pUser) ? m_pUser->PutUser(sLine, m_pUserSock) : false;
+	return (m_pUser) ? m_pUser->PutUser(sLine, m_pClient) : false;
 }
 bool CModule::PutStatus(const CString& sLine) {
-	return (m_pUser) ? m_pUser->PutStatus(sLine, m_pUserSock) : false;
+	return (m_pUser) ? m_pUser->PutStatus(sLine, m_pClient) : false;
 }
 bool CModule::PutModule(const CString& sLine, const CString& sIdent, const CString& sHost) {
-	return (m_pUser) ? m_pUser->PutUser(":" + GetModNick() + "!" + sIdent + "@" + sHost + " PRIVMSG " + m_pUser->GetCurNick() + " :" + sLine, m_pUserSock) : false;
+	return (m_pUser) ? m_pUser->PutUser(":" + GetModNick() + "!" + sIdent + "@" + sHost + " PRIVMSG " + m_pUser->GetCurNick() + " :" + sLine, m_pClient) : false;
 }
 bool CModule::PutModNotice(const CString& sLine, const CString& sIdent, const CString& sHost) {
-	return (m_pUser) ? m_pUser->PutUser(":" + GetModNick() + "!" + sIdent + "@" + sHost + " NOTICE " + m_pUser->GetCurNick() + " :" + sLine, m_pUserSock) : false;
+	return (m_pUser) ? m_pUser->PutUser(":" + GetModNick() + "!" + sIdent + "@" + sHost + " NOTICE " + m_pUser->GetCurNick() + " :" + sLine, m_pClient) : false;
 }
 
 
@@ -518,9 +518,9 @@ void CModules::UnloadAll() {
 	}
 }
 
-void CModules::SetUserSock(CUserSock* pUserSock) {
+void CModules::SetClient(CClient* pClient) {
 	for (unsigned int a = 0; a < size(); a++) {
-		(*this)[a]->SetUserSock(pUserSock);
+		(*this)[a]->SetClient(pClient);
 	}
 }
 
diff --git a/Modules.h b/Modules.h
index 9df6bc93..c0977e2f 100644
--- a/Modules.h
+++ b/Modules.h
@@ -3,7 +3,7 @@
 
 #include "main.h"
 #include "FileUtils.h"
-#include "UserSock.h"
+#include "Client.h"
 #include <dlfcn.h>
 #include <vector>
 #include <set>
@@ -193,7 +193,7 @@ public:
 	} EModException;
 
 	void SetUser(CUser* pUser);
-	void SetUserSock(CUserSock* pUserSock);
+	void SetClient(CClient* pClient);
 	void Unload();
 
 	virtual bool OnLoad(const CString& sArgs);
@@ -295,7 +295,7 @@ public:
 	const CString& GetDescription() const { return m_sDescription; }
 	const CString& GetArgs() const { return m_sArgs; }
 	CUser* GetUser() { return m_pUser; }
-	CUserSock* GetUserSock() { return m_pUserSock; }
+	CClient* GetClient() { return m_pClient; }
 	TSocketManager<Csock>* GetManager() { return m_pManager; }
 	// !Getters
 
@@ -307,7 +307,7 @@ protected:
 	void*					m_pDLL;
 	TSocketManager<Csock>*	m_pManager;
 	CUser*					m_pUser;
-	CUserSock*				m_pUserSock;
+	CClient*				m_pClient;
 	CString					m_sModName;
 	CString					m_sSavePath;
 	CString					m_sArgs;
@@ -321,7 +321,7 @@ public:
 	virtual ~CModules();
 
 	void SetUser(CUser* pUser) { m_pUser = pUser; }
-	void SetUserSock(CUserSock* pUserSock);
+	void SetClient(CClient* pClient);
 
 	void UnloadAll();
 
diff --git a/User.cpp b/User.cpp
index 7763c179..646a9884 100644
--- a/User.cpp
+++ b/User.cpp
@@ -3,7 +3,7 @@
 #include "User.h"
 #include "Server.h"
 #include "IRCSock.h"
-#include "UserSock.h"
+#include "Client.h"
 #include "DCCBounce.h"
 #include "DCCSock.h"
 #include "MD5.h"
@@ -56,8 +56,8 @@ CUser::~CUser() {
 		delete m_vChans[b];
 	}
 
-	for (unsigned int c = 0; c < m_vUserSocks.size(); c++) {
-		CZNC::Get().GetManager().DelSockByAddr(m_vUserSocks[c]);
+	for (unsigned int c = 0; c < m_vClients.size(); c++) {
+		CZNC::Get().GetManager().DelSockByAddr(m_vClients[c]);
 	}
 
 	CZNC::Get().GetManager().DelCronByAddr(m_pBackNickTimer);
@@ -74,44 +74,44 @@ bool CUser::OnBoot() {
 }
 
 void CUser::IRCConnected(CIRCSock* pIRCSock) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		m_vUserSocks[a]->IRCConnected(pIRCSock);
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		m_vClients[a]->IRCConnected(pIRCSock);
 	}
 }
 
 void CUser::IRCDisconnected() {
 	m_bIRCConnected = false;
 
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		m_vUserSocks[a]->IRCDisconnected();
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		m_vClients[a]->IRCDisconnected();
 	}
 }
 
 void CUser::BounceAllClients() {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		m_vUserSocks[a]->BouncedOff();
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		m_vClients[a]->BouncedOff();
 	}
 
-	m_vUserSocks.clear();
+	m_vClients.clear();
 }
 
-void CUser::UserConnected(CUserSock* pUserSock) {
+void CUser::UserConnected(CClient* pClient) {
 	if (!MultiClients()) {
 		BounceAllClients();
 	}
 
 	PutStatus("Another client authenticated as your user, use the 'ListClients' command to see all clients");
-	m_vUserSocks.push_back(pUserSock);
+	m_vClients.push_back(pClient);
 	StartBackNickTimer();
 
 	if (m_RawBuffer.IsEmpty()) {
-		pUserSock->PutServ(":irc.znc.com 001 " + pUserSock->GetNick() + " :- Welcome to ZNC -");
+		pClient->PutServ(":irc.znc.com 001 " + pClient->GetNick() + " :- Welcome to ZNC -");
 	} else {
 		unsigned int uIdx = 0;
 		CString sLine;
 
 		while (m_RawBuffer.GetLine(GetIRCNick().GetNick(), sLine, uIdx++)) {
-			pUserSock->PutServ(sLine);
+			pClient->PutServ(sLine);
 		}
 	}
 
@@ -123,20 +123,20 @@ void CUser::UserConnected(CUserSock* pUserSock) {
 		CString sLine;
 
 		while (m_MotdBuffer.GetLine(GetIRCNick().GetNick(), sLine, uIdx++)) {
-			pUserSock->PutServ(sLine);
+			pClient->PutServ(sLine);
 		}
 	}
 
 	const vector<CChan*>& vChans = GetChans();
 	for (unsigned int a = 0; a < vChans.size(); a++) {
 		if ((vChans[a]->IsOn()) && (!vChans[a]->IsDetached())) {
-			vChans[a]->JoinUser(true, "", pUserSock);
+			vChans[a]->JoinUser(true, "", pClient);
 		}
 	}
 
 	CString sBufLine;
 	while (m_QueryBuffer.GetNextLine(GetIRCNick().GetNick(), sBufLine)) {
-		pUserSock->PutServ(sBufLine);
+		pClient->PutServ(sBufLine);
 	}
 }
 
@@ -168,10 +168,10 @@ void CUser::DelBackNickTimer() {
 	m_pBackNickTimer = NULL;
 }
 
-void CUser::UserDisconnected(CUserSock* pUserSock) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		if (m_vUserSocks[a] == pUserSock) {
-			m_vUserSocks.erase(m_vUserSocks.begin() + a);
+void CUser::UserDisconnected(CClient* pClient) {
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		if (m_vClients[a] == pClient) {
+			m_vClients.erase(m_vClients.begin() + a);
 			break;
 		}
 	}
@@ -220,8 +220,8 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet) {
 		AddAllowedHost(*it);
 	}
 
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		CUserSock* pSock = m_vUserSocks[a];
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		CClient* pSock = m_vClients[a];
 
 		if (!IsHostAllowed(pSock->GetRemoteIP())) {
 			pSock->PutStatusNotice("You are being disconnected because your IP is no longer allowed to connect to this user");
@@ -672,7 +672,7 @@ bool CUser::CheckPass(const CString& sPass) {
 	return (m_sPass.CaseCmp((char*) CMD5(sPass)) == 0);
 }
 
-/*CUserSock* CUser::GetUserSock() {
+/*CClient* CUser::GetClient() {
 	// Todo: optimize this by saving a pointer to the sock
 	TSocketManager<Csock>& Manager = CZNC::Get().GetManager();
 	CString sSockName = "USR::" + m_sUserName;
@@ -681,12 +681,12 @@ bool CUser::CheckPass(const CString& sPass) {
 		Csock* pSock = Manager[a];
 		if (pSock->GetSockName().CaseCmp(sSockName) == 0) {
 			if (!pSock->IsClosed()) {
-				return (CUserSock*) pSock;
+				return (CClient*) pSock;
 			}
 		}
 	}
 
-	return (CUserSock*) CZNC::Get().GetManager().FindSockByName(sSockName);
+	return (CClient*) CZNC::Get().GetManager().FindSockByName(sSockName);
 }*/
 
 CIRCSock* CUser::GetIRCSock() {
@@ -701,8 +701,8 @@ CString CUser::GetLocalIP() {
 		return pIRCSock->GetLocalIP();
 	}
 
-	if (m_vUserSocks.size()) {
-		return m_vUserSocks[0]->GetLocalIP();
+	if (m_vClients.size()) {
+		return m_vClients[0]->GetLocalIP();
 	}
 
 	return "";
@@ -719,60 +719,60 @@ bool CUser::PutIRC(const CString& sLine) {
 	return true;
 }
 
-bool CUser::PutUser(const CString& sLine, CUserSock* pUserSock, CUserSock* pSkipClient) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		if ((!pUserSock || pUserSock == m_vUserSocks[a]) && pSkipClient != m_vUserSocks[a]) {
-			m_vUserSocks[a]->PutServ(sLine);
+bool CUser::PutUser(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		if ((!pClient || pClient == m_vClients[a]) && pSkipClient != m_vClients[a]) {
+			m_vClients[a]->PutServ(sLine);
 
-			if (pUserSock) {
+			if (pClient) {
 				return true;
 			}
 		}
 	}
 
-	return (pUserSock == NULL);
+	return (pClient == NULL);
 }
 
-bool CUser::PutStatus(const CString& sLine, CUserSock* pUserSock, CUserSock* pSkipClient) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		if ((!pUserSock || pUserSock == m_vUserSocks[a]) && pSkipClient != m_vUserSocks[a]) {
-			m_vUserSocks[a]->PutStatus(sLine);
+bool CUser::PutStatus(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		if ((!pClient || pClient == m_vClients[a]) && pSkipClient != m_vClients[a]) {
+			m_vClients[a]->PutStatus(sLine);
 
-			if (pUserSock) {
+			if (pClient) {
 				return true;
 			}
 		}
 	}
 
-	return (pUserSock == NULL);
+	return (pClient == NULL);
 }
 
-bool CUser::PutStatusNotice(const CString& sLine, CUserSock* pUserSock, CUserSock* pSkipClient) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		if ((!pUserSock || pUserSock == m_vUserSocks[a]) && pSkipClient != m_vUserSocks[a]) {
-			m_vUserSocks[a]->PutStatusNotice(sLine);
+bool CUser::PutStatusNotice(const CString& sLine, CClient* pClient, CClient* pSkipClient) {
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		if ((!pClient || pClient == m_vClients[a]) && pSkipClient != m_vClients[a]) {
+			m_vClients[a]->PutStatusNotice(sLine);
 
-			if (pUserSock) {
+			if (pClient) {
 				return true;
 			}
 		}
 	}
 
-	return (pUserSock == NULL);
+	return (pClient == NULL);
 }
 
-bool CUser::PutModule(const CString& sModule, const CString& sLine, CUserSock* pUserSock, CUserSock* pSkipClient) {
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		if ((!pUserSock || pUserSock == m_vUserSocks[a]) && pSkipClient != m_vUserSocks[a]) {
-			m_vUserSocks[a]->PutModule(sModule, sLine);
+bool CUser::PutModule(const CString& sModule, const CString& sLine, CClient* pClient, CClient* pSkipClient) {
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		if ((!pClient || pClient == m_vClients[a]) && pSkipClient != m_vClients[a]) {
+			m_vClients[a]->PutModule(sModule, sLine);
 
-			if (pUserSock) {
+			if (pClient) {
 				return true;
 			}
 		}
 	}
 
-	return (pUserSock == NULL);
+	return (pClient == NULL);
 }
 
 bool CUser::ResumeFile(const CString& sRemoteNick, unsigned short uPort, unsigned long uFileSize) {
@@ -850,8 +850,8 @@ CString CUser::GetCurNick() {
 		return pIRCSock->GetNick();
 	}
 
-	if (m_vUserSocks.size()) {
-		return m_vUserSocks[0]->GetNick();
+	if (m_vClients.size()) {
+		return m_vClients[0]->GetNick();
 	}
 
 	return "";
@@ -882,8 +882,8 @@ void CUser::SetAutoCycle(bool b) { m_bAutoCycle = b; }
 void CUser::SetIRCNick(const CNick& n) {
 	m_IRCNick = n;
 
-	for (unsigned int a = 0; a < m_vUserSocks.size(); a++) {
-		m_vUserSocks[a]->SetNick(n.GetNick());
+	for (unsigned int a = 0; a < m_vClients.size(); a++) {
+		m_vClients[a]->SetNick(n.GetNick());
 	}
 }
 
diff --git a/User.h b/User.h
index 26230587..1981a6d5 100644
--- a/User.h
+++ b/User.h
@@ -19,7 +19,7 @@ class CZNC;
 class CChan;
 class CServer;
 class CIRCSock;
-class CUserSock;
+class CClient;
 class CBackNickTimer;
 class CAwayNickTimer;
 class CKeepNickTimer;
@@ -69,14 +69,14 @@ public:
 	bool OnBoot();
 
 	bool PutIRC(const CString& sLine);
-	bool PutUser(const CString& sLine, CUserSock* pUserSock = NULL, CUserSock* pSkipClient = NULL);
-	bool PutStatus(const CString& sLine, CUserSock* pUserSock = NULL, CUserSock* pSkipClient = NULL);
-	bool PutStatusNotice(const CString& sLine, CUserSock* pUserSock = NULL, CUserSock* pSkipClient = NULL);
-	bool PutModule(const CString& sModule, const CString& sLine, CUserSock* pUserSock = NULL, CUserSock* pSkipClient = NULL);
+	bool PutUser(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
+	bool PutStatus(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
+	bool PutStatusNotice(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
+	bool PutModule(const CString& sModule, const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
 
-	bool IsUserAttached() { return (m_vUserSocks.size() > 0); }
-	void UserConnected(CUserSock* pUserSock);
-	void UserDisconnected(CUserSock* pUserSock);
+	bool IsUserAttached() { return (m_vClients.size() > 0); }
+	void UserConnected(CClient* pClient);
+	void UserDisconnected(CClient* pClient);
 
 	CString GetLocalIP();
 	bool IsIRCConnected() { return m_bIRCConnected; }
@@ -122,7 +122,7 @@ public:
 	// !Setters
 
 	// Getters
-	vector<CUserSock*>& GetUserSocks() { return m_vUserSocks; }
+	vector<CClient*>& GetClients() { return m_vClients; }
 	CIRCSock* GetIRCSock();
 	const CString& GetUserName() const;
 	const CString& GetNick() const;
@@ -204,7 +204,7 @@ protected:
 
 	vector<CServer*>	m_vServers;
 	vector<CChan*>		m_vChans;
-	vector<CUserSock*>	m_vUserSocks;
+	vector<CClient*>	m_vClients;
 	set<CString>		m_ssAllowedHosts;
 	unsigned int		m_uServerIdx;
 	unsigned int		m_uBufferCount;
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index bdab6ff1..1c23e012 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -52,14 +52,14 @@ public:
 
 	virtual void OnUserAttached() {
 		if (m_spInjectedPrefixes.find(m_pUser) == m_spInjectedPrefixes.end()) {
-			m_pUserSock->PutServ(":" + m_pUser->GetIRCServer() + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + "~ :are supported by this server.");
+			m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 005 " + m_pUser->GetIRCNick().GetNick() + " CHANTYPES=" + m_pUser->GetChanPrefixes() + "~ :are supported by this server.");
 		}
 
 		for (map<CString, set<CString> >::iterator it = m_msChans.begin(); it != m_msChans.end(); it++) {
 			set<CString>& ssNicks = it->second;
 
 			if (ssNicks.find(m_pUser->GetUserName()) != ssNicks.end()) {
-				m_pUserSock->PutServ(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN " + it->first);
+				m_pClient->PutServ(":" + m_pUser->GetIRCNick().GetNickMask() + " JOIN " + it->first);
 				SendNickList(ssNicks, it->first);
 				PutChan(ssNicks, ":*" + GetModName() + "!znc@rottenboy.com MODE " + it->first + " +" + CString(m_pUser->IsAdmin() ? "o" : "v") + " ?" + m_pUser->GetUserName(), true);
 			}
@@ -94,7 +94,7 @@ public:
 		}
 
 		if (sChannel.Left(2) != "~#") {
-			m_pUserSock->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No such channel");
+			m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :No such channel");
 			return HALT;
 		}
 
@@ -126,7 +126,7 @@ public:
 		}
 
 		if (sChannel.Left(2) != "~#") {
-			m_pUserSock->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :Channels look like ~#znc");
+			m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sChannel + " :Channels look like ~#znc");
 			return HALT;
 		}
 
@@ -174,7 +174,7 @@ public:
 
 		if (cPrefix == '~') {
 			if (m_msChans.find(sTarget.AsLower()) == m_msChans.end()) {
-				m_pUserSock->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such channel");
+				m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such channel");
 				return HALT;
 			}
 
@@ -186,7 +186,7 @@ public:
 			if (pUser) {
 				pUser->PutUser(":?" + m_pUser->GetUserName() + "!" + m_pUser->GetIdent() + "@" + sHost + " PRIVMSG " + pUser->GetIRCNick().GetNick() + " :" + sMessage);
 			} else {
-				m_pUserSock->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such znc user: " + sNick + "");
+				m_pClient->PutServ(":" + m_pUser->GetIRCServer() + " 403 " + m_pUser->GetIRCNick().GetNick() + " " + sTarget + " :No such znc user: " + sNick + "");
 			}
 		}
 
@@ -258,7 +258,7 @@ public:
 			if (ssNicks.find(it->first) != ssNicks.end()) {
 				if (it->second == m_pUser) {
 					if (bIncludeCurUser) {
-						it->second->PutUser(sLine, NULL, (bIncludeClient ? NULL : m_pUserSock));
+						it->second->PutUser(sLine, NULL, (bIncludeClient ? NULL : m_pClient));
 					}
 				} else {
 					it->second->PutUser(sLine);
diff --git a/modules/shell.cpp b/modules/shell.cpp
index 9823cb99..90c4fd11 100644
--- a/modules/shell.cpp
+++ b/modules/shell.cpp
@@ -14,10 +14,10 @@ class CShellMod;
 
 class CExecSock : public Csock {
 public:
-	CExecSock(CShellMod* pShellMod, CUserSock* pUserSock, const CString& sExec) : Csock() {
+	CExecSock(CShellMod* pShellMod, CClient* pClient, const CString& sExec) : Csock() {
 		EnableReadLine();
 		m_pParent = pShellMod;
-		m_pUserSock = pUserSock;
+		m_pClient = pClient;
 		int iReadFD, iWriteFD;
 		m_iPid = popen2(iReadFD, iWriteFD, sExec);
 		ConnectFD(iReadFD, iWriteFD, "0.0.0.0:0");
@@ -85,7 +85,7 @@ public:
 		return;
 	}
 private:
-	CUserSock*	m_pUserSock;
+	CClient*	m_pClient;
 };
 
 class CShellMod : public CModule {
@@ -188,7 +188,7 @@ public:
 	}
 
 	void RunCommand(const CString& sCommand) {
-		m_pManager->AddSock((Csock*) new CExecSock(this, m_pUserSock, "cd " + m_sPath + " && " + sCommand), "SHELL");
+		m_pManager->AddSock((Csock*) new CExecSock(this, m_pClient, "cd " + m_sPath + " && " + sCommand), "SHELL");
 	}
 private:
 	CString	m_sPath;
@@ -207,15 +207,15 @@ void CExecSock::ReadLine(const CString& sData) {
 		a = sLine.find('\t');
 	}
 
-	m_pParent->SetUserSock(m_pUserSock);
+	m_pParent->SetClient(m_pClient);
 	m_pParent->PutShell(sLine);
-	m_pParent->SetUserSock(NULL);
+	m_pParent->SetClient(NULL);
 }
 
 void CExecSock::Disconnected() {
-	m_pParent->SetUserSock(m_pUserSock);
+	m_pParent->SetClient(m_pClient);
 	m_pParent->PutShell("znc$");
-	m_pParent->SetUserSock(NULL);
+	m_pParent->SetClient(NULL);
 }
 
 MODULEDEFS(CShellMod, "Gives shell access")
diff --git a/znc.cpp b/znc.cpp
index acf761dc..666e034e 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -1,7 +1,7 @@
 #include "znc.h"
 #include "User.h"
 #include "Server.h"
-#include "UserSock.h"
+#include "Client.h"
 #include "IRCSock.h"
 #include "Utils.h"
 
@@ -258,16 +258,16 @@ bool CZNC::Listen() {
 		return false;
 	}
 
-	CUserSock* pUserSock = new CUserSock;
+	CClient* pClient = new CClient;
 
 	bool bSSL = false;
 #ifdef HAVE_LIBSSL
 	if (IsSSL()) {
 		bSSL = true;
-		pUserSock->SetPemLocation(GetPemLocation());
+		pClient->SetPemLocation(GetPemLocation());
 	}
 #endif
-	return m_Manager.ListenAll(m_uListenPort, "_LISTENER", bSSL, SOMAXCONN, pUserSock);
+	return m_Manager.ListenAll(m_uListenPort, "_LISTENER", bSSL, SOMAXCONN, pClient);
 }
 
 bool CZNC::IsHostAllowed(const CString& sHostMask) {
diff --git a/znc.h b/znc.h
index abb2a8b3..1bf8186b 100644
--- a/znc.h
+++ b/znc.h
@@ -12,7 +12,7 @@ using std::map;
 using std::set;
 
 class CUser;
-class CUserSock;
+class CClient;
 
 class CZNC {
 public: