diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java
index c5d1152e5..6ed895570 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java
@@ -113,6 +113,6 @@ public class BiomeWrapper implements IBiomeWrapper
 	
 	
 	@Override 
-	public Object getWrappedMcObject_UNSAFE() { return this.biome; }
+	public Object getWrappedMcObject() { return this.biome; }
 	
 }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java
index 773dc00c1..927b99edd 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java
@@ -75,7 +75,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	
 	@Override
-	public Object getWrappedMcObject_UNSAFE() { return this.blockState; }
+	public Object getWrappedMcObject() { return this.blockState; }
 	
 	@Override
 	public boolean isAir() { return this.isAir(this.blockState); }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java
index 9cb77a310..c64c60b8f 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java
@@ -45,7 +45,7 @@ public class ClientBlockStateCache
     public final BlockPos pos;
     public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos) {
         state = blockState;
-        level = (LevelReader) samplingLevel.getWrappedMcObject_UNSAFE();
+        level = (LevelReader) samplingLevel.getWrappedMcObject();
         pos = McObjectConverter.Convert(samplingPos);
         resolveColors();
         //LOGGER.info("ClientBlocKCache created for {}", blockState);
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java
index bc2056090..ee44b6f03 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java
@@ -28,7 +28,7 @@ public class ServerBlockStateCache
 
     public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos) {
         state = blockState;
-        level = (LevelReader) samplingLevel.getWrappedMcObject_UNSAFE();
+        level = (LevelReader) samplingLevel.getWrappedMcObject();
         pos = McObjectConverter.Convert(samplingPos);
         resolveShapes();
         //LOGGER.info("ServerBlockState created for {}", blockState);
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java
index 8d35db233..aef7d1592 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java
@@ -179,7 +179,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
     }
 
     @Override
-    public ClientLevel getWrappedMcObject_UNSAFE()
+    public ClientLevel getWrappedMcObject()
     {
         return level;
     }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java
index ad84a9243..d1439bfdb 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java
@@ -82,7 +82,7 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
     }
 	
 	@Override
-    public Object getWrappedMcObject_UNSAFE()
+    public Object getWrappedMcObject()
     {
         return this.dimensionType;
     }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java
index 55e9d7985..f83302226 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java
@@ -183,7 +183,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
     }
 
     @Override
-    public ServerLevel getWrappedMcObject_UNSAFE()
+    public ServerLevel getWrappedMcObject()
     {
         return level;
     }
diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java
index 4c4c481ee..26d7ad092 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java
@@ -69,7 +69,7 @@ public final class GlobalParameters
 	{
 		this.lodLevel = lodLevel;
 
-		level = ((ServerLevelWrapper)lodLevel.getServerLevelWrapper()).getWrappedMcObject_UNSAFE();
+		level = ((ServerLevelWrapper)lodLevel.getServerLevelWrapper()).getWrappedMcObject();
 		lightEngine = (ThreadedLevelLightEngine) level.getLightEngine();
 		MinecraftServer server = level.getServer();
 		WorldData worldData = server.getWorldData();
diff --git a/coreSubProjects b/coreSubProjects
index fb77c766a..5c2f89a0a 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit fb77c766a6a5023ff4058447252520f5054bd83b
+Subproject commit 5c2f89a0a5cdced358fab663cba904f310e5bf8c
diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java
index ae7ed891e..41d26cfe7 100644
--- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java
+++ b/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java
@@ -109,7 +109,7 @@ public class MixinWorldUpgrader {
         }
 
         @Override
-        public Object getWrappedMcObject_UNSAFE() {
+        public Object getWrappedMcObject() {
             return null;
         }