diff --git a/runescape-client/src/main/java/Calendar.java b/runescape-client/src/main/java/Calendar.java
index 9c6ba240dd..348a980af9 100644
--- a/runescape-client/src/main/java/Calendar.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -14,7 +14,8 @@ public class Calendar {
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
 	@ObfuscatedName("e")
-	public static java.util.Calendar field2504;
+	@Export("Calendar_calendar")
+	public static java.util.Calendar Calendar_calendar;
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "Lhj;"
@@ -27,7 +28,7 @@ public class Calendar {
 		MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}};
 		DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 		java.util.Calendar.getInstance();
-		field2504 = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
 	@ObfuscatedName("g")
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index 7d288eeb6d..a51b37e516 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ak")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class99 {
+public class DevicePcmPlayerProvider implements PcmPlayerProvider {
 	@ObfuscatedName("pf")
 	@ObfuscatedSignature(
 		signature = "Ljx;"
diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/PcmPlayerProvider.java
similarity index 72%
rename from runescape-client/src/main/java/class99.java
rename to runescape-client/src/main/java/PcmPlayerProvider.java
index 0e90eb94bf..e196912e17 100644
--- a/runescape-client/src/main/java/class99.java
+++ b/runescape-client/src/main/java/PcmPlayerProvider.java
@@ -1,9 +1,11 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("cm")
-public interface class99 {
+@Implements("PcmPlayerProvider")
+public interface PcmPlayerProvider {
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(B)Ldn;",
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index a25a3a49af..bd859ec2b0 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -74,14 +74,14 @@ public class class14 {
 			} else {
 				String var4 = var3 + "; Expires=";
 				long var6 = DirectByteArrayCopier.currentTimeMs() + 94608000000L;
-				Calendar.field2504.setTime(new Date(var6));
-				int var8 = Calendar.field2504.get(7);
-				int var9 = Calendar.field2504.get(5);
-				int var10 = Calendar.field2504.get(2);
-				int var11 = Calendar.field2504.get(1);
-				int var12 = Calendar.field2504.get(11);
-				int var13 = Calendar.field2504.get(12);
-				int var14 = Calendar.field2504.get(13);
+				Calendar.Calendar_calendar.setTime(new Date(var6));
+				int var8 = Calendar.Calendar_calendar.get(7);
+				int var9 = Calendar.Calendar_calendar.get(5);
+				int var10 = Calendar.Calendar_calendar.get(2);
+				int var11 = Calendar.Calendar_calendar.get(1);
+				int var12 = Calendar.Calendar_calendar.get(11);
+				int var13 = Calendar.Calendar_calendar.get(12);
+				int var14 = Calendar.Calendar_calendar.get(13);
 				var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT";
 				var3 = var4 + var5 + "; Max-Age=" + 94608000L;
 			}
diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java
index 798b3e5553..ea1df78531 100644
--- a/runescape-client/src/main/java/class32.java
+++ b/runescape-client/src/main/java/class32.java
@@ -18,7 +18,7 @@ public class class32 {
 		signature = "Lcm;"
 	)
 	@Export("pcmPlayerProvider")
-	public static class99 pcmPlayerProvider;
+	public static PcmPlayerProvider pcmPlayerProvider;
 	@ObfuscatedName("dq")
 	@ObfuscatedSignature(
 		signature = "Liu;"