diff --git a/client/src/main/java/Class6.java b/client/src/main/java/Class6.java
index 0a1dc5c..2adc02d 100644
--- a/client/src/main/java/Class6.java
+++ b/client/src/main/java/Class6.java
@@ -10,7 +10,7 @@ public final class Class6 implements QuickChatCommandDecoder {
 	@Override
 	public final JagString method30(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) long arg2) {
 		if (arg0 == 0) {
-			@Pc(12) Class3_Sub2_Sub15 local12 = Static253.method4330(arg1[0]);
+			@Pc(12) EnumType local12 = Static253.method4330(arg1[0]);
 			return local12.method3085((int) arg2);
 		} else if (arg0 == 1 || arg0 == 10) {
 			@Pc(31) Class55 local31 = Static71.method1439((int) arg2);
diff --git a/client/src/main/java/Class3_Sub2_Sub15.java b/client/src/main/java/EnumType.java
similarity index 98%
rename from client/src/main/java/Class3_Sub2_Sub15.java
rename to client/src/main/java/EnumType.java
index 5e11ebb..26f0606 100644
--- a/client/src/main/java/Class3_Sub2_Sub15.java
+++ b/client/src/main/java/EnumType.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ml")
-public final class Class3_Sub2_Sub15 extends SecondaryNode {
+public final class EnumType extends SecondaryNode {
 
 	@OriginalMember(owner = "client!ml", name = "N", descriptor = "I")
 	public int anInt3950;
diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java
index d8c7fe2..7a942bc 100644
--- a/client/src/main/java/Static253.java
+++ b/client/src/main/java/Static253.java
@@ -194,13 +194,13 @@ public final class Static253 {
 	}
 
 	@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IZ)Lclient!ml;")
-	public static Class3_Sub2_Sub15 method4330(@OriginalArg(0) int arg0) {
-		@Pc(10) Class3_Sub2_Sub15 local10 = (Class3_Sub2_Sub15) Static149.aClass54_10.method1806((long) arg0);
+	public static EnumType method4330(@OriginalArg(0) int arg0) {
+		@Pc(10) EnumType local10 = (EnumType) Static149.aClass54_10.method1806((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
 		@Pc(24) byte[] local24 = Static84.aClass153_35.method4495(Static97.method1959(arg0), Static103.method2236(arg0));
-		local10 = new Class3_Sub2_Sub15();
+		local10 = new EnumType();
 		if (local24 != null) {
 			local10.method3094(new Buffer(local24));
 		}
diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java
index d0b90ef..72f37b9 100644
--- a/client/src/main/java/Static88.java
+++ b/client/src/main/java/Static88.java
@@ -1530,7 +1530,7 @@ public final class Static88 {
 										continue;
 									}
 								} else if (local226 < 3500) {
-									@Pc(3422) Class3_Sub2_Sub15 local3422;
+									@Pc(3422) EnumType local3422;
 									if (local226 == 3400) {
 										local28 -= 2;
 										local809 = Static254.anIntArray487[local28];
@@ -1547,7 +1547,7 @@ public final class Static88 {
 										local803 = Static254.anIntArray487[local28 + 1];
 										local652 = Static254.anIntArray487[local28 + 3];
 										local1052 = Static254.anIntArray487[local28 + 2];
-										@Pc(3469) Class3_Sub2_Sub15 local3469 = Static253.method4330(local1052);
+										@Pc(3469) EnumType local3469 = Static253.method4330(local1052);
 										if (local3469.anInt3957 == local809 && local3469.anInt3950 == local803) {
 											if (local803 == 115) {
 												Static3.aClass100Array176[local26++] = local3469.method3085(local652);
@@ -1566,7 +1566,7 @@ public final class Static88 {
 										if (local803 == -1) {
 											throw new RuntimeException("C3409-2");
 										}
-										@Pc(3549) Class3_Sub2_Sub15 local3549 = Static253.method4330(local803);
+										@Pc(3549) EnumType local3549 = Static253.method4330(local803);
 										if (local3549.anInt3950 != local809) {
 											throw new RuntimeException("C3409-1");
 										}
@@ -1591,7 +1591,7 @@ public final class Static88 {
 									if (local226 == 3411) {
 										local28--;
 										local809 = Static254.anIntArray487[local28];
-										@Pc(3645) Class3_Sub2_Sub15 local3645 = Static253.method4330(local809);
+										@Pc(3645) EnumType local3645 = Static253.method4330(local809);
 										Static254.anIntArray487[local28++] = local3645.aClass133_16.method3864();
 										continue;
 									}