diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
index 65dfc4104ca..20aa86ef2cf 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
@@ -193,7 +193,7 @@ fun testFunctionLiterals() {
     val <!UNUSED_VARIABLE!>endsWithObjectDeclaration<!> : () -> Int = {
         var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>x<!> = 1
         x = <!UNUSED_VALUE!>333<!>
-        <!EXPECTED_TYPE_MISMATCH!><!LOCAL_OBJECT_NOT_ALLOWED!>object A<!> {}<!>
+        <!LOCAL_OBJECT_NOT_ALLOWED, EXPECTED_TYPE_MISMATCH!>object A<!> {}
     }
 
     val <!UNUSED_VARIABLE!>expectedUnitReturnType1<!> = { () : Unit ->
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
index 742f3a7e1ec..580ec466fe8 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -MANY_CLASS_OBJECTS
+// !DIAGNOSTICS: -MANY_CLASS_OBJECTS -REDECLARATION
 
 // KT-3464 Front-end shouldn't allow override modifier in class declaration
 
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
index d5ab72ee222..5de524609ad 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt
@@ -35,9 +35,9 @@ class Outer {
 
     }<!>
 
-    <!REDECLARATION!>object <!SYNTAX!><!>{
+    <!REDECLARATION!>object<!> <!SYNTAX!><!>{
 
-    }<!>
+    }
 
     <!REDECLARATION!>trait<!SYNTAX!><!> {
 
diff --git a/compiler/testData/recursiveProcessor/declarations.txt b/compiler/testData/recursiveProcessor/declarations.txt
index c2eb6168399..da3fc02b078 100644
--- a/compiler/testData/recursiveProcessor/declarations.txt
+++ b/compiler/testData/recursiveProcessor/declarations.txt
@@ -1,19 +1,3 @@
-<class-object-for-Class>.<get-classObjProp>:PropertyGetterDescriptor
-<class-object-for-Class>.<init>():ConstructorDescriptor
-<class-object-for-Class>.classObjFunc:SimpleFunctionDescriptor
-<class-object-for-Class>.classObjProp:PropertyDescriptor
-<class-object-for-Class>.this:ReceiverParameterDescriptor
-<class-object-for-Class>:ClassDescriptorWithResolutionScopes
-<class-object-for-NestedClass>.<init>():ConstructorDescriptor
-<class-object-for-NestedClass>.nestedClassObjFunc:SimpleFunctionDescriptor
-<class-object-for-NestedClass>.this:ReceiverParameterDescriptor
-<class-object-for-NestedClass>:ClassDescriptorWithResolutionScopes
-<class-object-for-NestedObject>.<init>():ConstructorDescriptor
-<class-object-for-NestedObject>.this:ReceiverParameterDescriptor
-<class-object-for-NestedObject>:ClassDescriptorWithResolutionScopes
-<class-object-for-Object>.<init>():ConstructorDescriptor
-<class-object-for-Object>.this:ReceiverParameterDescriptor
-<class-object-for-Object>:ClassDescriptorWithResolutionScopes
 <set-?>:ValueParameterDescriptor
 Class.<get-classProp>:PropertyGetterDescriptor
 Class.<init>():ConstructorDescriptor
@@ -21,6 +5,16 @@ Class.classFunc:SimpleFunctionDescriptor
 Class.classProp:PropertyDescriptor
 Class.this:ReceiverParameterDescriptor
 Class:ClassDescriptorWithResolutionScopes
+Default.<get-classObjProp>:PropertyGetterDescriptor
+Default.<init>():ConstructorDescriptor
+Default.<init>():ConstructorDescriptor
+Default.classObjFunc:SimpleFunctionDescriptor
+Default.classObjProp:PropertyDescriptor
+Default.nestedClassObjFunc:SimpleFunctionDescriptor
+Default.this:ReceiverParameterDescriptor
+Default.this:ReceiverParameterDescriptor
+Default:ClassDescriptorWithResolutionScopes
+Default:ClassDescriptorWithResolutionScopes
 NestedClass.<init>():ConstructorDescriptor
 NestedClass.this:ReceiverParameterDescriptor
 NestedClass:ClassDescriptorWithResolutionScopes
@@ -50,28 +44,18 @@ Trait.traitFunc:SimpleFunctionDescriptor
 Trait.traitProp:PropertyDescriptor
 Trait:ClassDescriptorWithResolutionScopes
 a:ValueParameterDescriptor
-fake <class-object-for-Class>.equals:DeserializedCallableMemberDescriptor
-fake <class-object-for-Class>.hashCode:DeserializedCallableMemberDescriptor
-fake <class-object-for-Class>.toString:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedClass>.equals:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedClass>.hashCode:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedClass>.toString:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedObject>.equals:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedObject>.hashCode:DeserializedCallableMemberDescriptor
-fake <class-object-for-NestedObject>.nestedFunc:SimpleFunctionDescriptor
-fake <class-object-for-NestedObject>.toString:DeserializedCallableMemberDescriptor
-fake <class-object-for-Object>.<get-objProp>:PropertyGetterDescriptor
-fake <class-object-for-Object>.equals:DeserializedCallableMemberDescriptor
-fake <class-object-for-Object>.hashCode:DeserializedCallableMemberDescriptor
-fake <class-object-for-Object>.objFunc:SimpleFunctionDescriptor
-fake <class-object-for-Object>.objProp:PropertyDescriptor
-fake <class-object-for-Object>.toString:DeserializedCallableMemberDescriptor
 fake Class.<get-traitProp>:PropertyGetterDescriptor
 fake Class.equals:DeserializedCallableMemberDescriptor
 fake Class.hashCode:DeserializedCallableMemberDescriptor
 fake Class.toString:DeserializedCallableMemberDescriptor
 fake Class.traitFunc:SimpleFunctionDescriptor
 fake Class.traitProp:PropertyDescriptor
+fake Default.equals:DeserializedCallableMemberDescriptor
+fake Default.equals:DeserializedCallableMemberDescriptor
+fake Default.hashCode:DeserializedCallableMemberDescriptor
+fake Default.hashCode:DeserializedCallableMemberDescriptor
+fake Default.toString:DeserializedCallableMemberDescriptor
+fake Default.toString:DeserializedCallableMemberDescriptor
 fake NestedClass.equals:DeserializedCallableMemberDescriptor
 fake NestedClass.hashCode:DeserializedCallableMemberDescriptor
 fake NestedClass.toString:DeserializedCallableMemberDescriptor
@@ -107,8 +91,6 @@ other:ValueParameterDescriptor
 other:ValueParameterDescriptor
 other:ValueParameterDescriptor
 other:ValueParameterDescriptor
-other:ValueParameterDescriptor
-other:ValueParameterDescriptor
 prop.this:ReceiverParameterDescriptor
 prop.this:ReceiverParameterDescriptor
-test:PackageViewDescriptor
+test:PackageViewDescriptor
\ No newline at end of file
diff --git a/idea/testData/checker/ClassObjects.kt b/idea/testData/checker/ClassObjects.kt
index 1b3efb7ce4f..e7bca713a65 100644
--- a/idea/testData/checker/ClassObjects.kt
+++ b/idea/testData/checker/ClassObjects.kt
@@ -4,7 +4,7 @@ class A {
   class object {
     val x = 1
   }
-  <error descr="[MANY_CLASS_OBJECTS] Only one class object is allowed per class">class object</error> { // error
+  <error descr="[MANY_CLASS_OBJECTS] Only one class object is allowed per class">class object Another</error> { // error
     val x = 1
   }
 }
diff --git a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt
index b8d0e4f9a95..f234d5e0b0a 100644
--- a/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt
+++ b/idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt
@@ -1,7 +1,7 @@
 class C {
     <error>class object</error> {
-        <error>val `OBJECT$`</error> = this
+        val <error>Default</error> = this
     }
 
-    val `OBJECT$` = C
+    val <error>Default</error> = C
 }
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.kt b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.kt
index 73c9c2bb7f8..bb1fcfcce50 100644
--- a/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.kt
+++ b/idea/testData/completion/basic/multifile/NotImportedObject/NotImportedObject.kt
@@ -4,6 +4,5 @@ fun testFun() {
     NamedObject<caret>
 }
 
-// EXIST: NamedObjectTopLevel1, NamedObjectTopLevel2
-// ABSENT: NamedObjectInClassObject
+// EXIST: NamedObjectTopLevel1, NamedObjectTopLevel2, NamedObjectInClassObject
 // ABSENT: NamedObjectInFun
diff --git a/idea/testData/navigation/gotoClass/inClassObject.kt b/idea/testData/navigation/gotoClass/inClassObject.kt
index 6cb420eba56..dc4b476d25b 100644
--- a/idea/testData/navigation/gotoClass/inClassObject.kt
+++ b/idea/testData/navigation/gotoClass/inClassObject.kt
@@ -15,7 +15,7 @@ class InClassObject {
 }
 
 // SEARCH_TEXT: ClassObject
-// REF: (test.InClassObject).ClassObjectClass
-// REF: (test.InClassObject).ClassObjectObject
-// REF: (test.InClassObject).ClassObjectTrait
-// REF: (test.InClassObject).ClassObjectTraitWithImpl
\ No newline at end of file
+// REF: (test.InClassObject.Default).ClassObjectClass
+// REF: (test.InClassObject.Default).ClassObjectObject
+// REF: (test.InClassObject.Default).ClassObjectTrait
+// REF: (test.InClassObject.Default).ClassObjectTraitWithImpl
\ No newline at end of file
diff --git a/idea/testData/navigation/gotoSymbol/properties.kt b/idea/testData/navigation/gotoSymbol/properties.kt
index bd9d3766d2e..b300f00f71e 100644
--- a/idea/testData/navigation/gotoSymbol/properties.kt
+++ b/idea/testData/navigation/gotoSymbol/properties.kt
@@ -19,5 +19,5 @@ class Some() {
 // SEARCH_TEXT: test
 // REF: (<root>).testGlobal
 // REF: (Some).testInClass
-// REF: (Some).testInClassObject
+// REF: (Some.Default).testInClassObject
 // REF: (SomeTrait).testInTrait
\ No newline at end of file
diff --git a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java
index 05b96c2ad8c..7c4be6ec546 100644
--- a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java
+++ b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java
@@ -6,4 +6,4 @@ public class ClassObjectField {
     }
 }
 
-// REF: (k.StaticFieldInClassObjectInTrait).XX
\ No newline at end of file
+// REF: (k.StaticFieldInClassObjectInTrait.Default).XX
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
index 69fae1adbf6..f2dd4112f1c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/actions/QualifiedNamesTest.kt
@@ -46,7 +46,7 @@ public class QualifiedNamesTest: LightCodeInsightTestCase() {
                     }
                 """
         )
-        assertEquals(listOf("foo.bar.Klass", "foo.bar.Klass.Nested", null, "foo.bar.Object", "foo.bar.anonymous", null),
+        assertEquals(listOf("foo.bar.Klass", "foo.bar.Klass.Nested", "foo.bar.Klass.Default", "foo.bar.Object", "foo.bar.anonymous", null),
                      getQualifiedNamesForDeclarations())
     }