diff --git a/client/src/main/java/Class3_Sub2_Sub9_Sub1.java b/client/src/main/java/SoftwareFont.java
similarity index 91%
rename from client/src/main/java/Class3_Sub2_Sub9_Sub1.java
rename to client/src/main/java/SoftwareFont.java
index fe3fe4a..2131d12 100644
--- a/client/src/main/java/Class3_Sub2_Sub9_Sub1.java
+++ b/client/src/main/java/SoftwareFont.java
@@ -4,18 +4,18 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!dd")
-public final class Class3_Sub2_Sub9_Sub1 extends Class3_Sub2_Sub9 {
+public final class SoftwareFont extends Class3_Sub2_Sub9 {
 
 	@OriginalMember(owner = "client!dd", name = "Eb", descriptor = "[[B")
 	private byte[][] aByteArrayArray7 = new byte[256][];
 
 	@OriginalMember(owner = "client!dd", name = "<init>", descriptor = "([B)V")
-	public Class3_Sub2_Sub9_Sub1(@OriginalArg(0) byte[] arg0) {
+	public SoftwareFont(@OriginalArg(0) byte[] arg0) {
 		super(arg0);
 	}
 
 	@OriginalMember(owner = "client!dd", name = "<init>", descriptor = "([B[I[I[I[I[[B)V")
-	public Class3_Sub2_Sub9_Sub1(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) byte[][] arg5) {
+	public SoftwareFont(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4, @OriginalArg(5) byte[][] arg5) {
 		super(arg0, arg1, arg2, arg3, arg4);
 		this.aByteArrayArray7 = arg5;
 	}
diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java
index 201ed5f..16f05cb 100644
--- a/client/src/main/java/Static102.java
+++ b/client/src/main/java/Static102.java
@@ -57,7 +57,7 @@ public final class Static102 {
 		if (Static239.aBoolean269) {
 			Static265.aClass3_Sub2_Sub9_Sub1_2 = Static122.method2412(Static166.anInt4049, arg0, arg1);
 		} else {
-			Static265.aClass3_Sub2_Sub9_Sub1_2 = (Class3_Sub2_Sub9_Sub1) Static114.aClass3_Sub2_Sub9_42;
+			Static265.aClass3_Sub2_Sub9_Sub1_2 = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42;
 		}
 		Static215.aClass3_Sub2_Sub9_32 = Static127.method2462(Static130.anInt3161, arg1, arg0);
 		Static280.aClass3_Sub2_Sub9_43 = Static127.method2462(Static73.anInt2077, arg1, arg0);
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index 2d0c7df..7fafb97 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -32,11 +32,11 @@ public final class Static114 {
 	}
 
 	@OriginalMember(owner = "client!j", name = "a", descriptor = "([BI)Lclient!dd;")
-	public static Class3_Sub2_Sub9_Sub1 method4635(@OriginalArg(0) byte[] arg0) {
+	public static SoftwareFont method4635(@OriginalArg(0) byte[] arg0) {
 		if (arg0 == null) {
 			return null;
 		} else {
-			@Pc(22) Class3_Sub2_Sub9_Sub1 local22 = new Class3_Sub2_Sub9_Sub1(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
+			@Pc(22) SoftwareFont local22 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
 			Static75.method1631();
 			return local22;
 		}
diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java
index 8483a0e..1f51613 100644
--- a/client/src/main/java/Static122.java
+++ b/client/src/main/java/Static122.java
@@ -90,7 +90,7 @@ public final class Static122 {
 	}
 
 	@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
-	public static Class3_Sub2_Sub9_Sub1 method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Class153 arg1, @OriginalArg(3) Class153 arg2) {
+	public static SoftwareFont method2412(@OriginalArg(0) int arg0, @OriginalArg(2) Class153 arg1, @OriginalArg(3) Class153 arg2) {
 		return Static234.method4016(arg2, 0, arg0) ? Static114.method4635(arg1.method4495(arg0, 0)) : null;
 	}
 }
diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java
index 35ea98f..572e62b 100644
--- a/client/src/main/java/Static148.java
+++ b/client/src/main/java/Static148.java
@@ -63,13 +63,13 @@ public final class Static148 {
 	}
 
 	@OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;")
-	public static Class3_Sub2_Sub9_Sub1 method2768(@OriginalArg(1) int arg0) {
-		@Pc(16) Class3_Sub2_Sub9_Sub1 local16 = (Class3_Sub2_Sub9_Sub1) Static139.aClass99_22.method3106((long) arg0);
+	public static SoftwareFont method2768(@OriginalArg(1) int arg0) {
+		@Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.method3106((long) arg0);
 		if (local16 != null) {
 			return local16;
 		}
 		@Pc(26) byte[] local26 = Static261.aClass153_107.method4495(arg0, 0);
-		local16 = new Class3_Sub2_Sub9_Sub1(local26);
+		local16 = new SoftwareFont(local26);
 		local16.method2873(Static159.aClass36Array12, null);
 		Static139.aClass99_22.method3095(local16, (long) arg0);
 		return local16;
diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java
index da91665..12e962f 100644
--- a/client/src/main/java/Static241.java
+++ b/client/src/main/java/Static241.java
@@ -80,7 +80,7 @@ public final class Static241 {
 	}
 
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZBLclient!ve;Lclient!dd;Lclient!ve;)V")
-	public static void method4542(@OriginalArg(2) Class153 arg0, @OriginalArg(3) Class3_Sub2_Sub9_Sub1 arg1, @OriginalArg(4) Class153 arg2) {
+	public static void method4542(@OriginalArg(2) Class153 arg0, @OriginalArg(3) SoftwareFont arg1, @OriginalArg(4) Class153 arg2) {
 		Static240.aBoolean276 = true;
 		Static230.aClass153_95 = arg2;
 		Static167.aClass153_61 = arg0;
diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java
index e53432f..91f2a38 100644
--- a/client/src/main/java/Static256.java
+++ b/client/src/main/java/Static256.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static256 {
 
 	@OriginalMember(owner = "client!um", name = "U", descriptor = "Lclient!dd;")
-	public static Class3_Sub2_Sub9_Sub1 aClass3_Sub2_Sub9_Sub1_1;
+	public static SoftwareFont aClass3_Sub2_Sub9_Sub1_1;
 
 	@OriginalMember(owner = "client!um", name = "V", descriptor = "Ljava/math/BigInteger;")
 	public static final BigInteger aBigInteger2 = new BigInteger("7162900525229798032761816791230527296329313291232324290237849263501208207972894053929065636522363163621000728841182238772712427862772219676577293600221789");
diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java
index de08050..7118327 100644
--- a/client/src/main/java/Static265.java
+++ b/client/src/main/java/Static265.java
@@ -8,7 +8,7 @@ public final class Static265 {
 	public static int anInt5765;
 
 	@OriginalMember(owner = "client!vj", name = "j", descriptor = "Lclient!dd;")
-	public static Class3_Sub2_Sub9_Sub1 aClass3_Sub2_Sub9_Sub1_2;
+	public static SoftwareFont aClass3_Sub2_Sub9_Sub1_2;
 
 	@OriginalMember(owner = "client!vj", name = "h", descriptor = "Lclient!na;")
 	private static final Class100 aClass100_1084 = Static28.method790("Connecting to update server");
diff --git a/client/src/main/java/Static29.java b/client/src/main/java/Static29.java
index f358747..c1d9e60 100644
--- a/client/src/main/java/Static29.java
+++ b/client/src/main/java/Static29.java
@@ -19,7 +19,7 @@ public final class Static29 {
 		if (Static239.aBoolean269) {
 			local27 = new Class3_Sub2_Sub9_Sub2(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
 		} else {
-			local27 = new Class3_Sub2_Sub9_Sub1(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
+			local27 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5);
 		}
 		Static75.method1631();
 		return local27;