diff --git a/client/src/main/java/Class3_Sub2_Sub8.java b/client/src/main/java/DelayedStateChange.java
similarity index 91%
rename from client/src/main/java/Class3_Sub2_Sub8.java
rename to client/src/main/java/DelayedStateChange.java
index eef042f..49c151e 100644
--- a/client/src/main/java/Class3_Sub2_Sub8.java
+++ b/client/src/main/java/DelayedStateChange.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!da")
-public final class Class3_Sub2_Sub8 extends SecondaryNode {
+public final class DelayedStateChange extends SecondaryNode {
 
 	@OriginalMember(owner = "client!da", name = "T", descriptor = "I")
 	public int anInt1269;
@@ -18,7 +18,7 @@ public final class Class3_Sub2_Sub8 extends SecondaryNode {
 	public JagString aClass100_254;
 
 	@OriginalMember(owner = "client!da", name = "<init>", descriptor = "(II)V")
-	public Class3_Sub2_Sub8(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		this.aLong192 = (long) arg0 << 32 | (long) arg1;
 	}
 
diff --git a/client/src/main/java/Static118.java b/client/src/main/java/Static118.java
index 1477969..c1e3d43 100644
--- a/client/src/main/java/Static118.java
+++ b/client/src/main/java/Static118.java
@@ -21,7 +21,7 @@ public final class Static118 {
 
 	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
 	public static void method2353(@OriginalArg(0) int arg0) {
-		@Pc(12) Class3_Sub2_Sub8 local12 = Static238.method4143(12, arg0);
+		@Pc(12) DelayedStateChange local12 = Static238.method4143(12, arg0);
 		local12.method1007();
 	}
 
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index 8ba7731..751e342 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -167,15 +167,15 @@ public final class Static127 {
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
-	public static Class3_Sub2_Sub8 method2464() {
-		@Pc(10) Class3_Sub2_Sub8 local10 = (Class3_Sub2_Sub8) Static215.aClass16_9.method795();
+	public static DelayedStateChange method2464() {
+		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.aClass16_9.method795();
 		if (local10 != null) {
 			local10.method4658();
 			local10.method4365();
 			return local10;
 		}
 		do {
-			local10 = (Class3_Sub2_Sub8) Static140.aClass16_7.method795();
+			local10 = (DelayedStateChange) Static140.aClass16_7.method795();
 			if (local10 == null) {
 				return null;
 			}
diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java
index b0aae12..2b91085 100644
--- a/client/src/main/java/Static132.java
+++ b/client/src/main/java/Static132.java
@@ -58,14 +58,14 @@ public final class Static132 {
 
 	@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
 	public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(1, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
 		local8.method1017();
 		local8.anInt1271 = arg1;
 	}
 
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
 	public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(4, arg2);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
 		local8.method1017();
 		local8.anInt1270 = arg3;
 		local8.anInt1269 = arg0;
diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java
index ff78542..6b6146a 100644
--- a/client/src/main/java/Static136.java
+++ b/client/src/main/java/Static136.java
@@ -22,7 +22,7 @@ public final class Static136 {
 
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
 	public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(4) Class3_Sub2_Sub8 local4 = Static238.method4143(6, arg1);
+		@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
 		local4.method1017();
 		local4.anInt1271 = arg0;
 	}
diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java
index cf0c268..dc694ae 100644
--- a/client/src/main/java/Static145.java
+++ b/client/src/main/java/Static145.java
@@ -96,7 +96,7 @@ public final class Static145 {
 
 	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
 	public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(10, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(10, arg0);
 		local8.method1017();
 		local8.anInt1270 = arg2;
 		local8.anInt1271 = arg3;
diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java
index 6c6de21..903f182 100644
--- a/client/src/main/java/Static153.java
+++ b/client/src/main/java/Static153.java
@@ -39,7 +39,7 @@ public final class Static153 {
 
 	@OriginalMember(owner = "client!mc", name = "c", descriptor = "(III)V")
 	public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(14) Class3_Sub2_Sub8 local14 = Static238.method4143(7, arg0);
+		@Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0);
 		local14.method1017();
 		local14.anInt1271 = arg1;
 	}
@@ -81,7 +81,7 @@ public final class Static153 {
 
 	@OriginalMember(owner = "client!mc", name = "a", descriptor = "(BI)V")
 	public static void method2910(@OriginalArg(1) int arg0) {
-		@Pc(4) Class3_Sub2_Sub8 local4 = Static238.method4143(8, arg0);
+		@Pc(4) DelayedStateChange local4 = Static238.method4143(8, arg0);
 		local4.method1007();
 	}
 }
diff --git a/client/src/main/java/Static163.java b/client/src/main/java/Static163.java
index 1414e7b..0c4b199 100644
--- a/client/src/main/java/Static163.java
+++ b/client/src/main/java/Static163.java
@@ -15,7 +15,7 @@ public final class Static163 {
 
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V")
 	public static void method3096(@OriginalArg(0) int arg0) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(3, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(3, arg0);
 		local8.method1007();
 	}
 
diff --git a/client/src/main/java/Static180.java b/client/src/main/java/Static180.java
index 2f1622f..9319c91 100644
--- a/client/src/main/java/Static180.java
+++ b/client/src/main/java/Static180.java
@@ -42,7 +42,7 @@ public final class Static180 {
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(II)V")
 	public static void method3328(@OriginalArg(0) int arg0) {
-		@Pc(12) Class3_Sub2_Sub8 local12 = Static238.method4143(10, arg0);
+		@Pc(12) DelayedStateChange local12 = Static238.method4143(10, arg0);
 		local12.method1007();
 	}
 
diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java
index c87a77c..e972c14 100644
--- a/client/src/main/java/Static181.java
+++ b/client/src/main/java/Static181.java
@@ -59,7 +59,7 @@ public final class Static181 {
 
 	@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
 	public static void method3345(@OriginalArg(0) int arg0) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(5, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(5, arg0);
 		local8.method1007();
 	}
 
diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java
index e3ba542..f8c9c63 100644
--- a/client/src/main/java/Static190.java
+++ b/client/src/main/java/Static190.java
@@ -52,7 +52,7 @@ public final class Static190 {
 
 	@OriginalMember(owner = "client!pf", name = "a", descriptor = "(III)V")
 	public static void method3444(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(14) Class3_Sub2_Sub8 local14 = Static238.method4143(13, arg1);
+		@Pc(14) DelayedStateChange local14 = Static238.method4143(13, arg1);
 		local14.method1017();
 		local14.anInt1271 = arg0;
 	}
diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java
index cbc33be..1a2485b 100644
--- a/client/src/main/java/Static193.java
+++ b/client/src/main/java/Static193.java
@@ -24,7 +24,7 @@ public final class Static193 {
 
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "(Lclient!na;BI)V")
 	public static void method3498(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
-		@Pc(10) Class3_Sub2_Sub8 local10 = Static238.method4143(2, arg1);
+		@Pc(10) DelayedStateChange local10 = Static238.method4143(2, arg1);
 		local10.method1017();
 		local10.aClass100_254 = arg0;
 	}
diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java
index 5d082aa..946263f 100644
--- a/client/src/main/java/Static209.java
+++ b/client/src/main/java/Static209.java
@@ -51,7 +51,7 @@ public final class Static209 {
 
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V")
 	public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(12) Class3_Sub2_Sub8 local12 = Static238.method4143(9, arg0);
+		@Pc(12) DelayedStateChange local12 = Static238.method4143(9, arg0);
 		local12.method1017();
 		local12.anInt1271 = arg2;
 		local12.anInt1270 = arg1;
diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java
index 4b394e8..aa71adb 100644
--- a/client/src/main/java/Static225.java
+++ b/client/src/main/java/Static225.java
@@ -87,7 +87,7 @@ public final class Static225 {
 
 	@OriginalMember(owner = "client!se", name = "a", descriptor = "(III)V")
 	public static void method3893(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(14) Class3_Sub2_Sub8 local14 = Static238.method4143(5, arg0);
+		@Pc(14) DelayedStateChange local14 = Static238.method4143(5, arg0);
 		local14.method1017();
 		local14.anInt1271 = arg1;
 	}
diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java
index 0341207..1008c6b 100644
--- a/client/src/main/java/Static229.java
+++ b/client/src/main/java/Static229.java
@@ -57,7 +57,7 @@ public final class Static229 {
 
 	@OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V")
 	public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(16) Class3_Sub2_Sub8 local16 = Static238.method4143(12, arg1);
+		@Pc(16) DelayedStateChange local16 = Static238.method4143(12, arg1);
 		local16.method1017();
 		local16.anInt1271 = arg0;
 	}
diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java
index a586d0c..3174e78 100644
--- a/client/src/main/java/Static238.java
+++ b/client/src/main/java/Static238.java
@@ -22,10 +22,10 @@ public final class Static238 {
 	}
 
 	@OriginalMember(owner = "client!te", name = "a", descriptor = "(III)Lclient!da;")
-	public static Class3_Sub2_Sub8 method4143(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(13) Class3_Sub2_Sub8 local13 = (Class3_Sub2_Sub8) Static36.aClass133_3.method3863((long) arg1 | (long) arg0 << 32);
+	public static DelayedStateChange method4143(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
+		@Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.method3863((long) arg1 | (long) arg0 << 32);
 		if (local13 == null) {
-			local13 = new Class3_Sub2_Sub8(arg0, arg1);
+			local13 = new DelayedStateChange(arg0, arg1);
 			Static36.aClass133_3.method3862(local13, local13.aLong192);
 		}
 		return local13;
diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java
index 46d2b95..d3bc569 100644
--- a/client/src/main/java/Static245.java
+++ b/client/src/main/java/Static245.java
@@ -30,7 +30,7 @@ public final class Static245 {
 
 	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V")
 	public static void method4224(@OriginalArg(0) int arg0) {
-		@Pc(16) Class3_Sub2_Sub8 local16 = Static238.method4143(6, arg0);
+		@Pc(16) DelayedStateChange local16 = Static238.method4143(6, arg0);
 		local16.method1007();
 	}
 
diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java
index 6b2456c..9a56c9a 100644
--- a/client/src/main/java/Static251.java
+++ b/client/src/main/java/Static251.java
@@ -81,7 +81,7 @@ public final class Static251 {
 
 	@OriginalMember(owner = "client!ug", name = "a", descriptor = "(IB)V")
 	public static void method4279(@OriginalArg(0) int arg0) {
-		@Pc(14) Class3_Sub2_Sub8 local14 = Static238.method4143(9, arg0);
+		@Pc(14) DelayedStateChange local14 = Static238.method4143(9, arg0);
 		local14.method1007();
 	}
 }
diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java
index e243122..69a562b 100644
--- a/client/src/main/java/Static261.java
+++ b/client/src/main/java/Static261.java
@@ -18,7 +18,7 @@ public final class Static261 {
 
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BIIII)V")
 	public static void method4505(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(8, arg1);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(8, arg1);
 		local8.method1017();
 		local8.anInt1269 = arg0;
 		local8.anInt1271 = arg3;
diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java
index 4129fa2..091cd91 100644
--- a/client/src/main/java/Static271.java
+++ b/client/src/main/java/Static271.java
@@ -43,7 +43,7 @@ public final class Static271 {
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V")
 	public static void method4600(@OriginalArg(1) int arg0) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(4, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg0);
 		local8.method1007();
 	}
 
diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java
index b00db95..53e39ff 100644
--- a/client/src/main/java/Static280.java
+++ b/client/src/main/java/Static280.java
@@ -52,7 +52,7 @@ public final class Static280 {
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIII)V")
 	public static void method4666(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(18) Class3_Sub2_Sub8 local18 = Static238.method4143(11, arg1);
+		@Pc(18) DelayedStateChange local18 = Static238.method4143(11, arg1);
 		local18.method1017();
 		local18.anInt1270 = arg2;
 		local18.anInt1271 = arg0;
@@ -735,7 +735,7 @@ public final class Static280 {
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(II)V")
 	public static void method4675(@OriginalArg(1) int arg0) {
-		@Pc(17) Class3_Sub2_Sub8 local17 = Static238.method4143(11, arg0);
+		@Pc(17) DelayedStateChange local17 = Static238.method4143(11, arg0);
 		local17.method1007();
 	}
 }
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index 55dbb22..617d3f9 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -48,7 +48,7 @@ public final class Static4 {
 
 	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(BI)V")
 	public static void method24(@OriginalArg(1) int arg0) {
-		@Pc(16) Class3_Sub2_Sub8 local16 = Static238.method4143(1, arg0);
+		@Pc(16) DelayedStateChange local16 = Static238.method4143(1, arg0);
 		local16.method1007();
 	}
 
diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java
index 8ee1baa..401e2ee 100644
--- a/client/src/main/java/Static80.java
+++ b/client/src/main/java/Static80.java
@@ -121,7 +121,7 @@ public final class Static80 {
 
 	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!na;II)V")
 	public static void method3617(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
-		@Pc(6) Class3_Sub2_Sub8 local6 = Static238.method4143(3, arg1);
+		@Pc(6) DelayedStateChange local6 = Static238.method4143(3, arg1);
 		local6.method1017();
 		local6.aClass100_254 = arg0;
 	}
diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java
index 7a739fa..33ba38f 100644
--- a/client/src/main/java/Static81.java
+++ b/client/src/main/java/Static81.java
@@ -290,7 +290,7 @@ public final class Static81 {
 			Static83.anIntArray23[Static70.anInt2015++ & 0x1F] = local34;
 		}
 		@Pc(782) int local782;
-		for (@Pc(709) Class3_Sub2_Sub8 local709 = Static127.method2464(); local709 != null; local709 = Static127.method2464()) {
+		for (@Pc(709) DelayedStateChange local709 = Static127.method2464(); local709 != null; local709 = Static127.method2464()) {
 			local79 = local709.method1011();
 			local88 = local709.method1012();
 			if (local79 == 1) {
diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java
index 07e3b5d..4dfcc7a 100644
--- a/client/src/main/java/Static89.java
+++ b/client/src/main/java/Static89.java
@@ -145,7 +145,7 @@ public final class Static89 {
 
 	@OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V")
 	public static void method1840(@OriginalArg(1) int arg0) {
-		@Pc(8) Class3_Sub2_Sub8 local8 = Static238.method4143(2, arg0);
+		@Pc(8) DelayedStateChange local8 = Static238.method4143(2, arg0);
 		local8.method1007();
 	}
 
diff --git a/client/src/main/java/Static93.java b/client/src/main/java/Static93.java
index 49da48c..8aebc7c 100644
--- a/client/src/main/java/Static93.java
+++ b/client/src/main/java/Static93.java
@@ -33,7 +33,7 @@ public final class Static93 {
 
 	@OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V")
 	public static void method1906(@OriginalArg(1) int arg0) {
-		@Pc(12) Class3_Sub2_Sub8 local12 = Static238.method4143(7, arg0);
+		@Pc(12) DelayedStateChange local12 = Static238.method4143(7, arg0);
 		local12.method1007();
 	}
 }