diff --git a/coreSubProjects b/coreSubProjects
index e695c1887..a97f9cf9b 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit e695c1887169c6685300047c61b334862ebc1b83
+Subproject commit a97f9cf9b46cb5bdf0b1d552b234bc29ca50e168
diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java
index 0ca5de7d3..326002a3c 100644
--- a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java
+++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java
@@ -73,11 +73,11 @@ public class FabricServerProxy {
         // ServerWorldLoadEvent
         //TODO: Check if both of this use the correct timed events. (i.e. is it 'ed' or 'ing' one?)
         ServerLifecycleEvents.SERVER_STARTING.register((server) -> {
-            if (isValidTime()) ServerApi.INSTANCE.serverWorldLoadEvent(isDedicated);
+            if (isValidTime()) ServerApi.INSTANCE.serverLoadEvent(isDedicated);
         });
         // ServerWorldUnloadEvent
         ServerLifecycleEvents.SERVER_STOPPED.register((server) -> {
-            if (isValidTime()) ServerApi.INSTANCE.serverWorldUnloadEvent();
+            if (isValidTime()) ServerApi.INSTANCE.serverUnloadEvent();
         });
 
         // ServerLevelLoadEvent
diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java
index 4f05aa047..dbfadd16a 100644
--- a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java
+++ b/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java
@@ -55,13 +55,13 @@ public class ForgeServerProxy {
     // ServerWorldLoadEvent
     @SubscribeEvent
     private void dedicatedWorldLoadEvent(ServerStartedEvent event) {
-        if (isValidTime()) serverApi.serverWorldLoadEvent(isDedicated);
+        if (isValidTime()) serverApi.serverLoadEvent(isDedicated);
     }
 
     // ServerWorldUnloadEvent
     @SubscribeEvent
     private void serverWorldUnloadEvent(ServerStoppingEvent event) {
-        if (isValidTime()) serverApi.serverWorldUnloadEvent();
+        if (isValidTime()) serverApi.serverUnloadEvent();
     }
 
     // ServerLevelLoadEvent