diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java
index 0a55142..d774da3 100644
--- a/client/src/main/java/Class13.java
+++ b/client/src/main/java/Class13.java
@@ -934,7 +934,7 @@ public final class Class13 {
 		if (local72 != null) {
 			return local72;
 		}
-		@Pc(85) Class3_Sub2_Sub1_Sub1 local85;
+		@Pc(85) SoftwareSprite local85;
 		if (this.aBoolean18) {
 			local85 = Static80.method3613(Static23.aClass153_12, local12);
 		} else {
diff --git a/client/src/main/java/Class3_Sub2_Sub1_Sub2_Sub1.java b/client/src/main/java/Class3_Sub2_Sub1_Sub2_Sub1.java
index 22e6a45..d98d559 100644
--- a/client/src/main/java/Class3_Sub2_Sub1_Sub2_Sub1.java
+++ b/client/src/main/java/Class3_Sub2_Sub1_Sub2_Sub1.java
@@ -14,7 +14,7 @@ public final class Class3_Sub2_Sub1_Sub2_Sub1 extends GlSprite {
 	}
 
 	@OriginalMember(owner = "client!el", name = "<init>", descriptor = "(Lclient!mm;)V")
-	public Class3_Sub2_Sub1_Sub2_Sub1(@OriginalArg(0) Class3_Sub2_Sub1_Sub1 arg0) {
+	public Class3_Sub2_Sub1_Sub2_Sub1(@OriginalArg(0) SoftwareSprite arg0) {
 		super(arg0);
 	}
 
diff --git a/client/src/main/java/Class63.java b/client/src/main/java/Class63.java
index 7bb1261..0a08eb4 100644
--- a/client/src/main/java/Class63.java
+++ b/client/src/main/java/Class63.java
@@ -16,8 +16,8 @@ public final class Class63 {
 	private int anInt2857;
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(B)Lclient!mm;")
-	public final Class3_Sub2_Sub1_Sub1 method2246() {
-		@Pc(7) Class3_Sub2_Sub1_Sub1 local7 = (Class3_Sub2_Sub1_Sub1) Static7.aClass99_5.method3106((long) this.anInt2857);
+	public final SoftwareSprite method2246() {
+		@Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.aClass99_5.method3106((long) this.anInt2857);
 		if (local7 != null) {
 			return local7;
 		}
diff --git a/client/src/main/java/GlSprite.java b/client/src/main/java/GlSprite.java
index 115faf1..f993a79 100644
--- a/client/src/main/java/GlSprite.java
+++ b/client/src/main/java/GlSprite.java
@@ -42,7 +42,7 @@ public class GlSprite extends Class3_Sub2_Sub1 {
 	}
 
 	@OriginalMember(owner = "client!cf", name = "<init>", descriptor = "(Lclient!mm;)V")
-	public GlSprite(@OriginalArg(0) Class3_Sub2_Sub1_Sub1 arg0) {
+	public GlSprite(@OriginalArg(0) SoftwareSprite arg0) {
 		this.anInt1860 = arg0.anInt1860;
 		this.anInt1866 = arg0.anInt1866;
 		this.anInt1863 = arg0.anInt1863;
diff --git a/client/src/main/java/SoftwareAlphaSprite.java b/client/src/main/java/SoftwareAlphaSprite.java
index 783936a..a53d498 100644
--- a/client/src/main/java/SoftwareAlphaSprite.java
+++ b/client/src/main/java/SoftwareAlphaSprite.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!am")
-public final class SoftwareAlphaSprite extends Class3_Sub2_Sub1_Sub1 {
+public final class SoftwareAlphaSprite extends SoftwareSprite {
 
 	@OriginalMember(owner = "client!am", name = "<init>", descriptor = "(IIIIII[I)V")
 	public SoftwareAlphaSprite(@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) {
diff --git a/client/src/main/java/Class3_Sub2_Sub1_Sub1.java b/client/src/main/java/SoftwareSprite.java
similarity index 99%
rename from client/src/main/java/Class3_Sub2_Sub1_Sub1.java
rename to client/src/main/java/SoftwareSprite.java
index 5d12ab1..0d855d8 100644
--- a/client/src/main/java/Class3_Sub2_Sub1_Sub1.java
+++ b/client/src/main/java/SoftwareSprite.java
@@ -4,13 +4,13 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!mm")
-public class Class3_Sub2_Sub1_Sub1 extends Class3_Sub2_Sub1 {
+public class SoftwareSprite extends Class3_Sub2_Sub1 {
 
 	@OriginalMember(owner = "client!mm", name = "L", descriptor = "[I")
 	public int[] anIntArray20;
 
 	@OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(IIIIII[I)V")
-	public Class3_Sub2_Sub1_Sub1(@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) {
+	public SoftwareSprite(@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) {
 		this.anInt1860 = arg0;
 		this.anInt1866 = arg1;
 		this.anInt1863 = arg2;
@@ -21,7 +21,7 @@ public class Class3_Sub2_Sub1_Sub1 extends Class3_Sub2_Sub1 {
 	}
 
 	@OriginalMember(owner = "client!mm", name = "<init>", descriptor = "(II)V")
-	public Class3_Sub2_Sub1_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public SoftwareSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		this.anIntArray20 = new int[arg0 * arg1];
 		this.anInt1867 = this.anInt1860 = arg0;
 		this.anInt1859 = this.anInt1866 = arg1;
diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java
index 1aea3c5..42fadc2 100644
--- a/client/src/main/java/Static1.java
+++ b/client/src/main/java/Static1.java
@@ -546,7 +546,7 @@ public final class Static1 {
 			return;
 		}
 		if (Static70.aClass3_Sub2_Sub1_2 == null || arg2 != Static70.aClass3_Sub2_Sub1_2.anInt1867 || Static70.aClass3_Sub2_Sub1_2.anInt1859 != arg1) {
-			@Pc(63) Class3_Sub2_Sub1_Sub1 local63 = new Class3_Sub2_Sub1_Sub1(arg2, arg1);
+			@Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1);
 			Static129.method2491(local63.anIntArray20, arg2, arg1);
 			Static214.method4364(arg2, 0, Static48.anInt1449, 0, 0, Static181.anInt4296, arg1, 0);
 			if (Static239.aBoolean269) {
diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java
index f831831..201ed5f 100644
--- a/client/src/main/java/Static102.java
+++ b/client/src/main/java/Static102.java
@@ -24,10 +24,10 @@ public final class Static102 {
 	public static int anInt2680 = 0;
 
 	@OriginalMember(owner = "client!hn", name = "d", descriptor = "(I)Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 method2071() {
+	public static SoftwareSprite method2071() {
 		@Pc(13) int local13 = Static26.anIntArray66[0] * Static254.anIntArray488[0];
 		@Pc(17) byte[] local17 = Static7.aByteArrayArray5[0];
-		@Pc(78) Class3_Sub2_Sub1_Sub1 local78;
+		@Pc(78) SoftwareSprite local78;
 		if (Static159.aBooleanArray87[0]) {
 			@Pc(30) byte[] local30 = Static64.aByteArrayArray9[0];
 			@Pc(33) int[] local33 = new int[local13];
@@ -40,7 +40,7 @@ public final class Static102 {
 			for (@Pc(85) int local85 = 0; local85 < local13; local85++) {
 				local83[local85] = Static259.anIntArray513[local17[local85] & 0xFF];
 			}
-			local78 = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local83);
+			local78 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local83);
 		}
 		Static75.method1631();
 		return local78;
diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java
index fe09179..9eee969 100644
--- a/client/src/main/java/Static112.java
+++ b/client/src/main/java/Static112.java
@@ -22,14 +22,14 @@ public final class Static112 {
 				Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.aClass153_86, Static169.anInt4073);
 				if (Static239.aBoolean269) {
 					if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
-						Static39.aClass3_Sub2_Sub1_1 = new Class3_Sub2_Sub1_Sub2_Sub1((Class3_Sub2_Sub1_Sub1) Static39.aClass3_Sub2_Sub1_1);
+						Static39.aClass3_Sub2_Sub1_1 = new Class3_Sub2_Sub1_Sub2_Sub1((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
 					} else {
-						Static39.aClass3_Sub2_Sub1_1 = new GlSprite((Class3_Sub2_Sub1_Sub1) Static39.aClass3_Sub2_Sub1_1);
+						Static39.aClass3_Sub2_Sub1_1 = new GlSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
 					}
 					if (Static181.aClass3_Sub2_Sub1_9 instanceof SoftwareAlphaSprite) {
-						Static181.aClass3_Sub2_Sub1_9 = new Class3_Sub2_Sub1_Sub2_Sub1((Class3_Sub2_Sub1_Sub1) Static181.aClass3_Sub2_Sub1_9);
+						Static181.aClass3_Sub2_Sub1_9 = new Class3_Sub2_Sub1_Sub2_Sub1((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9);
 					} else {
-						Static181.aClass3_Sub2_Sub1_9 = new GlSprite((Class3_Sub2_Sub1_Sub1) Static181.aClass3_Sub2_Sub1_9);
+						Static181.aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9);
 					}
 				}
 			} else if (Static239.aBoolean269) {
@@ -74,19 +74,19 @@ public final class Static112 {
 			Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.aClass153_86, Static254.anInt5556);
 			if (Static239.aBoolean269) {
 				if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
-					Static165.aClass3_Sub2_Sub1_8 = new Class3_Sub2_Sub1_Sub2_Sub1((Class3_Sub2_Sub1_Sub1) Static165.aClass3_Sub2_Sub1_8);
+					Static165.aClass3_Sub2_Sub1_8 = new Class3_Sub2_Sub1_Sub2_Sub1((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
 				} else {
-					Static165.aClass3_Sub2_Sub1_8 = new GlSprite((Class3_Sub2_Sub1_Sub1) Static165.aClass3_Sub2_Sub1_8);
+					Static165.aClass3_Sub2_Sub1_8 = new GlSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
 				}
 				if (Static92.aClass3_Sub2_Sub1_6 instanceof SoftwareAlphaSprite) {
-					Static92.aClass3_Sub2_Sub1_6 = new Class3_Sub2_Sub1_Sub2_Sub1((Class3_Sub2_Sub1_Sub1) Static92.aClass3_Sub2_Sub1_6);
+					Static92.aClass3_Sub2_Sub1_6 = new Class3_Sub2_Sub1_Sub2_Sub1((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6);
 				} else {
-					Static92.aClass3_Sub2_Sub1_6 = new GlSprite((Class3_Sub2_Sub1_Sub1) Static92.aClass3_Sub2_Sub1_6);
+					Static92.aClass3_Sub2_Sub1_6 = new GlSprite((SoftwareSprite) Static92.aClass3_Sub2_Sub1_6);
 				}
 				if (Static204.aClass3_Sub2_Sub1_10 instanceof SoftwareAlphaSprite) {
-					Static204.aClass3_Sub2_Sub1_10 = new Class3_Sub2_Sub1_Sub2_Sub1((Class3_Sub2_Sub1_Sub1) Static204.aClass3_Sub2_Sub1_10);
+					Static204.aClass3_Sub2_Sub1_10 = new Class3_Sub2_Sub1_Sub2_Sub1((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
 				} else {
-					Static204.aClass3_Sub2_Sub1_10 = new GlSprite((Class3_Sub2_Sub1_Sub1) Static204.aClass3_Sub2_Sub1_10);
+					Static204.aClass3_Sub2_Sub1_10 = new GlSprite((SoftwareSprite) Static204.aClass3_Sub2_Sub1_10);
 				}
 			}
 		}
diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java
index 2fda964..0639344 100644
--- a/client/src/main/java/Static137.java
+++ b/client/src/main/java/Static137.java
@@ -26,9 +26,9 @@ public final class Static137 {
 		@Pc(80) int local80;
 		if (Static56.aClass3_Sub2_Sub1_Sub1_1 == null) {
 			if (Static239.aBoolean269 || Static89.aClass3_Sub2_Sub1_5 == null) {
-				Static56.aClass3_Sub2_Sub1_Sub1_1 = new Class3_Sub2_Sub1_Sub1(512, 512);
+				Static56.aClass3_Sub2_Sub1_Sub1_1 = new SoftwareSprite(512, 512);
 			} else {
-				Static56.aClass3_Sub2_Sub1_Sub1_1 = (Class3_Sub2_Sub1_Sub1) Static89.aClass3_Sub2_Sub1_5;
+				Static56.aClass3_Sub2_Sub1_Sub1_1 = (SoftwareSprite) Static89.aClass3_Sub2_Sub1_5;
 			}
 			@Pc(32) int[] local32 = Static56.aClass3_Sub2_Sub1_Sub1_1.anIntArray20;
 			local35 = local32.length;
diff --git a/client/src/main/java/Static14.java b/client/src/main/java/Static14.java
index 4998d23..2703b77 100644
--- a/client/src/main/java/Static14.java
+++ b/client/src/main/java/Static14.java
@@ -17,8 +17,8 @@ public final class Static14 {
 	public static int anInt441 = 0;
 
 	@OriginalMember(owner = "client!bd", name = "a", descriptor = "(Z)[Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1[] method474() {
-		@Pc(4) Class3_Sub2_Sub1_Sub1[] local4 = new Class3_Sub2_Sub1_Sub1[Static165.anInt4038];
+	public static SoftwareSprite[] method474() {
+		@Pc(4) SoftwareSprite[] local4 = new SoftwareSprite[Static165.anInt4038];
 		for (@Pc(12) int local12 = 0; local12 < Static165.anInt4038; local12++) {
 			@Pc(27) int local27 = Static26.anIntArray66[local12] * Static254.anIntArray488[local12];
 			@Pc(31) byte[] local31 = Static7.aByteArrayArray5[local12];
@@ -26,7 +26,7 @@ public final class Static14 {
 			for (@Pc(36) int local36 = 0; local36 < local27; local36++) {
 				local34[local36] = Static259.anIntArray513[local31[local36] & 0xFF];
 			}
-			local4[local12] = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local12], Static269.anIntArray252[local12], Static254.anIntArray488[local12], Static26.anIntArray66[local12], local34);
+			local4[local12] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local12], Static269.anIntArray252[local12], Static254.anIntArray488[local12], Static26.anIntArray66[local12], local34);
 		}
 		Static75.method1631();
 		return local4;
diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java
index 2b1326b..a901f81 100644
--- a/client/src/main/java/Static145.java
+++ b/client/src/main/java/Static145.java
@@ -62,7 +62,7 @@ public final class Static145 {
 		Static69.method1545(null);
 		Static103.anIntArray254 = new int[32768];
 		Static216.anIntArray188 = new int[32768];
-		Static167.aClass3_Sub2_Sub1_Sub1_3 = new Class3_Sub2_Sub1_Sub1(128, 254);
+		Static167.aClass3_Sub2_Sub1_Sub1_3 = new SoftwareSprite(128, 254);
 	}
 
 	@OriginalMember(owner = "client!lf", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java
index e7c9e54..ef6be8e 100644
--- a/client/src/main/java/Static153.java
+++ b/client/src/main/java/Static153.java
@@ -8,7 +8,7 @@ public final class Static153 {
 	public static Class100 aClass100_724;
 
 	@OriginalMember(owner = "client!mc", name = "S", descriptor = "Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 aClass3_Sub2_Sub1_Sub1_2;
+	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_2;
 
 	@OriginalMember(owner = "client!mc", name = "Z", descriptor = "Lclient!ve;")
 	public static Class153 aClass153_57;
diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java
index 9885e3d..d88bb02 100644
--- a/client/src/main/java/Static160.java
+++ b/client/src/main/java/Static160.java
@@ -42,7 +42,7 @@ public final class Static160 {
 		} else if (Static239.aBoolean269) {
 			((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, 256, (GlSprite) arg2.method489(false));
 		} else {
-			((Class3_Sub2_Sub1_Sub1) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, arg2.anIntArray37, arg2.anIntArray45);
+			((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, arg2.anIntArray37, arg2.anIntArray45);
 		}
 		Static31.aBooleanArray29[arg3] = true;
 	}
diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java
index bedbc4f..a5839c1 100644
--- a/client/src/main/java/Static164.java
+++ b/client/src/main/java/Static164.java
@@ -173,7 +173,7 @@ public final class Static164 {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!ve;IZ)Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 method3117(@OriginalArg(0) Class153 arg0, @OriginalArg(1) int arg1) {
+	public static SoftwareSprite method3117(@OriginalArg(0) Class153 arg0, @OriginalArg(1) int arg1) {
 		return Static254.method4346(arg0, arg1) ? Static196.method3537() : null;
 	}
 
@@ -200,14 +200,14 @@ public final class Static164 {
 		if (local60 == null) {
 			return null;
 		}
-		@Pc(71) Class3_Sub2_Sub1_Sub1 local71 = null;
+		@Pc(71) SoftwareSprite local71 = null;
 		if (local5.anInt2358 != -1) {
-			local71 = (Class3_Sub2_Sub1_Sub1) method3150(0, true, local5.anInt2356, false, 1, 10, true);
+			local71 = (SoftwareSprite) method3150(0, true, local5.anInt2356, false, 1, 10, true);
 			if (local71 == null) {
 				return null;
 			}
 		} else if (local5.anInt2334 != -1) {
-			local71 = (Class3_Sub2_Sub1_Sub1) method3150(arg0, true, local5.anInt2363, false, arg4, arg5, false);
+			local71 = (SoftwareSprite) method3150(arg0, true, local5.anInt2363, false, arg4, arg5, false);
 			if (local71 == null) {
 				return null;
 			}
@@ -217,7 +217,7 @@ public final class Static164 {
 		@Pc(122) int local122 = Static129.anInt3146;
 		@Pc(125) int[] local125 = new int[4];
 		Static129.method2497(local125);
-		@Pc(133) Class3_Sub2_Sub1_Sub1 local133 = new Class3_Sub2_Sub1_Sub1(36, 32);
+		@Pc(133) SoftwareSprite local133 = new SoftwareSprite(36, 32);
 		Static129.method2491(local133.anIntArray20, 36, 32);
 		Static94.method1908();
 		Static94.method1919(16, 16);
diff --git a/client/src/main/java/Static167.java b/client/src/main/java/Static167.java
index a531306..ea92cc1 100644
--- a/client/src/main/java/Static167.java
+++ b/client/src/main/java/Static167.java
@@ -20,7 +20,7 @@ public final class Static167 {
 	public static Class153 aClass153_64;
 
 	@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 aClass3_Sub2_Sub1_Sub1_3;
+	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
 
 	@OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_780 = Static28.method790("Clientscript error in: ");
diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java
index 3da7d4c..bee0f25 100644
--- a/client/src/main/java/Static173.java
+++ b/client/src/main/java/Static173.java
@@ -11,7 +11,7 @@ public final class Static173 {
 	public static int anInt4183;
 
 	@OriginalMember(owner = "client!nk", name = "L", descriptor = "[Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1[] aClass3_Sub2_Sub1_Sub1Array9;
+	public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array9;
 
 	@OriginalMember(owner = "client!nk", name = "O", descriptor = "Lclient!e;")
 	public static Class8_Sub4_Sub1 aClass8_Sub4_Sub1_2;
diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java
index cc2dea0..ce94285 100644
--- a/client/src/main/java/Static196.java
+++ b/client/src/main/java/Static196.java
@@ -104,14 +104,14 @@ public final class Static196 {
 	}
 
 	@OriginalMember(owner = "client!pl", name = "a", descriptor = "(I)Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 method3537() {
+	public static SoftwareSprite method3537() {
 		@Pc(13) int local13 = Static254.anIntArray488[0] * Static26.anIntArray66[0];
 		@Pc(17) byte[] local17 = Static7.aByteArrayArray5[0];
 		@Pc(20) int[] local20 = new int[local13];
 		for (@Pc(22) int local22 = 0; local22 < local13; local22++) {
 			local20[local22] = Static259.anIntArray513[local17[local22] & 0xFF];
 		}
-		@Pc(57) Class3_Sub2_Sub1_Sub1 local57 = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
+		@Pc(57) SoftwareSprite local57 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
 		Static75.method1631();
 		return local57;
 	}
diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java
index 3e6bab5..4acc124 100644
--- a/client/src/main/java/Static213.java
+++ b/client/src/main/java/Static213.java
@@ -64,7 +64,7 @@ public final class Static213 {
 				if (Static239.aBoolean269) {
 					local14[local16] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119);
 				} else {
-					local14[local16] = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119);
+					local14[local16] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119);
 				}
 			}
 		}
diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java
index 414cc82..9e6e1e0 100644
--- a/client/src/main/java/Static234.java
+++ b/client/src/main/java/Static234.java
@@ -150,7 +150,7 @@ public final class Static234 {
 	}
 
 	@OriginalMember(owner = "client!ta", name = "a", descriptor = "([Lclient!mm;ILclient!ve;)V")
-	public static void method4018(@OriginalArg(0) Class3_Sub2_Sub1_Sub1[] arg0, @OriginalArg(2) Class153 arg1) {
+	public static void method4018(@OriginalArg(0) SoftwareSprite[] arg0, @OriginalArg(2) Class153 arg1) {
 		Static119.aClass153_44 = arg1;
 		Static241.aClass3_Sub2_Sub1_Sub1Array13 = arg0;
 		Static258.aBooleanArray130 = new boolean[Static241.aClass3_Sub2_Sub1_Sub1Array13.length];
diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java
index 75e1fd3..da91665 100644
--- a/client/src/main/java/Static241.java
+++ b/client/src/main/java/Static241.java
@@ -17,7 +17,7 @@ public final class Static241 {
 	public static int[] anIntArray522;
 
 	@OriginalMember(owner = "client!th", name = "p", descriptor = "[Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1[] aClass3_Sub2_Sub1_Sub1Array13;
+	public static SoftwareSprite[] aClass3_Sub2_Sub1_Sub1Array13;
 
 	@OriginalMember(owner = "client!th", name = "h", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_1088 = Static28.method790("::setparticles");
diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java
index e70c521..de08050 100644
--- a/client/src/main/java/Static265.java
+++ b/client/src/main/java/Static265.java
@@ -29,7 +29,7 @@ public final class Static265 {
 	}
 
 	@OriginalMember(owner = "client!vj", name = "a", descriptor = "(IIILclient!ve;)[Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1[] method4523(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
+	public static SoftwareSprite[] method4523(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static14.method474() : null;
 	}
 }
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index 6107439..296c23a 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -298,7 +298,7 @@ public final class Static269 {
 		if (Static239.aBoolean269) {
 			if (Static153.aClass3_Sub2_Sub1_Sub1_2 == null || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1867 != arg3 || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1859 != arg2) {
 				Static153.aClass3_Sub2_Sub1_Sub1_2 = null;
-				Static153.aClass3_Sub2_Sub1_Sub1_2 = new Class3_Sub2_Sub1_Sub1(arg3, arg2);
+				Static153.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2);
 			}
 			Static129.method2491(Static153.aClass3_Sub2_Sub1_Sub1_2.anIntArray20, arg3, arg2);
 			Static214.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211);
diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java
index 3512b46..4f97b19 100644
--- a/client/src/main/java/Static30.java
+++ b/client/src/main/java/Static30.java
@@ -47,14 +47,14 @@ public final class Static30 {
 				Static242.aClass36_Sub1Array2[local101].method1396();
 			}
 		}
-		@Pc(124) Class3_Sub2_Sub1_Sub1 local124 = Static78.method1693(0, arg0, Static163.anInt3962);
+		@Pc(124) SoftwareSprite local124 = Static78.method1693(0, arg0, Static163.anInt3962);
 		local124.method311();
 		if (Static239.aBoolean269) {
 			Static106.aClass3_Sub2_Sub1_7 = new GlSprite(local124);
 		} else {
 			Static106.aClass3_Sub2_Sub1_7 = local124;
 		}
-		@Pc(143) Class3_Sub2_Sub1_Sub1[] local143 = Static265.method4523(Static128.anInt3143, arg0);
+		@Pc(143) SoftwareSprite[] local143 = Static265.method4523(Static128.anInt3143, arg0);
 		@Pc(145) int local145;
 		for (local145 = 0; local145 < local143.length; local145++) {
 			local143[local145].method311();
diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java
index 0369196..1cd4a3d 100644
--- a/client/src/main/java/Static33.java
+++ b/client/src/main/java/Static33.java
@@ -207,7 +207,7 @@ public final class Static33 {
 			if (Static239.aBoolean269) {
 				local6[local15] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37);
 			} else {
-				local6[local15] = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37);
+				local6[local15] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37);
 			}
 		}
 		Static75.method1631();
diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java
index 4ed2660..0f7fdfe 100644
--- a/client/src/main/java/Static54.java
+++ b/client/src/main/java/Static54.java
@@ -35,7 +35,7 @@ public final class Static54 {
 			if (Static239.aBoolean269) {
 				((GlSprite) Static89.aClass3_Sub2_Sub1_5).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false));
 			} else {
-				((Class3_Sub2_Sub1_Sub1) Static89.aClass3_Sub2_Sub1_5).method310(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45);
+				((SoftwareSprite) Static89.aClass3_Sub2_Sub1_5).method310(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45);
 			}
 			@Pc(146) int local146;
 			@Pc(181) int local181;
diff --git a/client/src/main/java/Static56.java b/client/src/main/java/Static56.java
index 30c9f4b..9555304 100644
--- a/client/src/main/java/Static56.java
+++ b/client/src/main/java/Static56.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static56 {
 
 	@OriginalMember(owner = "client!ef", name = "j", descriptor = "Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 aClass3_Sub2_Sub1_Sub1_1;
+	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_1;
 
 	@OriginalMember(owner = "client!ef", name = "p", descriptor = "Lclient!vj;")
 	public static Resampler aClass156_1;
diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java
index a040e9b..3bede24 100644
--- a/client/src/main/java/Static60.java
+++ b/client/src/main/java/Static60.java
@@ -54,7 +54,7 @@ public final class Static60 {
 		if (Static239.aBoolean269) {
 			((GlSprite) arg1).method1425(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, arg0.anInt459 / 2 + arg4 - (local92 + arg1.anInt1866 / 2), (GlSprite) arg0.method489(false));
 		} else {
-			((Class3_Sub2_Sub1_Sub1) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
+			((SoftwareSprite) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
 		}
 	}
 
diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java
index 5c1fb29..55d8ec6 100644
--- a/client/src/main/java/Static78.java
+++ b/client/src/main/java/Static78.java
@@ -45,7 +45,7 @@ public final class Static78 {
 	}
 
 	@OriginalMember(owner = "client!gd", name = "a", descriptor = "(ILclient!ve;II)Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 method1693(@OriginalArg(0) int arg0, @OriginalArg(1) Class153 arg1, @OriginalArg(3) int arg2) {
+	public static SoftwareSprite method1693(@OriginalArg(0) int arg0, @OriginalArg(1) Class153 arg1, @OriginalArg(3) int arg2) {
 		return Static234.method4016(arg1, arg0, arg2) ? Static196.method3537() : null;
 	}
 
diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java
index 3d716cd..725a4f5 100644
--- a/client/src/main/java/Static80.java
+++ b/client/src/main/java/Static80.java
@@ -30,7 +30,7 @@ public final class Static80 {
 	public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 };
 
 	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;")
-	public static Class3_Sub2_Sub1_Sub1 method3613(@OriginalArg(0) Class153 arg0, @OriginalArg(2) int arg1) {
+	public static SoftwareSprite method3613(@OriginalArg(0) Class153 arg0, @OriginalArg(2) int arg1) {
 		return Static234.method4016(arg0, 0, arg1) ? Static102.method2071() : null;
 	}
 
diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java
index dbd0062..2155ee9 100644
--- a/client/src/main/java/Static81.java
+++ b/client/src/main/java/Static81.java
@@ -43,7 +43,7 @@ public final class Static81 {
 		}
 		if (arg0 != -1) {
 			@Pc(24) Class63 local24 = Static202.method3660(arg0);
-			@Pc(28) Class3_Sub2_Sub1_Sub1 local28 = local24.method2246();
+			@Pc(28) SoftwareSprite local28 = local24.method2246();
 			if (local28 == null) {
 				arg0 = -1;
 			} else {
diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java
index a108542..970d95b 100644
--- a/client/src/main/java/Static82.java
+++ b/client/src/main/java/Static82.java
@@ -46,7 +46,7 @@ public final class Static82 {
 		if (Static239.aBoolean269) {
 			local69 = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
 		} else {
-			local69 = new Class3_Sub2_Sub1_Sub1(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
+			local69 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
 		}
 		Static75.method1631();
 		return local69;
diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java
index c9f1a05..6eb5cd9 100644
--- a/client/src/main/java/Static97.java
+++ b/client/src/main/java/Static97.java
@@ -51,7 +51,7 @@ public final class Static97 {
 		if (Static239.aBoolean269) {
 			((GlSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method1428((arg5.anInt445 / 2 + arg2 + local117) * 16, (arg5.anInt459 / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D));
 		} else {
-			((Class3_Sub2_Sub1_Sub1) Static277.aClass3_Sub2_Sub1Array12[arg0]).method306(local117 + arg5.anInt445 / 2 + arg2 - 10, arg5.anInt459 / 2 + -10 + arg1 + -local124, local110);
+			((SoftwareSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method306(local117 + arg5.anInt445 / 2 + arg2 - 10, arg5.anInt459 / 2 + -10 + arg1 + -local124, local110);
 		}
 	}
 
diff --git a/client/src/main/java/TextureOpSprite.java b/client/src/main/java/TextureOpSprite.java
index d9a9c50..0b851e2 100644
--- a/client/src/main/java/TextureOpSprite.java
+++ b/client/src/main/java/TextureOpSprite.java
@@ -30,7 +30,7 @@ public class TextureOpSprite extends TextureOp {
 		} else if (this.anInt3235 < 0) {
 			return false;
 		} else {
-			@Pc(43) Class3_Sub2_Sub1_Sub1 local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : Static78.method1693(this.anInt3235, Static176.aClass153_76, Static215.anInt4868);
+			@Pc(43) SoftwareSprite local43 = Static215.anInt4868 < 0 ? Static164.method3117(Static176.aClass153_76, this.anInt3235) : Static78.method1693(this.anInt3235, Static176.aClass153_76, Static215.anInt4868);
 			local43.method311();
 			this.anInt3240 = local43.anInt1859;
 			this.anInt3239 = local43.anInt1867;