diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
index 72044e586be..8ec0a0d9d75 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt
@@ -128,6 +128,14 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
             return JsInvocation(jsDispatchReceiver!!, arguments)
         }
 
+        expression.superQualifierSymbol?.let {
+            val qualifierName = context.getNameForSymbol(it).makeRef()
+            val targetName = context.getNameForSymbol(symbol)
+            val qPrototype = JsNameRef(targetName, prototypeOf(qualifierName))
+            val callRef = JsNameRef(Namer.CALL_FUNCTION, qPrototype)
+            return JsInvocation(callRef, jsDispatchReceiver?. let { listOf(it) + arguments } ?: arguments)
+        }
+
         return if (symbol is IrConstructorSymbol) {
             JsNew(context.getNameForSymbol(symbol).makeRef(), arguments)
         } else {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/SimpleNameGenerator.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/SimpleNameGenerator.kt
index 0592b7534bb..be23c9aac78 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/SimpleNameGenerator.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/SimpleNameGenerator.kt
@@ -34,22 +34,19 @@ class SimpleNameGenerator : NameGenerator {
                     }
                 }
                 is ValueParameterDescriptor -> {
-                    if (descriptor.name.isSpecial) {
-                        // TODO: consider this case more carefully
-                        nameBuilder.append(Namer.IMPLICIT_RECEIVER_NAME)
+                    val declaredName = descriptor.name.asString()
+                    nameBuilder.append(declaredName)
+                    if (declaredName.startsWith("\$")) {
                         nameBuilder.append('_')
                         nameBuilder.append(descriptor.index)
-                    } else {
-                        val declaredName = descriptor.name.identifier
-                        nameBuilder.append(declaredName)
-                        if (declaredName.startsWith("\$")) {
-                            nameBuilder.append('_')
-                            nameBuilder.append(descriptor.index)
-                        }
                     }
                 }
                 is PropertyDescriptor -> {
                     nameBuilder.append(descriptor.name.identifier)
+                    if (descriptor.visibility == Visibilities.PRIVATE || descriptor.modality != Modality.FINAL) {
+                        nameBuilder.append('$')
+                        nameBuilder.append(getNameForDescriptor(descriptor.containingDeclaration, context))
+                    }
                 }
                 is PropertyAccessorDescriptor -> {
                     when (descriptor) {
@@ -57,6 +54,10 @@ class SimpleNameGenerator : NameGenerator {
                         is PropertySetterDescriptor -> nameBuilder.append(Namer.SETTER_PREFIX)
                     }
                     nameBuilder.append(descriptor.correspondingProperty.name.asString())
+                    if (descriptor.visibility == Visibilities.PRIVATE) {
+                        nameBuilder.append('$')
+                        nameBuilder.append(getNameForDescriptor(descriptor.containingDeclaration, context))
+                    }
                 }
                 is ClassDescriptor -> {
                     if (descriptor.name.isSpecial) {