diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt
index 3eee8aac1b2..6e1415c0528 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt
@@ -311,7 +311,7 @@ abstract class KotlinFile(
         }
         alreadyDeclared.add(topLevelName)
 
-        return topLevelName.asSimpleName()
+        return topLevelName
     }
 
     override fun declareProperty(name: String): String? =
@@ -320,7 +320,7 @@ abstract class KotlinFile(
                 // TODO: using original global name should be preferred to importing the clashed name.
             } else {
                 declaredProperties.add(name)
-                name.asSimpleName()
+                name
             }
 
     fun buildImports(): List<String> = importedNameToPkg.mapNotNull { (name, pkg) ->
diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt
index 736c7e254b5..1e622892d94 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt
@@ -286,7 +286,7 @@ class StubIrTextEmitter(
         val modality = "$override${renderMemberModality(element.modality, owner)}"
         val receiver = if (element.receiverType != null) "${renderStubType(element.receiverType)}." else ""
         val name = if (owner?.isTopLevelContainer == true) {
-            getTopLevelPropertyDeclarationName(kotlinFile, element.name)
+            getTopLevelPropertyDeclarationName(kotlinFile, element.name).asSimpleName()
         } else {
             element.name.asSimpleName()
         }
@@ -391,7 +391,7 @@ class StubIrTextEmitter(
     }
 
     private fun renderClassifierDeclaration(classifier: Classifier): String =
-            kotlinFile.declare(classifier)
+            kotlinFile.declare(classifier).asSimpleName()
 
     private fun renderClassStubModality(classStubModality: ClassStubModality): String = when (classStubModality) {
         ClassStubModality.INTERFACE -> "interface "