diff --git a/NovaCore-Spigot-Abstraction-1_16-plus-shared/src/main/java/net/novauniverse/spigot/version/shared/v1_16plus/BaseVersionIndependentUtilImplementation1_16Plus.java b/NovaCore-Spigot-Abstraction-1_16-plus-shared/src/main/java/net/novauniverse/spigot/version/shared/v1_16plus/BaseVersionIndependentUtilImplementation1_16Plus.java
index 56e65103..8c2ac01b 100644
--- a/NovaCore-Spigot-Abstraction-1_16-plus-shared/src/main/java/net/novauniverse/spigot/version/shared/v1_16plus/BaseVersionIndependentUtilImplementation1_16Plus.java
+++ b/NovaCore-Spigot-Abstraction-1_16-plus-shared/src/main/java/net/novauniverse/spigot/version/shared/v1_16plus/BaseVersionIndependentUtilImplementation1_16Plus.java
@@ -46,7 +46,7 @@
 import net.zeeraa.novacore.commons.log.Log;
 import net.zeeraa.novacore.commons.utils.LoopableIterator;
 import net.zeeraa.novacore.commons.utils.RandomGenerator;
-import net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader;
+import net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentUtils;
 import net.zeeraa.novacore.spigot.abstraction.bossbar.NovaBossBar;
 import net.zeeraa.novacore.spigot.abstraction.enums.ColoredBlockType;
@@ -56,7 +56,7 @@ public abstract class BaseVersionIndependentUtilImplementation1_16Plus extends V
 	private DyeColorToMaterialMapper dyeColorToMaterialMapper;
 	protected Random random;
 
