diff --git a/client/src/main/java/Class3_Sub18.java b/client/src/main/java/MidiInstrument.java
similarity index 99%
rename from client/src/main/java/Class3_Sub18.java
rename to client/src/main/java/MidiInstrument.java
index 1455c88..6276540 100644
--- a/client/src/main/java/Class3_Sub18.java
+++ b/client/src/main/java/MidiInstrument.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!jk")
-public final class Class3_Sub18 extends Node {
+public final class MidiInstrument extends Node {
 
 	@OriginalMember(owner = "client!jk", name = "r", descriptor = "[B")
 	public final byte[] aByteArray43 = new byte[128];
@@ -31,7 +31,7 @@ public final class Class3_Sub18 extends Node {
 	public final Class162[] aClass162Array1 = new Class162[128];
 
 	@OriginalMember(owner = "client!jk", name = "<init>", descriptor = "([B)V")
-	public Class3_Sub18(@OriginalArg(0) byte[] arg0) {
+	public MidiInstrument(@OriginalArg(0) byte[] arg0) {
 		@Pc(29) int local29 = 0;
 		this.aByteArray44 = new byte[128];
 		@Pc(38) Buffer local38 = new Buffer(arg0);
diff --git a/client/src/main/java/MidiNote.java b/client/src/main/java/MidiNote.java
index 1790b06..183b7e7 100644
--- a/client/src/main/java/MidiNote.java
+++ b/client/src/main/java/MidiNote.java
@@ -65,7 +65,7 @@ public final class MidiNote extends Node {
 	public int anInt3782;
 
 	@OriginalMember(owner = "client!mf", name = "V", descriptor = "Lclient!jk;")
-	public Class3_Sub18 aClass3_Sub18_1;
+	public MidiInstrument aClass3_Sub18_1;
 
 	@OriginalMember(owner = "client!mf", name = "d", descriptor = "(I)V")
 	public final void method2957() {
diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java
index db1c609..6c809c8 100644
--- a/client/src/main/java/MidiPcmStream.java
+++ b/client/src/main/java/MidiPcmStream.java
@@ -112,7 +112,7 @@ public final class MidiPcmStream extends PcmStream {
 		@Pc(20) int[] local20 = new int[] { 22050 };
 		for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.method3859(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.method3861()) {
 			@Pc(40) int local40 = (int) local34.aLong192;
-			@Pc(48) Class3_Sub18 local48 = (Class3_Sub18) this.aClass133_23.method3863((long) local40);
+			@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.method3863((long) local40);
 			if (local48 == null) {
 				local48 = Static116.method2320(arg1, local40);
 				if (local48 == null) {
@@ -133,7 +133,7 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "d", descriptor = "(B)V")
 	public final synchronized void method4412() {
-		for (@Pc(15) Class3_Sub18 local15 = (Class3_Sub18) this.aClass133_23.method3859(); local15 != null; local15 = (Class3_Sub18) this.aClass133_23.method3861()) {
+		for (@Pc(15) MidiInstrument local15 = (MidiInstrument) this.aClass133_23.method3859(); local15 != null; local15 = (MidiInstrument) this.aClass133_23.method3861()) {
 			local15.method2432();
 		}
 	}
@@ -254,7 +254,7 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "e", descriptor = "(I)V")
 	public final synchronized void method4426() {
-		for (@Pc(7) Class3_Sub18 local7 = (Class3_Sub18) this.aClass133_23.method3859(); local7 != null; local7 = (Class3_Sub18) this.aClass133_23.method3861()) {
+		for (@Pc(7) MidiInstrument local7 = (MidiInstrument) this.aClass133_23.method3859(); local7 != null; local7 = (MidiInstrument) this.aClass133_23.method3861()) {
 			local7.method4658();
 		}
 	}
@@ -276,7 +276,7 @@ public final class MidiPcmStream extends PcmStream {
 				}
 			}
 		}
-		@Pc(118) Class3_Sub18 local118 = (Class3_Sub18) this.aClass133_23.method3863((long) this.anIntArray506[arg1]);
+		@Pc(118) MidiInstrument local118 = (MidiInstrument) this.aClass133_23.method3863((long) this.anIntArray506[arg1]);
 		if (local118 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java
index 3342526..3fe3b01 100644
--- a/client/src/main/java/Static116.java
+++ b/client/src/main/java/Static116.java
@@ -23,9 +23,9 @@ public final class Static116 {
 	public static int anInt2961 = 0;
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;")
-	public static Class3_Sub18 method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
+	public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
 		@Pc(9) byte[] local9 = arg0.method4500(arg1);
-		return local9 == null ? null : new Class3_Sub18(local9);
+		return local9 == null ? null : new MidiInstrument(local9);
 	}
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(IZ)V")