diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassesProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassesProvider.kt
index 2b52aef55ce..dabd107e543 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassesProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassesProvider.kt
@@ -22,30 +22,21 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.org.objectweb.asm.Type
 
-public interface JvmFileClassesProvider {
-    public fun getFileClassInfo(file: KtFile): JvmFileClassInfo
+interface JvmFileClassesProvider {
+    fun getFileClassInfo(file: KtFile): JvmFileClassInfo
 }
 
-public fun FqName.getInternalName(): String =
-        JvmClassName.byFqNameWithoutInnerClasses(this).internalName
+val FqName.internalNameWithoutInnerClasses: String
+    get() = JvmClassName.byFqNameWithoutInnerClasses(this).internalName
 
-public fun FqName.getClassType(): Type =
-        Type.getObjectType(getInternalName())
-
-public fun JvmFileClassesProvider.getFileClassFqName(file: KtFile): FqName =
+fun JvmFileClassesProvider.getFileClassFqName(file: KtFile): FqName =
         getFileClassInfo(file).fileClassFqName
 
-public fun JvmFileClassesProvider.getFileClassInternalName(file: KtFile): String =
-        getFileClassFqName(file).getInternalName()
+fun JvmFileClassesProvider.getFileClassInternalName(file: KtFile): String =
+        getFileClassFqName(file).internalNameWithoutInnerClasses
 
-public fun JvmFileClassesProvider.getFileClassType(file: KtFile): Type =
-        getFileClassFqName(file).getClassType()
+fun JvmFileClassesProvider.getFileClassType(file: KtFile): Type =
+        Type.getObjectType(getFileClassFqName(file).internalNameWithoutInnerClasses)
 
-public fun JvmFileClassesProvider.getFacadeClassFqName(file: KtFile): FqName =
-        getFileClassInfo(file).facadeClassFqName
-
-public fun JvmFileClassesProvider.getFacadeClassInternalName(file: KtFile): String =
-        getFacadeClassFqName(file).getInternalName()
-
-public fun JvmFileClassesProvider.getFacadeClassType(file: KtFile): Type =
-        getFacadeClassFqName(file).getClassType()
\ No newline at end of file
+fun JvmFileClassesProvider.getFacadeClassInternalName(file: KtFile): String =
+        getFileClassInfo(file).facadeClassFqName.internalNameWithoutInnerClasses
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index 046e6c540eb..a7f1a2017bb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider
 import org.jetbrains.kotlin.fileClasses.getFileClassInternalName
-import org.jetbrains.kotlin.fileClasses.getInternalName
+import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
@@ -224,7 +224,8 @@ public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : M
         if (psiFile is ClsFileImpl) {
             val decompiledPsiFile = runReadAction { psiFile.decompiledPsiFile }
             if (decompiledPsiFile is KtClsFile && sourcePosition.line == -1) {
-                val className = JvmFileClassUtil.getFileClassInfoNoResolve(decompiledPsiFile).fileClassFqName.getInternalName()
+                val className =
+                        JvmFileClassUtil.getFileClassInfoNoResolve(decompiledPsiFile).fileClassFqName.internalNameWithoutInnerClasses
                 return myDebugProcess.virtualMachineProxy.classesByName(className)
             }
         }