diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java
index afbf518..7e33c41 100644
--- a/client/src/main/java/Class3_Sub14.java
+++ b/client/src/main/java/Class3_Sub14.java
@@ -207,7 +207,7 @@ public final class Class3_Sub14 extends Node {
 	}
 
 	@OriginalMember(owner = "client!hg", name = "a", descriptor = "([[[Lclient!bj;FZ)V")
-	public final void method1944(@OriginalArg(0) Class3_Sub5[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) {
+	public final void method1944(@OriginalArg(0) Tile[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) {
 		if (Static95.aClass3_Sub15_3 == null || Static95.aClass3_Sub15_3.aByteArray40.length < this.anInt2488 * 4) {
 			Static95.aClass3_Sub15_3 = new Buffer(this.anInt2488 * 4);
 		} else {
@@ -219,7 +219,7 @@ public final class Class3_Sub14 extends Node {
 			Static95.aClass3_Sub15_2.anInt2792 = 0;
 		}
 		@Pc(47) int local47;
-		@Pc(68) Class3_Sub5 local68;
+		@Pc(68) Tile local68;
 		@Pc(111) Buffer local111;
 		@Pc(78) int[] local78;
 		@Pc(86) int[] local86;
diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java
index beff266..8db3b87 100644
--- a/client/src/main/java/Static105.java
+++ b/client/src/main/java/Static105.java
@@ -122,7 +122,7 @@ public final class Static105 {
 				if (local10 < 0 || local17 < 0 || local10 >= Static152.anInt3594 || local17 >= Static99.anInt2550) {
 					return false;
 				}
-				@Pc(42) Class3_Sub5 local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local10][local17];
+				@Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local10][local17];
 				if (local42 != null && local42.anInt662 >= 5) {
 					return false;
 				}
@@ -158,10 +158,10 @@ public final class Static105 {
 				}
 				for (@Pc(141) int local141 = arg0; local141 >= 0; local141--) {
 					if (Static130.aClass3_Sub5ArrayArrayArray1[local141][local17][local108] == null) {
-						Static130.aClass3_Sub5ArrayArrayArray1[local141][local17][local108] = new Class3_Sub5(local141, local17, local108);
+						Static130.aClass3_Sub5ArrayArrayArray1[local141][local17][local108] = new Tile(local141, local17, local108);
 					}
 				}
-				@Pc(174) Class3_Sub5 local174 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local17][local108];
+				@Pc(174) Tile local174 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][local17][local108];
 				local174.aClass31Array1[local174.anInt662] = local58;
 				local174.anIntArray59[local174.anInt662] = local115;
 				local174.anInt664 |= local115;
diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java
index d7408bb..c0dd810 100644
--- a/client/src/main/java/Static110.java
+++ b/client/src/main/java/Static110.java
@@ -9,7 +9,7 @@ public final class Static110 {
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(III)Lclient!jh;")
 	public static Class77 method2276(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		} else {
diff --git a/client/src/main/java/Static120.java b/client/src/main/java/Static120.java
index 72b0c08..ef8a427 100644
--- a/client/src/main/java/Static120.java
+++ b/client/src/main/java/Static120.java
@@ -366,7 +366,7 @@ public final class Static120 {
 	}
 
 	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
-	public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Class3_Sub5[][][] arg2) {
+	public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
 		if (!Static178.aBoolean202) {
 			return;
 		}
@@ -409,7 +409,7 @@ public final class Static120 {
 						local141 = Static2.anInt15 - 1;
 					}
 					for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
-						@Pc(160) Class3_Sub5 local160 = null;
+						@Pc(160) Tile local160 = null;
 						if (local66 >= 0) {
 							local160 = arg2[local66][local155][local112];
 						}
diff --git a/client/src/main/java/Static130.java b/client/src/main/java/Static130.java
index 7afd798..6fd296b 100644
--- a/client/src/main/java/Static130.java
+++ b/client/src/main/java/Static130.java
@@ -7,7 +7,7 @@ public final class Static130 {
 	public static Class41 aClass41_1;
 
 	@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
-	public static Class3_Sub5[][][] aClass3_Sub5ArrayArrayArray1;
+	public static Tile[][][] aClass3_Sub5ArrayArrayArray1;
 
 	@OriginalMember(owner = "client!kc", name = "p", descriptor = "[I")
 	public static int[] anIntArray299;
diff --git a/client/src/main/java/Static133.java b/client/src/main/java/Static133.java
index 26dd8e9..41998b8 100644
--- a/client/src/main/java/Static133.java
+++ b/client/src/main/java/Static133.java
@@ -24,7 +24,7 @@ public final class Static133 {
 
 	@OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
 	public static Class31 method4008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		}
diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java
index cdab478..6993ab4 100644
--- a/client/src/main/java/Static139.java
+++ b/client/src/main/java/Static139.java
@@ -28,7 +28,7 @@ public final class Static139 {
 
 	@OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
 	public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.aLong52;
 	}
 
diff --git a/client/src/main/java/Static146.java b/client/src/main/java/Static146.java
index 0bbd171..4e21222 100644
--- a/client/src/main/java/Static146.java
+++ b/client/src/main/java/Static146.java
@@ -42,7 +42,7 @@ public final class Static146 {
 		for (@Pc(3) int local3 = 0; local3 < Static152.anInt3594; local3++) {
 			for (@Pc(8) int local8 = 0; local8 < Static99.anInt2550; local8++) {
 				if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] == null) {
-					Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] = new Class3_Sub5(arg0, local3, local8);
+					Static130.aClass3_Sub5ArrayArrayArray1[arg0][local3][local8] = new Tile(arg0, local3, local8);
 				}
 			}
 		}
diff --git a/client/src/main/java/Static152.java b/client/src/main/java/Static152.java
index 4e8adca..64c353c 100644
--- a/client/src/main/java/Static152.java
+++ b/client/src/main/java/Static152.java
@@ -27,7 +27,7 @@ public final class Static152 {
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
 	public static void method2835(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg2][arg3][arg4];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg2][arg3][arg4];
 		if (local7 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static16.java b/client/src/main/java/Static16.java
index 880dbb6..b164a38 100644
--- a/client/src/main/java/Static16.java
+++ b/client/src/main/java/Static16.java
@@ -38,12 +38,12 @@ public final class Static16 {
 		if (!Static239.aBoolean269 || Static231.aBoolean252) {
 			return;
 		}
-		@Pc(14) Class3_Sub5[][][] local14 = Static130.aClass3_Sub5ArrayArrayArray1;
+		@Pc(14) Tile[][][] local14 = Static130.aClass3_Sub5ArrayArrayArray1;
 		for (@Pc(22) int local22 = 0; local22 < local14.length; local22++) {
-			@Pc(30) Class3_Sub5[][] local30 = local14[local22];
+			@Pc(30) Tile[][] local30 = local14[local22];
 			for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
 				for (@Pc(42) int local42 = 0; local42 < local30[local32].length; local42++) {
-					@Pc(54) Class3_Sub5 local54 = local30[local32][local42];
+					@Pc(54) Tile local54 = local30[local32][local42];
 					if (local54 != null) {
 						@Pc(71) Class8_Sub1_Sub1 local71;
 						if (local54.aClass15_1 != null && local54.aClass15_1.aClass8_1 instanceof Class8_Sub1_Sub1) {
diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java
index 40f075b..4ddd6ce 100644
--- a/client/src/main/java/Static170.java
+++ b/client/src/main/java/Static170.java
@@ -47,7 +47,7 @@ public final class Static170 {
 		local6.aLong26 = arg5;
 		local6.aBoolean49 = arg6;
 		if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] == null) {
-			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] = new Class3_Sub5(arg0, arg1, arg2);
+			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
 		}
 		Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass15_1 = local6;
 	}
diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java
index 6215e69..4be261f 100644
--- a/client/src/main/java/Static176.java
+++ b/client/src/main/java/Static176.java
@@ -268,7 +268,7 @@ public final class Static176 {
 			local12 = new Class131(arg10, arg11, arg12, arg13, -1, arg18, false);
 			for (local14 = arg0; local14 >= 0; local14--) {
 				if (Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] == null) {
-					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Class3_Sub5(local14, arg1, arg2);
+					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
 				}
 			}
 			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass131_1 = local12;
@@ -276,7 +276,7 @@ public final class Static176 {
 			local12 = new Class131(arg14, arg15, arg16, arg17, arg5, arg19, arg6 == arg7 && arg6 == arg8 && arg6 == arg9);
 			for (local14 = arg0; local14 >= 0; local14--) {
 				if (Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] == null) {
-					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Class3_Sub5(local14, arg1, arg2);
+					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
 				}
 			}
 			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass131_1 = local12;
@@ -284,7 +284,7 @@ public final class Static176 {
 			@Pc(134) Class43 local134 = new Class43(arg3, arg4, arg5, arg1, arg2, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19);
 			for (local14 = arg0; local14 >= 0; local14--) {
 				if (Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] == null) {
-					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Class3_Sub5(local14, arg1, arg2);
+					Static130.aClass3_Sub5ArrayArrayArray1[local14][arg1][arg2] = new Tile(local14, arg1, arg2);
 				}
 			}
 			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass43_1 = local134;
diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java
index 2d6bc98..c08e19b 100644
--- a/client/src/main/java/Static18.java
+++ b/client/src/main/java/Static18.java
@@ -100,7 +100,7 @@ public final class Static18 {
 
 	@OriginalMember(owner = "client!bh", name = "a", descriptor = "(IIII)V")
 	public static void method559(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static187.java b/client/src/main/java/Static187.java
index 2953324..01a48f6 100644
--- a/client/src/main/java/Static187.java
+++ b/client/src/main/java/Static187.java
@@ -30,7 +30,7 @@ public final class Static187 {
 
 	@OriginalMember(owner = "client!pb", name = "b", descriptor = "(III)Lclient!jj;")
 	public static Class79 method3420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		} else {
diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java
index fe6f99c..928702e 100644
--- a/client/src/main/java/Static197.java
+++ b/client/src/main/java/Static197.java
@@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static197 {
 
 	@OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;")
-	public static Class3_Sub5[][][] aClass3_Sub5ArrayArrayArray2;
+	public static Tile[][][] aClass3_Sub5ArrayArrayArray2;
 
 	@OriginalMember(owner = "client!pm", name = "hb", descriptor = "I")
 	public static int anInt4620;
diff --git a/client/src/main/java/Static20.java b/client/src/main/java/Static20.java
index f5317cb..2a85a43 100644
--- a/client/src/main/java/Static20.java
+++ b/client/src/main/java/Static20.java
@@ -43,7 +43,7 @@ public final class Static20 {
 
 	@OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J")
 	public static long method602(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null || local7.aClass15_1 == null ? 0L : local7.aClass15_1.aLong26;
 	}
 }
diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java
index 119e9a8..55f9e02 100644
--- a/client/src/main/java/Static220.java
+++ b/client/src/main/java/Static220.java
@@ -123,7 +123,7 @@ public final class Static220 {
 		for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) {
 			for (@Pc(6) int local6 = 0; local6 < Static152.anInt3594; local6++) {
 				for (@Pc(11) int local11 = 0; local11 < Static99.anInt2550; local11++) {
-					@Pc(22) Class3_Sub5 local22 = Static130.aClass3_Sub5ArrayArrayArray1[local1][local6][local11];
+					@Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[local1][local6][local11];
 					if (local22 != null) {
 						@Pc(27) Class77 local27 = local22.aClass77_1;
 						if (local27 != null && local27.aClass8_5.method4543()) {
diff --git a/client/src/main/java/Static224.java b/client/src/main/java/Static224.java
index f745b0c..d081fb0 100644
--- a/client/src/main/java/Static224.java
+++ b/client/src/main/java/Static224.java
@@ -37,9 +37,9 @@ public final class Static224 {
 
 	@OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V")
 	public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1];
 		for (@Pc(9) int local9 = 0; local9 < 3; local9++) {
-			@Pc(30) Class3_Sub5 local30 = Static130.aClass3_Sub5ArrayArrayArray1[local9][arg0][arg1] = Static130.aClass3_Sub5ArrayArrayArray1[local9 + 1][arg0][arg1];
+			@Pc(30) Tile local30 = Static130.aClass3_Sub5ArrayArrayArray1[local9][arg0][arg1] = Static130.aClass3_Sub5ArrayArrayArray1[local9 + 1][arg0][arg1];
 			if (local30 != null) {
 				local30.anInt672--;
 				for (@Pc(40) int local40 = 0; local40 < local30.anInt662; local40++) {
@@ -51,7 +51,7 @@ public final class Static224 {
 			}
 		}
 		if (Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1] == null) {
-			Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1] = new Class3_Sub5(0, arg0, arg1);
+			Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1] = new Tile(0, arg0, arg1);
 		}
 		Static130.aClass3_Sub5ArrayArrayArray1[0][arg0][arg1].aClass3_Sub5_1 = local7;
 		Static130.aClass3_Sub5ArrayArrayArray1[3][arg0][arg1] = null;
diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java
index e555e91..0a63c1f 100644
--- a/client/src/main/java/Static247.java
+++ b/client/src/main/java/Static247.java
@@ -35,21 +35,21 @@ public final class Static247 {
 	}
 
 	@OriginalMember(owner = "client!ub", name = "a", descriptor = "(Lclient!bj;Z)V")
-	public static void method4245(@OriginalArg(0) Class3_Sub5 arg0, @OriginalArg(1) boolean arg1) {
+	public static void method4245(@OriginalArg(0) Tile arg0, @OriginalArg(1) boolean arg1) {
 		Static7.aClass69_32.method2282(arg0);
 		while (true) {
-			@Pc(8) Class3_Sub5 local8;
+			@Pc(8) Tile local8;
 			@Pc(18) int local18;
 			@Pc(21) int local21;
 			@Pc(24) int local24;
 			@Pc(27) int local27;
-			@Pc(31) Class3_Sub5[][] local31;
+			@Pc(31) Tile[][] local31;
 			@Pc(65) int local65;
 			@Pc(115) int local115;
 			@Pc(894) int local894;
 			@Pc(899) int local899;
 			@Pc(904) int local904;
-			@Pc(153) Class3_Sub5 local153;
+			@Pc(153) Tile local153;
 			@Pc(1332) int local1332;
 			do {
 				do {
@@ -65,10 +65,10 @@ public final class Static247 {
 										@Pc(363) Class77 var22;
 										@Pc(469) boolean var24;
 										@Pc(425) Class31 var25;
-										@Pc(1179) Class3_Sub5 var32;
+										@Pc(1179) Tile var32;
 										while (true) {
 											do {
-												local8 = (Class3_Sub5) Static7.aClass69_32.method2287();
+												local8 = (Tile) Static7.aClass69_32.method2287();
 												if (local8 == null) {
 													return;
 												}
@@ -525,7 +525,7 @@ public final class Static247 {
 												}
 												for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) {
 													for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) {
-														@Pc(1863) Class3_Sub5 local1863 = local31[local894][local899];
+														@Pc(1863) Tile local1863 = local31[local894][local899];
 														if (local1863.anInt663 != 0) {
 															Static7.aClass69_32.method2282(local1863);
 														} else if ((local894 != local18 || local899 != local21) && local1863.aBoolean46) {
@@ -633,7 +633,7 @@ public final class Static247 {
 					}
 				}
 			}
-			@Pc(2388) Class3_Sub5 local2388;
+			@Pc(2388) Tile local2388;
 			if (local24 < Static126.anInt3114 - 1) {
 				local2388 = Static130.aClass3_Sub5ArrayArrayArray1[local24 + 1][local18][local21];
 				if (local2388 != null && local2388.aBoolean46) {
diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java
index 026640d..bb289eb 100644
--- a/client/src/main/java/Static248.java
+++ b/client/src/main/java/Static248.java
@@ -46,10 +46,10 @@ public final class Static248 {
 		@Pc(37) int local37;
 		@Pc(183) int local183;
 		for (@Pc(23) int local23 = Static235.anInt5276; local23 < Static126.anInt3114; local23++) {
-			@Pc(30) Class3_Sub5[][] local30 = Static130.aClass3_Sub5ArrayArrayArray1[local23];
+			@Pc(30) Tile[][] local30 = Static130.aClass3_Sub5ArrayArrayArray1[local23];
 			for (local32 = Static31.anInt987; local32 < Static2.anInt15; local32++) {
 				for (local37 = Static80.anInt4698; local37 < Static215.anInt4866; local37++) {
-					@Pc(46) Class3_Sub5 local46 = local30[local32][local37];
+					@Pc(46) Tile local46 = local30[local32][local37];
 					if (local46 != null) {
 						if (Static48.aBooleanArrayArray1[local32 + Static277.anInt5855 - Static167.anInt4069][local37 + Static277.anInt5855 - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
 							local46.aBoolean45 = true;
@@ -144,9 +144,9 @@ public final class Static248 {
 		}
 		@Pc(434) int local434;
 		@Pc(438) int local438;
-		@Pc(450) Class3_Sub5 local450;
+		@Pc(450) Tile local450;
 		@Pc(399) int local399;
-		@Pc(406) Class3_Sub5[][] local406;
+		@Pc(406) Tile[][] local406;
 		@Pc(415) int local415;
 		@Pc(428) int local428;
 		for (local399 = Static235.anInt5276; local399 < Static126.anInt3114; local399++) {
diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java
index 8e7598e..5811ed5 100644
--- a/client/src/main/java/Static254.java
+++ b/client/src/main/java/Static254.java
@@ -43,7 +43,7 @@ public final class Static254 {
 	}
 
 	@OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z")
-	public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Class3_Sub5[][][] arg3, @OriginalArg(5) int arg4) {
+	public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) {
 		@Pc(14) byte local14 = arg0 ? 1 : (byte) (Static136.anInt3325 & 0xFF);
 		if (local14 == Static266.aByteArrayArrayArray15[Static55.anInt1735][arg1][arg2]) {
 			return false;
@@ -108,7 +108,7 @@ public final class Static254 {
 							}
 						}
 						local132 = true;
-						@Pc(395) Class3_Sub5 local395 = arg3[local150][local108][local122];
+						@Pc(395) Tile local395 = arg3[local150][local108][local122];
 						if (local395 != null && local395.anInt662 > 0) {
 							for (local227 = 0; local227 < local395.anInt662; local227++) {
 								@Pc(418) Class31 local418 = local395.aClass31Array1[local227];
diff --git a/client/src/main/java/Static257.java b/client/src/main/java/Static257.java
index c3ded36..3735b3f 100644
--- a/client/src/main/java/Static257.java
+++ b/client/src/main/java/Static257.java
@@ -21,7 +21,7 @@ public final class Static257 {
 
 	@OriginalMember(owner = "client!v", name = "a", descriptor = "(IIIJ)Z")
 	public static boolean method523(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return false;
 		} else if (local7.aClass77_1 != null && local7.aClass77_1.aLong107 == arg3) {
diff --git a/client/src/main/java/Static262.java b/client/src/main/java/Static262.java
index 3e07c62..9df4e58 100644
--- a/client/src/main/java/Static262.java
+++ b/client/src/main/java/Static262.java
@@ -56,7 +56,7 @@ public final class Static262 {
 		local8.anInt3052 = arg7;
 		for (@Pc(42) int local42 = arg0; local42 >= 0; local42--) {
 			if (Static130.aClass3_Sub5ArrayArrayArray1[local42][arg1][arg2] == null) {
-				Static130.aClass3_Sub5ArrayArrayArray1[local42][arg1][arg2] = new Class3_Sub5(local42, arg1, arg2);
+				Static130.aClass3_Sub5ArrayArrayArray1[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
 			}
 		}
 		Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass77_1 = local8;
@@ -64,7 +64,7 @@ public final class Static262 {
 
 	@OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;")
 	public static Class77 method4509(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null ? null : local7.aClass77_1;
 	}
 
diff --git a/client/src/main/java/Static264.java b/client/src/main/java/Static264.java
index 99ff80a..27c071f 100644
--- a/client/src/main/java/Static264.java
+++ b/client/src/main/java/Static264.java
@@ -35,7 +35,7 @@ public final class Static264 {
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!th;III)V")
 	public static void method3574(@OriginalArg(0) Class8 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(12) Class3_Sub5 local12;
+		@Pc(12) Tile local12;
 		if (arg2 < Static152.anInt3594) {
 			local12 = Static130.aClass3_Sub5ArrayArrayArray1[arg1][arg2 + 1][arg3];
 			if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.aClass8_1.method4543()) {
diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java
index a0d272f..e70c521 100644
--- a/client/src/main/java/Static265.java
+++ b/client/src/main/java/Static265.java
@@ -24,7 +24,7 @@ public final class Static265 {
 
 	@OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J")
 	public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null || local7.aClass77_1 == null ? 0L : local7.aClass77_1.aLong107;
 	}
 
diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java
index f57bf30..e058cdd 100644
--- a/client/src/main/java/Static266.java
+++ b/client/src/main/java/Static266.java
@@ -64,7 +64,7 @@ public final class Static266 {
 	public static void method4193(@OriginalArg(0) Class31 arg0) {
 		for (@Pc(2) int local2 = arg0.anInt1701; local2 <= arg0.anInt1713; local2++) {
 			for (@Pc(9) int local9 = arg0.anInt1696; local9 <= arg0.anInt1698; local9++) {
-				@Pc(22) Class3_Sub5 local22 = Static130.aClass3_Sub5ArrayArrayArray1[arg0.anInt1709][local2][local9];
+				@Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[arg0.anInt1709][local2][local9];
 				if (local22 != null) {
 					@Pc(26) int local26;
 					for (local26 = 0; local26 < local22.anInt662; local26++) {
diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java
index 9724c3a..b1aa7a9 100644
--- a/client/src/main/java/Static267.java
+++ b/client/src/main/java/Static267.java
@@ -33,7 +33,7 @@ public final class Static267 {
 
 	@OriginalMember(owner = "client!vl", name = "a", descriptor = "(III)Lclient!bm;")
 	public static Class15 method4526(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		} else {
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index b3f7c2a..c0acd22 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -231,7 +231,7 @@ public final class Static269 {
 
 	@OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;")
 	public static Class15 method2210(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null || local7.aClass15_1 == null ? null : local7.aClass15_1;
 	}
 
diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java
index b851eda..bb23aac 100644
--- a/client/src/main/java/Static276.java
+++ b/client/src/main/java/Static276.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static276 {
 
 	@OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;")
-	public static Class3_Sub5[][][] aClass3_Sub5ArrayArrayArray3;
+	public static Tile[][][] aClass3_Sub5ArrayArrayArray3;
 
 	@OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;")
 	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array11;
diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java
index 1a85c57..545ef4c 100644
--- a/client/src/main/java/Static28.java
+++ b/client/src/main/java/Static28.java
@@ -101,13 +101,13 @@ public final class Static28 {
 		Static152.anInt3594 = 104;
 		Static99.anInt2550 = 104;
 		Static277.anInt5855 = arg0;
-		Static197.aClass3_Sub5ArrayArrayArray2 = new Class3_Sub5[4][Static152.anInt3594][Static99.anInt2550];
+		Static197.aClass3_Sub5ArrayArrayArray2 = new Tile[4][Static152.anInt3594][Static99.anInt2550];
 		Static107.anIntArrayArrayArray10 = new int[4][Static152.anInt3594 + 1][Static99.anInt2550 + 1];
 		if (Static239.aBoolean269) {
 			Static36.aClass3_Sub14ArrayArray1 = new Class3_Sub14[4][];
 		}
 		if (arg1) {
-			Static276.aClass3_Sub5ArrayArrayArray3 = new Class3_Sub5[1][Static152.anInt3594][Static99.anInt2550];
+			Static276.aClass3_Sub5ArrayArrayArray3 = new Tile[1][Static152.anInt3594][Static99.anInt2550];
 			Static62.anIntArrayArray11 = new int[Static152.anInt3594][Static99.anInt2550];
 			Static80.anIntArrayArrayArray19 = new int[1][Static152.anInt3594 + 1][Static99.anInt2550 + 1];
 			if (Static239.aBoolean269) {
diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java
index fa93d44..09edd90 100644
--- a/client/src/main/java/Static35.java
+++ b/client/src/main/java/Static35.java
@@ -108,7 +108,7 @@ public final class Static35 {
 
 	@OriginalMember(owner = "client!cl", name = "a", descriptor = "(III)J")
 	public static long method899(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return 0L;
 		}
diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java
index 8ab4d77..e036032 100644
--- a/client/src/main/java/Static47.java
+++ b/client/src/main/java/Static47.java
@@ -15,7 +15,7 @@ public final class Static47 {
 
 	@OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;")
 	public static Class31 method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		}
diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java
index 20e4e28..a0b2128 100644
--- a/client/src/main/java/Static69.java
+++ b/client/src/main/java/Static69.java
@@ -75,7 +75,7 @@ public final class Static69 {
 		local3.aClass8_7 = arg6;
 		local3.aClass8_8 = arg7;
 		@Pc(34) int local34 = 0;
-		@Pc(42) Class3_Sub5 local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(42) Tile local42 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local42 != null) {
 			for (@Pc(46) int local46 = 0; local46 < local42.anInt662; local46++) {
 				@Pc(55) Class31 local55 = local42.aClass31Array1[local46];
@@ -89,7 +89,7 @@ public final class Static69 {
 		}
 		local3.anInt3063 = -local34;
 		if (Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] == null) {
-			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] = new Class3_Sub5(arg0, arg1, arg2);
+			Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
 		}
 		Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass79_1 = local3;
 	}
@@ -107,7 +107,7 @@ public final class Static69 {
 					if (local28 >= 0 && local28 < Static152.anInt3594) {
 						for (@Pc(39) int local39 = local11; local39 <= local15; local39++) {
 							if (local39 >= 0 && local39 < Static99.anInt2550 && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) {
-								@Pc(71) Class3_Sub5 local71 = Static130.aClass3_Sub5ArrayArrayArray1[local17][local28][local39];
+								@Pc(71) Tile local71 = Static130.aClass3_Sub5ArrayArrayArray1[local17][local28][local39];
 								if (local71 != null) {
 									@Pc(158) int local158 = (Static83.anIntArrayArrayArray4[local17][local28][local39] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39] + Static83.anIntArrayArrayArray4[local17][local28][local39 + 1] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39 + 1]) / 4 - (Static83.anIntArrayArrayArray4[arg1][arg2][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2][arg3 + 1] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3 + 1]) / 4;
 									@Pc(161) Class77 local161 = local71.aClass77_1;
diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java
index a5b4770..fcbb860 100644
--- a/client/src/main/java/Static75.java
+++ b/client/src/main/java/Static75.java
@@ -169,7 +169,7 @@ public final class Static75 {
 
 	@OriginalMember(owner = "client!g", name = "a", descriptor = "(III)Lclient!df;")
 	public static Class24 method1633(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return null;
 		} else {
diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java
index 8bd7385..622f5d0 100644
--- a/client/src/main/java/Static83.java
+++ b/client/src/main/java/Static83.java
@@ -38,7 +38,7 @@ public final class Static83 {
 
 	@OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;")
 	public static Class24 method435(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Class3_Sub5 local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
+		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		return local7 == null ? null : local7.aClass24_1;
 	}
 
diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java
index 035f086..278cd35 100644
--- a/client/src/main/java/Static91.java
+++ b/client/src/main/java/Static91.java
@@ -133,7 +133,7 @@ public final class Static91 {
 		local6.anInt1392 = arg9;
 		for (@Pc(46) int local46 = arg0; local46 >= 0; local46--) {
 			if (Static130.aClass3_Sub5ArrayArrayArray1[local46][arg1][arg2] == null) {
-				Static130.aClass3_Sub5ArrayArrayArray1[local46][arg1][arg2] = new Class3_Sub5(local46, arg1, arg2);
+				Static130.aClass3_Sub5ArrayArrayArray1[local46][arg1][arg2] = new Tile(local46, arg1, arg2);
 			}
 		}
 		Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2].aClass24_1 = local6;
diff --git a/client/src/main/java/Class3_Sub5.java b/client/src/main/java/Tile.java
similarity index 93%
rename from client/src/main/java/Class3_Sub5.java
rename to client/src/main/java/Tile.java
index c698f1a..3c437bd 100644
--- a/client/src/main/java/Class3_Sub5.java
+++ b/client/src/main/java/Tile.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!bj")
-public final class Class3_Sub5 extends Node {
+public final class Tile extends Node {
 
 	@OriginalMember(owner = "client!bj", name = "x", descriptor = "Z")
 	public boolean aBoolean45;
@@ -36,7 +36,7 @@ public final class Class3_Sub5 extends Node {
 	public Class77 aClass77_1;
 
 	@OriginalMember(owner = "client!bj", name = "M", descriptor = "Lclient!bj;")
-	public Class3_Sub5 aClass3_Sub5_1;
+	public Tile aClass3_Sub5_1;
 
 	@OriginalMember(owner = "client!bj", name = "N", descriptor = "Z")
 	public boolean aBoolean47;
@@ -72,7 +72,7 @@ public final class Class3_Sub5 extends Node {
 	public final int anInt669;
 
 	@OriginalMember(owner = "client!bj", name = "<init>", descriptor = "(III)V")
-	public Class3_Sub5(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public Tile(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		this.anInt666 = arg2;
 		this.anInt668 = this.anInt672 = arg0;
 		this.anInt669 = arg1;