diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt
index 8ac62fe9bb0..aac6b26adea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt
@@ -17,29 +17,16 @@
 package org.jetbrains.jet.lang.diagnostics.rendering
 
 import org.jetbrains.jet.renderer.Renderer
-import org.jetbrains.jet.lang.descriptors.ClassKind
-import org.jetbrains.jet.lang.descriptors.ClassKind.*
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject
+import org.jetbrains.jet.renderer.DescriptorRendererImpl
 
 public fun <P> renderParameter(parameter: P, renderer: Renderer<P>?): Any = renderer?.render(parameter) ?: parameter
 
 public fun ClassDescriptor.renderKindWithName(): String {
-    val kind = getKind().getText()
+    val kind = DescriptorRendererImpl.getClassKindPrefix(this)
     if (isClassObject(this)) {
         return "$kind of '${getContainingDeclaration().getName()}'"
     }
     return "$kind '${getName()}'"
 }
-
-public fun ClassKind.getText(): String {
-    return when (this) {
-        CLASS -> "class"
-        TRAIT -> "trait"
-        ENUM_CLASS -> "enum class"
-        ENUM_ENTRY -> "enum entry"
-        ANNOTATION_CLASS -> "annotation class"
-        OBJECT -> "object"
-        CLASS_OBJECT -> "class object"
-    }
-}
\ No newline at end of file
diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
index 976ba88c90a..04ce2c97e1d 100644
--- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
@@ -855,7 +855,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
     }
 
     @NotNull
-    private static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
+    public static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
         switch (klass.getKind()) {
             case CLASS:
                 return "class";