diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java
index d774da3..f4c8f27 100644
--- a/client/src/main/java/Class13.java
+++ b/client/src/main/java/Class13.java
@@ -765,7 +765,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;")
-	public final Class3_Sub2_Sub1 method482(@OriginalArg(1) int arg0) {
+	public final Sprite method482(@OriginalArg(1) int arg0) {
 		Static211.aBoolean72 = false;
 		if (arg0 < 0 || arg0 >= this.anIntArray36.length) {
 			return null;
@@ -774,7 +774,7 @@ public final class Class13 {
 		if (local29 == -1) {
 			return null;
 		}
-		@Pc(43) Class3_Sub2_Sub1 local43 = (Class3_Sub2_Sub1) Static190.aClass99_26.method3106((long) local29);
+		@Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.method3106((long) local29);
 		if (local43 != null) {
 			return local43;
 		}
@@ -918,7 +918,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(BZ)Lclient!qf;")
-	public final Class3_Sub2_Sub1 method489(@OriginalArg(1) boolean arg0) {
+	public final Sprite method489(@OriginalArg(1) boolean arg0) {
 		Static211.aBoolean72 = false;
 		@Pc(12) int local12;
 		if (arg0) {
@@ -930,7 +930,7 @@ public final class Class13 {
 			return null;
 		}
 		@Pc(66) long local66 = ((this.aBoolean21 ? 1L : 0L) << 38) + ((this.aBoolean18 ? 1L : 0L) << 35) + (long) local12 + ((long) this.anInt514 << 36) + ((this.aBoolean26 ? 1L : 0L) << 39) + ((long) this.anInt513 << 40);
-		@Pc(72) Class3_Sub2_Sub1 local72 = (Class3_Sub2_Sub1) Static190.aClass99_26.method3106(local66);
+		@Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.method3106(local66);
 		if (local72 != null) {
 			return local72;
 		}
diff --git a/client/src/main/java/GlSprite.java b/client/src/main/java/GlSprite.java
index f993a79..def0e88 100644
--- a/client/src/main/java/GlSprite.java
+++ b/client/src/main/java/GlSprite.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!cf")
-public class GlSprite extends Class3_Sub2_Sub1 {
+public class GlSprite extends Sprite {
 
 	@OriginalMember(owner = "client!cf", name = "O", descriptor = "I")
 	public int anInt1870;
diff --git a/client/src/main/java/SoftwareSprite.java b/client/src/main/java/SoftwareSprite.java
index 0d855d8..5df7ae5 100644
--- a/client/src/main/java/SoftwareSprite.java
+++ b/client/src/main/java/SoftwareSprite.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!mm")
-public class SoftwareSprite extends Class3_Sub2_Sub1 {
+public class SoftwareSprite extends Sprite {
 
 	@OriginalMember(owner = "client!mm", name = "L", descriptor = "[I")
 	public int[] anIntArray20;
diff --git a/client/src/main/java/Class3_Sub2_Sub1.java b/client/src/main/java/Sprite.java
similarity index 96%
rename from client/src/main/java/Class3_Sub2_Sub1.java
rename to client/src/main/java/Sprite.java
index 68913f5..68092ed 100644
--- a/client/src/main/java/Class3_Sub2_Sub1.java
+++ b/client/src/main/java/Sprite.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!qf")
-public abstract class Class3_Sub2_Sub1 extends Class3_Sub2 {
+public abstract class Sprite extends Class3_Sub2 {
 
 	@OriginalMember(owner = "client!qf", name = "I", descriptor = "I")
 	public int anInt1859;
@@ -25,7 +25,7 @@ public abstract class Class3_Sub2_Sub1 extends Class3_Sub2 {
 	public int anInt1867;
 
 	@OriginalMember(owner = "client!qf", name = "<init>", descriptor = "()V")
-	protected Class3_Sub2_Sub1() {
+	protected Sprite() {
 	}
 
 	@OriginalMember(owner = "client!qf", name = "c", descriptor = "(II)V")
diff --git a/client/src/main/java/Static106.java b/client/src/main/java/Static106.java
index 812c970..a703b7b 100644
--- a/client/src/main/java/Static106.java
+++ b/client/src/main/java/Static106.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static106 {
 
 	@OriginalMember(owner = "client!ic", name = "a", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_7;
+	public static Sprite aClass3_Sub2_Sub1_7;
 
 	@OriginalMember(owner = "client!ic", name = "n", descriptor = "I")
 	public static int anInt2871;
diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java
index 3b43494..fa4f2a4 100644
--- a/client/src/main/java/Static116.java
+++ b/client/src/main/java/Static116.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static116 {
 
 	@OriginalMember(owner = "client!jb", name = "k", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array3;
+	public static Sprite[] aClass3_Sub2_Sub1Array3;
 
 	@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_583 = Static28.method790("(Y<)4col>");
diff --git a/client/src/main/java/Static130.java b/client/src/main/java/Static130.java
index 6fd296b..92a61d6 100644
--- a/client/src/main/java/Static130.java
+++ b/client/src/main/java/Static130.java
@@ -28,7 +28,7 @@ public final class Static130 {
 	public static final int[] anIntArray300 = new int[] { 1, 1, 1, 1, 4, 1, 1, 5, 6, 1, 5, 0, 7, 0, 4, 1, 7, 2, 1, 1, 6, 1, 1, 3, 6, 1, 7, 0, 0, 6, 7, 0, 1, 7, 6, 1, 1, 1, 5, 4, 3, 2, 1, 1, 0, 4, 1, 5 };
 
 	@OriginalMember(owner = "client!kc", name = "a", descriptor = "(ILclient!ve;I)Lclient!qf;")
-	public static Class3_Sub2_Sub1 method2514(@OriginalArg(1) Class153 arg0, @OriginalArg(2) int arg1) {
+	public static Sprite method2514(@OriginalArg(1) Class153 arg0, @OriginalArg(2) int arg1) {
 		return Static254.method4346(arg0, arg1) ? Static82.method1764() : null;
 	}
 }
diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java
index 08f2f5b..a696adf 100644
--- a/client/src/main/java/Static131.java
+++ b/client/src/main/java/Static131.java
@@ -159,7 +159,7 @@ public final class Static131 {
 	}
 
 	@OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIILclient!ve;)[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
+	public static Sprite[] method2580(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static33.method870() : null;
 	}
 }
diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java
index fe0028b..41f95e7 100644
--- a/client/src/main/java/Static138.java
+++ b/client/src/main/java/Static138.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static138 {
 
 	@OriginalMember(owner = "client!km", name = "sc", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array5;
+	public static Sprite[] aClass3_Sub2_Sub1Array5;
 
 	@OriginalMember(owner = "client!km", name = "uc", descriptor = "F")
 	public static float aFloat14;
diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java
index 6993ab4..7a382aa 100644
--- a/client/src/main/java/Static139.java
+++ b/client/src/main/java/Static139.java
@@ -9,7 +9,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static139 {
 
 	@OriginalMember(owner = "client!l", name = "j", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array6;
+	public static Sprite[] aClass3_Sub2_Sub1Array6;
 
 	@OriginalMember(owner = "client!l", name = "l", descriptor = "[I")
 	public static int[] anIntArray325;
diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java
index a99d6c2..9813e94 100644
--- a/client/src/main/java/Static142.java
+++ b/client/src/main/java/Static142.java
@@ -122,11 +122,11 @@ public final class Static142 {
 					}
 				}
 				if (local17.anInt3378 > Static83.anInt372) {
-					@Pc(508) Class3_Sub2_Sub1 local508 = Static116.aClass3_Sub2_Sub1Array3[0];
-					@Pc(512) Class3_Sub2_Sub1 local512 = Static116.aClass3_Sub2_Sub1Array3[1];
+					@Pc(508) Sprite local508 = Static116.aClass3_Sub2_Sub1Array3[0];
+					@Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1];
 					if (local17 instanceof Class8_Sub4_Sub2) {
 						@Pc(518) Class8_Sub4_Sub2 local518 = (Class8_Sub4_Sub2) local17;
-						@Pc(528) Class3_Sub2_Sub1[] local528 = (Class3_Sub2_Sub1[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736);
+						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736);
 						if (local528 == null) {
 							local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.aClass153_86);
 							if (local528 != null) {
diff --git a/client/src/main/java/Static149.java b/client/src/main/java/Static149.java
index 5536a6c..e4f4ac4 100644
--- a/client/src/main/java/Static149.java
+++ b/client/src/main/java/Static149.java
@@ -7,7 +7,7 @@ public final class Static149 {
 	public static int anInt3551;
 
 	@OriginalMember(owner = "client!lj", name = "t", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array7;
+	public static Sprite[] aClass3_Sub2_Sub1Array7;
 
 	@OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
 	public static Image anImage3;
diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java
index 618fe38..f6ea375 100644
--- a/client/src/main/java/Static150.java
+++ b/client/src/main/java/Static150.java
@@ -41,7 +41,7 @@ public final class Static150 {
 	}
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(IIBLclient!ve;)Lclient!qf;")
-	public static Class3_Sub2_Sub1 method2800(@OriginalArg(1) int arg0, @OriginalArg(3) Class153 arg1) {
+	public static Sprite method2800(@OriginalArg(1) int arg0, @OriginalArg(3) Class153 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static82.method1764() : null;
 	}
 
diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java
index d88bb02..8f3dc40 100644
--- a/client/src/main/java/Static160.java
+++ b/client/src/main/java/Static160.java
@@ -32,7 +32,7 @@ public final class Static160 {
 		}
 		if (Static270.anInt5795 >= 3) {
 			if (Static239.aBoolean269) {
-				@Pc(44) Class3_Sub2_Sub1 local44 = arg2.method489(false);
+				@Pc(44) Sprite local44 = arg2.method489(false);
 				if (local44 != null) {
 					local44.method1423(arg0, arg1);
 				}
diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java
index a5839c1..a2bf9e4 100644
--- a/client/src/main/java/Static164.java
+++ b/client/src/main/java/Static164.java
@@ -183,7 +183,7 @@ public final class Static164 {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IBZIZIIZ)Lclient!qf;")
-	public static Class3_Sub2_Sub1 method3150(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) boolean arg6) {
+	public static Sprite method3150(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) boolean arg6) {
 		@Pc(5) Class55 local5 = Static71.method1439(arg2);
 		if (arg5 > 1 && local5.anIntArray214 != null) {
 			@Pc(15) int local15 = -1;
diff --git a/client/src/main/java/Static165.java b/client/src/main/java/Static165.java
index 09462d8..2d3f25b 100644
--- a/client/src/main/java/Static165.java
+++ b/client/src/main/java/Static165.java
@@ -8,7 +8,7 @@ public final class Static165 {
 	public static int anInt4038;
 
 	@OriginalMember(owner = "client!nb", name = "i", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_8;
+	public static Sprite aClass3_Sub2_Sub1_8;
 
 	@OriginalMember(owner = "client!nb", name = "o", descriptor = "I")
 	public static int anInt4042;
diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java
index 4a8707d..03ea06c 100644
--- a/client/src/main/java/Static181.java
+++ b/client/src/main/java/Static181.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static181 {
 
 	@OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_9;
+	public static Sprite aClass3_Sub2_Sub1_9;
 
 	@OriginalMember(owner = "client!oi", name = "m", descriptor = "I")
 	public static int anInt4296;
diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java
index b85b108..c82a295 100644
--- a/client/src/main/java/Static190.java
+++ b/client/src/main/java/Static190.java
@@ -35,10 +35,10 @@ public final class Static190 {
 	}
 
 	@OriginalMember(owner = "client!pf", name = "a", descriptor = "(IIZIII)Lclient!qf;")
-	public static Class3_Sub2_Sub1 method3443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public static Sprite method3443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		@Pc(27) int local27 = (arg2 ? 65536 : 0) + arg1 + (arg0 << 17) + (arg4 << 19);
 		@Pc(37) long local37 = (long) local27 * 3849834839L + (long) arg3 * 3147483667L;
-		@Pc(43) Class3_Sub2_Sub1 local43 = (Class3_Sub2_Sub1) Static118.aClass99_16.method3106(local37);
+		@Pc(43) Sprite local43 = (Sprite) Static118.aClass99_16.method3106(local37);
 		if (local43 != null) {
 			return local43;
 		}
diff --git a/client/src/main/java/Static204.java b/client/src/main/java/Static204.java
index 4eea288..f06d632 100644
--- a/client/src/main/java/Static204.java
+++ b/client/src/main/java/Static204.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static204 {
 
 	@OriginalMember(owner = "client!qi", name = "z", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_10;
+	public static Sprite aClass3_Sub2_Sub1_10;
 
 	@OriginalMember(owner = "client!qi", name = "C", descriptor = "Lclient!ei;")
 	public static Class3_Sub3_Sub2 aClass3_Sub3_Sub2_1;
diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java
index a095f7e..54c76ee 100644
--- a/client/src/main/java/Static209.java
+++ b/client/src/main/java/Static209.java
@@ -58,7 +58,7 @@ public final class Static209 {
 	}
 
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(IBILclient!ve;)[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] method3708(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
+	public static Sprite[] method3708(@OriginalArg(2) int arg0, @OriginalArg(3) Class153 arg1) {
 		return Static234.method4016(arg1, 0, arg0) ? Static213.method3730() : null;
 	}
 
diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java
index 4acc124..92ccdd3 100644
--- a/client/src/main/java/Static213.java
+++ b/client/src/main/java/Static213.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static213 {
 
 	@OriginalMember(owner = "client!re", name = "w", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array8;
+	public static Sprite[] aClass3_Sub2_Sub1Array8;
 
 	@OriginalMember(owner = "client!re", name = "y", descriptor = "I")
 	public static int anInt4851;
@@ -40,8 +40,8 @@ public final class Static213 {
 	}
 
 	@OriginalMember(owner = "client!re", name = "b", descriptor = "(I)[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] method3730() {
-		@Pc(14) Class3_Sub2_Sub1[] local14 = new Class3_Sub2_Sub1[Static165.anInt4038];
+	public static Sprite[] method3730() {
+		@Pc(14) Sprite[] local14 = new Sprite[Static165.anInt4038];
 		for (@Pc(16) int local16 = 0; local16 < Static165.anInt4038; local16++) {
 			@Pc(23) byte[] local23 = Static7.aByteArrayArray5[local16];
 			@Pc(31) int local31 = Static26.anIntArray66[local16] * Static254.anIntArray488[local16];
diff --git a/client/src/main/java/Static219.java b/client/src/main/java/Static219.java
index db6546d..6d44270 100644
--- a/client/src/main/java/Static219.java
+++ b/client/src/main/java/Static219.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static219 {
 
 	@OriginalMember(owner = "client!rl", name = "V", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array9;
+	public static Sprite[] aClass3_Sub2_Sub1Array9;
 
 	@OriginalMember(owner = "client!rl", name = "P", descriptor = "Lclient!n;")
 	public static final Class99 aClass99_27 = new Class99(64);
diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java
index 43b1aa2..6f273d7 100644
--- a/client/src/main/java/Static240.java
+++ b/client/src/main/java/Static240.java
@@ -13,7 +13,7 @@ public final class Static240 {
 	public static int anInt5334;
 
 	@OriginalMember(owner = "client!tg", name = "d", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array10;
+	public static Sprite[] aClass3_Sub2_Sub1Array10;
 
 	@OriginalMember(owner = "client!tg", name = "f", descriptor = "Z")
 	public static boolean aBoolean276;
diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java
index bb23aac..80ef0f0 100644
--- a/client/src/main/java/Static276.java
+++ b/client/src/main/java/Static276.java
@@ -8,7 +8,7 @@ public final class Static276 {
 	public static Tile[][][] aClass3_Sub5ArrayArrayArray3;
 
 	@OriginalMember(owner = "client!wh", name = "l", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array11;
+	public static Sprite[] aClass3_Sub2_Sub1Array11;
 
 	@OriginalMember(owner = "client!wh", name = "g", descriptor = "[I")
 	public static final int[] anIntArray563 = new int[50];
diff --git a/client/src/main/java/Static277.java b/client/src/main/java/Static277.java
index 140212c..38bf26a 100644
--- a/client/src/main/java/Static277.java
+++ b/client/src/main/java/Static277.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static277 {
 
 	@OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array12;
+	public static Sprite[] aClass3_Sub2_Sub1Array12;
 
 	@OriginalMember(owner = "client!wi", name = "ab", descriptor = "I")
 	public static int anInt5853;
diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java
index 4f97b19..0c6c217 100644
--- a/client/src/main/java/Static30.java
+++ b/client/src/main/java/Static30.java
@@ -60,7 +60,7 @@ public final class Static30 {
 			local143[local145].method311();
 		}
 		if (Static239.aBoolean269) {
-			Static277.aClass3_Sub2_Sub1Array12 = new Class3_Sub2_Sub1[local143.length];
+			Static277.aClass3_Sub2_Sub1Array12 = new Sprite[local143.length];
 			for (local145 = 0; local145 < local143.length; local145++) {
 				Static277.aClass3_Sub2_Sub1Array12[local145] = new GlSprite(local143[local145]);
 			}
@@ -76,7 +76,7 @@ public final class Static30 {
 			Static173.aClass3_Sub2_Sub1_Sub1Array9[local219].method315(local145 + local217, local217 + local196, local217 + local210);
 		}
 		if (Static239.aBoolean269) {
-			Static67.aClass3_Sub2_Sub1Array4 = new Class3_Sub2_Sub1[Static173.aClass3_Sub2_Sub1_Sub1Array9.length];
+			Static67.aClass3_Sub2_Sub1Array4 = new Sprite[Static173.aClass3_Sub2_Sub1_Sub1Array9.length];
 			for (local219 = 0; local219 < Static173.aClass3_Sub2_Sub1_Sub1Array9.length; local219++) {
 				Static67.aClass3_Sub2_Sub1Array4[local219] = new GlSprite(Static173.aClass3_Sub2_Sub1_Sub1Array9[local219]);
 			}
diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java
index 1cd4a3d..2f40120 100644
--- a/client/src/main/java/Static33.java
+++ b/client/src/main/java/Static33.java
@@ -195,8 +195,8 @@ public final class Static33 {
 	}
 
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(I)[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] method870() {
-		@Pc(6) Class3_Sub2_Sub1[] local6 = new Class3_Sub2_Sub1[Static165.anInt4038];
+	public static Sprite[] method870() {
+		@Pc(6) Sprite[] local6 = new Sprite[Static165.anInt4038];
 		for (@Pc(15) int local15 = 0; local15 < Static165.anInt4038; local15++) {
 			@Pc(30) int local30 = Static254.anIntArray488[local15] * Static26.anIntArray66[local15];
 			@Pc(34) byte[] local34 = Static7.aByteArrayArray5[local15];
diff --git a/client/src/main/java/Static39.java b/client/src/main/java/Static39.java
index 9701d84..ff87818 100644
--- a/client/src/main/java/Static39.java
+++ b/client/src/main/java/Static39.java
@@ -13,7 +13,7 @@ public final class Static39 {
 	public static Class153 aClass153_23;
 
 	@OriginalMember(owner = "client!d", name = "ib", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_1;
+	public static Sprite aClass3_Sub2_Sub1_1;
 
 	@OriginalMember(owner = "client!d", name = "R", descriptor = "Lclient!be;")
 	public static Class13 aClass13_10 = null;
diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java
index 0f7fdfe..09bb6d2 100644
--- a/client/src/main/java/Static54.java
+++ b/client/src/main/java/Static54.java
@@ -198,7 +198,7 @@ public final class Static54 {
 				Static129.method2495(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215);
 			}
 		} else if (Static239.aBoolean269) {
-			@Pc(1041) Class3_Sub2_Sub1 local1041 = arg3.method489(false);
+			@Pc(1041) Sprite local1041 = arg3.method489(false);
 			if (local1041 != null) {
 				local1041.method1423(arg2, arg1);
 			}
diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java
index 3bede24..ed3480d 100644
--- a/client/src/main/java/Static60.java
+++ b/client/src/main/java/Static60.java
@@ -35,7 +35,7 @@ public final class Static60 {
 	public static int anInt1894 = 0;
 
 	@OriginalMember(owner = "client!em", name = "a", descriptor = "(Lclient!be;Lclient!qf;IIIBI)V")
-	public static void method1446(@OriginalArg(0) Class13 arg0, @OriginalArg(1) Class3_Sub2_Sub1 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
+	public static void method1446(@OriginalArg(0) Class13 arg0, @OriginalArg(1) Sprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
 		if (arg1 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java
index 96070cb..cf40d0a 100644
--- a/client/src/main/java/Static67.java
+++ b/client/src/main/java/Static67.java
@@ -6,7 +6,7 @@ public final class Static67 {
 	public static int anInt3356;
 
 	@OriginalMember(owner = "client!fe", name = "lc", descriptor = "[Lclient!qf;")
-	public static Class3_Sub2_Sub1[] aClass3_Sub2_Sub1Array4;
+	public static Sprite[] aClass3_Sub2_Sub1Array4;
 
 	@OriginalMember(owner = "client!fe", name = "I", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_639 = Static28.method790(" ");
diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java
index f410139..ab0fc50 100644
--- a/client/src/main/java/Static70.java
+++ b/client/src/main/java/Static70.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static70 {
 
 	@OriginalMember(owner = "client!fi", name = "j", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_2;
+	public static Sprite aClass3_Sub2_Sub1_2;
 
 	@OriginalMember(owner = "client!fi", name = "m", descriptor = "[[[B")
 	public static byte[][][] aByteArrayArrayArray7;
diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java
index 55d8ec6..3e37e9e 100644
--- a/client/src/main/java/Static78.java
+++ b/client/src/main/java/Static78.java
@@ -11,7 +11,7 @@ public final class Static78 {
 	public static Class153 aClass153_32;
 
 	@OriginalMember(owner = "client!gd", name = "n", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_3;
+	public static Sprite aClass3_Sub2_Sub1_3;
 
 	@OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_464 = Static28.method790("null");
diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java
index 970d95b..0cf28b2 100644
--- a/client/src/main/java/Static82.java
+++ b/client/src/main/java/Static82.java
@@ -35,14 +35,14 @@ public final class Static82 {
 	}
 
 	@OriginalMember(owner = "client!gi", name = "b", descriptor = "(I)Lclient!qf;")
-	public static Class3_Sub2_Sub1 method1764() {
+	public static Sprite method1764() {
 		@Pc(9) byte[] local9 = Static7.aByteArrayArray5[0];
 		@Pc(17) int local17 = Static254.anIntArray488[0] * Static26.anIntArray66[0];
 		@Pc(20) int[] local20 = new int[local17];
 		for (@Pc(28) int local28 = 0; local28 < local17; local28++) {
 			local20[local28] = Static259.anIntArray513[local9[local28] & 0xFF];
 		}
-		@Pc(69) Class3_Sub2_Sub1 local69;
+		@Pc(69) Sprite local69;
 		if (Static239.aBoolean269) {
 			local69 = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20);
 		} else {
diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java
index 2f30c3e..f327393 100644
--- a/client/src/main/java/Static84.java
+++ b/client/src/main/java/Static84.java
@@ -14,7 +14,7 @@ public final class Static84 {
 	public static int anInt2257;
 
 	@OriginalMember(owner = "client!gk", name = "l", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_4;
+	public static Sprite aClass3_Sub2_Sub1_4;
 
 	@OriginalMember(owner = "client!gk", name = "a", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_483 = Static28.method790("leuchten2:");
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 10db622..1b3ecef 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -415,7 +415,7 @@ public final class Static87 {
 											if (local30.anIntArray40[local270] > 0) {
 												local545 = local30.anIntArray40[local270] - 1;
 												if (arg0 < local503 + 32 && local503 < arg4 && arg6 < local514 + 32 && local514 < arg7 || local30 == Static118.aClass13_15 && Static4.anInt36 == local270) {
-													@Pc(1476) Class3_Sub2_Sub1 local1476;
+													@Pc(1476) Sprite local1476;
 													if (Static260.anInt5014 == 1 && Static185.anInt4370 == local270 && local30.anInt507 == Static224.anInt5062) {
 														local1476 = Static190.method3443(2, local545, local30.aBoolean31, local30.anIntArray50[local270], 0);
 													} else {
@@ -484,7 +484,7 @@ public final class Static87 {
 													}
 												}
 											} else if (local30.anIntArray36 != null && local270 < 20) {
-												@Pc(1381) Class3_Sub2_Sub1 local1381 = local30.method482(local270);
+												@Pc(1381) Sprite local1381 = local30.method482(local270);
 												if (local1381 != null) {
 													local1381.method1423(local503, local514);
 												} else if (Static211.aBoolean72) {
@@ -571,7 +571,7 @@ public final class Static87 {
 											Static43.method1143(local30);
 										}
 									} else if (local30.anInt452 == 5) {
-										@Pc(2094) Class3_Sub2_Sub1 local2094;
+										@Pc(2094) Sprite local2094;
 										if (local30.aBoolean32) {
 											if (local30.anInt458 == -1) {
 												local2094 = local30.method489(false);
diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java
index 0fd441b..d651e46 100644
--- a/client/src/main/java/Static89.java
+++ b/client/src/main/java/Static89.java
@@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static89 {
 
 	@OriginalMember(owner = "client!ha", name = "i", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_5;
+	public static Sprite aClass3_Sub2_Sub1_5;
 
 	@OriginalMember(owner = "client!ha", name = "k", descriptor = "[[Z")
 	public static boolean[][] aBooleanArrayArray3;
diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java
index f552cfc..78aaf8a 100644
--- a/client/src/main/java/Static92.java
+++ b/client/src/main/java/Static92.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static92 {
 
 	@OriginalMember(owner = "client!hd", name = "e", descriptor = "Lclient!qf;")
-	public static Class3_Sub2_Sub1 aClass3_Sub2_Sub1_6;
+	public static Sprite aClass3_Sub2_Sub1_6;
 
 	@OriginalMember(owner = "client!hd", name = "a", descriptor = "I")
 	public static int anInt2430 = 0;