-	public BaseVersionIndependentUtilImplementation1_16Plus(VersionIndependantLoader loader, DyeColorToMaterialMapper colorToMaterialMapper) {
+	public BaseVersionIndependentUtilImplementation1_16Plus(VersionIndependentLoader loader, DyeColorToMaterialMapper colorToMaterialMapper) {
 		super(loader);
 		this.dyeColorToMaterialMapper = colorToMaterialMapper;
 		this.random = new Random();
diff --git a/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependantLoader.java b/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentLoader.java
similarity index 88%
rename from NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependantLoader.java
rename to NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentLoader.java
index 61361322..4afe40c3 100644
--- a/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependantLoader.java
+++ b/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentLoader.java
@@ -2,7 +2,7 @@
 
 import net.zeeraa.novacore.spigot.abstraction.particle.NovaParticleProvider;
 
-public abstract class VersionIndependantLoader {
+public abstract class VersionIndependentLoader {
 	public abstract CommandRegistrator getCommandRegistrator();
 
 	public abstract VersionIndependentUtils getVersionIndependentUtils();
diff --git a/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentUtils.java b/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentUtils.java
index 54cf3ff5..c551e155 100644
--- a/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentUtils.java
+++ b/NovaCore-Spigot-Abstraction/src/main/java/net/zeeraa/novacore/spigot/abstraction/VersionIndependentUtils.java
@@ -60,7 +60,7 @@ public abstract class VersionIndependentUtils {
 	private static VersionIndependentUtils instance;
 	protected static List<String> BED_MATERIALS = new ArrayList<>();
 	
-	protected VersionIndependantLoader loader;
+	protected VersionIndependentLoader loader;
 
 	static {
 		BED_MATERIALS.add("BED");
@@ -83,11 +83,11 @@ public abstract class VersionIndependentUtils {
 		BED_MATERIALS.add("YELLOW_BED");
 	}
 
-	public VersionIndependentUtils(VersionIndependantLoader loader) {
+	public VersionIndependentUtils(VersionIndependentLoader loader) {
 		this.loader = loader;
 	}
 	
-	public VersionIndependantLoader getLoader() {
+	public VersionIndependentLoader getLoader() {
 		return loader;
 	}
 	
diff --git a/NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/NovaCore.java b/NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/NovaCore.java
index 8ef55971..043ab791 100644
--- a/NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/NovaCore.java
+++ b/NovaCore-Spigot/src/main/java/net/zeeraa/novacore/spigot/NovaCore.java
@@ -42,7 +42,7 @@
 import net.zeeraa.novacore.commons.utils.JSONFileUtils;
 import net.zeeraa.novacore.spigot.abstraction.CommandRegistrator;
 import net.zeeraa.novacore.spigot.abstraction.NovaCoreAbstraction;
-import net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader;
+import net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentUtils;
 import net.zeeraa.novacore.spigot.abstraction.commons.AbstractBukkitConsoleSender;
 import net.zeeraa.novacore.spigot.abstraction.commons.AbstractBukkitPlayerMessageSender;
@@ -613,8 +613,8 @@ public void onEnable() {
 
 		try {
 			Class<?> clazz = Class.forName("net.zeeraa.novacore.spigot.version." + version + ".VersionIndependentLoader");
-			if (VersionIndependantLoader.class.isAssignableFrom(clazz)) {
-				VersionIndependantLoader versionIndependantLoader = (VersionIndependantLoader) clazz.getConstructor().newInstance();
+			if (VersionIndependentLoader.class.isAssignableFrom(clazz)) {
+				VersionIndependentLoader versionIndependantLoader = (VersionIndependentLoader) clazz.getConstructor().newInstance();
 
 				if (!forceReflectionCommandRegistrator) {
 					bukkitCommandRegistrator = versionIndependantLoader.getCommandRegistrator();
@@ -643,7 +643,7 @@ public void onEnable() {
 					this.novaParticleProvider = versionSpecificParticleProvider;
 				}
 			} else {
-				throw new InvalidClassException(clazz.getName() + " is not assignable from " + VersionIndependantLoader.class.getName());
+				throw new InvalidClassException(clazz.getName() + " is not assignable from " + VersionIndependentLoader.class.getName());
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/NovaCore-Spigot_1.8.8-R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_8_R3/VersionIndependentLoader.java b/NovaCore-Spigot_1.8.8-R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_8_R3/VersionIndependentLoader.java
index 8c3016b5..48027790 100644
--- a/NovaCore-Spigot_1.8.8-R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_8_R3/VersionIndependentLoader.java
+++ b/NovaCore-Spigot_1.8.8-R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_8_R3/VersionIndependentLoader.java
@@ -4,7 +4,7 @@
 import net.zeeraa.novacore.spigot.abstraction.Listeners;
 import net.zeeraa.novacore.spigot.abstraction.particle.NovaParticleProvider;
 
-public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader {
+public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader {
 	@Override
 	public CommandRegistrator getCommandRegistrator() {
 		return new NMSBasedCommandRegistrator();
diff --git a/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentLoader.java b/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentLoader.java
index c530289e..1bf04dd4 100644
--- a/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentLoader.java
+++ b/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentLoader.java
@@ -4,7 +4,7 @@
 import net.zeeraa.novacore.spigot.abstraction.Listeners;
 import net.zeeraa.novacore.spigot.abstraction.particle.NovaParticleProvider;
 
-public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader {
+public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader {
 	@Override
 	public CommandRegistrator getCommandRegistrator() {
 		return new NMSBasedCommandRegistrator();
diff --git a/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentUtilsImplementation.java b/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentUtilsImplementation.java
index 84c1c157..b8f8f8c3 100644
--- a/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentUtilsImplementation.java
+++ b/NovaCore-Spigot_1_12-R1/src/main/java/net/zeeraa/novacore/spigot/version/v1_12_R1/VersionIndependentUtilsImplementation.java
@@ -34,7 +34,7 @@
 import net.zeeraa.novacore.spigot.abstraction.ChunkLoader;
 import net.zeeraa.novacore.spigot.abstraction.ItemBuilderRecordList;
 import net.zeeraa.novacore.spigot.abstraction.MaterialNameList;
-import net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader;
+import net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentItems;
 import net.zeeraa.novacore.spigot.abstraction.bossbar.NovaBossBar;
 import net.zeeraa.novacore.spigot.abstraction.commons.AttributeInfo;
@@ -129,7 +129,7 @@ public ChunkLoader getChunkLoader() {
 		return chunkLoader;
 	}
 
-	public VersionIndependentUtilsImplementation(VersionIndependantLoader loader) {
+	public VersionIndependentUtilsImplementation(VersionIndependentLoader loader) {
 		super(loader);
 		itemBuilderRecordList = new ItemBuilderRecordList1_12();
 		materialNameList = MaterialNameList1_12.get();
diff --git a/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentLoader.java b/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentLoader.java
index e2fd53e1..7de6f262 100644
--- a/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentLoader.java
+++ b/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentLoader.java
@@ -5,7 +5,7 @@
 import net.zeeraa.novacore.spigot.abstraction.Listeners;
 import net.zeeraa.novacore.spigot.abstraction.particle.NovaParticleProvider;
 
-public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader {
+public class VersionIndependentLoader extends net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader {
 	@Override
 	public CommandRegistrator getCommandRegistrator() {
 		return new NMSBasedCommandRegistrator();
diff --git a/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentUtilsImplementation.java b/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentUtilsImplementation.java
index 048a132e..e62fdba6 100644
--- a/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentUtilsImplementation.java
+++ b/NovaCore-Spigot_1_16_R3/src/main/java/net/zeeraa/novacore/spigot/version/v1_16_R3/VersionIndependentUtilsImplementation.java
@@ -21,7 +21,7 @@
 import net.zeeraa.novacore.spigot.abstraction.ChunkLoader;
 import net.zeeraa.novacore.spigot.abstraction.ItemBuilderRecordList;
 import net.zeeraa.novacore.spigot.abstraction.MaterialNameList;
-import net.zeeraa.novacore.spigot.abstraction.VersionIndependantLoader;
+import net.zeeraa.novacore.spigot.abstraction.VersionIndependentLoader;
 import net.zeeraa.novacore.spigot.abstraction.VersionIndependentItems;
 import net.zeeraa.novacore.spigot.abstraction.commons.AttributeInfo;
 import net.zeeraa.novacore.spigot.abstraction.enums.ColoredBlockType;
@@ -93,7 +93,7 @@ public ChunkLoader getChunkLoader() {
 		return chunkLoader;
 	}
 
-	public VersionIndependentUtilsImplementation(VersionIndependantLoader loader) {
+	public VersionIndependentUtilsImplementation(VersionIndependentLoader loader) {
 		super(loader, new DyeColorToMaterialMapper_1_16());
 		itemBuilderRecordList = new ItemBuilderRecordList1_16();
 	}