diff --git a/NeoForge/src/main/kotlin/PyTekNeoForge.kt b/NeoForge/src/main/kotlin/PyTekNeoForge.kt
index 7b7e31c..81d8cbc 100644
--- a/NeoForge/src/main/kotlin/PyTekNeoForge.kt
+++ b/NeoForge/src/main/kotlin/PyTekNeoForge.kt
@@ -12,20 +12,14 @@ import gay.pyrrha.pytek.MOD_ID
 import gay.pyrrha.pytek.PyTekCore
 import gay.pyrrha.pytek.blocks.ModBlocks
 import gay.pyrrha.pytek.blocks.entity.ModBlockEntities
-import gay.pyrrha.pytek.neoforge.datagen.BlockStateProvider
-import gay.pyrrha.pytek.neoforge.datagen.EnUsLanguageProvider
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.Registries
-import net.minecraft.data.DataGenerator
-import net.minecraft.data.DataProvider
-import net.minecraft.data.PackOutput
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.neoforged.bus.api.IEventBus
 import net.neoforged.fml.ModContainer
 import net.neoforged.fml.common.Mod
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent
-import net.neoforged.neoforge.data.event.GatherDataEvent
 import net.neoforged.neoforge.registries.RegisterEvent
 
 @Mod(MOD_ID)
diff --git a/NeoForge/src/main/kotlin/datagen/BlockStateProvider.kt b/NeoForge/src/main/kotlin/datagen/NeoBlockStateDataProvider.kt
similarity index 96%
rename from NeoForge/src/main/kotlin/datagen/BlockStateProvider.kt
rename to NeoForge/src/main/kotlin/datagen/NeoBlockStateDataProvider.kt
index 99cb580..3c0ecd1 100644
--- a/NeoForge/src/main/kotlin/datagen/BlockStateProvider.kt
+++ b/NeoForge/src/main/kotlin/datagen/NeoBlockStateDataProvider.kt
@@ -16,7 +16,7 @@ import net.neoforged.neoforge.client.model.generators.BlockStateProvider
 import net.neoforged.neoforge.common.data.ExistingFileHelper
 
 // todo(py, 21/05/2024): make this platform non-specific
-public class BlockStateProvider(
+public class NeoBlockStateDataProvider(
     output: PackOutput,
     exFileHelper: ExistingFileHelper
 ) : BlockStateProvider(output, MOD_ID, exFileHelper) {
diff --git a/NeoForge/src/main/kotlin/datagen/NeoForgeDataGenerator.kt b/NeoForge/src/main/kotlin/datagen/NeoForgeDataGenerator.kt
index 2ff6c86..9302457 100644
--- a/NeoForge/src/main/kotlin/datagen/NeoForgeDataGenerator.kt
+++ b/NeoForge/src/main/kotlin/datagen/NeoForgeDataGenerator.kt
@@ -22,7 +22,7 @@ public object NeoForgeDataGenerator {
         val output = generator.packOutput
         val disabledExistingFileHelper = ExistingFileHelper(emptyList(), emptySet(), false, null, null)
 
-        generator.addProvider(event.includeServer(), EnUsLanguageProvider(output))
-        generator.addProvider(event.includeServer(), BlockStateProvider(output, disabledExistingFileHelper))
+        generator.addProvider(event.includeServer(), NeoUSEnglishLanguageDataProvider(output))
+        generator.addProvider(event.includeServer(), NeoBlockStateDataProvider(output, disabledExistingFileHelper))
     }
 }
diff --git a/NeoForge/src/main/kotlin/datagen/EnUsLanguageProvider.kt b/NeoForge/src/main/kotlin/datagen/NeoUSEnglishLanguageDataProvider.kt
similarity index 85%
rename from NeoForge/src/main/kotlin/datagen/EnUsLanguageProvider.kt
rename to NeoForge/src/main/kotlin/datagen/NeoUSEnglishLanguageDataProvider.kt
index 1c85959..beabb9c 100644
--- a/NeoForge/src/main/kotlin/datagen/EnUsLanguageProvider.kt
+++ b/NeoForge/src/main/kotlin/datagen/NeoUSEnglishLanguageDataProvider.kt
@@ -13,7 +13,7 @@ import gay.pyrrha.pytek.datagen.lang.EnUsLanguageProvider
 import net.minecraft.data.PackOutput
 import net.neoforged.neoforge.common.data.LanguageProvider
 
-public class EnUsLanguageProvider(output: PackOutput) : LanguageProvider(output, MOD_ID, "en_us") {
+public class NeoUSEnglishLanguageDataProvider(output: PackOutput) : LanguageProvider(output, MOD_ID, "en_us") {
     override fun addTranslations() {
         EnUsLanguageProvider.provide(::add, ::add, ::add, ::add, ::add, ::add, ::add, ::add)
     }