diff --git a/client/src/main/java/Class20.java b/client/src/main/java/BasType.java
similarity index 99%
rename from client/src/main/java/Class20.java
rename to client/src/main/java/BasType.java
index c49bbbd..74f3f37 100644
--- a/client/src/main/java/Class20.java
+++ b/client/src/main/java/BasType.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ck")
-public final class Class20 {
+public final class BasType {
 
 	@OriginalMember(owner = "client!ck", name = "g", descriptor = "[[I")
 	public int[][] anIntArrayArray7;
diff --git a/client/src/main/java/Class59.java b/client/src/main/java/Class59.java
index 2d59705..0ec8174 100644
--- a/client/src/main/java/Class59.java
+++ b/client/src/main/java/Class59.java
@@ -228,7 +228,7 @@ public final class Class59 {
 						}
 					}
 				}
-				@Pc(303) Class20 local303 = null;
+				@Pc(303) BasType local303 = null;
 				if (this.anInt2497 != -1) {
 					local303 = Static90.method1856(this.anInt2497);
 				}
diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java
index a4aaf2a..c895ad1 100644
--- a/client/src/main/java/NpcType.java
+++ b/client/src/main/java/NpcType.java
@@ -252,7 +252,7 @@ public final class NpcType {
 					}
 				}
 			}
-			@Pc(156) Class20 local156 = null;
+			@Pc(156) BasType local156 = null;
 			if (this.anInt3737 != -1) {
 				local156 = Static90.method1856(this.anInt3737);
 			}
diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java
index 4406324..9729418 100644
--- a/client/src/main/java/PathingEntity.java
+++ b/client/src/main/java/PathingEntity.java
@@ -253,7 +253,7 @@ public abstract class PathingEntity extends Entity {
 	public int anInt3418 = -1;
 
 	@OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;")
-	public final Class20 method2681() {
+	public final BasType method2681() {
 		@Pc(7) int local7 = this.method2688();
 		return local7 == -1 ? Static4.aClass20_1 : Static90.method1856(local7);
 	}
@@ -351,7 +351,7 @@ public abstract class PathingEntity extends Entity {
 		Static102.anInt2680 = 0;
 		Static101.anInt2640 = 0;
 		Static62.anInt1938 = 0;
-		@Pc(21) Class20 local21 = this.method2681();
+		@Pc(21) BasType local21 = this.method2681();
 		@Pc(24) int local24 = local21.anInt1059;
 		@Pc(27) int local27 = local21.anInt1050;
 		if (local24 == 0 || local27 == 0) {
@@ -415,7 +415,7 @@ public abstract class PathingEntity extends Entity {
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(Lclient!ak;B)V")
 	protected final void method2687(@OriginalArg(0) Model arg0) {
-		@Pc(16) Class20 local16 = this.method2681();
+		@Pc(16) BasType local16 = this.method2681();
 		if (local16.anInt1064 == 0 && local16.anInt1041 == 0) {
 			return;
 		}
diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java
index 531850d..5e086fd 100644
--- a/client/src/main/java/Static104.java
+++ b/client/src/main/java/Static104.java
@@ -9,7 +9,7 @@ public final class Static104 {
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
 	public static void method2247(@OriginalArg(1) PathingEntity arg0) {
-		@Pc(9) Class20 local9 = arg0.method2681();
+		@Pc(9) BasType local9 = arg0.method2681();
 		arg0.anInt3366 = local9.anInt1037;
 		if (arg0.anInt3409 == 0) {
 			arg0.anInt3417 = 0;
diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java
index 8a6f2a0..352db6c 100644
--- a/client/src/main/java/Static110.java
+++ b/client/src/main/java/Static110.java
@@ -46,7 +46,7 @@ public final class Static110 {
 			Static150.method2804(arg1, local6, arg3, arg0, arg2);
 		}
 		@Pc(37) byte local37;
-		@Pc(42) Class20 local42;
+		@Pc(42) BasType local42;
 		@Pc(141) int local141;
 		for (local6 = (Class3_Sub12) Static152.aClass69_87.method2289(); local6 != null; local6 = (Class3_Sub12) Static152.aClass69_87.method2288()) {
 			local37 = 1;
diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java
index 8af1f61..1c4c5e1 100644
--- a/client/src/main/java/Static112.java
+++ b/client/src/main/java/Static112.java
@@ -125,7 +125,7 @@ public final class Static112 {
 			}
 		}
 		@Pc(29) int local29 = local13.anInt3747;
-		@Pc(33) Class20 local33 = arg0.method2681();
+		@Pc(33) BasType local33 = arg0.method2681();
 		if (local33.anInt1037 == arg0.anInt3366) {
 			local29 = local13.anInt3728;
 		} else if (arg0.anInt3366 == local33.anInt1058 || local33.anInt1054 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1045 || arg0.anInt3366 == local33.anInt1043) {
diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java
index f269cfc..12409f9 100644
--- a/client/src/main/java/Static140.java
+++ b/client/src/main/java/Static140.java
@@ -43,7 +43,7 @@ public final class Static140 {
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I")
 	public static int method2706(@OriginalArg(1) Player arg0) {
 		@Pc(14) int local14 = arg0.anInt1654;
-		@Pc(18) Class20 local18 = arg0.method2681();
+		@Pc(18) BasType local18 = arg0.method2681();
 		if (local18.anInt1037 == arg0.anInt3366) {
 			local14 = arg0.anInt1648;
 		} else if (local18.anInt1058 == arg0.anInt3366 || arg0.anInt3366 == local18.anInt1054 || arg0.anInt3366 == local18.anInt1045 || local18.anInt1043 == arg0.anInt3366) {
diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java
index d226116..2f709d5 100644
--- a/client/src/main/java/Static37.java
+++ b/client/src/main/java/Static37.java
@@ -30,7 +30,7 @@ public final class Static37 {
 		if (arg0.anInt3376 == 0) {
 			return;
 		}
-		@Pc(13) Class20 local13 = arg0.method2681();
+		@Pc(13) BasType local13 = arg0.method2681();
 		@Pc(43) int local43;
 		@Pc(36) int local36;
 		if (arg0.anInt3370 != -1 && arg0.anInt3370 < 32768) {
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index a92c610..770e75e 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -18,7 +18,7 @@ public final class Static4 {
 	public static short aShort1 = 32767;
 
 	@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
-	public static final Class20 aClass20_1 = new Class20();
+	public static final BasType aClass20_1 = new BasType();
 
 	@OriginalMember(owner = "client!ac", name = "m", descriptor = "Lclient!na;")
 	public static final JagString aClass100_7 = Static28.method790("overlay");
diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java
index 5f79c15..6383356 100644
--- a/client/src/main/java/Static75.java
+++ b/client/src/main/java/Static75.java
@@ -415,7 +415,7 @@ public final class Static75 {
 								}
 							}
 							if (local1198 != null) {
-								@Pc(1232) Class20 local1232 = local1198.method2681();
+								@Pc(1232) BasType local1232 = local1198.method2681();
 								if (local1232.anIntArrayArray7 != null && local1232.anIntArrayArray7[local1194] != null) {
 									local1188 = local1232.anIntArrayArray7[local1194][0];
 									local224 -= local1232.anIntArrayArray7[local1194][1];
diff --git a/client/src/main/java/Static90.java b/client/src/main/java/Static90.java
index 6f9526e..95e088c 100644
--- a/client/src/main/java/Static90.java
+++ b/client/src/main/java/Static90.java
@@ -36,13 +36,13 @@ public final class Static90 {
 	}
 
 	@OriginalMember(owner = "client!hb", name = "a", descriptor = "(ZI)Lclient!ck;")
-	public static Class20 method1856(@OriginalArg(1) int arg0) {
-		@Pc(10) Class20 local10 = (Class20) Static262.aClass99_34.method3106((long) arg0);
+	public static BasType method1856(@OriginalArg(1) int arg0) {
+		@Pc(10) BasType local10 = (BasType) Static262.aClass99_34.method3106((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
 		@Pc(21) byte[] local21 = Static167.aClass153_62.method4495(32, arg0);
-		local10 = new Class20();
+		local10 = new BasType();
 		if (local21 != null) {
 			local10.method880(new Buffer(local21));
 		}