diff --git a/client/src/main/java/Class45.java b/client/src/main/java/Class45.java
index 5de365e..165860e 100644
--- a/client/src/main/java/Class45.java
+++ b/client/src/main/java/Class45.java
@@ -57,7 +57,7 @@ public final class Class45 {
 	public int anInt2019;
 
 	@OriginalMember(owner = "client!fj", name = "a", descriptor = "(Lclient!gi;IIIFFF)I")
-	public final int method1553(@OriginalArg(0) Class51 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float arg4, @OriginalArg(5) float arg5, @OriginalArg(6) float arg6) {
+	public final int method1553(@OriginalArg(0) Light arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float arg4, @OriginalArg(5) float arg5, @OriginalArg(6) float arg6) {
 		@Pc(1) long local1 = 0L;
 		if ((arg1 & 0x7F) == 0 || (arg3 & 0x7F) == 0) {
 			local1 = arg1 + (arg3 << 16);
diff --git a/client/src/main/java/Class51.java b/client/src/main/java/Light.java
similarity index 98%
rename from client/src/main/java/Class51.java
rename to client/src/main/java/Light.java
index 21adc2d..5714904 100644
--- a/client/src/main/java/Class51.java
+++ b/client/src/main/java/Light.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!gi")
-public final class Class51 {
+public final class Light {
 
 	@OriginalMember(owner = "client!gi", name = "a", descriptor = "Z")
 	public final boolean aBoolean124;
@@ -67,7 +67,7 @@ public final class Class51 {
 	public final float[] aFloatArray3 = new float[4];
 
 	@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class51(@OriginalArg(0) Buffer arg0) {
+	public Light(@OriginalArg(0) Buffer arg0) {
 		if (Static62.anIntArray150 == null) {
 			Static84.method1771();
 		}
diff --git a/client/src/main/java/Static120.java b/client/src/main/java/Static120.java
index ef8a427..637c4cb 100644
--- a/client/src/main/java/Static120.java
+++ b/client/src/main/java/Static120.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static120 {
 
 	@OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
-	public static Class51[] aClass51Array1;
+	public static Light[] aClass51Array1;
 
 	@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
 	private static int[] anIntArray283;
@@ -78,7 +78,7 @@ public final class Static120 {
 	}
 
 	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
-	public static void method2389(@OriginalArg(0) Class51 arg0) {
+	public static void method2389(@OriginalArg(0) Light arg0) {
 		if (anInt3034 >= 255) {
 			System.out.println("Number of lights added exceeds maximum!");
 		} else {
@@ -242,7 +242,7 @@ public final class Static120 {
 	@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
 	public static void method2395() {
 		for (@Pc(1) int local1 = 0; local1 < anInt3034; local1++) {
-			@Pc(8) Class51 local8 = aClass51Array1[local1];
+			@Pc(8) Light local8 = aClass51Array1[local1];
 			@Pc(11) int local11 = local8.anInt2241;
 			if (local8.aBoolean124) {
 				local11 = 0;
@@ -357,7 +357,7 @@ public final class Static120 {
 
 	@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
 	public static void method2401() {
-		aClass51Array1 = new Class51[255];
+		aClass51Array1 = new Light[255];
 		anIntArray284 = new int[4];
 		aBooleanArray65 = new boolean[4];
 		anIntArray283 = new int[4];
@@ -382,7 +382,7 @@ public final class Static120 {
 		local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_SRC0_RGB, GL.GL_CONSTANT);
 		local4.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_OPERAND0_RGB, GL.GL_SRC_ALPHA);
 		label71: for (@Pc(56) int local56 = 0; local56 < anInt3034; local56++) {
-			@Pc(63) Class51 local63 = aClass51Array1[local56];
+			@Pc(63) Light local63 = aClass51Array1[local56];
 			@Pc(66) int local66 = local63.anInt2241;
 			if (local63.aBoolean125) {
 				local66--;
@@ -433,7 +433,7 @@ public final class Static120 {
 	}
 
 	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V")
-	private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Class51 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		@Pc(5) int local5 = arg0 + 16384 + 4;
 		@Pc(7) GL local7 = Static239.aGL1;
 		if (!aBooleanArray65[arg0]) {
diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java
index e45bf66..7cafb82 100644
--- a/client/src/main/java/Static131.java
+++ b/client/src/main/java/Static131.java
@@ -80,7 +80,7 @@ public final class Static131 {
 	}
 
 	@OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V")
-	public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Class45 arg6, @OriginalArg(8) Class51 arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) {
+	public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) {
 		@Pc(7) int[] local7 = new int[arg5.length / 2];
 		for (@Pc(13) int local13 = 0; local13 < local7.length; local13++) {
 			@Pc(27) int local27 = arg5[local13 + local13];
diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java
index a02472f..2ab33ed 100644
--- a/client/src/main/java/Static141.java
+++ b/client/src/main/java/Static141.java
@@ -49,7 +49,7 @@ public final class Static141 {
 		Static171.aClass139_1 = new Class139();
 		((Js5GlTextureProvider) Static94.anInterface1_2).method3247();
 		Static120.anInt3034 = 0;
-		Static120.aClass51Array1 = new Class51[255];
+		Static120.aClass51Array1 = new Light[255];
 		Static237.method4120();
 		Static242.method4203();
 		Static115.method2315();
diff --git a/client/src/main/java/Static221.java b/client/src/main/java/Static221.java
index f351c95..ef88b92 100644
--- a/client/src/main/java/Static221.java
+++ b/client/src/main/java/Static221.java
@@ -77,9 +77,9 @@ public final class Static221 {
 	}
 
 	@OriginalMember(owner = "client!s", name = "a", descriptor = "([[F[[B[[B[Lclient!gi;II[[F[[B[[B[[II[[F)V")
-	public static void method3393(@OriginalArg(0) float[][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) Class51[] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) float[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) byte[][] arg8, @OriginalArg(9) int[][] arg9, @OriginalArg(11) float[][] arg10) {
+	public static void method3393(@OriginalArg(0) float[][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) Light[] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) float[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) byte[][] arg8, @OriginalArg(9) int[][] arg9, @OriginalArg(11) float[][] arg10) {
 		for (@Pc(7) int local7 = 0; local7 < arg5; local7++) {
-			@Pc(18) Class51 local18 = arg3[local7];
+			@Pc(18) Light local18 = arg3[local7];
 			if (local18.anInt2241 == arg4) {
 				@Pc(24) int local24 = 0;
 				@Pc(28) Class45 local28 = new Class45();
diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java
index 216c154..fad9f11 100644
--- a/client/src/main/java/Static245.java
+++ b/client/src/main/java/Static245.java
@@ -207,7 +207,7 @@ public final class Static245 {
 					break label207;
 				} while (local497 <= 0);
 				for (local232 = 0; local232 < local497; local232++) {
-					@Pc(517) Class51 local517 = new Class51(local96);
+					@Pc(517) Light local517 = new Light(local96);
 					if (local517.anInt2243 == 31) {
 						@Pc(529) Class65 local529 = Static140.method2709(local96.method2163());
 						local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872);
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index b7b71b3..40cb7a1 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -196,7 +196,7 @@ public final class Static269 {
 					break label270;
 				} while (local515 <= 0);
 				for (local243 = 0; local243 < local515; local243++) {
-					@Pc(529) Class51 local529 = new Class51(local95);
+					@Pc(529) Light local529 = new Light(local95);
 					if (local529.anInt2243 == 31) {
 						@Pc(541) Class65 local541 = Static140.method2709(local95.method2163());
 						local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872);