diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
index ee668b980f6..055736034e5 100644
--- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
+++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.daemon.client
 import com.intellij.openapi.progress.ProcessCanceledException
 import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
 import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
-import org.jetbrains.kotlin.daemon.common.RmiFriendlyCompilationCancelledException
+import org.jetbrains.kotlin.daemon.common.RmiFriendlyCompilationCanceledException
 import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
 import org.jetbrains.kotlin.incremental.components.LookupInfo
 import org.jetbrains.kotlin.incremental.components.LookupTracker
@@ -32,7 +32,7 @@ import java.rmi.server.UnicastRemoteObject
 
 class CompilerCallbackServicesFacadeServer(
         val incrementalCompilationComponents: IncrementalCompilationComponents? = null,
-        val compilationCancelledStatus: CompilationCanceledStatus? = null,
+        val compilationCanceledStatus: CompilationCanceledStatus? = null,
         port: Int = SOCKET_ANY_FREE_PORT
 ) : CompilerCallbackServicesFacade,
     UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
@@ -41,7 +41,7 @@ class CompilerCallbackServicesFacadeServer(
 
     override fun hasLookupTracker(): Boolean = incrementalCompilationComponents != null
 
-    override fun hasCompilationCanceledStatus(): Boolean = compilationCancelledStatus != null
+    override fun hasCompilationCanceledStatus(): Boolean = compilationCanceledStatus != null
 
     // TODO: consider replacing NPE with other reporting, although NPE here means most probably incorrect usage
 
@@ -83,12 +83,12 @@ class CompilerCallbackServicesFacadeServer(
 
     override fun compilationCanceledStatus_checkCanceled() {
         try {
-            compilationCancelledStatus!!.checkCanceled()
+            compilationCanceledStatus!!.checkCanceled()
         }
         catch (e: ProcessCanceledException) {
             // avoid passing exceptions that may have different serialVersionUID on across rmi border
             // TODO: doublecheck whether we need to distinguish different cancellation exceptions
-            throw RmiFriendlyCompilationCancelledException()
+            throw RmiFriendlyCompilationCanceledException()
         }
     }
 }
diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
index 2dc6a114e33..c877048b187 100644
--- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
@@ -140,7 +140,7 @@ object KotlinCompilerClient {
                     targetPlatform,
                     args,
                     CompilerCallbackServicesFacadeServer(incrementalCompilationComponents = callbackServices.incrementalCompilationComponents,
-                                                         compilationCancelledStatus = callbackServices.compilationCanceledStatus,
+                                                         compilationCanceledStatus = callbackServices.compilationCanceledStatus,
                                                          port = port),
                     RemoteOutputStreamServer(compilerOut, port),
                     CompileService.OutputFormat.XML,
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
index 6b6859ffb93..e277522fd25 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
@@ -82,12 +82,12 @@ interface CompilerCallbackServicesFacade : Remote {
 
     // ----------------------------------------------------
     // CompilationCanceledStatus
-    @Throws(RemoteException::class, RmiFriendlyCompilationCancelledException::class)
+    @Throws(RemoteException::class, RmiFriendlyCompilationCanceledException::class)
     fun compilationCanceledStatus_checkCanceled(): Unit
 }
 
 
-class RmiFriendlyCompilationCancelledException: Exception(), Serializable {
+class RmiFriendlyCompilationCanceledException : Exception(), Serializable {
     companion object {
         private val serialVersionUID: Long = 8228357578L // just a random number, but should never be changed to avoid deserialization problems
     }
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteCompilationCanceledStatusClient.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteCompilationCanceledStatusClient.kt
index 62ff144fa78..7f4a154d92c 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteCompilationCanceledStatusClient.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteCompilationCanceledStatusClient.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.daemon.common.CompilerCallbackServicesFacade
 import org.jetbrains.kotlin.daemon.common.DummyProfiler
 import org.jetbrains.kotlin.daemon.common.Profiler
-import org.jetbrains.kotlin.daemon.common.RmiFriendlyCompilationCancelledException
+import org.jetbrains.kotlin.daemon.common.RmiFriendlyCompilationCanceledException
 import org.jetbrains.kotlin.progress.CompilationCanceledException
 import java.util.concurrent.TimeUnit
 import java.util.logging.Logger
@@ -36,7 +36,7 @@ class RemoteCompilationCanceledStatusClient(val facade: CompilerCallbackServices
     override fun checkCanceled() {
 
         fun cancelOnError(e: Exception) {
-            log.warning("error communicating with host, assuming compilation cancelled (${e.message})")
+            log.warning("error communicating with host, assuming compilation canceled (${e.message})")
             throw CompilationCanceledException()
         }
 
@@ -46,7 +46,7 @@ class RemoteCompilationCanceledStatusClient(val facade: CompilerCallbackServices
                 try {
                     facade.compilationCanceledStatus_checkCanceled()
                 }
-                catch (e: RmiFriendlyCompilationCancelledException) {
+                catch (e: RmiFriendlyCompilationCanceledException) {
                     throw CompilationCanceledException()
                 }
                 catch (e: java.rmi.ConnectIOException) {
diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
index 42e92e825f7..ee4112d54ea 100644
--- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
@@ -440,7 +440,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
             val jar = tmpdir.absolutePath + File.separator + "largeKotlinFile.jar"
 
             var callbackServices: CompilerCallbackServicesFacadeServer? = null
-            callbackServices = CompilerCallbackServicesFacadeServer(compilationCancelledStatus = object : CompilationCanceledStatus {
+            callbackServices = CompilerCallbackServicesFacadeServer(compilationCanceledStatus = object : CompilationCanceledStatus {
                 override fun checkCanceled() {
                     thread {
                         Thread.sleep(10)
@@ -460,7 +460,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
 
             val compilerOutput = strm.toString()
             assertTrue("Expecting cancelation message in:\n$compilerOutput", compilerOutput.contains("Compilation was canceled"))
-            logFile.assertLogContainsSequence("error communicating with host, assuming compilation cancelled")
+            logFile.assertLogContainsSequence("error communicating with host, assuming compilation canceled")
 
             logFile.delete()
         }