diff --git a/compiler/testData/lazyResolve/diagnostics/Builders.txt b/compiler/testData/lazyResolve/diagnostics/Builders.txt
index 0644ee99f95..05feb86ab96 100644
--- a/compiler/testData/lazyResolve/diagnostics/Builders.txt
+++ b/compiler/testData/lazyResolve/diagnostics/Builders.txt
@@ -12,11 +12,11 @@ internal final class html.A : html.BodyTag {
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     public final var href: jet.String?
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.B : html.BodyTag {
@@ -27,11 +27,11 @@ internal final class html.B : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.Body : html.BodyTag {
@@ -42,11 +42,11 @@ internal final class html.Body : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract class html.BodyTag : html.TagWithText {
@@ -57,11 +57,11 @@ internal abstract class html.BodyTag : html.TagWithText {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract trait html.Element : jet.Any {
@@ -75,11 +75,11 @@ internal final class html.H1 : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.HTML : html.TagWithText {
@@ -89,20 +89,20 @@ internal final class html.HTML : html.TagWithText {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final fun head(/*0*/ init: jet.ExtensionFunction0<html.Head, jet.Tuple0>): html.Head
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
 }
 internal final class html.Head : html.TagWithText {
     public final /*constructor*/ fun <init>(): html.Head
     internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final fun title(/*0*/ init: jet.ExtensionFunction0<html.Title, jet.Tuple0>): html.Title
 }
 internal final class html.LI : html.BodyTag {
@@ -113,11 +113,11 @@ internal final class html.LI : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.P : html.BodyTag {
@@ -128,11 +128,11 @@ internal final class html.P : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract class html.Tag : html.Element {
@@ -149,10 +149,10 @@ internal abstract class html.TagWithText : html.Tag {
     internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
 }
 internal final class html.TextElement : html.Element {
     public final /*constructor*/ fun <init>(/*0*/ text: jet.String): html.TextElement
@@ -164,10 +164,10 @@ internal final class html.Title : html.TagWithText {
     internal final override /*1*/ val attributes: java.util.HashMap<jet.String, jet.String>
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
 }
 internal final class html.UL : html.BodyTag {
     public final /*constructor*/ fun <init>(): html.UL
@@ -177,12 +177,12 @@ internal final class html.UL : html.BodyTag {
     internal final override /*1*/ val children: java.util.ArrayList<html.Element>
     internal final override /*1*/ fun h1(/*0*/ init: jet.ExtensionFunction0<html.H1, jet.Tuple0>): html.H1
     protected final override /*1*/ fun </*0*/ T : html.Element>initTag(/*0*/ tag: T, /*1*/ init: jet.ExtensionFunction0<T, jet.Tuple0>): T
-    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun jet.String.plus(): jet.Tuple0
     internal final fun li(/*0*/ init: jet.ExtensionFunction0<html.LI, jet.Tuple0>): html.LI
     internal final override /*1*/ val name: jet.String
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    invisible_fake final override /*1*/ fun renderAttributes(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final fun html(/*0*/ init: jet.ExtensionFunction0<html.HTML, jet.Tuple0>): html.HTML
diff --git a/compiler/testData/lazyResolve/namespaceComparator/enum.txt b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
index d6911f6f63d..c7e0d969de5 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/enum.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/enum.txt
@@ -2,7 +2,7 @@ namespace <root>
 
 internal final enum class Test : jet.Any {
     public final /*constructor*/ fun <init>(/*0*/ a: jet.Int): Test
-    internal final object Test.<class-object-for-Test> {
+    internal final class object Test.<class-object-for-Test> {
         internal final /*constructor*/ fun <init>(): Test.<class-object-for-Test>
         internal final val A: Test.<class-object-for-Test>.A
         internal final val C: Test.<class-object-for-Test>.C
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
index e22e3ad7a6a..71902dc133d 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
@@ -2,7 +2,7 @@ namespace test
 
 internal final class test.ClassObjectDeclaresProperty : jet.Any {
     public final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    internal final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
+    internal final class object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
         internal final val i: jet.Int
     }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
index c203e019383..107f10eb323 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
@@ -2,7 +2,7 @@ namespace test
 
 internal final class test.ClassObjectDeclaresProperty : jet.Any {
     public final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty
-    internal final object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
+    internal final class object test.ClassObjectDeclaresProperty.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): test.ClassObjectDeclaresProperty.<no name provided>
         internal final var s: jet.String
     }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
index cb3d6016fee..da0f29a0a7f 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
@@ -4,7 +4,7 @@ internal abstract trait test.Bbb : jet.Any {
 }
 internal final class test.ClassObjectextendsTrait : jet.Any {
     public final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait
-    internal final object test.ClassObjectextendsTrait.<no name provided> : test.Bbb {
+    internal final class object test.ClassObjectextendsTrait.<no name provided> : test.Bbb {
         internal final /*constructor*/ fun <init>(): test.ClassObjectextendsTrait.<no name provided>
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
index 65410e62216..e7b4704b70c 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -4,7 +4,7 @@ internal abstract trait test.Bbb</*0*/ P : jet.Any?> : jet.Any {
 }
 internal final class test.ClassObjectExtendsTraitWithTP : jet.Any {
     public final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP
-    internal final object test.ClassObjectExtendsTraitWithTP.<no name provided> : test.Bbb<jet.String> {
+    internal final class object test.ClassObjectExtendsTraitWithTP.<no name provided> : test.Bbb<jet.String> {
         internal final /*constructor*/ fun <init>(): test.ClassObjectExtendsTraitWithTP.<no name provided>
     }
 }
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt b/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
index 5845b19fab9..1b189d02ce5 100644
--- a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
+++ b/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
@@ -2,7 +2,7 @@ namespace test
 
 internal final class test.SimpleClassObject : jet.Any {
     public final /*constructor*/ fun <init>(): test.SimpleClassObject
-    internal final object test.SimpleClassObject.<no name provided> : jet.Any {
+    internal final class object test.SimpleClassObject.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): test.SimpleClassObject.<no name provided>
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
index 511d7577493..10ed275823a 100644
--- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
@@ -720,7 +720,7 @@ public class NamespaceComparator {
 
             if (klass.getClassObjectDescriptor() != null) {
                 StringBuilder sbForClassObject = new StringBuilder();
-                new FullContentSerialier(sbForClassObject).serialize(klass.getClassObjectDescriptor());
+                new ClassObjectSerializer(sbForClassObject).serialize(klass.getClassObjectDescriptor());
                 sb.append(indent(sbForClassObject.toString()));
             }
 
@@ -728,6 +728,19 @@ public class NamespaceComparator {
         }
     }
 
+    private class ClassObjectSerializer extends FullContentSerialier {
+
+        private ClassObjectSerializer(StringBuilder sb) {
+            super(sb);
+        }
+
+        @Override
+        public void serialize(ClassKind kind) {
+            assert kind == ClassKind.OBJECT : "Must be called for class objects only";
+            sb.append("class object");
+        }
+    }
+
 
     private static String indent(String string) {
         // This method gets called a lot, so the performance is critical