diff --git a/zone/client.cpp b/zone/client.cpp
index cda1669e0..b7d52e82d 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -246,7 +246,7 @@ Client::Client(EQStreamInterface* ieqs)
 	GlobalChatLimiterTimer = new Timer(RuleI(Chat, IntervalDurationMS));
 	AttemptedMessages = 0;
 	TotalKarma = 0;
-	ClientVersion = ClientVersion::Unknown;
+	m_ClientVersion = ClientVersion::Unknown;
 	ClientVersionBit = 0;
 	AggroCount = 0;
 	RestRegenHP = 0;
diff --git a/zone/client.h b/zone/client.h
index 8f596d52a..cc9eb7f77 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -1019,8 +1019,9 @@ public:
 	inline int ActiveTasksInSet(int TaskSet) { return (taskstate ? taskstate->ActiveTasksInSet(TaskSet) :0); }
 	inline int CompletedTasksInSet(int TaskSet) { return (taskstate ? taskstate->CompletedTasksInSet(TaskSet) :0); }
 
-	inline const ClientVersion GetClientVersion() const { return ClientVersion; }
+	inline const ClientVersion GetClientVersion() const { return m_ClientVersion; }
 	inline const uint32 GetClientVersionBit() const { return ClientVersionBit; }
+	inline void SetClientVersion(ClientVersion in) { m_ClientVersion = in; }
 
 	/** Adventure Stuff **/
 	void SendAdventureError(const char *error);
@@ -1506,7 +1507,7 @@ private:
 	Timer *GlobalChatLimiterTimer; //60 seconds
 	uint32 AttemptedMessages;
 
-	ClientVersion ClientVersion;
+	ClientVersion m_ClientVersion;
 	uint32 ClientVersionBit;
 
 	int XPRate;
diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp
index bc639b371..1d64cd2c0 100644
--- a/zone/client_mods.cpp
+++ b/zone/client_mods.cpp
@@ -1172,7 +1172,7 @@ uint32 Client::CalcCurrentWeight() {
 	*/
 
 	// SoD+ client has no weight for coin
-	if (EQLimits::CoinHasWeight(ClientVersion))
+	if (EQLimits::CoinHasWeight(GetClientVersion()))
 		Total += (m_pp.platinum + m_pp.gold + m_pp.silver + m_pp.copper) / 4;
 
 	float Packrat = (float)spellbonuses.Packrat + (float)aabonuses.Packrat + (float)itembonuses.Packrat;
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index f09e9ecf4..46c00bf3f 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -1309,12 +1309,12 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 
 	conn_state = ReceivedZoneEntry;
 
-	ClientVersion = Connection()->GetClientVersion();
-	if (ClientVersion != ClientVersion::Unknown)
-		ClientVersionBit = 1 << (static_cast<unsigned int>(ClientVersion) - 1);
+	SetClientVersion(Connection()->GetClientVersion());
+	if (m_ClientVersion != ClientVersion::Unknown)
+		ClientVersionBit = 1 << (static_cast<unsigned int>(m_ClientVersion) - 1);
 
-	bool siv = m_inv.SetInventoryVersion(ClientVersion);
-	LogFile->write(EQEmuLog::Debug, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), ClientVersionName(ClientVersion), ClientVersion);
+	bool siv = m_inv.SetInventoryVersion(m_ClientVersion);
+	LogFile->write(EQEmuLog::Debug, "%s inventory version to %s(%i)", (siv ? "Succeeded in setting" : "Failed to set"), ClientVersionName(m_ClientVersion), m_ClientVersion);
 
 	/* Antighost code
 		tmp var is so the search doesnt find this object