diff --git a/buildSrc/src/main/java/de/griefed/generation/BlockAndItemCodeGenerator.java b/buildSrc/src/main/java/de/griefed/generation/BlockAndItemCodeGenerator.java
index c913574..64578bc 100644
--- a/buildSrc/src/main/java/de/griefed/generation/BlockAndItemCodeGenerator.java
+++ b/buildSrc/src/main/java/de/griefed/generation/BlockAndItemCodeGenerator.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.griefed.generation.blocks.BlockDefinitionParser;
-import de.griefed.generation.generator.CommonGeneration;
+import de.griefed.generation.generator.CommonSubProjectGenerator;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
@@ -33,7 +33,7 @@ public void apply(Project project) {
             String modName = gradleProperties.getProperty("mod_name");
 
             BlockDefinitionParser parser = new BlockDefinitionParser(project, objectMapper);
-            CommonGeneration common = new CommonGeneration(project.findProject("Common"), modName, parser, objectMapper);
+            CommonSubProjectGenerator common = new CommonSubProjectGenerator(project.findProject("Common"), modName, parser, objectMapper);
             common.run();
         } catch (IOException e) {
             throw new RuntimeException("Error generating block and item code.", e);
diff --git a/buildSrc/src/main/java/de/griefed/generation/generator/ModloaderGeneration.java b/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java
similarity index 98%
rename from buildSrc/src/main/java/de/griefed/generation/generator/ModloaderGeneration.java
rename to buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java
index 9cfecb7..ec1fdb6 100644
--- a/buildSrc/src/main/java/de/griefed/generation/generator/ModloaderGeneration.java
+++ b/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java
@@ -12,7 +12,7 @@
 import java.util.regex.Pattern;
 
 @SuppressWarnings("unused")
-public abstract class ModloaderGeneration {
+public abstract class CodeGenerator {
 
     public static final Pattern GENERATED_CODE_PATTERN = Pattern.compile("/\\*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###\\*/.*/\\*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###\\*/", Pattern.DOTALL);
     public static final Pattern LANG_REPLACE = Pattern.compile("\"DO\\.NOT\\.EDIT\\.MANUALLY\\.BEGIN\": \"BEGIN\".*\"DO\\.NOT\\.EDIT\\.MANUALLY\\.END\": \"END\"", Pattern.DOTALL);
@@ -66,7 +66,7 @@ public abstract class ModloaderGeneration {
     private final File assetsDirectory;
     private final File translationsFile;
 
-    protected ModloaderGeneration(Project project, String modName, BlockDefinitionParser parser, ObjectMapper objectMapper) {
+    protected CodeGenerator(Project project, String modName, BlockDefinitionParser parser, ObjectMapper objectMapper) {
         this.project = project;
         this.blockDefinitionParser = parser;
         this.modName = modName;
diff --git a/buildSrc/src/main/java/de/griefed/generation/generator/CommonGeneration.java b/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java
similarity index 98%
rename from buildSrc/src/main/java/de/griefed/generation/generator/CommonGeneration.java
rename to buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java
index 6f72029..9e3d4a6 100644
--- a/buildSrc/src/main/java/de/griefed/generation/generator/CommonGeneration.java
+++ b/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java
@@ -7,8 +7,8 @@
 
 import java.io.IOException;
 
-public class CommonGeneration extends ModloaderGeneration implements CodeGeneration {
-    public CommonGeneration(Project project, String modName, BlockDefinitionParser parser, ObjectMapper objectMapper) {
+public class CommonSubProjectGenerator extends CodeGenerator implements CodeGeneration {
+    public CommonSubProjectGenerator(Project project, String modName, BlockDefinitionParser parser, ObjectMapper objectMapper) {
         super(project, modName, parser, objectMapper);
     }