diff --git a/client/src/main/java/Canvas_Sub2.java b/client/src/main/java/GameCanvas.java
similarity index 89%
rename from client/src/main/java/Canvas_Sub2.java
rename to client/src/main/java/GameCanvas.java
index ef7ad57..bad0f66 100644
--- a/client/src/main/java/Canvas_Sub2.java
+++ b/client/src/main/java/GameCanvas.java
@@ -6,13 +6,13 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!tm")
-public final class Canvas_Sub2 extends Canvas {
+public final class GameCanvas extends Canvas {
 
 	@OriginalMember(owner = "client!tm", name = "m", descriptor = "Ljava/awt/Component;")
 	private final Component aComponent2;
 
 	@OriginalMember(owner = "client!tm", name = "<init>", descriptor = "(Ljava/awt/Component;)V")
-	public Canvas_Sub2(@OriginalArg(0) Component arg0) {
+	public GameCanvas(@OriginalArg(0) Component arg0) {
 		this.aComponent2 = arg0;
 	}
 
diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java
index f3f7d3e..90a913b 100644
--- a/client/src/main/java/GameShell.java
+++ b/client/src/main/java/GameShell.java
@@ -95,7 +95,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			local19 = Static39.aFrame1;
 		}
 		local19.setLayout(null);
-		Static154.aCanvas1 = new Canvas_Sub2(this);
+		Static154.aCanvas1 = new GameCanvas(this);
 		local19.add(Static154.aCanvas1);
 		Static154.aCanvas1.setSize(Static48.anInt1448, Static254.anInt5554);
 		Static154.aCanvas1.setVisible(true);