diff --git a/client/src/main/java/Class118.java b/client/src/main/java/Class118.java
index b036ecb..2292c5e 100644
--- a/client/src/main/java/Class118.java
+++ b/client/src/main/java/Class118.java
@@ -805,7 +805,7 @@ public final class Class118 {
 				local69.aShort18 = (short) (this.anInt4405 * 5 + 768);
 				local69.method1668();
 			} else {
-				local60 = new Class8_Sub1_Sub2(local69, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
+				local60 = new SoftwareModel(local69, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
 			}
 			Static93.aClass99_14.method3095(local60, local29);
 		}
@@ -813,8 +813,8 @@ public final class Class118 {
 			local60 = ((RawModel) local60).method1675();
 		}
 		if (this.aByte15 != 0) {
-			if (local60 instanceof Class8_Sub1_Sub2) {
-				local60 = ((Class8_Sub1_Sub2) local60).method4586(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9, true);
+			if (local60 instanceof SoftwareModel) {
+				local60 = ((SoftwareModel) local60).method4586(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9, true);
 			} else if (local60 instanceof RawModel) {
 				local60 = ((RawModel) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9);
 			}
@@ -832,30 +832,30 @@ public final class Class118 {
 			} else {
 				local30 = arg5 + (this.anInt4426 << 10) + (arg11 << 3);
 			}
-			@Pc(195) Class8_Sub1_Sub2 local195 = (Class8_Sub1_Sub2) Static262.aClass99_36.method3106(local30);
+			@Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.method3106(local30);
 			if (local195 == null) {
 				@Pc(204) RawModel local204 = this.method3418(arg5, arg11);
 				if (local204 == null) {
 					return null;
 				}
-				local195 = new Class8_Sub1_Sub2(local204, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
+				local195 = new SoftwareModel(local204, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
 				Static262.aClass99_36.method3095(local195, local30);
 			}
 			@Pc(234) boolean local234 = false;
 			if (arg4 != null) {
 				local234 = true;
-				local195 = (Class8_Sub1_Sub2) arg4.method4214(arg8, arg10, local195, arg5, arg12);
+				local195 = (SoftwareModel) arg4.method4214(arg8, arg10, local195, arg5, arg12);
 			}
 			if (arg11 == 10 && arg5 > 3) {
 				if (!local234) {
 					local234 = true;
-					local195 = (Class8_Sub1_Sub2) local195.method4568(true, true, true);
+					local195 = (SoftwareModel) local195.method4568(true, true, true);
 				}
 				local195.method4554(256);
 			}
 			if (this.aByte15 != 0) {
 				if (!local234) {
-					local195 = (Class8_Sub1_Sub2) local195.method4568(true, true, true);
+					local195 = (SoftwareModel) local195.method4568(true, true, true);
 				}
 				local195 = local195.method4586(this.aByte15, this.aShort26, arg6, arg9, arg1, arg3, arg0, false);
 			}
diff --git a/client/src/main/java/Class55.java b/client/src/main/java/Class55.java
index 7c05003..a9606c8 100644
--- a/client/src/main/java/Class55.java
+++ b/client/src/main/java/Class55.java
@@ -625,7 +625,7 @@ public final class Class55 {
 	}
 
 	@OriginalMember(owner = "client!h", name = "d", descriptor = "(I)Lclient!w;")
-	public final Class8_Sub1_Sub2 method1834() {
+	public final SoftwareModel method1834() {
 		@Pc(11) RawModel local11 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
 		if (local11 == null) {
 			return null;
@@ -645,7 +645,7 @@ public final class Class55 {
 				local11.method1669(this.aShortArray32[local21], this.aShortArray31[local21]);
 			}
 		}
-		@Pc(107) Class8_Sub1_Sub2 local107 = local11.method1671(this.anInt2352 + 64, 768 - -this.anInt2357);
+		@Pc(107) SoftwareModel local107 = local11.method1671(this.anInt2352 + 64, 768 - -this.anInt2357);
 		if (this.anInt2373 != 128 || this.anInt2350 != 128 || this.anInt2368 != 128) {
 			local107.method4559(this.anInt2373, this.anInt2350, this.anInt2368);
 		}
diff --git a/client/src/main/java/Class8_Sub4_Sub1.java b/client/src/main/java/Class8_Sub4_Sub1.java
index 65ea1f3..76f7158 100644
--- a/client/src/main/java/Class8_Sub4_Sub1.java
+++ b/client/src/main/java/Class8_Sub4_Sub1.java
@@ -290,10 +290,10 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 {
 			}
 		} else {
 			if (local184 != null) {
-				local76 = ((Class8_Sub1_Sub2) local76).method4588(local184);
+				local76 = ((SoftwareModel) local76).method4588(local184);
 			}
 			if (local515 != null) {
-				local76 = ((Class8_Sub1_Sub2) local76).method4588(local515);
+				local76 = ((SoftwareModel) local76).method4588(local515);
 			}
 			local76.aBoolean303 = true;
 			local76.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
diff --git a/client/src/main/java/Class8_Sub4_Sub2.java b/client/src/main/java/Class8_Sub4_Sub2.java
index 21b1c2f..2a78fe0 100644
--- a/client/src/main/java/Class8_Sub4_Sub2.java
+++ b/client/src/main/java/Class8_Sub4_Sub2.java
@@ -75,7 +75,7 @@ public final class Class8_Sub4_Sub2 extends Class8_Sub4 {
 		}
 		if (!Static239.aBoolean269) {
 			if (local140 != null) {
-				local74 = ((Class8_Sub1_Sub2) local74).method4588(local140);
+				local74 = ((SoftwareModel) local74).method4588(local140);
 			}
 			if (this.aClass96_1.anInt3713 == 1) {
 				local74.aBoolean303 = true;
diff --git a/client/src/main/java/RawModel.java b/client/src/main/java/RawModel.java
index d9aba51..6943823 100644
--- a/client/src/main/java/RawModel.java
+++ b/client/src/main/java/RawModel.java
@@ -786,8 +786,8 @@ public final class RawModel extends Entity {
 	}
 
 	@OriginalMember(owner = "client!gb", name = "b", descriptor = "(IIIII)Lclient!w;")
-	public final Class8_Sub1_Sub2 method1671(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		return new Class8_Sub1_Sub2(this, arg0, arg1, -50, -10, -50);
+	public final SoftwareModel method1671(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+		return new SoftwareModel(this, arg0, arg1, -50, -10, -50);
 	}
 
 	@OriginalMember(owner = "client!gb", name = "a", descriptor = "(IIIII)V")
@@ -1236,7 +1236,7 @@ public final class RawModel extends Entity {
 			local9.method4099();
 			return local9;
 		} else {
-			return new Class8_Sub1_Sub2(this, arg0, arg1, arg2, arg3, arg4);
+			return new SoftwareModel(this, arg0, arg1, arg2, arg3, arg4);
 		}
 	}
 
diff --git a/client/src/main/java/Class8_Sub1_Sub2.java b/client/src/main/java/SoftwareModel.java
similarity index 98%
rename from client/src/main/java/Class8_Sub1_Sub2.java
rename to client/src/main/java/SoftwareModel.java
index 4b327ac..ac604cf 100644
--- a/client/src/main/java/Class8_Sub1_Sub2.java
+++ b/client/src/main/java/SoftwareModel.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!w")
-public final class Class8_Sub1_Sub2 extends Model {
+public final class SoftwareModel extends Model {
 
 	@OriginalMember(owner = "client!w", name = "t", descriptor = "[S")
 	private short[] aShortArray89;
@@ -124,11 +124,11 @@ public final class Class8_Sub1_Sub2 extends Model {
 	}
 
 	@OriginalMember(owner = "client!w", name = "<init>", descriptor = "()V")
-	public Class8_Sub1_Sub2() {
+	public SoftwareModel() {
 	}
 
 	@OriginalMember(owner = "client!w", name = "<init>", descriptor = "(Lclient!gb;IIIII)V")
-	public Class8_Sub1_Sub2(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+	public SoftwareModel(@OriginalArg(0) RawModel arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
 		arg0.method1668();
 		arg0.method1683();
 		this.anInt5788 = arg0.anInt2139;
@@ -304,7 +304,7 @@ public final class Class8_Sub1_Sub2 extends Model {
 	}
 
 	@OriginalMember(owner = "client!w", name = "<init>", descriptor = "([Lclient!w;I)V")
-	private Class8_Sub1_Sub2(@OriginalArg(0) Class8_Sub1_Sub2[] arg0, @OriginalArg(1) int arg1) {
+	private SoftwareModel(@OriginalArg(0) SoftwareModel[] arg0, @OriginalArg(1) int arg1) {
 		@Pc(21) boolean local21 = false;
 		@Pc(23) boolean local23 = false;
 		@Pc(25) boolean local25 = false;
@@ -314,7 +314,7 @@ public final class Class8_Sub1_Sub2 extends Model {
 		this.anInt5789 = 0;
 		this.aByte20 = -1;
 		@Pc(45) int local45;
-		@Pc(52) Class8_Sub1_Sub2 local52;
+		@Pc(52) SoftwareModel local52;
 		for (local45 = 0; local45 < arg1; local45++) {
 			local52 = arg0[local45];
 			if (local52 != null) {
@@ -512,7 +512,7 @@ public final class Class8_Sub1_Sub2 extends Model {
 	}
 
 	@OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZLclient!w;[B[S[I[I[I)Lclient!ak;")
-	private Model method4584(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Class8_Sub1_Sub2 arg2, @OriginalArg(3) byte[] arg3, @OriginalArg(4) short[] arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7) {
+	private Model method4584(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) SoftwareModel arg2, @OriginalArg(3) byte[] arg3, @OriginalArg(4) short[] arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7) {
 		arg2.anInt5788 = this.anInt5788;
 		arg2.anInt5787 = this.anInt5787;
 		arg2.anInt5789 = this.anInt5789;
@@ -769,7 +769,7 @@ public final class Class8_Sub1_Sub2 extends Model {
 	}
 
 	@OriginalMember(owner = "client!w", name = "a", descriptor = "(II[[I[[IIIIZ)Lclient!w;")
-	public final Class8_Sub1_Sub2 method4586(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) {
+	public final SoftwareModel method4586(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7) {
 		if (!this.aBoolean305) {
 			this.method4592();
 		}
@@ -796,9 +796,9 @@ public final class Class8_Sub1_Sub2 extends Model {
 				return this;
 			}
 		}
-		@Pc(150) Class8_Sub1_Sub2 local150;
+		@Pc(150) SoftwareModel local150;
 		if (arg7) {
-			local150 = new Class8_Sub1_Sub2();
+			local150 = new SoftwareModel();
 			local150.anInt5788 = this.anInt5788;
 			local150.anInt5787 = this.anInt5787;
 			local150.anInt5789 = this.anInt5789;
@@ -1185,7 +1185,7 @@ public final class Class8_Sub1_Sub2 extends Model {
 
 	@OriginalMember(owner = "client!w", name = "a", descriptor = "(Lclient!ak;)Lclient!ak;")
 	public final Model method4588(@OriginalArg(0) Model arg0) {
-		return new Class8_Sub1_Sub2(new Class8_Sub1_Sub2[] { this, (Class8_Sub1_Sub2) arg0 }, 2);
+		return new SoftwareModel(new SoftwareModel[] { this, (SoftwareModel) arg0 }, 2);
 	}
 
 	@OriginalMember(owner = "client!w", name = "g", descriptor = "()I")
diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java
index 298f5a8..d2e05b2 100644
--- a/client/src/main/java/Static164.java
+++ b/client/src/main/java/Static164.java
@@ -196,7 +196,7 @@ public final class Static164 {
 				local5 = Static71.method1439(local15);
 			}
 		}
-		@Pc(60) Class8_Sub1_Sub2 local60 = local5.method1834();
+		@Pc(60) SoftwareModel local60 = local5.method1834();
 		if (local60 == null) {
 			return null;
 		}
diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java
index e00d0bb..43d7f8e 100644
--- a/client/src/main/java/Static220.java
+++ b/client/src/main/java/Static220.java
@@ -107,7 +107,7 @@ public final class Static220 {
 				local68.aClass5_1.aBoolean3 = false;
 			}
 		} else {
-			@Pc(142) Class8_Sub1_Sub2 local142 = (Class8_Sub1_Sub2) local10;
+			@Pc(142) SoftwareModel local142 = (SoftwareModel) local10;
 			if (arg5 != Static207.method3685(Static55.anInt1735, local42 + arg3, local48 + arg1) || arg5 != Static207.method3685(Static55.anInt1735, arg3 + local45, local51 + arg1)) {
 				for (local94 = 0; local94 < local142.anInt5788; local94++) {
 					local142.anIntArray527[local94] += Static207.method3685(Static55.anInt1735, arg3 + local142.anIntArray528[local94], local142.anIntArray531[local94] + arg1) - arg5;
diff --git a/client/src/main/java/Static268.java b/client/src/main/java/Static268.java
index f2681f3..4b612c2 100644
--- a/client/src/main/java/Static268.java
+++ b/client/src/main/java/Static268.java
@@ -31,7 +31,7 @@ public final class Static268 {
 	public static int[] anIntArray558;
 
 	@OriginalMember(owner = "client!w", name = "ab", descriptor = "Lclient!w;")
-	public static final Class8_Sub1_Sub2 aClass8_Sub1_Sub2_1 = new Class8_Sub1_Sub2();
+	public static final SoftwareModel aClass8_Sub1_Sub2_1 = new SoftwareModel();
 
 	@OriginalMember(owner = "client!w", name = "cb", descriptor = "[I")
 	public static int[] anIntArray535 = new int[1];
@@ -40,7 +40,7 @@ public final class Static268 {
 	public static int[] anIntArray536 = new int[1];
 
 	@OriginalMember(owner = "client!w", name = "eb", descriptor = "Lclient!w;")
-	public static final Class8_Sub1_Sub2 aClass8_Sub1_Sub2_2 = new Class8_Sub1_Sub2();
+	public static final SoftwareModel aClass8_Sub1_Sub2_2 = new SoftwareModel();
 
 	@OriginalMember(owner = "client!w", name = "fb", descriptor = "[B")
 	public static byte[] aByteArray76 = new byte[1];
@@ -64,7 +64,7 @@ public final class Static268 {
 	public static byte[] aByteArray77 = new byte[1];
 
 	@OriginalMember(owner = "client!w", name = "nb", descriptor = "Lclient!w;")
-	public static final Class8_Sub1_Sub2 aClass8_Sub1_Sub2_3 = new Class8_Sub1_Sub2();
+	public static final SoftwareModel aClass8_Sub1_Sub2_3 = new SoftwareModel();
 
 	@OriginalMember(owner = "client!w", name = "ob", descriptor = "[I")
 	public static int[] anIntArray540 = new int[1];
diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java
index 74e1d55..600238d 100644
--- a/client/src/main/java/Static41.java
+++ b/client/src/main/java/Static41.java
@@ -157,7 +157,7 @@ public final class Static41 {
 				local650.aClass127_4.aBoolean235 = false;
 			}
 		} else {
-			@Pc(574) Class8_Sub1_Sub2 local574 = (Class8_Sub1_Sub2) local33;
+			@Pc(574) SoftwareModel local574 = (SoftwareModel) local33;
 			if (Static207.method3685(Static55.anInt1735, arg3 + local384, arg5 - -local126) != arg11 || arg11 != Static207.method3685(Static55.anInt1735, arg3 + local115, arg5 - -local130)) {
 				for (local162 = 0; local162 < local574.anInt5788; local162++) {
 					local574.anIntArray527[local162] += Static207.method3685(Static55.anInt1735, arg3 + local574.anIntArray528[local162], arg5 + local574.anIntArray531[local162]) - arg11;
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 5dfa9c3..31d6a58 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -760,7 +760,7 @@ public final class Static87 {
 													if (!local30.aBoolean32) {
 														local2589.method4571(local30.anInt524, 0, local30.anInt450, 0, local563, local571, -1L);
 													} else if (local30.aBoolean22) {
-														((Class8_Sub1_Sub2) local2589).method4591(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local503 + local563, local571 + local30.anInt497, local30.anInt443);
+														((SoftwareModel) local2589).method4591(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local503 + local563, local571 + local30.anInt497, local30.anInt443);
 													} else {
 														local2589.method4571(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local563 + local503, local571 + local30.anInt497, -1L);
 													}