diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
index 89f4275c450..f1b5b37929e 100644
--- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
+++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
@@ -21,7 +21,7 @@ public class CompilerSettings {
     public var copyJsLibraryFiles: Boolean = true
     public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY
 
-    default object {
+    class object {
         private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version"
         private val DEFAULT_OUTPUT_DIRECTORY = "lib"
     }
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index fcd05b867a6..6266658a7fa 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure
 import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
 
 public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
-    default object {
+    class object {
         public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
 
         private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession")
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 123058f6aa5..953d3f8a2a4 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin"
 
 
 class CacheFormatVersion(targetDataRoot: File) {
-    default object {
+    class object {
         // Change this when incremental cache format changes
         private val INCREMENTAL_CACHE_OWN_VERSION = 2
         private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION
@@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) {
 }
 
 public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache {
-    default object {
+    class object {
         val PROTO_MAP = "proto.tab"
         val CONSTANTS_MAP = "constants.tab"
         val INLINE_FUNCTIONS = "inline-functions.tab"
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
index e57a8a934d1..9b27dc8647e 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
@@ -29,7 +29,7 @@ class LocalFileKotlinClass private(
         innerClasses: FileBasedKotlinClass.InnerClassesInfo
 ) : FileBasedKotlinClass(className, classHeader, innerClasses) {
 
-    default object {
+    class object {
         fun create(file: File): LocalFileKotlinClass? {
             val fileContents = file.readBytes()
             return FileBasedKotlinClass.create(fileContents) {
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index f9620793a9a..61f75320692 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus
 import org.jetbrains.jps.builders.java.dependencyView.Callbacks
 
 public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
-    default object {
+    class object {
         val COMPILATION_FAILED = "COMPILATION FAILED"
 
         // change to "/tmp" or anything when default is too long (for easier debugging)
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
index 495ade9943c..7652295c2f9 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.utils.PathUtil
  * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime
  */
 public class ClasspathOrderTest : TestCaseWithTmpdir() {
-    default object {
+    class object {
         val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile()
     }