diff --git a/coreSubProjects b/coreSubProjects
index 1b5a10591..0f06fedb9 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 1b5a10591b018febe5a73750d24d549b97fafd99
+Subproject commit 0f06fedb951f98bf2a1278abf95088a5d94de93c
diff --git a/fabric/src/main/java/com/seibel/lod/FabricMain.java b/fabric/src/main/java/com/seibel/lod/FabricMain.java
index 6a9cd42e8..f7a00ed6d 100644
--- a/fabric/src/main/java/com/seibel/lod/FabricMain.java
+++ b/fabric/src/main/java/com/seibel/lod/FabricMain.java
@@ -24,7 +24,7 @@ import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.core.ModInfo;
 import com.seibel.lod.core.config.Config;
-import com.seibel.lod.core.DependencyInjection.DhApiEventInjector;
+import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
@@ -64,7 +64,7 @@ public class FabricMain
 	// This loads the mod after minecraft loads which doesn't causes a lot of issues
 	public static void init()
 	{
-		DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		LOGGER.info("Initializing Mod");
 		LodCommonMain.startup(null);
@@ -85,7 +85,7 @@ public class FabricMain
 		}
 		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
 		
-		DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 
 		// Init config
 		// The reason im initialising in this rather than the post init process is cus im using this for the auto updater
diff --git a/forge/src/main/java/com/seibel/lod/ForgeMain.java b/forge/src/main/java/com/seibel/lod/ForgeMain.java
index ebfb45d34..8fcf20000 100644
--- a/forge/src/main/java/com/seibel/lod/ForgeMain.java
+++ b/forge/src/main/java/com/seibel/lod/ForgeMain.java
@@ -26,7 +26,7 @@ import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.gui.GetConfigScreen;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
-import com.seibel.lod.core.DependencyInjection.DhApiEventInjector;
+import com.seibel.lod.core.DependencyInjection.ApiEventInjector;
 import com.seibel.lod.core.ModInfo;
 import com.seibel.lod.core.ReflectionHandler;
 import com.seibel.lod.core.dependencyInjection.ModAccessorInjector;
@@ -115,7 +115,7 @@ public class ForgeMain implements LodForgeMethodCaller
 
 	private void initCommon()
 	{
-		DhApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		LodCommonMain.startup(this);
 		ForgeDependencySetup.createInitialBindings();
@@ -140,7 +140,7 @@ public class ForgeMain implements LodForgeMethodCaller
 		LodCommonMain.initConfig();
 		LOGGER.info("Mod Post-Initialized");
 		
-		DhApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 	}
 
 	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();