diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index 9060a7e0ab..f060628a30 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -161,8 +161,8 @@ public class ChatChannel {
 		MusicPatchNode.worldHost = var0.host; // L: 1555
 		Client.worldId = var0.id; // L: 1556
 		Client.worldProperties = var0.properties; // L: 1557
-		MouseRecorder.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1558
-		class171.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1559
-		DynamicObject.port3 = MouseRecorder.port1; // L: 1560
+		MouseRecorder.worldPort = Client.gameBuild == 0 ? 43594 : var0.id + 40000; // L: 1558
+		class171.js5Port = Client.gameBuild == 0 ? 443 : var0.id + 50000; // L: 1559
+		DynamicObject.currentPort = MouseRecorder.worldPort; // L: 1560
 	} // L: 1561
-}
+}
\ No newline at end of file
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 4f8ebb49ae..3fa3ff79d7 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -1566,9 +1566,9 @@ public final class Client extends GameEngine implements Usernamed {
 	@Export("setUp")
 	protected final void setUp() {
 		Strings.method4329(new int[]{20, 260, 10000}, new int[]{1000, 100, 500}); // L: 791
-		MouseRecorder.port1 = gameBuild == 0 ? 43594 : worldId + 40000; // L: 792
-		class171.port2 = gameBuild == 0 ? 443 : worldId + 50000; // L: 793
-		DynamicObject.port3 = MouseRecorder.port1; // L: 794
+		MouseRecorder.worldPort = gameBuild == 0 ? 43594 : worldId + 40000; // L: 792
+		class171.js5Port = gameBuild == 0 ? 443 : worldId + 50000; // L: 793
+		DynamicObject.currentPort = MouseRecorder.worldPort; // L: 794
 		PlayerComposition.field2565 = class224.field2577; // L: 795
 		class105.field1339 = class224.field2573; // L: 796
 		HealthBar.field1143 = class224.field2575; // L: 797
@@ -2274,7 +2274,7 @@ public final class Client extends GameEngine implements Usernamed {
 			if (--field761 + 1 <= 0) { // L: 1249
 				try {
 					if (js5ConnectState == 0) { // L: 1251
-						TaskHandler.js5SocketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.port3); // L: 1252
+						TaskHandler.js5SocketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.currentPort); // L: 1252
 						++js5ConnectState; // L: 1253
 					}
 
@@ -2401,10 +2401,10 @@ public final class Client extends GameEngine implements Usernamed {
 		TaskHandler.js5SocketTask = null; // L: 1356
 		WorldMapArea.js5Socket = null; // L: 1357
 		js5ConnectState = 0; // L: 1358
-		if (DynamicObject.port3 == MouseRecorder.port1) { // L: 1359
-			DynamicObject.port3 = class171.port2;
+		if (DynamicObject.currentPort == MouseRecorder.worldPort) { // L: 1359
+			DynamicObject.currentPort = class171.js5Port;
 		} else {
-			DynamicObject.port3 = MouseRecorder.port1; // L: 1360
+			DynamicObject.currentPort = MouseRecorder.worldPort; // L: 1360
 		}
 
 		++js5Errors; // L: 1361
@@ -2462,7 +2462,7 @@ public final class Client extends GameEngine implements Usernamed {
 
 			if (loginState == 1) { // L: 1815
 				if (NetSocket.socketTask == null) { // L: 1816
-					NetSocket.socketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.port3); // L: 1817
+					NetSocket.socketTask = GameEngine.taskHandler.newSocketTask(MusicPatchNode.worldHost, DynamicObject.currentPort); // L: 1817
 				}
 
 				if (NetSocket.socketTask.status == 2) { // L: 1819
@@ -2908,10 +2908,10 @@ public final class Client extends GameEngine implements Usernamed {
 						++field696; // L: 2395
 						if (field696 > 2000) { // L: 2396
 							if (field786 < 1) { // L: 2397
-								if (MouseRecorder.port1 == DynamicObject.port3) { // L: 2398
-									DynamicObject.port3 = class171.port2;
+								if (MouseRecorder.worldPort == DynamicObject.currentPort) { // L: 2398
+									DynamicObject.currentPort = class171.js5Port;
 								} else {
-									DynamicObject.port3 = MouseRecorder.port1; // L: 2399
+									DynamicObject.currentPort = MouseRecorder.worldPort; // L: 2399
 								}
 
 								++field786; // L: 2400
@@ -3070,10 +3070,10 @@ public final class Client extends GameEngine implements Usernamed {
 			}
 		} catch (IOException var22) { // L: 2408
 			if (field786 < 1) { // L: 2409
-				if (MouseRecorder.port1 == DynamicObject.port3) { // L: 2410
-					DynamicObject.port3 = class171.port2;
+				if (MouseRecorder.worldPort == DynamicObject.currentPort) { // L: 2410
+					DynamicObject.currentPort = class171.js5Port;
 				} else {
-					DynamicObject.port3 = MouseRecorder.port1; // L: 2411
+					DynamicObject.currentPort = MouseRecorder.worldPort; // L: 2411
 				}
 
 				++field786; // L: 2412
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index 1543bed552..2514398472 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -16,8 +16,8 @@ public class DynamicObject extends Renderable {
 	@ObfuscatedGetter(
 		intValue = 1685580933
 	)
-	@Export("port3")
-	static int port3;
+	@Export("currentPort")
+	static int currentPort;
 	@ObfuscatedName("n")
 	@ObfuscatedGetter(
 		intValue = -1583763067
@@ -166,4 +166,4 @@ public class DynamicObject extends Renderable {
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 88120bccc8..b9551bde1a 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -10,8 +10,8 @@ public class MouseRecorder implements Runnable {
 	@ObfuscatedGetter(
 		intValue = -1626344665
 	)
-	@Export("port1")
-	static int port1;
+	@Export("worldPort")
+	static int worldPort;
 	@ObfuscatedName("n")
 	@Export("isRunning")
 	boolean isRunning;
@@ -56,4 +56,4 @@ public class MouseRecorder implements Runnable {
 		}
 
 	} // L: 28
-}
+}
\ No newline at end of file
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
index a4c8494ed1..8296fccfb8 100644
--- a/runescape-client/src/main/java/class171.java
+++ b/runescape-client/src/main/java/class171.java
@@ -9,8 +9,8 @@ public class class171 implements class170 {
 	@ObfuscatedGetter(
 		intValue = -853566565
 	)
-	@Export("port2")
-	static int port2;
+	@Export("js5Port")
+	static int js5Port;
 
 	@ObfuscatedName("n")
 	@ObfuscatedSignature(
@@ -286,4 +286,4 @@ public class class171 implements class170 {
 		WorldMapSectionType.clientPreferences.soundEffectsVolume = var0; // L: 11113
 		class23.savePreferences(); // L: 11114
 	} // L: 11115
-}
+}
\ No newline at end of file