diff --git a/client/src/main/java/Class3_Sub3_Sub1.java b/client/src/main/java/Class3_Sub3_Sub1.java
index dbe4b37..f79cc2b 100644
--- a/client/src/main/java/Class3_Sub3_Sub1.java
+++ b/client/src/main/java/Class3_Sub3_Sub1.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!b")
-public final class Class3_Sub3_Sub1 extends Class3_Sub3 {
+public final class Class3_Sub3_Sub1 extends PcmStream {
 
 	@OriginalMember(owner = "client!b", name = "v", descriptor = "I")
 	public int anInt344;
@@ -568,7 +568,7 @@ public final class Class3_Sub3_Sub1 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!b", name = "b", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4406() {
+	public final PcmStream method4406() {
 		return null;
 	}
 
@@ -729,7 +729,7 @@ public final class Class3_Sub3_Sub1 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!b", name = "d", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4409() {
+	public final PcmStream method4409() {
 		return null;
 	}
 }
diff --git a/client/src/main/java/Class3_Sub3_Sub2.java b/client/src/main/java/Class3_Sub3_Sub2.java
index c3712eb..98aacbf 100644
--- a/client/src/main/java/Class3_Sub3_Sub2.java
+++ b/client/src/main/java/Class3_Sub3_Sub2.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!ei")
-public final class Class3_Sub3_Sub2 extends Class3_Sub3 {
+public final class Class3_Sub3_Sub2 extends PcmStream {
 
 	@OriginalMember(owner = "client!ei", name = "t", descriptor = "Lclient!ih;")
 	private final Class69 aClass69_43 = new Class69();
@@ -31,7 +31,7 @@ public final class Class3_Sub3_Sub2 extends Class3_Sub3 {
 	}
 
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!qb;)V")
-	public final synchronized void method1343(@OriginalArg(0) Class3_Sub3 arg0) {
+	public final synchronized void method1343(@OriginalArg(0) PcmStream arg0) {
 		this.aClass69_43.method2283(arg0);
 	}
 
@@ -82,26 +82,26 @@ public final class Class3_Sub3_Sub2 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!ei", name = "b", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4406() {
-		return (Class3_Sub3) this.aClass69_43.method2289();
+	public final PcmStream method4406() {
+		return (PcmStream) this.aClass69_43.method2289();
 	}
 
 	@OriginalMember(owner = "client!ei", name = "d", descriptor = "(I)V")
 	private void method1345(@OriginalArg(0) int arg0) {
-		for (@Pc(5) Class3_Sub3 local5 = (Class3_Sub3) this.aClass69_43.method2289(); local5 != null; local5 = (Class3_Sub3) this.aClass69_43.method2288()) {
+		for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
 			local5.method4410(arg0);
 		}
 	}
 
 	@OriginalMember(owner = "client!ei", name = "c", descriptor = "([III)V")
 	private void method1346(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		for (@Pc(5) Class3_Sub3 local5 = (Class3_Sub3) this.aClass69_43.method2289(); local5 != null; local5 = (Class3_Sub3) this.aClass69_43.method2288()) {
+		for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
 			local5.method4405(arg0, arg1, arg2);
 		}
 	}
 
 	@OriginalMember(owner = "client!ei", name = "b", descriptor = "(Lclient!qb;)V")
-	public final synchronized void method1347(@OriginalArg(0) Class3_Sub3 arg0) {
+	public final synchronized void method1347(@OriginalArg(0) PcmStream arg0) {
 		arg0.method4658();
 	}
 
@@ -145,8 +145,8 @@ public final class Class3_Sub3_Sub2 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!ei", name = "d", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4409() {
-		return (Class3_Sub3) this.aClass69_43.method2288();
+	public final PcmStream method4409() {
+		return (PcmStream) this.aClass69_43.method2288();
 	}
 
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!ab;Lclient!cc;)V")
diff --git a/client/src/main/java/Class3_Sub3_Sub3.java b/client/src/main/java/Class3_Sub3_Sub3.java
index 0a30d07..7cbef2d 100644
--- a/client/src/main/java/Class3_Sub3_Sub3.java
+++ b/client/src/main/java/Class3_Sub3_Sub3.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!te")
-public final class Class3_Sub3_Sub3 extends Class3_Sub3 {
+public final class Class3_Sub3_Sub3 extends PcmStream {
 
 	@OriginalMember(owner = "client!te", name = "w", descriptor = "Lclient!ih;")
 	public final Class69 aClass69_126 = new Class69();
@@ -22,7 +22,7 @@ public final class Class3_Sub3_Sub3 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!te", name = "d", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4409() {
+	public final PcmStream method4409() {
 		@Pc(9) Class3_Sub25 local9;
 		do {
 			local9 = (Class3_Sub25) this.aClass69_126.method2288();
@@ -35,7 +35,7 @@ public final class Class3_Sub3_Sub3 extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!te", name = "b", descriptor = "()Lclient!qb;")
 	@Override
-	public final Class3_Sub3 method4406() {
+	public final PcmStream method4406() {
 		@Pc(9) Class3_Sub25 local9 = (Class3_Sub25) this.aClass69_126.method2289();
 		if (local9 == null) {
 			return null;
diff --git a/client/src/main/java/Class62.java b/client/src/main/java/Class62.java
index 3fd259b..1936d91 100644
--- a/client/src/main/java/Class62.java
+++ b/client/src/main/java/Class62.java
@@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc;
 public class Class62 {
 
 	@OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
-	private Class3_Sub3 aClass3_Sub3_6;
+	private PcmStream aClass3_Sub3_6;
 
 	@OriginalMember(owner = "client!vh", name = "n", descriptor = "[I")
 	public int[] anIntArray411;
@@ -29,7 +29,7 @@ public class Class62 {
 	private long aLong151 = Class209.method5096();
 
 	@OriginalMember(owner = "client!vh", name = "w", descriptor = "[Lclient!qb;")
-	private final Class3_Sub3[] aClass3_Sub3Array5 = new Class3_Sub3[8];
+	private final PcmStream[] aClass3_Sub3Array5 = new PcmStream[8];
 
 	@OriginalMember(owner = "client!vh", name = "x", descriptor = "I")
 	private int anInt4634 = 0;
@@ -44,7 +44,7 @@ public class Class62 {
 	private boolean aBoolean229 = true;
 
 	@OriginalMember(owner = "client!vh", name = "z", descriptor = "[Lclient!qb;")
-	private final Class3_Sub3[] aClass3_Sub3Array6 = new Class3_Sub3[8];
+	private final PcmStream[] aClass3_Sub3Array6 = new PcmStream[8];
 
 	@OriginalMember(owner = "client!vh", name = "y", descriptor = "J")
 	private long aLong153 = 0L;
@@ -95,8 +95,8 @@ public class Class62 {
 				for (@Pc(73) int local73 = local47 >>> local57 & 0x11111111; local73 != 0; local73 >>>= 0x4) {
 					if ((local73 & 0x1) != 0) {
 						local47 &= ~(0x1 << local57);
-						@Pc(91) Class3_Sub3 local91 = null;
-						@Pc(96) Class3_Sub3 local96 = this.aClass3_Sub3Array5[local57];
+						@Pc(91) PcmStream local91 = null;
+						@Pc(96) PcmStream local96 = this.aClass3_Sub3Array5[local57];
 						label100: while (true) {
 							while (true) {
 								if (local96 == null) {
@@ -113,7 +113,7 @@ public class Class62 {
 									if (local45 >= this.anInt4621) {
 										break label106;
 									}
-									@Pc(145) Class3_Sub3 local145 = local96.method4406();
+									@Pc(145) PcmStream local145 = local96.method4406();
 									if (local145 != null) {
 										@Pc(150) int local150 = local96.anInt5626;
 										while (local145 != null) {
@@ -121,7 +121,7 @@ public class Class62 {
 											local145 = local96.method4409();
 										}
 									}
-									@Pc(169) Class3_Sub3 local169 = local96.aClass3_Sub3_8;
+									@Pc(169) PcmStream local169 = local96.aClass3_Sub3_8;
 									local96.aClass3_Sub3_8 = null;
 									if (local91 == null) {
 										this.aClass3_Sub3Array5[local57] = local169;
@@ -146,10 +146,10 @@ public class Class62 {
 				local49--;
 			}
 			for (local49 = 0; local49 < 8; local49++) {
-				@Pc(212) Class3_Sub3 local212 = this.aClass3_Sub3Array5[local49];
+				@Pc(212) PcmStream local212 = this.aClass3_Sub3Array5[local49];
 				this.aClass3_Sub3Array5[local49] = this.aClass3_Sub3Array6[local49] = null;
 				while (local212 != null) {
-					@Pc(227) Class3_Sub3 local227 = local212.aClass3_Sub3_8;
+					@Pc(227) PcmStream local227 = local212.aClass3_Sub3_8;
 					local212.aClass3_Sub3_8 = null;
 					local212 = local227;
 				}
@@ -239,14 +239,14 @@ public class Class62 {
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!qb;)V")
-	public final synchronized void method3566(@OriginalArg(1) Class3_Sub3 arg0) {
+	public final synchronized void method3566(@OriginalArg(1) PcmStream arg0) {
 		this.aClass3_Sub3_6 = arg0;
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!qb;IB)V")
-	private void method3567(@OriginalArg(0) Class3_Sub3 arg0, @OriginalArg(1) int arg1) {
+	private void method3567(@OriginalArg(0) PcmStream arg0, @OriginalArg(1) int arg1) {
 		@Pc(16) int local16 = arg1 >> 5;
-		@Pc(21) Class3_Sub3 local21 = this.aClass3_Sub3Array6[local16];
+		@Pc(21) PcmStream local21 = this.aClass3_Sub3Array6[local16];
 		if (local21 == null) {
 			this.aClass3_Sub3Array5[local16] = arg0;
 		} else {
diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java
index c60ac02..0bb77ac 100644
--- a/client/src/main/java/MidiPcmStream.java
+++ b/client/src/main/java/MidiPcmStream.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!va")
-public final class MidiPcmStream extends Class3_Sub3 {
+public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "Kb", descriptor = "Z")
 	private boolean aBoolean293;
@@ -597,7 +597,7 @@ public final class MidiPcmStream extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!va", name = "b", descriptor = "()Lclient!qb;")
 	@Override
-	public final synchronized Class3_Sub3 method4406() {
+	public final synchronized PcmStream method4406() {
 		return this.aClass3_Sub3_Sub3_1;
 	}
 
@@ -861,7 +861,7 @@ public final class MidiPcmStream extends Class3_Sub3 {
 
 	@OriginalMember(owner = "client!va", name = "d", descriptor = "()Lclient!qb;")
 	@Override
-	public final synchronized Class3_Sub3 method4409() {
+	public final synchronized PcmStream method4409() {
 		return null;
 	}
 }
diff --git a/client/src/main/java/Class3_Sub3.java b/client/src/main/java/PcmStream.java
similarity index 90%
rename from client/src/main/java/Class3_Sub3.java
rename to client/src/main/java/PcmStream.java
index 76782c7..a5fb781 100644
--- a/client/src/main/java/Class3_Sub3.java
+++ b/client/src/main/java/PcmStream.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!qb")
-public abstract class Class3_Sub3 extends Class3 {
+public abstract class PcmStream extends Class3 {
 
 	@OriginalMember(owner = "client!qb", name = "p", descriptor = "I")
 	public int anInt5626;
@@ -12,7 +12,7 @@ public abstract class Class3_Sub3 extends Class3 {
 	public Class3_Sub16 aClass3_Sub16_5;
 
 	@OriginalMember(owner = "client!qb", name = "s", descriptor = "Lclient!qb;")
-	public Class3_Sub3 aClass3_Sub3_8;
+	public PcmStream aClass3_Sub3_8;
 
 	@OriginalMember(owner = "client!qb", name = "r", descriptor = "Z")
 	public volatile boolean aBoolean292 = true;
@@ -30,7 +30,7 @@ public abstract class Class3_Sub3 extends Class3 {
 	}
 
 	@OriginalMember(owner = "client!qb", name = "b", descriptor = "()Lclient!qb;")
-	public abstract Class3_Sub3 method4406();
+	public abstract PcmStream method4406();
 
 	@OriginalMember(owner = "client!qb", name = "c", descriptor = "()I")
 	public int method4407() {
@@ -41,7 +41,7 @@ public abstract class Class3_Sub3 extends Class3 {
 	public abstract void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
 
 	@OriginalMember(owner = "client!qb", name = "d", descriptor = "()Lclient!qb;")
-	public abstract Class3_Sub3 method4409();
+	public abstract PcmStream method4409();
 
 	@OriginalMember(owner = "client!qb", name = "c", descriptor = "(I)V")
 	public abstract void method4410(@OriginalArg(0) int arg0);
diff --git a/client/src/main/java/Static167.java b/client/src/main/java/Static167.java
index e53b6c8..a531306 100644
--- a/client/src/main/java/Static167.java
+++ b/client/src/main/java/Static167.java
@@ -38,12 +38,12 @@ public final class Static167 {
 	public static final Class100 aClass100_783 = Static28.method790(")4p=");
 
 	@OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V")
-	public static void method3170(@OriginalArg(1) Class3_Sub3 arg0) {
+	public static void method3170(@OriginalArg(1) PcmStream arg0) {
 		if (arg0.aClass3_Sub16_5 != null) {
 			arg0.aClass3_Sub16_5.anInt3313 = 0;
 		}
 		arg0.aBoolean292 = false;
-		for (@Pc(14) Class3_Sub3 local14 = arg0.method4406(); local14 != null; local14 = arg0.method4409()) {
+		for (@Pc(14) PcmStream local14 = arg0.method4406(); local14 != null; local14 = arg0.method4409()) {
 			method3170(local14);
 		}
 	}