diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java b/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java
index 6d5228fae..3ea5bae22 100644
--- a/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java
+++ b/api/src/main/java/com/seibel/lod/api/interfaces/override/worldGenerator/IDhApiWorldGeneratorOverrideRegister.java
@@ -2,7 +2,6 @@ package com.seibel.lod.api.interfaces.override.worldGenerator;
 
 import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.lod.api.objects.DhApiResult;
-import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector;
 
 /**
  * Handles adding world generator overrides.
diff --git a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java
index 1678ee655..01330d185 100644
--- a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java
+++ b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java
@@ -25,7 +25,6 @@ import com.seibel.lod.core.config.Config;
 import com.seibel.lod.api.enums.config.EDistanceGenerationMode;
 import com.seibel.lod.core.dependencyInjection.SingletonInjector;
 import com.seibel.lod.core.logging.DhLoggerBuilder;
-import com.seibel.lod.core.pos.DhChunkPos;
 import com.seibel.lod.core.util.BitShiftUtil;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
@@ -34,7 +33,6 @@ import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenera
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;
 import org.apache.logging.log4j.Logger;
 
-import java.lang.invoke.MethodHandles;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
@@ -42,7 +40,7 @@ import java.util.function.Consumer;
  * @author Leetom
  * @version 2022-11-25
  */
-public class BatchGenerator implements IChunkGenerator
+public class BatchGenerator implements IWorldGenerator
 {
 	private static final IWrapperFactory FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
diff --git a/core/src/main/java/com/seibel/lod/core/generation/IChunkGenerator.java b/core/src/main/java/com/seibel/lod/core/generation/IWorldGenerator.java
similarity index 95%
rename from core/src/main/java/com/seibel/lod/core/generation/IChunkGenerator.java
rename to core/src/main/java/com/seibel/lod/core/generation/IWorldGenerator.java
index acbf11af7..d9b200257 100644
--- a/core/src/main/java/com/seibel/lod/core/generation/IChunkGenerator.java
+++ b/core/src/main/java/com/seibel/lod/core/generation/IWorldGenerator.java
@@ -10,7 +10,6 @@ import com.seibel.lod.core.pos.DhChunkPos;
 import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 
-import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
@@ -22,7 +21,7 @@ import java.util.function.Consumer;
  * @author Leetom
  * @version 2022-12-5
  */
-public interface IChunkGenerator extends IDhApiWorldGenerator
+public interface IWorldGenerator extends IDhApiWorldGenerator
 {
 	/**
 	 * Start a generation event
diff --git a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java
index ec40612c5..6ffa7b743 100644
--- a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java
+++ b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java
@@ -25,7 +25,7 @@ public class WorldGenerationQueue implements Closeable
 	
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	private final IChunkGenerator generator;
+	private final IWorldGenerator generator;
 	
 	private final ConcurrentLinkedQueue<WorldGenTask> looseTasks = new ConcurrentLinkedQueue<>();
 	// FIXME: Concurrency issue on close!
@@ -57,7 +57,7 @@ public class WorldGenerationQueue implements Closeable
 	
 	
 	
-	public WorldGenerationQueue(IChunkGenerator generator)
+	public WorldGenerationQueue(IWorldGenerator generator)
 	{
 		this.generator = generator;
 		this.maxGranularity = generator.getMaxGenerationGranularity();
diff --git a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
index 635f64802..8159b84cc 100644
--- a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
+++ b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
@@ -5,7 +5,7 @@ import com.seibel.lod.core.datatype.full.ChunkSizedData;
 import com.seibel.lod.core.datatype.full.FullDataSource;
 import com.seibel.lod.core.datatype.transform.ChunkToLodBuilder;
 import com.seibel.lod.core.file.datafile.IDataSourceProvider;
-import com.seibel.lod.core.generation.IChunkGenerator;
+import com.seibel.lod.core.generation.IWorldGenerator;
 import com.seibel.lod.core.generation.WorldGenerationQueue;
 import com.seibel.lod.core.pos.DhLodPos;
 import com.seibel.lod.core.pos.DhSectionPos;
@@ -365,7 +365,7 @@ public class DhClientServerLevel implements IDhClientLevel, IDhServerLevel
 	
 	private class WorldGenState
 	{
-		public final IChunkGenerator chunkGenerator;
+		public final IWorldGenerator chunkGenerator;
 		public final WorldGenerationQueue worldGenerationQueue;
 		
 		WorldGenState()
diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
index 3091c7a9a..d023530f5 100644
--- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
+++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestPrimary.java
@@ -1,10 +1,6 @@
 package testItems.worldGeneratorInjection.objects;
 
 import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode;
-import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
-import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper;
-import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.lod.core.DependencyInjection.OverrideInjector;
 
 /**
diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
index 212d6748e..6e65da758 100644
--- a/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
+++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/WorldGeneratorTestSecondary.java
@@ -1,10 +1,6 @@
 package testItems.worldGeneratorInjection.objects;
 
 import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenThreadMode;
-import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
-import com.seibel.lod.api.interfaces.world.IDhApiChunkWrapper;
-import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.lod.core.DependencyInjection.OverrideInjector;
 
 /**