diff --git a/client/src/main/java/BufferedImageFrameBuffer.java b/client/src/main/java/BufferedImageFrameBuffer.java
index a0b26f8..5a8cc86 100644
--- a/client/src/main/java/BufferedImageFrameBuffer.java
+++ b/client/src/main/java/BufferedImageFrameBuffer.java
@@ -13,7 +13,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ti")
-public final class BufferedImageFrameBuffer extends Class27 {
+public final class BufferedImageFrameBuffer extends FrameBuffer {
 
 	@OriginalMember(owner = "client!ti", name = "p", descriptor = "Ljava/awt/Component;")
 	private Component aComponent1;
diff --git a/client/src/main/java/Class27_Sub1.java b/client/src/main/java/Class27_Sub1.java
index 50ba5b2..c381612 100644
--- a/client/src/main/java/Class27_Sub1.java
+++ b/client/src/main/java/Class27_Sub1.java
@@ -7,14 +7,14 @@ import java.awt.image.DirectColorModel;
 import java.awt.image.ImageConsumer;
 import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
-import java.util.Hashtable;
+
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!di")
-public final class Class27_Sub1 extends Class27 implements ImageProducer, ImageObserver {
+public final class Class27_Sub1 extends FrameBuffer implements ImageProducer, ImageObserver {
 
 	@OriginalMember(owner = "client!di", name = "A", descriptor = "Ljava/awt/image/ImageConsumer;")
 	private ImageConsumer anImageConsumer1;
diff --git a/client/src/main/java/Class27.java b/client/src/main/java/FrameBuffer.java
similarity index 97%
rename from client/src/main/java/Class27.java
rename to client/src/main/java/FrameBuffer.java
index 9b3effb..6636c52 100644
--- a/client/src/main/java/Class27.java
+++ b/client/src/main/java/FrameBuffer.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!vk")
-public abstract class Class27 {
+public abstract class FrameBuffer {
 
 	@OriginalMember(owner = "client!vk", name = "e", descriptor = "[I")
 	protected int[] anIntArray472;
diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java
index b61d095..635b801 100644
--- a/client/src/main/java/Static131.java
+++ b/client/src/main/java/Static131.java
@@ -145,10 +145,10 @@ public final class Static131 {
 	}
 
 	@OriginalMember(owner = "client!kd", name = "a", descriptor = "(IIZLjava/awt/Component;)Lclient!vk;")
-	public static Class27 method2579(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
+	public static FrameBuffer method2579(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) Component arg2) {
 		try {
 			@Pc(12) Class local12 = Class.forName("BufferedImageFrameBuffer");
-			@Pc(16) Class27 local16 = (Class27) local12.getDeclaredConstructor().newInstance();
+			@Pc(16) FrameBuffer local16 = (FrameBuffer) local12.getDeclaredConstructor().newInstance();
 			local16.method4192(arg0, arg1, arg2);
 			return local16;
 		} catch (@Pc(25) Throwable local25) {
diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java
index bcaffbf..f89f7a0 100644
--- a/client/src/main/java/Static260.java
+++ b/client/src/main/java/Static260.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static260 {
 
 	@OriginalMember(owner = "client!vd", name = "w", descriptor = "Lclient!vk;")
-	public static Class27 aClass27_2;
+	public static FrameBuffer aClass27_2;
 
 	@OriginalMember(owner = "client!vd", name = "v", descriptor = "Lclient!na;")
 	public static final Class100 aClass100_944 = Static28.method790("hitbar_default");