diff --git a/src/Components/Modules/Bans.cpp b/src/Components/Modules/Bans.cpp
index 7fdef6cb..d3f5d306 100644
--- a/src/Components/Modules/Bans.cpp
+++ b/src/Components/Modules/Bans.cpp
@@ -181,9 +181,9 @@ namespace Components
 		Game::client_t* client = &Game::svs_clients[num];
 
 		SteamID guid;
-		guid.bits = client->steamid;
+		guid.bits = client->steamID;
 
-		Bans::InsertBan({ guid, client->addr.ip });
+		Bans::InsertBan({ guid, client->netchan.remoteAddress.ip });
 
 		Game::SV_KickClientError(client, reason);
 	}
diff --git a/src/Components/Modules/Bots.cpp b/src/Components/Modules/Bots.cpp
index 4cbbde53..7e0f16ba 100644
--- a/src/Components/Modules/Bots.cpp
+++ b/src/Components/Modules/Bots.cpp
@@ -437,7 +437,7 @@ namespace Components
 				ucmd.rightmove = g_botai[i].right;
 				ucmd.weapon = g_botai[i].weapon;
 
-				client->deltaMessage = client->outgoingSequence - 1;
+				client->deltaMessage = client->netchan.outgoingSequence - 1;
 
 				Game::SV_ClientThink(client, &ucmd);
 			}
diff --git a/src/Components/Modules/Client.cpp b/src/Components/Modules/Client.cpp
index 0f3e991f..4f5f9770 100644
--- a/src/Components/Modules/Client.cpp
+++ b/src/Components/Modules/Client.cpp
@@ -134,7 +134,7 @@ namespace Components
 
 			if (client->state >= 3)
 			{
-				std::string ip = Game::NET_AdrToString(client->addr);
+				std::string ip = Game::NET_AdrToString(client->netchan.remoteAddress);
 				if (ip.find_first_of(":") != std::string::npos)
 					ip.erase(ip.begin() + ip.find_first_of(":"), ip.end()); // erase port
 				Game::Scr_AddString(ip.data());
diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index 71e1630e..1061bba2 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -152,7 +152,7 @@ namespace Components
 		{
 			if (Game::svs_clients[i].state >= 3)
 			{
-				list.append(Utils::String::VA(" %llX", Game::svs_clients[i].steamid));
+				list.append(Utils::String::VA(" %llX", Game::svs_clients[i].steamID));
 
 				Utils::InfoString info(Game::svs_clients[i].connectInfoString);
 				list.append(Utils::String::VA(" %llX", strtoull(info.get("realsteamId").data(), nullptr, 16)));
diff --git a/src/Components/Modules/Download.cpp b/src/Components/Modules/Download.cpp
index f4c25566..d2bb9649 100644
--- a/src/Components/Modules/Download.cpp
+++ b/src/Components/Modules/Download.cpp
@@ -387,7 +387,7 @@ namespace Components
 
 			if (client->state >= 3)
 			{
-				if (address.getIP().full == Network::Address(client->addr).getIP().full)
+				if (address.getIP().full == Network::Address(client->netchan.remoteAddress).getIP().full)
 				{
 					return client;
 				}
diff --git a/src/Game/Functions.cpp b/src/Game/Functions.cpp
index 0ed7b3cc..99f0b6c0 100644
--- a/src/Game/Functions.cpp
+++ b/src/Game/Functions.cpp
@@ -606,7 +606,7 @@ namespace Game
 	{
 		if (client->state < 5)
 		{
-			Components::Network::SendCommand(client->addr, "error", reason);
+			Components::Network::SendCommand(client->netchan.remoteAddress, "error", reason);
 		}
 
 		SV_KickClient(client, reason.data());