diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt
index 3a255502ee2..5ffab7914d9 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/defaultLambdaInNoInline.kt
@@ -9,7 +9,7 @@ inline fun inlineFun(crossinline inlineLambda: () -> String = { "OK" }, noinline
 
 // FILE: 2.kt
 //NO_CHECK_LAMBDA_INLINING
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda_0 scope=box
 import test.*
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/noInline.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/noInline.kt
index bba18103d4f..2f9c2618cc3 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/noInline.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/noInline.kt
@@ -9,8 +9,8 @@ fun call(lambda: () -> String ) = lambda()
 
 // FILE: 2.kt
 //NO_CHECK_LAMBDA_INLINING
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=box
-// CHECK_CALLED_IN_SCOPE: function=call_h4ejuu$ scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda scope=box
+// CHECK_CALLED_IN_SCOPE: function=call scope=box
 import test.*
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/nonDefaultInlineInNoInline.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/nonDefaultInlineInNoInline.kt
index 469a34e52c4..abe5059b0e8 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/nonDefaultInlineInNoInline.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/nonDefaultInlineInNoInline.kt
@@ -9,7 +9,7 @@ inline fun inlineFun(crossinline inlineLambda: () -> String, noinline noInlineLa
 
 // FILE: 2.kt
 //NO_CHECK_LAMBDA_INLINING
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=inlineFun
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda scope=inlineFun
 import test.*
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash.kt
index f93ac5f8a22..f5367e6f018 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash.kt
@@ -10,8 +10,8 @@ inline fun String.inlineFun(crossinline lambda: () -> String = { this }): String
 }
 
 // FILE: 2.kt
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=box
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda_0 scope=box
 
 import test.*
 
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash2.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash2.kt
index 957f1fa9bae..7a8f71ffc8b 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash2.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClash2.kt
@@ -10,8 +10,8 @@ inline fun String.inlineFun(crossinline lambda: () -> String, crossinline dlambd
 }
 
 // FILE: 2.kt
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=test
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=test
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda_0 scope=test
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda scope=test
 import test.*
 
 fun String.test(): String = "INLINE".inlineFun({ this })
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass.kt
index a5aa23e929e..75d74f77eb1 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass.kt
@@ -14,8 +14,8 @@ class A(val value: String) {
 
 // FILE: 2.kt
 //WITH_RUNTIME
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=box
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=box
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda scope=box
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda_0 scope=box
 import test.*
 
 fun box(): String {
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass2.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass2.kt
index 18b2b8dfefb..11117e9422a 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass2.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/receiverClashInClass2.kt
@@ -14,8 +14,8 @@ class A(val value: String) {
 
 // FILE: 2.kt
 //WIH_RUNTIME
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=test
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=test
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda scope=test
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda_0 scope=test
 import test.*
 
 fun String.test(): String = with(A("VALUE")) { "INLINE".inlineFun({ this@test }) }
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClash.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClash.kt
index 3f5f519e012..ecfd75bc120 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClash.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClash.kt
@@ -12,8 +12,8 @@ inline fun String.inlineFun(crossinline lambda: () -> String = { { this }() }):
 }
 
 // FILE: 2.kt
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=box
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda scope=box
+// CHECK_CALLED_IN_SCOPE: function=inlineFun$lambda_0 scope=box
 
 import test.*
 
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClashInClass.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClashInClass.kt
index ca91879d2d6..e6f5016471d 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClashInClass.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/thisClashInClass.kt
@@ -15,8 +15,8 @@ class A(val value: String) {
 
 // FILE: 2.kt
 //WITH_RUNTIME
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f scope=box
-// CHECK_CALLED_IN_SCOPE: function=inlineFun$f_0 scope=box
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda scope=box
+// CHECK_CALLED_IN_SCOPE: function=A$inlineFun$lambda_0 scope=box
 import test.*
 
 fun box(): String {
diff --git a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
index 8e2f389508e..fe901808ffc 100644
--- a/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
+++ b/js/js.translator/testData/box/multiModule/publishedApiMangling.kt
@@ -1,18 +1,15 @@
 // EXPECTED_REACHABLE_NODES: 1695
-// MODULE: lib
-// FILE: lib.kt
+// PROPERTY_WRITE_COUNT: name=publishedTopLevel_61zpoe$ count=1
+// PROPERTY_WRITE_COUNT: name=published_61zpoe$ count=1
+// PROPERTY_WRITE_COUNT: name=B count=1
 class A {
     @PublishedApi
     internal fun published(x: String) = "${x}K"
-
-    fun template(x: String): String = TODO("")
 }
 
 @PublishedApi
 internal fun publishedTopLevel(x: String) = "${x}K"
 
-fun templateTopLevel(x: String): String = TODO("")
-
 interface I {
     fun test(): String
 }
@@ -22,34 +19,4 @@ internal class B(val x: String) : I {
     override fun test() = x + "K"
 }
 
-// MODULE: main(lib)
-// FILE: main.kt
-import kotlin.text.Regex
-
-inline fun templates() {
-    A().template("X")
-    templateTopLevel("X")
-}
-
-fun box(): String {
-    val testFunctionName = "published" + extractSuffix("template")
-    val a = A()
-    var result = a.asDynamic()[testFunctionName].call(a, "O")
-    if (result != "OK") return "fail1: $result"
-
-    val topLevelName = "publishedTopLevel" + extractSuffix("templateTopLevel")
-    result = js("lib")[topLevelName]("O")
-    if (result != "OK") return "fail2: $result"
-
-    val b: I = js("new lib.B('O')")
-    result = b.test()
-    if (result != "OK") return "fail3: $result"
-
-    return "OK"
-}
-
-private fun extractSuffix(prefix: String): String {
-    val functionBody: String = js("_").templates.toString()
-    val regex = Regex(prefix + "(_[\\\$a-zA-Z0-9]+)")
-    return regex.find(functionBody)!!.groupValues[1]
-}
\ No newline at end of file
+fun box(): String = "OK"
\ No newline at end of file