diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/AdditionalCompilerArguments.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
similarity index 85%
rename from compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/AdditionalCompilerArguments.kt
rename to compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
index 02f76b6049b..09bca7ddb0b 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/AdditionalCompilerArguments.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationOptions.kt
@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.daemon.common
 import java.io.File
 import java.io.Serializable
 
-open class AdditionalCompilerArguments(val reportingFilters: List<ReportingFilter>) : Serializable {
+open class CompilationOptions(val reportingFilters: List<ReportingFilter>) : Serializable {
     companion object {
         const val serialVersionUID: Long = 0
     }
 }
 
-class IncrementalCompilerArguments(
+class IncrementalCompilationOptions(
         val areFileChangesKnown: Boolean,
         val modifiedFiles: List<File>?,
         val deletedFiles: List<File>?,
@@ -33,7 +33,7 @@ class IncrementalCompilerArguments(
         val customCacheVersionFileName: String,
         val customCacheVersion: Int,
         reportingFilters: List<ReportingFilter>
-) : AdditionalCompilerArguments(reportingFilters) {
+) : CompilationOptions(reportingFilters) {
     companion object {
         const val serialVersionUID: Long = 0
     }
diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
index 91930e4c5fc..ca94d80cdcf 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
@@ -139,7 +139,7 @@ interface CompileService : Remote {
             compilerMode: CompilerMode,
             targetPlatform: TargetPlatform,
             compilerArguments: CommonCompilerArguments,
-            additionalCompilerArguments: AdditionalCompilerArguments,
+            compilationOptions: CompilationOptions,
             servicesFacade: CompilerServicesFacadeBase
     ): CallResult<Int>
 
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 6e30028500f..eef7fd4b677 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -326,11 +326,11 @@ class CompileServiceImpl(
             compilerMode: CompileService.CompilerMode,
             targetPlatform: CompileService.TargetPlatform,
             compilerArguments: CommonCompilerArguments,
-            additionalCompilerArguments: AdditionalCompilerArguments,
+            compilationOptions: CompilationOptions,
             servicesFacade: CompilerServicesFacadeBase
     ): CompileService.CallResult<Int> {
-        val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, additionalCompilerArguments)
-        val serviceReporter = CompileServiceReporterImpl(servicesFacade, additionalCompilerArguments)
+        val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, compilationOptions)
+        val serviceReporter = CompileServiceReporterImpl(servicesFacade, compilationOptions)
 
         return when (compilerMode) {
             CompileService.CompilerMode.JPS_COMPILER -> {
@@ -352,7 +352,7 @@ class CompileServiceImpl(
                 }
 
                 val k2jvmArgs = compilerArguments as K2JVMCompilerArguments
-                val gradleIncrementalArgs = additionalCompilerArguments as IncrementalCompilerArguments
+                val gradleIncrementalArgs = compilationOptions as IncrementalCompilationOptions
                 val gradleIncrementalServicesFacade = servicesFacade as IncrementalCompilerServicesFacade
 
                 withIC {
@@ -386,7 +386,7 @@ class CompileServiceImpl(
 
     private fun execIncrementalCompiler(
             k2jvmArgs: K2JVMCompilerArguments,
-            incrementalCompilerArgs: IncrementalCompilerArguments,
+            incrementalCompilerArgs: IncrementalCompilationOptions,
             servicesFacade: IncrementalCompilerServicesFacade,
             messageCollector: CompileServicesFacadeMessageCollector
     ): ExitCode {
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteICReporter.kt
index 9196545c935..9e03d1cdf46 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteICReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/incremental/RemoteICReporter.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.daemon.incremental
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.daemon.report.FilteringReporterBase
 import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
-import org.jetbrains.kotlin.daemon.common.AdditionalCompilerArguments
+import org.jetbrains.kotlin.daemon.common.CompilationOptions
 import org.jetbrains.kotlin.daemon.common.IncrementalCompilationServicesFacade
 import org.jetbrains.kotlin.daemon.common.ReportCategory
 import org.jetbrains.kotlin.daemon.incremental.IncrementalCompilationSeverity.COMPILED_FILES
@@ -30,7 +30,7 @@ import java.io.Serializable
 
 internal class RemoteICReporter(
         servicesFacade: CompilerServicesFacadeBase,
-        additionalCompilerArgs: AdditionalCompilerArguments
+        additionalCompilerArgs: CompilationOptions
 ) : FilteringReporterBase(servicesFacade, additionalCompilerArgs, ReportCategory.INCREMENTAL_COMPILATION), ICReporter {
     override fun report(message: () -> String) {
         if (shouldReport(LOGGING.value)) {
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServiceReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServiceReporter.kt
index 607f574ddef..4f7f4c40acb 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServiceReporter.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServiceReporter.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.daemon.report
 
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.daemon.common.AdditionalCompilerArguments
+import org.jetbrains.kotlin.daemon.common.CompilationOptions
 import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
 import org.jetbrains.kotlin.daemon.common.ReportCategory
 import org.jetbrains.kotlin.daemon.report.FilteringReporterBase
@@ -40,8 +40,8 @@ internal class CompileServiceReporterStreamAdapter(private val out: PrintStream)
 
 internal class CompileServiceReporterImpl(
         servicesFacade: CompilerServicesFacadeBase,
-        additionalCompilerArguments: AdditionalCompilerArguments
-) : FilteringReporterBase(servicesFacade, additionalCompilerArguments, ReportCategory.DAEMON_MESSAGE), CompileServiceReporter {
+        compilationOptions: CompilationOptions
+) : FilteringReporterBase(servicesFacade, compilationOptions, ReportCategory.DAEMON_MESSAGE), CompileServiceReporter {
 
     override fun report(severity: CompilerMessageSeverity, message: String) {
         report(severity.value, message)
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServicesFacadeMessageCollector.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServicesFacadeMessageCollector.kt
index f2aa8d9a244..39bd6e2f73f 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServicesFacadeMessageCollector.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServicesFacadeMessageCollector.kt
@@ -19,16 +19,16 @@ package org.jetbrains.kotlin.daemon.report
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.daemon.common.AdditionalCompilerArguments
+import org.jetbrains.kotlin.daemon.common.CompilationOptions
 import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
 import org.jetbrains.kotlin.daemon.common.ReportCategory
 
 internal class CompileServicesFacadeMessageCollector(
         private val servicesFacade: CompilerServicesFacadeBase,
-        additionalCompilerArguments: AdditionalCompilerArguments
+        compilationOptions: CompilationOptions
 ) : MessageCollector {
     private var hasErrors = false
-    private val reportingFilter = additionalCompilerArguments.reportingFilters.firstOrNull { it.category == ReportCategory.DAEMON_MESSAGE }
+    private val reportingFilter = compilationOptions.reportingFilters.firstOrNull { it.category == ReportCategory.DAEMON_MESSAGE }
 
     override fun clear() {
         hasErrors = false
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/FilteringReporterBase.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/FilteringReporterBase.kt
index bf5e86c7712..a30d9f1ede0 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/FilteringReporterBase.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/FilteringReporterBase.kt
@@ -16,14 +16,14 @@
 
 package org.jetbrains.kotlin.daemon.report
 
-import org.jetbrains.kotlin.daemon.common.AdditionalCompilerArguments
+import org.jetbrains.kotlin.daemon.common.CompilationOptions
 import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
 import org.jetbrains.kotlin.daemon.common.ReportCategory
 import java.io.Serializable
 
 internal open class FilteringReporterBase(
         private val servicesFacade: CompilerServicesFacadeBase,
-        additionalCompilerArgs: AdditionalCompilerArguments,
+        additionalCompilerArgs: CompilationOptions,
         private val reportCategory: ReportCategory
 ) {
     private val reportingFilter = additionalCompilerArgs.reportingFilters.firstOrNull { it.category == reportCategory }
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
index 4458bb65141..be4a19841ca 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
@@ -104,7 +104,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
                     CompileService.CompilerMode.JPS_COMPILER,
                     targetPlatform,
                     compilerArgs,
-                    AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)),
+                    CompilationOptions(reportingFilters = getReportingFilters(compilerArgs.verbose)),
                     JpsCompilerServicesFacadeImpl(environment))
         }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index 4fb63650cab..aef592557f8 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -169,7 +169,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
                     CompileService.CompilerMode.NON_INCREMENTAL_COMPILER,
                     targetPlatform,
                     environment.compilerArgs,
-                    AdditionalCompilerArguments(reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose)),
+                    CompilationOptions(reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose)),
                     GradleCompilerServicesFacadeImpl(project, environment.messageCollector))
         }
 
@@ -184,7 +184,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
     private fun incrementalCompilationWithDaemon(environment: GradleIncrementalCompilerEnvironment): ExitCode? {
         val knownChangedFiles = environment.changedFiles as? ChangedFiles.Known
 
-        val additionalCompilerArguments = IncrementalCompilerArguments(
+        val additionalCompilerArguments = IncrementalCompilationOptions(
                 areFileChangesKnown = knownChangedFiles != null,
                 modifiedFiles = knownChangedFiles?.modified,
                 deletedFiles = knownChangedFiles?.removed,