diff --git a/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java b/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
index 466cd82..f884b61 100644
--- a/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
+++ b/src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
@@ -41,7 +41,7 @@
 import net.minecraft.world.chunk.IChunkProvider;
 
 import org.apache.logging.log4j.Level;
-import org.ultramine.server.chunk.WrappedModGenerator;
+import org.ultramine.server.chunk.WrappedWorldGenerator;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
@@ -77,7 +77,7 @@
 	 */
 	public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight)
 	{
-		generator = new WrappedModGenerator(generator, Loader.instance().activeModContainer());
+		generator = new WrappedWorldGenerator(generator, Loader.instance().activeModContainer());
 		worldGenerators.add(generator);
 		worldGeneratorIndex.put(generator, modGenerationWeight);
 		if (sortedGeneratorList != null)
diff --git a/src/main/java/org/ultramine/server/chunk/WrappedModGenerator.java b/src/main/java/org/ultramine/server/chunk/WrappedModGenerator.java
deleted file mode 100644
index a53f45d..0000000
--- a/src/main/java/org/ultramine/server/chunk/WrappedModGenerator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.ultramine.server.chunk;
-
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraft.world.chunk.IChunkProvider;
-import cpw.mods.fml.common.IWorldGenerator;
-import cpw.mods.fml.common.ModContainer;
-
-public class WrappedModGenerator implements IWorldGenerator
-{
-	private final IWorldGenerator wrapped;
-	private final ModContainer owner;
-	
-	public WrappedModGenerator(IWorldGenerator wrapped, ModContainer owner)
-	{
-		this.wrapped = wrapped;
-		this.owner = owner;
-	}
-
-	@Override
-	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
-	{
-		List<String> modGenerationBlackList = ((WorldServer)world).getConfig().generation.modGenerationBlackList;
-		if(modGenerationBlackList == null || owner == null || !modGenerationBlackList.contains(owner.getModId()))
-			wrapped.generate(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
-	}
-
-	public int hashCode()
-	{
-		return wrapped.hashCode();
-	}
-	
-	public boolean equals(Object o)
-	{
-		return o instanceof WrappedModGenerator && ((WrappedModGenerator)o).wrapped.equals(wrapped) || wrapped.equals(o);
-	}
-}
diff --git a/src/main/java/org/ultramine/server/chunk/WrappedWorldGenerator.java b/src/main/java/org/ultramine/server/chunk/WrappedWorldGenerator.java
new file mode 100644
index 0000000..f42fc23
--- /dev/null
+++ b/src/main/java/org/ultramine/server/chunk/WrappedWorldGenerator.java
@@ -0,0 +1,40 @@
+package org.ultramine.server.chunk;
+
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.IChunkProvider;
+import cpw.mods.fml.common.IWorldGenerator;
+import cpw.mods.fml.common.ModContainer;
+
+public class WrappedWorldGenerator implements IWorldGenerator
+{
+	private final IWorldGenerator wrapped;
+	private final ModContainer owner;
+	
+	public WrappedWorldGenerator(IWorldGenerator wrapped, ModContainer owner)
+	{
+		this.wrapped = wrapped;
+		this.owner = owner;
+	}
+
+	@Override
+	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
+	{
+		List<String> modGenerationBlackList = ((WorldServer)world).getConfig().generation.modGenerationBlackList;
+		if(modGenerationBlackList == null || owner == null || !modGenerationBlackList.contains(owner.getModId()))
+			wrapped.generate(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
+	}
+
+	public int hashCode()
+	{
+		return wrapped.hashCode();
+	}
+	
+	public boolean equals(Object o)
+	{
+		return o instanceof WrappedWorldGenerator && ((WrappedWorldGenerator)o).wrapped.equals(wrapped) || wrapped.equals(o);
+	}
+}