diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index d66e24ee7..83b82e63a 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -157,7 +157,7 @@ int CClient::SendMsgActive(CMsgPacker *pMsg, int Flags)
 void CClient::SendInfo(int Conn)
 {
 	CMsgPacker MsgVer(NETMSG_CLIENTVER, true);
-	MsgVer.AddRaw(&m_ConnectionID, sizeof(m_ConnectionID));
+	MsgVer.AddRaw(&m_ConnectionId, sizeof(m_ConnectionId));
 	MsgVer.AddInt(GameClient()->DDNetVersion());
 	MsgVer.AddString(GameClient()->DDNetVersionStr());
 	SendMsg(Conn, &MsgVer, MSGFLAG_VITAL);
@@ -445,7 +445,7 @@ void CClient::Connect(const char *pAddress, const char *pPassword)
 	Disconnect();
 	dbg_assert(m_State == IClient::STATE_OFFLINE, "Disconnect must ensure that client is offline");
 
-	m_ConnectionID = RandomUuid();
+	m_ConnectionId = RandomUuid();
 	if(pAddress != m_aConnectAddressStr)
 		str_copy(m_aConnectAddressStr, pAddress);
 
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 3b6246a6c..973734237 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -91,7 +91,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
 
 	char m_aConnectAddressStr[MAX_SERVER_ADDRESSES * NETADDR_MAXSTRSIZE] = "";
 
-	CUuid m_ConnectionID = UUID_ZEROED;
+	CUuid m_ConnectionId = UUID_ZEROED;
 
 	bool m_HaveGlobalTcpAddr = false;
 	NETADDR m_GlobalTcpAddr = NETADDR_ZEROED;
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 570905008..cc30da8be 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -586,7 +586,7 @@ bool CServer::GetClientInfo(int ClientID, CClientInfo *pInfo) const
 		pInfo->m_DDNetVersion = m_aClients[ClientID].m_DDNetVersion >= 0 ? m_aClients[ClientID].m_DDNetVersion : VERSION_VANILLA;
 		if(m_aClients[ClientID].m_GotDDNetVersionPacket)
 		{
-			pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionID;
+			pInfo->m_pConnectionID = &m_aClients[ClientID].m_ConnectionId;
 			pInfo->m_pDDNetVersionStr = m_aClients[ClientID].m_aDDNetVersionStr;
 		}
 		else
@@ -1470,7 +1470,7 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
 				{
 					return;
 				}
-				m_aClients[ClientID].m_ConnectionID = *pConnectionID;
+				m_aClients[ClientID].m_ConnectionId = *pConnectionID;
 				m_aClients[ClientID].m_DDNetVersion = DDNetVersion;
 				str_copy(m_aClients[ClientID].m_aDDNetVersionStr, pDDNetVersionStr);
 				m_aClients[ClientID].m_DDNetVersionSettled = true;
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index c4fca2094..5df3105cf 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -177,7 +177,7 @@ public:
 		bool m_DDNetVersionSettled;
 		int m_DDNetVersion;
 		char m_aDDNetVersionStr[64];
-		CUuid m_ConnectionID;
+		CUuid m_ConnectionId;
 		int64_t m_RedirectDropTime;
 
 		// DNSBL