diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
index 9bfe5fb5f72..b3e59571d47 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
@@ -271,18 +271,8 @@ public class CodegenBinding {
         return false;
     }
 
-    public static JvmClassName getJvmClassName(BindingTrace bindingTrace, ClassDescriptor classDescriptor) {
-        classDescriptor = (ClassDescriptor) classDescriptor.getOriginal();
-        final JvmClassName name = bindingTrace.getBindingContext().get(FQN, classDescriptor);
-        if (name != null) {
-            return name;
-        }
-
-        return getJvmInternalName(bindingTrace, classDescriptor);
-    }
-
     @NotNull
-    private static JvmClassName getJvmInternalName(BindingTrace bindingTrace, @NotNull DeclarationDescriptor descriptor) {
+    public static JvmClassName getJvmInternalName(BindingTrace bindingTrace, @NotNull DeclarationDescriptor descriptor) {
         descriptor = descriptor.getOriginal();
         JvmClassName name = bindingTrace.getBindingContext().get(FQN, descriptor);
         if (name != null) {
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
index d66c6ab2ef8..41ca34ead96 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
@@ -261,8 +261,7 @@ public abstract class CodegenContext {
         final ClassDescriptor enclosingClass = getEnclosingClass();
         outerExpression = enclosingClass != null
                           ? StackValue
-                .field(typeMapper.mapType(enclosingClass), CodegenBinding.getJvmClassName(
-                        typeMapper.getBindingTrace(), classDescriptor), CodegenUtil.THIS$0,
+                .field(typeMapper.mapType(enclosingClass), CodegenBinding.getJvmInternalName(typeMapper.getBindingTrace(), classDescriptor), CodegenUtil.THIS$0,
                        false)
                           : null;
     }
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
index 02de8bda302..d1dd918034f 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
@@ -297,7 +297,7 @@ public class JetTypeMapper extends BindingTraceAware {
         }
 
         if (descriptor instanceof ClassDescriptor) {
-            JvmClassName name = getJvmClassName(bindingTrace, (ClassDescriptor) descriptor);
+            JvmClassName name = getJvmInternalName(bindingTrace, (ClassDescriptor) descriptor);
             Type asmType;
             if (kind == JetTypeMapperMode.TRAIT_IMPL) {
                 asmType = Type.getObjectType(name.getInternalName() + JvmAbi.TRAIT_IMPL_SUFFIX);