diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/LanguageTemplateGenerator.kt
similarity index 98%
rename from src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt
rename to src/main/kotlin/com/beust/kobalt/app/LanguageTemplateGenerator.kt
index 2e9e4893..4629470f 100644
--- a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/LanguageTemplateGenerator.kt
@@ -13,9 +13,9 @@ import java.io.*
 import java.util.*
 
 /**
- * Abstract base class for the build generators that use build.mustache.
+ * Abstract base class for the "java" and "kotlin" templates.
  */
-abstract class BuildGenerator : ITemplate {
+abstract class LanguageTemplateGenerator : ITemplate {
     override val pluginName = KobaltPlugin.PLUGIN_NAME
 
     abstract val defaultSourceDirectories : HashSet<String>
diff --git a/src/main/kotlin/com/beust/kobalt/app/Templates.kt b/src/main/kotlin/com/beust/kobalt/app/Templates.kt
index 38bb3eae..83c91c63 100644
--- a/src/main/kotlin/com/beust/kobalt/app/Templates.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/Templates.kt
@@ -2,15 +2,15 @@ package com.beust.kobalt.app
 
 import com.beust.kobalt.api.ITemplate
 import com.beust.kobalt.api.ITemplateContributor
-import com.beust.kobalt.app.java.JavaBuildGenerator
-import com.beust.kobalt.app.kotlin.KotlinBuildGenerator
+import com.beust.kobalt.app.java.JavaTemplateGenerator
+import com.beust.kobalt.app.kotlin.KotlinTemplateGenerator
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.misc.log
 import com.google.common.collect.ArrayListMultimap
 import com.google.inject.Inject
 
 class Templates @Inject constructor() : ITemplateContributor {
-    override val templates = listOf(JavaBuildGenerator(), KotlinBuildGenerator(), IdeaFilesTemplate())
+    override val templates = listOf(JavaTemplateGenerator(), KotlinTemplateGenerator(), IdeaFilesTemplate())
 
     fun list(pluginInfo: PluginInfo) {
         val map = ArrayListMultimap.create<String, ITemplate>()
diff --git a/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/java/JavaTemplateGenerator.kt
similarity index 82%
rename from src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
rename to src/main/kotlin/com/beust/kobalt/app/java/JavaTemplateGenerator.kt
index e80353ec..c34b80d3 100644
--- a/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/java/JavaTemplateGenerator.kt
@@ -1,8 +1,11 @@
 package com.beust.kobalt.app.java
 
-import com.beust.kobalt.app.BuildGenerator
+import com.beust.kobalt.app.LanguageTemplateGenerator
 
-class JavaBuildGenerator: BuildGenerator() {
+/**
+ * Template for the "java" generator.
+ */
+class JavaTemplateGenerator : LanguageTemplateGenerator() {
     override val defaultSourceDirectories = hashSetOf("src/main/java")
     override val defaultTestDirectories = hashSetOf("src/test/java")
     override val directive = "project"
diff --git a/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinTemplateGenerator.kt
similarity index 85%
rename from src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
rename to src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinTemplateGenerator.kt
index cd404447..6aef587c 100644
--- a/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinTemplateGenerator.kt
@@ -1,8 +1,8 @@
 package com.beust.kobalt.app.kotlin
 
-import com.beust.kobalt.app.BuildGenerator
+import com.beust.kobalt.app.LanguageTemplateGenerator
 
-class KotlinBuildGenerator : BuildGenerator() {
+class KotlinTemplateGenerator : LanguageTemplateGenerator() {
     override val defaultSourceDirectories = hashSetOf("src/main/kotlin")
     override val defaultTestDirectories = hashSetOf("src/test/kotlin")
     override val directive = "project"
diff --git a/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt b/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt
index aa1eba96..27fa07c2 100644
--- a/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt
+++ b/src/test/kotlin/com/beust/kobalt/maven/PomTest.kt
@@ -3,7 +3,7 @@ package com.beust.kobalt.maven
 import com.beust.kobalt.Args
 import com.beust.kobalt.KobaltTest
 import com.beust.kobalt.api.Kobalt
-import com.beust.kobalt.app.BuildGenerator
+import com.beust.kobalt.app.LanguageTemplateGenerator
 import com.beust.kobalt.app.ProjectGenerator
 import com.beust.kobalt.internal.PluginInfo
 import com.google.inject.Inject
@@ -66,7 +66,7 @@ class PomTest @Inject constructor() : KobaltTest() {
             Assert.assertTrue(contents.contains("version = \"${pom.version}\""), "Should find the version defined")
             pom.properties.forEach {
                 Assert.assertTrue(contents.contains(
-                        "val ${BuildGenerator.toIdentifier(it.key)} = \"${it.value}\""), "Should find the " +
+                        "val ${LanguageTemplateGenerator.toIdentifier(it.key)} = \"${it.value}\""), "Should find the " +
                         "property defined")
             }
             pom.repositories.forEach {