diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
index 2df14c04d52..eacc3174e4f 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt
@@ -27,7 +27,7 @@ import kotlin.reflect.KMutableProperty1
 
 val COMPILER_JAR_NAME: String = "kotlin-compiler.jar"
 val COMPILER_SERVICE_RMI_NAME: String = "KotlinJvmCompilerService"
-val COMPILER_DAEMON_CLASS_FQN: String = "org.jetbrains.kotlin.daemon.CompileDaemon"
+val COMPILER_DAEMON_CLASS_FQN: String = "org.jetbrains.kotlin.daemon.KotlinCompileDaemon"
 val COMPILE_DAEMON_FIND_PORT_ATTEMPTS: Int = 10
 val COMPILE_DAEMON_PORTS_RANGE_START: Int = 17001
 val COMPILE_DAEMON_PORTS_RANGE_END: Int = 18000
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileDaemon.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt
similarity index 98%
rename from compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileDaemon.kt
rename to compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt
index 85a6d55de61..7b3692525b4 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileDaemon.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt
@@ -55,7 +55,7 @@ class LogStream(name: String) : OutputStream() {
 }
 
 
-object CompileDaemon {
+object KotlinCompileDaemon {
 
     init {
         val logTime: String = SimpleDateFormat("yyyy-MM-dd.HH-mm-ss-SSS").format(Date())
@@ -78,7 +78,7 @@ object CompileDaemon {
     val log by lazy { Logger.getLogger("daemon") }
 
     private fun loadVersionFromResource(): String? {
-        (CompileDaemon::class.java.classLoader as? URLClassLoader)
+        (KotlinCompileDaemon::class.java.classLoader as? URLClassLoader)
                 ?.findResource("META-INF/MANIFEST.MF")
                 ?.let {
                     try {