diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java
index f4c8f27..5a0ffef 100644
--- a/client/src/main/java/Class13.java
+++ b/client/src/main/java/Class13.java
@@ -1157,12 +1157,12 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "([Lclient!ok;I)Lclient!rk;")
-	public final Class3_Sub2_Sub9 method491(@OriginalArg(0) Class36[] arg0) {
+	public final Font method491(@OriginalArg(0) Class36[] arg0) {
 		Static211.aBoolean72 = false;
 		if (this.anInt502 == -1) {
 			return null;
 		}
-		@Pc(21) Class3_Sub2_Sub9 local21 = (Class3_Sub2_Sub9) Static87.aClass99_12.method3106((long) this.anInt502);
+		@Pc(21) Font local21 = (Font) Static87.aClass99_12.method3106((long) this.anInt502);
 		if (local21 != null) {
 			return local21;
 		}
diff --git a/client/src/main/java/Class3_Sub2_Sub9_Sub2.java b/client/src/main/java/Class3_Sub2_Sub9_Sub2.java
index 5df0f83..22cc03b 100644
--- a/client/src/main/java/Class3_Sub2_Sub9_Sub2.java
+++ b/client/src/main/java/Class3_Sub2_Sub9_Sub2.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!mb")
-public final class Class3_Sub2_Sub9_Sub2 extends Class3_Sub2_Sub9 {
+public final class Class3_Sub2_Sub9_Sub2 extends Font {
 
 	@OriginalMember(owner = "client!mb", name = "Gb", descriptor = "[I")
 	private int[] anIntArray349;
diff --git a/client/src/main/java/Class3_Sub2_Sub9.java b/client/src/main/java/Font.java
similarity index 99%
rename from client/src/main/java/Class3_Sub2_Sub9.java
rename to client/src/main/java/Font.java
index 835bff9..c376e1b 100644
--- a/client/src/main/java/Class3_Sub2_Sub9.java
+++ b/client/src/main/java/Font.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!rk")
-public abstract class Class3_Sub2_Sub9 extends SecondaryNode {
+public abstract class Font extends SecondaryNode {
 
 	@OriginalMember(owner = "client!rk", name = "W", descriptor = "[I")
 	private int[] anIntArray346;
@@ -41,7 +41,7 @@ public abstract class Class3_Sub2_Sub9 extends SecondaryNode {
 	private int anInt3624;
 
 	@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B[I[I[I[I)V")
-	protected Class3_Sub2_Sub9(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
+	protected Font(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
 		this.anIntArray344 = arg1;
 		this.anIntArray347 = arg2;
 		this.anIntArray343 = arg3;
@@ -62,7 +62,7 @@ public abstract class Class3_Sub2_Sub9 extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B)V")
-	public Class3_Sub2_Sub9(@OriginalArg(0) byte[] arg0) {
+	public Font(@OriginalArg(0) byte[] arg0) {
 		this.method2876(arg0);
 	}
 
diff --git a/client/src/main/java/SoftwareFont.java b/client/src/main/java/SoftwareFont.java
index 2131d12..4b96cc6 100644
--- a/client/src/main/java/SoftwareFont.java
+++ b/client/src/main/java/SoftwareFont.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!dd")
-public final class SoftwareFont extends Class3_Sub2_Sub9 {
+public final class SoftwareFont extends Font {
 
 	@OriginalMember(owner = "client!dd", name = "Eb", descriptor = "[[B")
 	private byte[][] aByteArrayArray7 = new byte[256][];
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index 7fafb97..b186e89 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static114 {
 
 	@OriginalMember(owner = "client!j", name = "x", descriptor = "Lclient!rk;")
-	public static Class3_Sub2_Sub9 aClass3_Sub2_Sub9_42;
+	public static Font aClass3_Sub2_Sub9_42;
 
 	@OriginalMember(owner = "client!j", name = "v", descriptor = "I")
 	public static int anInt5831 = 0;
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index c35e836..a9d34cd 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -30,7 +30,7 @@ public final class Static127 {
 	public static final Class100 aClass100_605 = Static28.method790("Chargement des sprites )2 ");
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
-	public static Class3_Sub2_Sub9 method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Class153 arg1, @OriginalArg(4) Class153 arg2) {
+	public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Class153 arg1, @OriginalArg(4) Class153 arg2) {
 		return Static234.method4016(arg1, 0, arg0) ? Static29.method799(arg2.method4495(arg0, 0)) : null;
 	}
 
diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java
index 5d94666..be37088 100644
--- a/client/src/main/java/Static182.java
+++ b/client/src/main/java/Static182.java
@@ -26,7 +26,7 @@ public final class Static182 {
 	public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false };
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V")
-	public static void method3359(@OriginalArg(1) boolean arg0, @OriginalArg(2) Class3_Sub2_Sub9 arg1) {
+	public static void method3359(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) {
 		@Pc(9) int local9;
 		if (Static239.aBoolean269 || arg0) {
 			local9 = Static254.anInt5554;
diff --git a/client/src/main/java/Static215.java b/client/src/main/java/Static215.java
index ed68c97..aa0b6d2 100644
--- a/client/src/main/java/Static215.java
+++ b/client/src/main/java/Static215.java
@@ -9,7 +9,7 @@ public final class Static215 {
 	public static int anInt4866;
 
 	@OriginalMember(owner = "client!rh", name = "h", descriptor = "Lclient!rk;")
-	public static Class3_Sub2_Sub9 aClass3_Sub2_Sub9_32;
+	public static Font aClass3_Sub2_Sub9_32;
 
 	@OriginalMember(owner = "client!rh", name = "j", descriptor = "Lclient!client;")
 	public static client aClient1;
diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java
index 98e0cfd..8fea5de 100644
--- a/client/src/main/java/Static280.java
+++ b/client/src/main/java/Static280.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static280 {
 
 	@OriginalMember(owner = "client!wl", name = "q", descriptor = "Lclient!rk;")
-	public static Class3_Sub2_Sub9 aClass3_Sub2_Sub9_43;
+	public static Font aClass3_Sub2_Sub9_43;
 
 	@OriginalMember(owner = "client!wl", name = "s", descriptor = "Lclient!ve;")
 	public static Class153 aClass153_110;
diff --git a/client/src/main/java/Static29.java b/client/src/main/java/Static29.java
index c1d9e60..7d3537c 100644
--- a/client/src/main/java/Static29.java
+++ b/client/src/main/java/Static29.java
@@ -11,11 +11,11 @@ public final class Static29 {
 	public static final Class100 aClass100_175 = Static28.method790("Lade Texturen )2 ");
 
 	@OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;")
-	public static Class3_Sub2_Sub9 method799(@OriginalArg(1) byte[] arg0) {
+	public static Font method799(@OriginalArg(1) byte[] arg0) {
 		if (arg0 == null) {
 			return null;
 		}
-		@Pc(27) Class3_Sub2_Sub9 local27;
+		@Pc(27) Font local27;
 		if (Static239.aBoolean269) {
 			local27 = new Class3_Sub2_Sub9_Sub2(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
 		} else {
diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java
index 96af7b4..1127a78 100644
--- a/client/src/main/java/Static49.java
+++ b/client/src/main/java/Static49.java
@@ -194,7 +194,7 @@ public final class Static49 {
 			Static133.method4012(arg2 + 4, Static280.aClass3_Sub2_Sub9_43.method2858(local24) + local40, arg1, 15);
 			return;
 		}
-		@Pc(59) Class3_Sub2_Sub9 local59 = arg0.method491(Static159.aClass36Array12);
+		@Pc(59) Font local59 = arg0.method491(Static159.aClass36Array12);
 		if (local59 == null) {
 			local59 = Static280.aClass3_Sub2_Sub9_43;
 		}
diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java
index 09bb6d2..2c4cde7 100644
--- a/client/src/main/java/Static54.java
+++ b/client/src/main/java/Static54.java
@@ -51,7 +51,7 @@ public final class Static54 {
 						local146 = (Static235.aClass134_2.aShortArray73[local117] - Static225.anInt5068) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3412 / 32;
 						local150 = Class58.anIntArray223[local48];
 						local154 = Class58.anIntArray225[local48];
-						@Pc(156) Class3_Sub2_Sub9 local156 = Static114.aClass3_Sub2_Sub9_42;
+						@Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42;
 						@Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256);
 						local181 = (Static235.aClass134_2.aShortArray72[local117] - Static142.anInt3483) * 4 + 2 - Static173.aClass8_Sub4_Sub1_2.anInt3421 / 32;
 						@Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256);
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 1b3ecef..c4bb0a4 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -530,7 +530,7 @@ public final class Static87 {
 										Static129.method2487(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF));
 									}
 								} else {
-									@Pc(1921) Class3_Sub2_Sub9 local1921;
+									@Pc(1921) Font local1921;
 									if (local30.anInt452 == 4) {
 										local1921 = local30.method491(Static159.aClass36Array12);
 										if (local1921 != null) {
@@ -805,7 +805,7 @@ public final class Static87 {
 												local276 = 0;
 												local270 = 0;
 												@Pc(3297) Class100 local3297 = local30.aClass100_84;
-												@Pc(3299) Class3_Sub2_Sub9 local3299 = Static215.aClass3_Sub2_Sub9_32;
+												@Pc(3299) Font local3299 = Static215.aClass3_Sub2_Sub9_32;
 												local3297 = Static127.method2465(local30, local3297);
 												@Pc(3325) Class100 local3325;
 												while (local3297.method3120() > 0) {