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 e56828179b7..e93c55a39e9 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
@@ -10,6 +10,8 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.ir.backend.js.utils.*
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrConstructor
+import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
+import org.jetbrains.kotlin.ir.declarations.IrValueDeclaration
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.types.isUnit
 import org.jetbrains.kotlin.ir.util.*
@@ -85,7 +87,7 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
     }
 
     override fun visitGetValue(expression: IrGetValue, context: JsGenerationContext): JsExpression {
-        if (expression.symbol.owner === context.currentFunction?.dispatchReceiverParameter) return JsThisRef()
+        if (expression.symbol.owner.isThisReceiver()) return JsThisRef()
         return context.getNameForValueDeclaration(expression.symbol.owner).makeRef()
     }
 
@@ -271,4 +273,10 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
             expression.left.accept(this, data),
             expression.right.accept(this, data)
         )
+
+    private fun IrValueDeclaration.isThisReceiver(): Boolean = when (val p = parent) {
+        is IrSimpleFunction -> this === p.dispatchReceiverParameter
+        is IrClass -> this === p.thisReceiver
+        else -> false
+    }
 }
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
index c92db8e9874..a94b018bc41 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/NameTables.kt
@@ -372,16 +372,6 @@ class NameTables(
             element.acceptChildrenVoid(this)
         }
 
-        override fun visitValueParameter(declaration: IrValueParameter) {
-            val parentFunction = declaration.parent as? IrFunction
-            if ((declaration.origin == IrDeclarationOrigin.INSTANCE_RECEIVER && declaration.name.isSpecial) ||
-                (parentFunction != null && declaration == parentFunction.dispatchReceiverParameter)
-            )
-                table.declareStableName(declaration, Namer.IMPLICIT_RECEIVER_NAME)
-            else
-                super.visitValueParameter(declaration)
-        }
-
         override fun visitDeclaration(declaration: IrDeclaration) {
             if (declaration is IrDeclarationWithName && declaration is IrSymbolOwner) {
                 table.declareFreshName(declaration, declaration.name.asString())