diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IPluginActor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IPluginActor.kt
index c53bb860..5cf11f87 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IPluginActor.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IPluginActor.kt
@@ -4,7 +4,7 @@ interface IPluginActor {
     /**
      * Clean up any state that your actor might have saved so it can be run again.
      */
-    fun shutdownActors() {}
+    fun cleanUpActors() {}
 }
 
 interface IContributor : IPluginActor
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index bc415c4b..e7208b67 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -229,7 +229,7 @@ open class JvmCompilerPlugin @Inject constructor(
     // IProjectContributor
     override fun projects() = allProjects
 
-    override fun shutdownActors() {
+    override fun cleanUpActors() {
         allProjects.clear()
     }
 
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt
index 626039bf..4f40fcbb 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltPluginXml.kt
@@ -168,7 +168,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
         }
     }
 
-    fun shutdown() {
+    fun cleanUp() {
         listOf(projectContributors, classpathContributors, initContributors,
                 repoContributors, compilerFlagContributors, compilerInterceptors,
                 sourceDirectoriesInterceptors, buildDirectoryInterceptors,
@@ -179,7 +179,7 @@ class PluginInfo(val xml: KobaltPluginXml, val classLoader: ClassLoader?) {
                 incrementalAssemblyContributors
             ).forEach {
                 it.forEach {
-                    it.shutdownActors()
+                    it.cleanUpActors()
                 }
             }
     }
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
index 0cda20eb..9cc77525 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
@@ -343,7 +343,7 @@ class TaskManager @Inject constructor(val args: Args,
     /**
      * Invoked by the server whenever it's done processing a command so the state can be reset for the next command.
      */
-    private fun cleanUp() {
+    fun cleanUp() {
         annotationTasks.clear()
         dynamicTasks.clear()
         taskAnnotations.clear()
diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index 123440d7..547e0ccb 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -45,7 +45,7 @@ fun mainNoExit(argv: Array<String>): Int {
     Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
     val result = Kobalt.INJECTOR.getInstance(Main::class.java).run {
         val runResult = run(jc, args, argv)
-        pluginInfo.shutdown()
+        pluginInfo.cleanUp()
         executors.shutdown()
         runResult
     }
@@ -221,8 +221,8 @@ private class Main @Inject constructor(
     }
 
     private fun cleanUp() {
-        pluginInfo.shutdown()
-        taskManager.shutdown()
+        pluginInfo.cleanUp()
+        taskManager.cleanUp()
     }
 
     private fun initForBuildFile(buildFile: BuildFile, args: Args): List<Project> {