diff --git a/client/src/main/java/Static130.java b/client/src/main/java/Static130.java
index 04755e2..81fcaa2 100644
--- a/client/src/main/java/Static130.java
+++ b/client/src/main/java/Static130.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static130 {
 
 	@OriginalMember(owner = "client!kc", name = "n", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_1;
+	public static WorldMapFont aClass41_1;
 
 	@OriginalMember(owner = "client!kc", name = "o", descriptor = "[[[Lclient!bj;")
 	public static Tile[][][] aClass3_Sub5ArrayArrayArray1;
@@ -19,7 +19,7 @@ public final class Static130 {
 	public static Js5 aClass153_47;
 
 	@OriginalMember(owner = "client!kc", name = "C", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_2;
+	public static WorldMapFont aClass41_2;
 
 	@OriginalMember(owner = "client!kc", name = "r", descriptor = "Lclient!na;")
 	public static final JagString aClass100_607 = Static28.method790("K");
diff --git a/client/src/main/java/Static152.java b/client/src/main/java/Static152.java
index 86629eb..6e98661 100644
--- a/client/src/main/java/Static152.java
+++ b/client/src/main/java/Static152.java
@@ -8,7 +8,7 @@ public final class Static152 {
 	public static int anInt3594;
 
 	@OriginalMember(owner = "client!ma", name = "q", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_3;
+	public static WorldMapFont aClass41_3;
 
 	@OriginalMember(owner = "client!ma", name = "x", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_87 = new LinkedList();
diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java
index fc19cae..73f1026 100644
--- a/client/src/main/java/Static160.java
+++ b/client/src/main/java/Static160.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static160 {
 
 	@OriginalMember(owner = "client!mj", name = "n", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_4;
+	public static WorldMapFont aClass41_4;
 
 	@OriginalMember(owner = "client!mj", name = "u", descriptor = "B")
 	public static byte aByte14;
diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java
index 870e798..7d3ae91 100644
--- a/client/src/main/java/Static169.java
+++ b/client/src/main/java/Static169.java
@@ -9,7 +9,7 @@ public final class Static169 {
 	public static short[] aShortArray52;
 
 	@OriginalMember(owner = "client!nf", name = "d", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_5;
+	public static WorldMapFont aClass41_5;
 
 	@OriginalMember(owner = "client!nf", name = "e", descriptor = "I")
 	public static int anInt4073;
diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java
index 89975b8..3bcb2de 100644
--- a/client/src/main/java/Static186.java
+++ b/client/src/main/java/Static186.java
@@ -119,42 +119,42 @@ public final class Static186 {
 			Static41.anInt1309 = 70;
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 70) {
-			Static273.aClass41_7 = new Class41(11, true, Static154.aCanvas1);
+			Static273.aClass41_7 = new WorldMapFont(11, true, Static154.aCanvas1);
 			Static41.anInt1309 = 73;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 73) {
-			Static152.aClass41_3 = new Class41(12, true, Static154.aCanvas1);
+			Static152.aClass41_3 = new WorldMapFont(12, true, Static154.aCanvas1);
 			Static41.anInt1309 = 76;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 76) {
-			Static169.aClass41_5 = new Class41(14, true, Static154.aCanvas1);
+			Static169.aClass41_5 = new WorldMapFont(14, true, Static154.aCanvas1);
 			Static41.anInt1309 = 79;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 79) {
-			Static130.aClass41_1 = new Class41(17, true, Static154.aCanvas1);
+			Static130.aClass41_1 = new WorldMapFont(17, true, Static154.aCanvas1);
 			Static41.anInt1309 = 82;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 82) {
-			Static203.aClass41_8 = new Class41(19, true, Static154.aCanvas1);
+			Static203.aClass41_8 = new WorldMapFont(19, true, Static154.aCanvas1);
 			Static41.anInt1309 = 85;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 85) {
-			Static130.aClass41_2 = new Class41(22, true, Static154.aCanvas1);
+			Static130.aClass41_2 = new WorldMapFont(22, true, Static154.aCanvas1);
 			Static41.anInt1309 = 88;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 88) {
-			Static270.aClass41_9 = new Class41(26, true, Static154.aCanvas1);
+			Static270.aClass41_9 = new WorldMapFont(26, true, Static154.aCanvas1);
 			Static41.anInt1309 = 91;
 			Static7.method842(true);
 			Static234.method4020();
 		} else {
-			Static160.aClass41_4 = new Class41(30, true, Static154.aCanvas1);
+			Static160.aClass41_4 = new WorldMapFont(30, true, Static154.aCanvas1);
 			Static41.anInt1309 = 100;
 			Static7.method842(true);
 			Static234.method4020();
diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java
index d2084d3..702f902 100644
--- a/client/src/main/java/Static203.java
+++ b/client/src/main/java/Static203.java
@@ -10,7 +10,7 @@ public final class Static203 {
 	public static Class134 aClass134_1;
 
 	@OriginalMember(owner = "client!qh", name = "d", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_8;
+	public static WorldMapFont aClass41_8;
 
 	@OriginalMember(owner = "client!qh", name = "e", descriptor = "[Lclient!ee;")
 	public static Class32[] aClass32Array1;
diff --git a/client/src/main/java/Static270.java b/client/src/main/java/Static270.java
index 34bfa56..b495c26 100644
--- a/client/src/main/java/Static270.java
+++ b/client/src/main/java/Static270.java
@@ -8,7 +8,7 @@ public final class Static270 {
 	public static int[] anIntArray562;
 
 	@OriginalMember(owner = "client!wb", name = "l", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_9;
+	public static WorldMapFont aClass41_9;
 
 	@OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1089 = Static28.method790(")2");
diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java
index 7c7d536..f75ed84 100644
--- a/client/src/main/java/Static273.java
+++ b/client/src/main/java/Static273.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static273 {
 
 	@OriginalMember(owner = "client!we", name = "v", descriptor = "Lclient!fd;")
-	public static Class41 aClass41_7;
+	public static WorldMapFont aClass41_7;
 
 	@OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
 	public static byte[][] aByteArrayArray13;
diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java
index 02e9281..902cba6 100644
--- a/client/src/main/java/Static38.java
+++ b/client/src/main/java/Static38.java
@@ -35,7 +35,7 @@ public final class Static38 {
 				@Pc(64) int local64 = Static203.aClass134_1.method3894(local11);
 				@Pc(80) int local80 = (arg7 - arg1) * (local43 - arg5) / (arg4 - arg5) + arg1;
 				@Pc(82) int local82 = 16777215;
-				@Pc(84) Class41 local84 = null;
+				@Pc(84) WorldMapFont local84 = null;
 				if (local64 == 0) {
 					if ((double) Static83.aFloat3 == 3.0D) {
 						local84 = Static273.aClass41_7;
diff --git a/client/src/main/java/Static66.java b/client/src/main/java/Static66.java
index c922559..731e8e1 100644
--- a/client/src/main/java/Static66.java
+++ b/client/src/main/java/Static66.java
@@ -3,5 +3,5 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static66 {
 
 	@OriginalMember(owner = "client!fd", name = "e", descriptor = "I")
-	public static final int anInt1956 = Class41.aString2.length();
+	public static final int anInt1956 = WorldMapFont.aString2.length();
 }
diff --git a/client/src/main/java/Class41.java b/client/src/main/java/WorldMapFont.java
similarity index 98%
rename from client/src/main/java/Class41.java
rename to client/src/main/java/WorldMapFont.java
index 68aed0e..18afa36 100644
--- a/client/src/main/java/Class41.java
+++ b/client/src/main/java/WorldMapFont.java
@@ -11,7 +11,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!fd")
-public final class Class41 {
+public final class WorldMapFont {
 
 	@OriginalMember(owner = "client!fd", name = "d", descriptor = "Ljava/lang/String;")
 	public static final String aString2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| " + String.valueOf('Ä') + 'Ë' + 'Ï' + 'Ö' + 'Ü' + 'ä' + 'ë' + 'ï' + 'ö' + 'ü' + 'ÿ' + 'ß' + 'Á' + 'À' + 'É' + 'È' + 'Í' + 'Ì' + 'Ó' + 'Ò' + 'Ú' + 'Ù' + 'á' + 'à' + 'é' + 'è' + 'í' + 'ì' + 'ó' + 'ò' + 'ú' + 'ù' + 'Â' + 'Ê' + 'Î' + 'Ô' + 'Û' + 'â' + 'ê' + 'î' + 'ô' + 'û' + 'Æ' + 'æ';
@@ -39,7 +39,7 @@ public final class Class41 {
 	}
 
 	@OriginalMember(owner = "client!fd", name = "<init>", descriptor = "(IZLjava/awt/Component;)V")
-	public Class41(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Component arg2) {
+	public WorldMapFont(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Component arg2) {
 		this.anInt1955 = Static66.anInt1956 * 9;
 		this.aBoolean112 = false;
 		@Pc(30) Font local30 = new Font("Helvetica", 1, arg0);