diff --git a/client/src/main/java/Class95.java b/client/src/main/java/BufferedSocket.java
similarity index 97%
rename from client/src/main/java/Class95.java
rename to client/src/main/java/BufferedSocket.java
index ebd6385..11ee5f4 100644
--- a/client/src/main/java/Class95.java
+++ b/client/src/main/java/BufferedSocket.java
@@ -9,7 +9,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ma")
-public final class Class95 implements Runnable {
+public final class BufferedSocket implements Runnable {
 
 	@OriginalMember(owner = "client!ma", name = "h", descriptor = "[B")
 	private byte[] aByteArray49;
@@ -42,7 +42,7 @@ public final class Class95 implements Runnable {
 	private OutputStream anOutputStream1;
 
 	@OriginalMember(owner = "client!ma", name = "<init>", descriptor = "(Ljava/net/Socket;Lsignlink!ll;)V")
-	public Class95(@OriginalArg(0) Socket arg0, @OriginalArg(1) Class213 arg1) throws IOException {
+	public BufferedSocket(@OriginalArg(0) Socket arg0, @OriginalArg(1) Class213 arg1) throws IOException {
 		this.aClass213_5 = arg1;
 		this.aSocket1 = arg0;
 		this.aSocket1.setSoTimeout(30000);
diff --git a/client/src/main/java/Class73.java b/client/src/main/java/Class73.java
index 63c6fdd..2941a5d 100644
--- a/client/src/main/java/Class73.java
+++ b/client/src/main/java/Class73.java
@@ -11,7 +11,7 @@ public final class Class73 {
 	private long aLong104;
 
 	@OriginalMember(owner = "client!jb", name = "B", descriptor = "Lclient!ma;")
-	private Class95 aClass95_1;
+	private BufferedSocket aClass95_1;
 
 	@OriginalMember(owner = "client!jb", name = "C", descriptor = "I")
 	private int anInt2962;
@@ -251,7 +251,7 @@ public final class Class73 {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(ZLclient!ma;I)V")
-	public final void method2324(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class95 arg1) {
+	public final void method2324(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
 		if (this.aClass95_1 != null) {
 			try {
 				this.aClass95_1.method2834();
diff --git a/client/src/main/java/Static124.java b/client/src/main/java/Static124.java
index a124f85..8dcfedf 100644
--- a/client/src/main/java/Static124.java
+++ b/client/src/main/java/Static124.java
@@ -8,7 +8,7 @@ public final class Static124 {
 	public static int anInt3080;
 
 	@OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
-	public static Class95 aClass95_2;
+	public static BufferedSocket aClass95_2;
 
 	@OriginalMember(owner = "client!jk", name = "J", descriptor = "I")
 	public static int anInt3083;
diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java
index c9dc5cb..89acc5c 100644
--- a/client/src/main/java/Static158.java
+++ b/client/src/main/java/Static158.java
@@ -57,7 +57,7 @@ public final class Static158 {
 				if (Static72.aClass212_3.anInt5925 != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new Class95((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
 				Static72.aClass212_3 = null;
 				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792);
 				if (Static11.aClass62_1 != null) {
diff --git a/client/src/main/java/Static206.java b/client/src/main/java/Static206.java
index e96ecc5..f3e9be3 100644
--- a/client/src/main/java/Static206.java
+++ b/client/src/main/java/Static206.java
@@ -8,7 +8,7 @@ public final class Static206 {
 	public static int[] anIntArray427;
 
 	@OriginalMember(owner = "client!qk", name = "g", descriptor = "Lclient!ma;")
-	public static Class95 aClass95_3;
+	public static BufferedSocket aClass95_3;
 
 	@OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_899 = Static28.method790("0(U");
diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java
index 8b041df..94e1786 100644
--- a/client/src/main/java/Static207.java
+++ b/client/src/main/java/Static207.java
@@ -111,7 +111,7 @@ public final class Static207 {
 				if (Static72.aClass212_3.anInt5925 != 1) {
 					return -1;
 				}
-				Static124.aClass95_2 = new Class95((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
 				Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0;
 				Static72.aClass212_3 = null;
 				local82 = 0;
diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java
index 5a30f11..93beea0 100644
--- a/client/src/main/java/Static216.java
+++ b/client/src/main/java/Static216.java
@@ -51,7 +51,7 @@ public final class Static216 {
 				if (Static72.aClass212_3.anInt5925 != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new Class95((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
 				Static72.aClass212_3 = null;
 				@Pc(106) long local106 = Static101.aLong98 = Static186.aClass100_829.method3158();
 				Static6.aClass3_Sub15_Sub1_1.anInt2792 = 0;
diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java
index 8ccb756..3daf272 100644
--- a/client/src/main/java/Static233.java
+++ b/client/src/main/java/Static233.java
@@ -14,7 +14,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static233 {
 
 	@OriginalMember(owner = "client!t", name = "l", descriptor = "Lclient!ma;")
-	public static Class95 aClass95_4;
+	public static BufferedSocket aClass95_4;
 
 	@OriginalMember(owner = "client!t", name = "o", descriptor = "I")
 	public static int anInt5217;
diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java
index 19b16db..291bca5 100644
--- a/client/src/main/java/Static31.java
+++ b/client/src/main/java/Static31.java
@@ -79,7 +79,7 @@ public final class Static31 {
 				if (Static72.aClass212_3.anInt5925 != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new Class95((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
 				Static72.aClass212_3 = null;
 				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.aByteArray40, Static6.aClass3_Sub15_Sub1_1.anInt2792);
 				if (Static11.aClass62_1 != null) {
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
index a890b8a..f78490c 100644
--- a/client/src/main/java/client.java
+++ b/client/src/main/java/client.java
@@ -589,7 +589,7 @@ public final class client extends GameShell {
 				}
 			}
 			if (Static4.anInt30 == 2) {
-				Static206.aClass95_3 = new Class95((Socket) Static37.aClass212_2.anObject6, Static71.aClass213_3);
+				Static206.aClass95_3 = new BufferedSocket((Socket) Static37.aClass212_2.anObject6, Static71.aClass213_3);
 				@Pc(194) Buffer local194 = new Buffer(5);
 				local194.method2178(15);
 				local194.method2164(530);