diff --git a/client/src/main/java/Class12.java b/client/src/main/java/Class12.java
index 20ae27d..5fed99c 100644
--- a/client/src/main/java/Class12.java
+++ b/client/src/main/java/Class12.java
@@ -8,7 +8,7 @@ public final class Class12 {
 	public int anInt439;
 
 	@OriginalMember(owner = "client!bd", name = "f", descriptor = "Lclient!cb;")
-	public Class3_Sub2_Sub6 aClass3_Sub2_Sub6_1;
+	public QuickChatPhraseType aClass3_Sub2_Sub6_1;
 
 	@OriginalMember(owner = "client!bd", name = "h", descriptor = "[I")
 	public int[] anIntArray33;
diff --git a/client/src/main/java/Class3_Sub2_Sub6.java b/client/src/main/java/QuickChatPhraseType.java
similarity index 98%
rename from client/src/main/java/Class3_Sub2_Sub6.java
rename to client/src/main/java/QuickChatPhraseType.java
index 7a0e47b..8ea8b37 100644
--- a/client/src/main/java/Class3_Sub2_Sub6.java
+++ b/client/src/main/java/QuickChatPhraseType.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!cb")
-public final class Class3_Sub2_Sub6 extends SecondaryNode {
+public final class QuickChatPhraseType extends SecondaryNode {
 
 	@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
 	private int[] anIntArray71;
diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java
index 8af35c9..2a21def 100644
--- a/client/src/main/java/Static230.java
+++ b/client/src/main/java/Static230.java
@@ -125,8 +125,8 @@ public final class Static230 {
 	}
 
 	@OriginalMember(owner = "client!sj", name = "b", descriptor = "(II)Lclient!cb;")
-	public static Class3_Sub2_Sub6 method3953(@OriginalArg(1) int arg0) {
-		@Pc(10) Class3_Sub2_Sub6 local10 = (Class3_Sub2_Sub6) Static249.aClass54_15.method1806((long) arg0);
+	public static QuickChatPhraseType method3953(@OriginalArg(1) int arg0) {
+		@Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) Static249.aClass54_15.method1806((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -136,7 +136,7 @@ public final class Static230 {
 		} else {
 			local27 = Static262.aClass153_108.getFile(1, arg0 & 0x7FFF);
 		}
-		local10 = new Class3_Sub2_Sub6();
+		local10 = new QuickChatPhraseType();
 		if (local27 != null) {
 			local10.method761(new Buffer(local27));
 		}
diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java
index 9c85223..e174445 100644
--- a/client/src/main/java/Static24.java
+++ b/client/src/main/java/Static24.java
@@ -40,7 +40,7 @@ public final class Static24 {
 		@Pc(28) int local28 = arg0 ? 32768 : 0;
 		@Pc(36) int local36 = (arg0 ? Static34.anInt1047 : Static144.anInt3490) + local28;
 		for (@Pc(38) int local38 = local28; local38 < local36; local38++) {
-			@Pc(45) Class3_Sub2_Sub6 local45 = Static230.method3953(local38);
+			@Pc(45) QuickChatPhraseType local45 = Static230.method3953(local38);
 			if (local45.aBoolean60 && local45.method769().toLowerCase().indexOf(local9) != -1) {
 				if (local11 >= 50) {
 					Static111.anInt2905 = -1;
diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java
index 4f6b22f..23b62b4 100644
--- a/client/src/main/java/Static88.java
+++ b/client/src/main/java/Static88.java
@@ -2465,7 +2465,7 @@ public final class Static88 {
 												if (opcode == 5056) {
 													isp--;
 													local809 = Static254.intStack[isp];
-													@Pc(6527) Class3_Sub2_Sub6 local6527 = Static230.method3953(local809);
+													@Pc(6527) QuickChatPhraseType local6527 = Static230.method3953(local809);
 													if (local6527.anIntArray72 == null) {
 														Static254.intStack[isp++] = 0;
 													} else {
@@ -2589,7 +2589,7 @@ public final class Static88 {
 													local809 = Static254.intStack[isp];
 													local1052 = Static254.intStack[isp + 2];
 													local803 = Static254.intStack[isp + 1];
-													@Pc(6996) Class3_Sub2_Sub6 local6996 = Static230.method3953(local809);
+													@Pc(6996) QuickChatPhraseType local6996 = Static230.method3953(local809);
 													if (local6996.method765(local803) != 0) {
 														throw new RuntimeException("bad command");
 													}