diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index 07fe57b4..911f9818 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -8,7 +8,7 @@ import com.beust.kobalt.internal.*
 import com.beust.kobalt.kotlin.BuildFile
 import com.beust.kobalt.maven.*
 import com.beust.kobalt.misc.*
-import com.beust.kobalt.kotlin.ScriptCompiler2
+import com.beust.kobalt.kotlin.BuildFileCompiler
 import com.beust.kobalt.wrapper.Wrapper
 import com.google.inject.Guice
 import java.io.File
@@ -38,7 +38,7 @@ public fun mainNoExit(argv: Array<String>) : Int {
 }
 
 private class Main @Inject constructor(
-        val buildFileCompilerFactory: ScriptCompiler2.IFactory,
+        val buildFileCompilerFactory: BuildFileCompiler.IFactory,
         val plugins: Plugins,
         val taskManager: TaskManager,
         val http: Http,
diff --git a/src/main/kotlin/com/beust/kobalt/internal/KobaltClient.kt b/src/main/kotlin/com/beust/kobalt/internal/KobaltClient.kt
index 2ff10169..b5a9fb4a 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/KobaltClient.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/KobaltClient.kt
@@ -2,7 +2,7 @@ package com.beust.kobalt.internal
 
 import com.beust.kobalt.Args
 import com.beust.kobalt.SystemProperties
-import com.beust.kobalt.kotlin.ScriptCompiler2
+import com.beust.kobalt.kotlin.BuildFileCompiler
 import com.beust.kobalt.mainNoExit
 import com.beust.kobalt.misc.log
 import com.google.gson.JsonObject
@@ -54,7 +54,7 @@ public class KobaltClient @Inject constructor() : Runnable {
         }
     }
 
-    fun sendInfo(info: ScriptCompiler2.BuildScriptInfo) {
+    fun sendInfo(info: BuildFileCompiler.BuildScriptInfo) {
         outgoing!!.println("Sending info with project count: " + info.projects.size())
     }
 }
diff --git a/src/main/kotlin/com/beust/kobalt/internal/KobaltServer.kt b/src/main/kotlin/com/beust/kobalt/internal/KobaltServer.kt
index 1f77f390..64ef13e6 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/KobaltServer.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/KobaltServer.kt
@@ -1,9 +1,8 @@
 package com.beust.kobalt.internal
 
-import com.beust.klaxon.json
 import com.beust.kobalt.Args
 import com.beust.kobalt.kotlin.BuildFile
-import com.beust.kobalt.kotlin.ScriptCompiler2
+import com.beust.kobalt.kotlin.BuildFileCompiler
 import com.beust.kobalt.maven.IClasspathDependency
 import com.beust.kobalt.maven.MavenDependency
 import com.beust.kobalt.misc.KobaltExecutors
@@ -20,7 +19,7 @@ import java.net.SocketException
 import java.nio.file.Paths
 
 public class KobaltServer @Inject constructor(val args: Args, val executors: KobaltExecutors,
-        val buildFileCompilerFactory: ScriptCompiler2.IFactory) : Runnable {
+        val buildFileCompilerFactory: BuildFileCompiler.IFactory) : Runnable {
     var outgoing: PrintWriter? = null
     val pending = arrayListOf<String>()
 
@@ -90,7 +89,7 @@ public class KobaltServer @Inject constructor(val args: Args, val executors: Kob
 
     class GetDependenciesData(val projects: List<ProjectData>)
 
-    private fun toJson(info: ScriptCompiler2.BuildScriptInfo) : String {
+    private fun toJson(info: BuildFileCompiler.BuildScriptInfo) : String {
         val executor = executors.miscExecutor
         val projects = arrayListOf<ProjectData>()
 
diff --git a/src/main/kotlin/com/beust/kobalt/kotlin/ScriptCompiler2.kt b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt
similarity index 98%
rename from src/main/kotlin/com/beust/kobalt/kotlin/ScriptCompiler2.kt
rename to src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt
index 3fad7bf6..386dd4c5 100644
--- a/src/main/kotlin/com/beust/kobalt/kotlin/ScriptCompiler2.kt
+++ b/src/main/kotlin/com/beust/kobalt/kotlin/BuildFileCompiler.kt
@@ -24,11 +24,11 @@ import java.nio.file.Paths
 import java.util.jar.JarInputStream
 import javax.inject.Inject
 
-public class ScriptCompiler2 @Inject constructor(@Assisted("buildFiles") val buildFiles: List<BuildFile>,
+public class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFiles: List<BuildFile>,
         val files: KFiles, val plugins: Plugins) {
 
     interface IFactory {
-        fun create(@Assisted("buildFiles") buildFiles: List<BuildFile>) : ScriptCompiler2
+        fun create(@Assisted("buildFiles") buildFiles: List<BuildFile>) : BuildFileCompiler
     }
 
     val observable = PublishSubject.create<BuildScriptInfo>()
diff --git a/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt b/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt
index 93735433..40e16bcf 100644
--- a/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt
+++ b/src/main/kotlin/com/beust/kobalt/misc/MainModule.kt
@@ -1,7 +1,7 @@
 package com.beust.kobalt.misc
 
 import com.beust.kobalt.Args
-import com.beust.kobalt.kotlin.ScriptCompiler2
+import com.beust.kobalt.kotlin.BuildFileCompiler
 import com.beust.kobalt.maven.ArtifactFetcher
 import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.Pom
@@ -40,7 +40,7 @@ public open class MainModule(val args: Args) : AbstractModule() {
                 PomGenerator.IFactory::class.java,
                 JCenterApi.IFactory::class.java,
                 Pom.IFactory::class.java,
-                ScriptCompiler2.IFactory::class.java,
+                BuildFileCompiler.IFactory::class.java,
                 ArtifactFetcher.IFactory::class.java)
             .forEach {
                 install(builder.build(it))