diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt
index 6accc472406..96ccad4021a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt
@@ -18,15 +18,8 @@ package org.jetbrains.kotlin.diagnostics.rendering
 
 import org.jetbrains.kotlin.renderer.Renderer
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.resolve.DescriptorUtils.isClassObject
 import org.jetbrains.kotlin.renderer.DescriptorRendererImpl
 
 public fun <P> renderParameter(parameter: P, renderer: Renderer<P>?): Any = renderer?.render(parameter) ?: parameter
 
-public fun ClassDescriptor.renderKindWithName(): String {
-    val kind = DescriptorRendererImpl.getClassKindPrefix(this)
-    if (isClassObject(this)) {
-        return "$kind of '${getContainingDeclaration().getName()}'"
-    }
-    return "$kind '${getName()}'"
-}
+public fun ClassDescriptor.renderKindWithName(): String = "${DescriptorRendererImpl.getClassKindPrefix(this)} '${getName()}'"
diff --git a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt
index 7c279a99321..ed1c56c31a3 100644
--- a/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt
+++ b/idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference2.txt
@@ -1,2 +1,2 @@
 <!-- nestedClassAcessedViaInstanceReference2 -->
-Nested class object of 'NestedWithClassObject' accessed via instance reference
\ No newline at end of file
+Nested class object 'Default' accessed via instance reference
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt
index 6a7d0009c45..c6641f60961 100644
--- a/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt
+++ b/idea/testData/diagnosticMessage/nestedClassShouldBeQualified5.txt
@@ -1,2 +1,2 @@
 <!-- nestedClassShouldBeQualified5 -->
-Nested class object of 'F' should be qualified as 'E.F.Default'
\ No newline at end of file
+Nested class object 'Default' should be qualified as 'E.F.Default'
\ No newline at end of file