diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java
index 1515caf..24d41e5 100644
--- a/client/src/main/java/MidiPcmStream.java
+++ b/client/src/main/java/MidiPcmStream.java
@@ -22,7 +22,7 @@ public final class MidiPcmStream extends PcmStream {
 	private long aLong189;
 
 	@OriginalMember(owner = "client!va", name = "Qb", descriptor = "Lclient!rf;")
-	private Class3_Sub29 aClass3_Sub29_2;
+	private Song aClass3_Sub29_2;
 
 	@OriginalMember(owner = "client!va", name = "Rb", descriptor = "I")
 	private int anInt5676;
@@ -106,7 +106,7 @@ public final class MidiPcmStream extends PcmStream {
 	}
 
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(Lclient!rf;ILclient!ve;Lclient!le;I)Z")
-	public final synchronized boolean method4411(@OriginalArg(0) Class3_Sub29 arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) SoundBank arg2) {
+	public final synchronized boolean method4411(@OriginalArg(0) Song arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) SoundBank arg2) {
 		arg0.method3741();
 		@Pc(5) boolean local5 = true;
 		@Pc(20) int[] local20 = new int[] { 22050 };
@@ -151,7 +151,7 @@ public final class MidiPcmStream extends PcmStream {
 	}
 
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(ZLclient!rf;ZB)V")
-	private synchronized void method4416(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub29 arg1, @OriginalArg(2) boolean arg2) {
+	private synchronized void method4416(@OriginalArg(0) boolean arg0, @OriginalArg(1) Song arg1, @OriginalArg(2) boolean arg2) {
 		this.method4448(arg2);
 		this.aClass84_1.method2635(arg1.aByteArray65);
 		this.aBoolean293 = arg0;
@@ -485,7 +485,7 @@ public final class MidiPcmStream extends PcmStream {
 	}
 
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(ZLclient!rf;I)V")
-	public final synchronized void method4431(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub29 arg1) {
+	public final synchronized void method4431(@OriginalArg(0) boolean arg0, @OriginalArg(1) Song arg1) {
 		this.method4416(arg0, arg1, true);
 	}
 
diff --git a/client/src/main/java/Class3_Sub29.java b/client/src/main/java/Song.java
similarity index 99%
rename from client/src/main/java/Class3_Sub29.java
rename to client/src/main/java/Song.java
index 37f0a56..e93f390 100644
--- a/client/src/main/java/Class3_Sub29.java
+++ b/client/src/main/java/Song.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!rf")
-public final class Class3_Sub29 extends Node {
+public final class Song extends Node {
 
 	@OriginalMember(owner = "client!rf", name = "p", descriptor = "Lclient!sc;")
 	public HashTable aClass133_22;
@@ -13,7 +13,7 @@ public final class Class3_Sub29 extends Node {
 	public final byte[] aByteArray65;
 
 	@OriginalMember(owner = "client!rf", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class3_Sub29(@OriginalArg(0) Buffer arg0) {
+	public Song(@OriginalArg(0) Buffer arg0) {
 		arg0.anInt2792 = arg0.aByteArray40.length - 3;
 		@Pc(12) int local12 = arg0.method2229();
 		@Pc(16) int local16 = arg0.method2163();
diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java
index b1d7e72..87b823d 100644
--- a/client/src/main/java/Static144.java
+++ b/client/src/main/java/Static144.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static144 {
 
 	@OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;")
-	public static Class3_Sub29 aClass3_Sub29_1;
+	public static Song aClass3_Sub29_1;
 
 	@OriginalMember(owner = "client!le", name = "e", descriptor = "I")
 	public static int anInt3490 = 0;
diff --git a/client/src/main/java/Static291.java b/client/src/main/java/Static291.java
index af8136b..b51a1fd 100644
--- a/client/src/main/java/Static291.java
+++ b/client/src/main/java/Static291.java
@@ -5,8 +5,8 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static291 {
 
 	@OriginalMember(owner = "client!rf", name = "a", descriptor = "(Lclient!ve;II)Lclient!rf;")
-	public static Class3_Sub29 method3742(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public static Song method3742(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(5) byte[] local5 = arg0.method4495(arg1, arg2);
-		return local5 == null ? null : new Class3_Sub29(new Buffer(local5));
+		return local5 == null ? null : new Song(new Buffer(local5));
 	}
 }