diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
index f99f50537..07c2eda3a 100644
--- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
+++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
@@ -19,7 +19,7 @@ import com.dfsek.terra.api.world.generator.ChunkData;
 import com.dfsek.terra.api.world.generator.Palette;
 import com.dfsek.terra.api.world.generator.Sampler;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
@@ -30,7 +30,7 @@ import java.util.Random;
 public class NoiseChunkGenerator3D implements TerraChunkGenerator {
     private final ConfigPack configPack;
     private final TerraPlugin main;
-    private final List<TerraGenerationStage> generationStages = new ArrayList<>();
+    private final List<GenerationStage> generationStages = new ArrayList<>();
 
     private final BlockState air;
 
@@ -160,7 +160,7 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
     }
 
     @Override
-    public List<TerraGenerationStage> getGenerationStages() {
+    public List<GenerationStage> getGenerationStages() {
         return generationStages;
     }
 
diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java
index 7f2263b0b..bf9398586 100644
--- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java
+++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java
@@ -10,14 +10,14 @@ import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generator.Chunkified;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
-public class CavePopulator implements TerraGenerationStage, Chunkified {
+public class CavePopulator implements GenerationStage, Chunkified {
     private static final Map<BlockType, BlockState> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time.
     private final TerraPlugin main;
 
diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
index ac5cf1ca8..f6146fdd0 100644
--- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
+++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OrePopulator.java
@@ -6,12 +6,12 @@ import com.dfsek.terra.api.util.PopulationUtil;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
-public class OrePopulator implements TerraGenerationStage {
+public class OrePopulator implements GenerationStage {
     private final TerraPlugin main;
 
     public OrePopulator(TerraPlugin main) {
diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
index 355161c4c..e3067f95a 100644
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
@@ -11,13 +11,13 @@ import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.Chunkified;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
-public class StructurePopulator implements TerraGenerationStage, Chunkified {
+public class StructurePopulator implements GenerationStage, Chunkified {
     private final TerraPlugin main;
 
     public StructurePopulator(TerraPlugin main) {
diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java
index 7c8cf1c57..180bbb63c 100644
--- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java
+++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java
@@ -8,9 +8,9 @@ import com.dfsek.terra.api.util.PopulationUtil;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 
-public class FeatureGenerationStage implements TerraGenerationStage {
+public class FeatureGenerationStage implements GenerationStage {
     private final TerraPlugin main;
 
     public FeatureGenerationStage(TerraPlugin main) {
diff --git a/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraGenerationStage.java b/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraGenerationStage.java
index 50bb228ce..8957fad87 100644
--- a/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraGenerationStage.java
+++ b/common/addons/generation-stage-flora/src/main/java/com/dfsek/terra/addons/generation/flora/FloraGenerationStage.java
@@ -7,7 +7,7 @@ import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
+import com.dfsek.terra.api.world.generator.GenerationStage;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
@@ -18,7 +18,7 @@ import java.util.Random;
 /**
  * Populates Flora
  */
-public class FloraGenerationStage implements TerraGenerationStage {
+public class FloraGenerationStage implements GenerationStage {
     private final TerraPlugin main;
 
     public FloraGenerationStage(TerraPlugin main) {
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraGenerationStage.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java
similarity index 81%
rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraGenerationStage.java
rename to common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java
index 8f4cf9f0a..9b14e61de 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraGenerationStage.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java
@@ -3,6 +3,6 @@ package com.dfsek.terra.api.world.generator;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 
-public interface TerraGenerationStage {
+public interface GenerationStage {
     void populate(World world, Chunk chunk);
 }
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java
index 209001f56..db12f7b15 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java
@@ -3,5 +3,5 @@ package com.dfsek.terra.api.world.generator;
 import com.dfsek.terra.api.config.ConfigPack;
 
 public interface GenerationStageProvider {
-    TerraGenerationStage newInstance(ConfigPack pack);
+    GenerationStage newInstance(ConfigPack pack);
 }
diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java b/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
index e2ef1241a..390a00a72 100644
--- a/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/world/generator/TerraChunkGenerator.java
@@ -23,7 +23,7 @@ public interface TerraChunkGenerator {
 
     Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
 
-    List<TerraGenerationStage> getGenerationStages();
+    List<GenerationStage> getGenerationStages();
 
     BlockState getBlock(World world, int x, int y, int z);