diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructures.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
similarity index 90%
rename from common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructures.java
rename to common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
index 6f84711..1c16054 100644
--- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructures.java
+++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/structures/GenerationsStructureSettings.java
@@ -3,12 +3,11 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.worldgen.BootstapContext;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.structure.Structure;
 import net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool;
 import net.minecraft.world.level.levelgen.structure.structures.JigsawStructure;
 
-public class GenerationsStructures {
+public class GenerationsStructureSettings {
 
     public static void bootstrap(BootstapContext<Structure> context) {
 
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/StructureSets.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/GenerationsStructureSets.java
similarity index 99%
rename from common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/StructureSets.java
rename to common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/GenerationsStructureSets.java
index b26c4fc..2976781 100644
--- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/StructureSets.java
+++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/structureset/GenerationsStructureSets.java
@@ -19,7 +19,7 @@
  * @see StructureSet
  * @author Joseph T. McQuigg
  */
-public class StructureSets {
+public class GenerationsStructureSets {
     public static ResourceKey<StructureSet> LOOT_BALLOON = create("loot_balloon");
     public static ResourceKey<StructureSet> COMET = create("comet");
     public static ResourceKey<StructureSet> POKESHOPS = create("pokeshops");
diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/TemplatePools.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java
similarity index 99%
rename from common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/TemplatePools.java
rename to common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java
index f1691ff..a15daae 100644
--- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/TemplatePools.java
+++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-public class TemplatePools {
+public class GenerationsTemplatePools {
 
     public static final ResourceKey<StructureTemplatePool> BEAST_BALLOON = create("loot_balloon/beast_balloon");
     public static final ResourceKey<StructureTemplatePool> GREAT_BALLOON = create("loot_balloon/great_balloon");
diff --git a/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java b/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java
index 1beb862..adfeac7 100644
--- a/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java
+++ b/forge/src/main/java/generations/gg/generations/structures/generationsstructures/forge/datagen/ForgeDatagen.java
@@ -1,11 +1,12 @@
 package generations.gg.generations.structures.generationsstructures.forge.datagen;
 
 import generations.gg.generations.structures.generationsstructures.GenerationsStructures;
+import generations.gg.generations.structures.generationsstructures.structures.GenerationsStructureSettings;
 import generations.gg.generations.structures.generationsstructures.structures.GenerationsStructuresKeys;
 import generations.gg.generations.structures.generationsstructures.tags.GenerationsBiomeTags;
 import generations.gg.generations.structures.generationsstructures.tags.GenerationsStructureTags;
-import generations.gg.generations.structures.generationsstructures.worldgen.structureset.StructureSets;
-import generations.gg.generations.structures.generationsstructures.worldgen.template_pool.TemplatePools;
+import generations.gg.generations.structures.generationsstructures.worldgen.structureset.GenerationsStructureSets;
+import generations.gg.generations.structures.generationsstructures.worldgen.template_pool.GenerationsTemplatePools;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
@@ -45,9 +46,9 @@ public static void gatherData(GatherDataEvent event) {
     }
 
     private static final RegistrySetBuilder BUILDER = new RegistrySetBuilder()
-            .add(Registries.TEMPLATE_POOL, TemplatePools::bootstrap)
-            .add(Registries.STRUCTURE, generations.gg.generations.structures.generationsstructures.structures.GenerationsStructures::bootstrap)
-            .add(Registries.STRUCTURE_SET, StructureSets::bootstrap);
+            .add(Registries.TEMPLATE_POOL, GenerationsTemplatePools::bootstrap)
+            .add(Registries.STRUCTURE, GenerationsStructureSettings::bootstrap)
+            .add(Registries.STRUCTURE_SET, GenerationsStructureSets::bootstrap);
 
     private static class GenerationsStructuresBiomeTagsProvider extends BiomeTagsProvider {