diff --git a/client/src/main/java/Class3_Sub12.java b/client/src/main/java/AreaSound.java
similarity index 98%
rename from client/src/main/java/Class3_Sub12.java
rename to client/src/main/java/AreaSound.java
index a7b1799..98127c8 100644
--- a/client/src/main/java/Class3_Sub12.java
+++ b/client/src/main/java/AreaSound.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!fl")
-public final class Class3_Sub12 extends Node {
+public final class AreaSound extends Node {
 
 	@OriginalMember(owner = "client!fl", name = "p", descriptor = "I")
 	public int anInt2028;
diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java
index 7d2dc5e..c5fbe2b 100644
--- a/client/src/main/java/Static110.java
+++ b/client/src/main/java/Static110.java
@@ -41,14 +41,14 @@ public final class Static110 {
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(IIIII)V")
 	public static void method2281(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(6) Class3_Sub12 local6;
-		for (local6 = (Class3_Sub12) Static3.aClass69_135.method2289(); local6 != null; local6 = (Class3_Sub12) Static3.aClass69_135.method2288()) {
+		@Pc(6) AreaSound local6;
+		for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
 			Static150.method2804(arg1, local6, arg3, arg0, arg2);
 		}
 		@Pc(37) byte local37;
 		@Pc(42) BasType local42;
 		@Pc(141) int local141;
-		for (local6 = (Class3_Sub12) Static152.aClass69_87.method2289(); local6 != null; local6 = (Class3_Sub12) Static152.aClass69_87.method2288()) {
+		for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
 			local37 = 1;
 			local42 = local6.aClass8_Sub4_Sub2_1.method2681();
 			if (local42.anInt1037 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
@@ -75,7 +75,7 @@ public final class Static110 {
 			local6.anInt2028 = local6.aClass8_Sub4_Sub2_1.anInt3421 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
 			Static150.method2804(arg1, local6, arg3, arg0, arg2);
 		}
-		for (local6 = (Class3_Sub12) Static93.aClass133_7.method3859(); local6 != null; local6 = (Class3_Sub12) Static93.aClass133_7.method3861()) {
+		for (local6 = (AreaSound) Static93.aClass133_7.method3859(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.method3861()) {
 			local37 = 1;
 			local42 = local6.aClass8_Sub4_Sub1_1.method2681();
 			if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1037) {
diff --git a/client/src/main/java/Static119.java b/client/src/main/java/Static119.java
index db08e16..f376901 100644
--- a/client/src/main/java/Static119.java
+++ b/client/src/main/java/Static119.java
@@ -79,13 +79,13 @@ public final class Static119 {
 
 	@OriginalMember(owner = "client!je", name = "k", descriptor = "(I)V")
 	public static void method2386() {
-		@Pc(6) Class3_Sub12 local6;
-		for (local6 = (Class3_Sub12) Static3.aClass69_135.method2289(); local6 != null; local6 = (Class3_Sub12) Static3.aClass69_135.method2288()) {
+		@Pc(6) AreaSound local6;
+		for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
 			if (local6.aBoolean117) {
 				local6.method1567();
 			}
 		}
-		for (local6 = (Class3_Sub12) Static152.aClass69_87.method2289(); local6 != null; local6 = (Class3_Sub12) Static152.aClass69_87.method2288()) {
+		for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
 			if (local6.aBoolean117) {
 				local6.method1567();
 			}
diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java
index 0d78f54..e71e624 100644
--- a/client/src/main/java/Static122.java
+++ b/client/src/main/java/Static122.java
@@ -38,7 +38,7 @@ public final class Static122 {
 
 	@OriginalMember(owner = "client!jh", name = "a", descriptor = "(IZLclient!pb;ILclient!km;IILclient!e;)V")
 	public static void method2411(@OriginalArg(0) int arg0, @OriginalArg(2) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Npc arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) Player arg6) {
-		@Pc(13) Class3_Sub12 local13 = new Class3_Sub12();
+		@Pc(13) AreaSound local13 = new AreaSound();
 		local13.anInt2029 = arg0 * 128;
 		local13.anInt2041 = arg4 * 128;
 		local13.anInt2033 = arg5;
diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java
index 6ae2c99..38090e1 100644
--- a/client/src/main/java/Static150.java
+++ b/client/src/main/java/Static150.java
@@ -106,7 +106,7 @@ public final class Static150 {
 	}
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!fl;IIII)V")
-	public static void method2804(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub12 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public static void method2804(@OriginalArg(0) int arg0, @OriginalArg(1) AreaSound arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (arg1.anInt2044 == -1 && arg1.anIntArray181 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java
index 5afb843..5d082aa 100644
--- a/client/src/main/java/Static209.java
+++ b/client/src/main/java/Static209.java
@@ -21,7 +21,7 @@ public final class Static209 {
 
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
 	public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		for (@Pc(10) Class3_Sub12 local10 = (Class3_Sub12) Static3.aClass69_135.method2289(); local10 != null; local10 = (Class3_Sub12) Static3.aClass69_135.method2288()) {
+		for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.method2289(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.method2288()) {
 			if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.aClass118_1.anInt4426) {
 				if (local10.aClass3_Sub3_Sub1_1 != null) {
 					Static204.aClass3_Sub3_Sub2_1.method1347(local10.aClass3_Sub3_Sub1_1);
diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java
index 14b8d21..592dfa8 100644
--- a/client/src/main/java/Static214.java
+++ b/client/src/main/java/Static214.java
@@ -33,7 +33,7 @@ public final class Static214 {
 
 	@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
 	public static void method4359(@OriginalArg(0) Player arg0) {
-		@Pc(12) Class3_Sub12 local12 = (Class3_Sub12) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158());
+		@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158());
 		if (local12 == null) {
 			Static122.method2411(arg0.anIntArray317[0], null, 0, null, arg0.anIntArray318[0], Static55.anInt1735, arg0);
 		} else {
diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java
index 65e8035..f7985a6 100644
--- a/client/src/main/java/Static260.java
+++ b/client/src/main/java/Static260.java
@@ -176,8 +176,8 @@ public final class Static260 {
 
 	@OriginalMember(owner = "client!vd", name = "a", descriptor = "(BZ)V")
 	public static void method3852(@OriginalArg(1) boolean arg0) {
-		@Pc(14) Class3_Sub12 local14;
-		for (local14 = (Class3_Sub12) Static3.aClass69_135.method2289(); local14 != null; local14 = (Class3_Sub12) Static3.aClass69_135.method2288()) {
+		@Pc(14) AreaSound local14;
+		for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
 				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
@@ -191,14 +191,14 @@ public final class Static260 {
 		if (!arg0) {
 			return;
 		}
-		for (local14 = (Class3_Sub12) Static152.aClass69_87.method2289(); local14 != null; local14 = (Class3_Sub12) Static152.aClass69_87.method2288()) {
+		for (local14 = (AreaSound) Static152.aClass69_87.method2289(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.method2288()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
 				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
 			}
 			local14.method4658();
 		}
-		for (local14 = (Class3_Sub12) Static93.aClass133_7.method3859(); local14 != null; local14 = (Class3_Sub12) Static93.aClass133_7.method3861()) {
+		for (local14 = (AreaSound) Static93.aClass133_7.method3859(); local14 != null; local14 = (AreaSound) Static93.aClass133_7.method3861()) {
 			if (local14.aClass3_Sub3_Sub1_1 != null) {
 				Static204.aClass3_Sub3_Sub2_1.method1347(local14.aClass3_Sub3_Sub1_1);
 				local14.aClass3_Sub3_Sub1_1 = null;
diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java
index 6ab3983..4129fa2 100644
--- a/client/src/main/java/Static271.java
+++ b/client/src/main/java/Static271.java
@@ -18,7 +18,7 @@ public final class Static271 {
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
 	public static void method4597(@OriginalArg(0) Player arg0) {
-		@Pc(10) Class3_Sub12 local10 = (Class3_Sub12) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158());
+		@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.method3158());
 		if (local10 == null) {
 			return;
 		}
diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java
index ed33d99..d75770e 100644
--- a/client/src/main/java/Static91.java
+++ b/client/src/main/java/Static91.java
@@ -85,7 +85,7 @@ public final class Static91 {
 
 	@OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!km;Z)V")
 	public static void method1877(@OriginalArg(0) Npc arg0) {
-		for (@Pc(13) Class3_Sub12 local13 = (Class3_Sub12) Static152.aClass69_87.method2289(); local13 != null; local13 = (Class3_Sub12) Static152.aClass69_87.method2288()) {
+		for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.method2289(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.method2288()) {
 			if (arg0 == local13.aClass8_Sub4_Sub2_1) {
 				if (local13.aClass3_Sub3_Sub1_1 != null) {
 					Static204.aClass3_Sub3_Sub2_1.method1347(local13.aClass3_Sub3_Sub1_1);