diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/ArgumentSliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/ArgumentSliceProducer.kt
index c53a800fbd67d..af8acd23f1156 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/ArgumentSliceProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/ArgumentSliceProducer.kt
@@ -38,6 +38,8 @@ data class ArgumentSliceProducer private constructor(
         return listOf(KotlinSliceUsage(argumentExpression, parent, mode, forcedExpressionMode = true))
     }
 
+    override val testPresentation = "ARGUMENT #$parameterIndex".let { if (isExtension) "$it EXTENSION" else it }
+
     private fun extractArgumentExpression(refElement: PsiElement): PsiElement? {
         val refParent = refElement.parent
         return when {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt
index f8e3625a660da..97f79db5eebaf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/CallSliceProducer.kt
@@ -49,6 +49,9 @@ object CallSliceProducer : SliceProducer {
         }
     }
 
+    override val testPresentation: String?
+        get() = null
+
     override fun equals(other: Any?) = other === this
     override fun hashCode() = 0
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
index 918f37ca6551a..1c1a41942901c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -145,16 +145,16 @@ class InflowSlicer(
                     lambda.passToProcessor(mode.dropBehaviour())
                 }
 
-                is LambdaArgumentInflowBehaviour -> {
+                is LambdaParameterInflowBehaviour -> {
                     val valueParameters = lambda.valueParameters
                     if (valueParameters.isEmpty() && lambda is KtFunctionLiteral) {
-                        if (currentBehaviour.argumentIndex == 0) {
+                        if (currentBehaviour.parameterIndex == 0) {
                             lambda.implicitItUsages().forEach {
                                 it.passToProcessor(mode.dropBehaviour())
                             }
                         }
                     } else {
-                        valueParameters.getOrNull(currentBehaviour.argumentIndex)?.passToProcessor(mode.dropBehaviour())
+                        valueParameters.getOrNull(currentBehaviour.parameterIndex)?.passToProcessor(mode.dropBehaviour())
                     }
                 }
 
@@ -238,9 +238,9 @@ class InflowSlicer(
                             referencedDeclaration.passToProcessor(mode.dropBehaviour())
                         }
 
-                        is LambdaArgumentInflowBehaviour -> {
+                        is LambdaParameterInflowBehaviour -> {
                             val parameter = (referencedDeclaration as? KtCallableDeclaration)
-                                ?.valueParameters?.getOrNull(currentBehaviour.argumentIndex)
+                                ?.valueParameters?.getOrNull(currentBehaviour.parameterIndex)
                             parameter?.passToProcessor(mode.dropBehaviour())
                         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
index d9e0d26a894fc..3f7679c5a5495 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaCallsBehaviour.kt
@@ -34,5 +34,12 @@ data class LambdaCallsBehaviour(private val sliceProducer: SliceProducer) : Kotl
         get() = KotlinBundle.message("slicer.text.tracking.lambda.calls")
 
     override val testPresentationPrefix: String
-        get() = "[LAMBDA CALLS] "
+        get() = buildString {
+            append("[LAMBDA CALLS")
+            sliceProducer.testPresentation?.let {
+                append(" ")
+                append(it)
+            }
+            append("] ")
+        }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaArgumentInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
similarity index 83%
rename from idea/src/org/jetbrains/kotlin/idea/slicer/LambdaArgumentInflowBehaviour.kt
rename to idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
index d5e141e6e265c..8eaff3817cd04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaArgumentInflowBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaParameterInflowBehaviour.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 import org.jetbrains.kotlin.psi.KtElement
 
-data class LambdaArgumentInflowBehaviour(val argumentIndex: Int) : KotlinSliceAnalysisMode.Behaviour {
+data class LambdaParameterInflowBehaviour(val parameterIndex: Int) : KotlinSliceAnalysisMode.Behaviour {
     override fun processUsages(element: KtElement, parent: KotlinSliceUsage, uniqueProcessor: SliceUsageProcessor) {
         InflowSlicer(element, uniqueProcessor, parent).processChildren(parent.forcedExpressionMode)
     }
@@ -18,5 +18,5 @@ data class LambdaArgumentInflowBehaviour(val argumentIndex: Int) : KotlinSliceAn
         get() = KotlinBundle.message("slicer.text.tracking.lambda.argument")
 
     override val testPresentationPrefix: String
-        get() = "[LAMBDA ARGUMENT IN] "
+        get() = "[LAMBDA PARAMETER #$parameterIndex] "
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
index 9727a228c3915..291a4907fc4e4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/LambdaReceiverInflowBehaviour.kt
@@ -18,7 +18,7 @@ object LambdaReceiverInflowBehaviour : KotlinSliceAnalysisMode.Behaviour {
         get() = KotlinBundle.message("slicer.text.tracking.lambda.receiver")
 
     override val testPresentationPrefix: String
-        get() = "[LAMBDA RECEIVER IN] "
+        get() = "[LAMBDA RECEIVER] "
 
     override fun equals(other: Any?) = other === this
     override fun hashCode() = 0
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
index 4415cba799d2a..ff1434719fa70 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/OutflowSlicer.kt
@@ -227,9 +227,9 @@ class OutflowSlicer(
         if (receiverType == null || !receiverType.isFunctionType) return
         val isExtension = receiverType.isExtensionFunctionType
         val shift = if (isExtension) 1 else 0
-        val argumentIndex = parameterDescriptor.index - shift
-        val newMode = if (argumentIndex >= 0)
-            mode.withBehaviour(LambdaArgumentInflowBehaviour(argumentIndex))
+        val parameterIndex = parameterDescriptor.index - shift
+        val newMode = if (parameterIndex >= 0)
+            mode.withBehaviour(LambdaParameterInflowBehaviour(parameterIndex))
         else
             mode.withBehaviour(LambdaReceiverInflowBehaviour)
         receiver.passToProcessor(newMode)
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/ReceiverSliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/ReceiverSliceProducer.kt
index 9d3eaaeacb9b1..4c8c66e4b6974 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/ReceiverSliceProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/ReceiverSliceProducer.kt
@@ -57,6 +57,9 @@ object ReceiverSliceProducer : SliceProducer {
         }
     }
 
+    override val testPresentation: String?
+        get() = "RECEIVER"
+
     override fun equals(other: Any?) = other === this
     override fun hashCode() = 0
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
index db8d0571679a4..8addb8ded94a3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/SliceProducer.kt
@@ -12,6 +12,8 @@ import org.jetbrains.kotlin.idea.findUsages.handlers.SliceUsageProcessor
 interface SliceProducer {
     fun produce(usage: UsageInfo, mode: KotlinSliceAnalysisMode, parent: SliceUsage): Collection<SliceUsage>?
 
+    val testPresentation: String?
+
     override fun equals(other: Any?): Boolean
     override fun hashCode(): Int
 
@@ -20,6 +22,9 @@ interface SliceProducer {
             return null
         }
 
+        override val testPresentation: String?
+            get() = null
+
         override fun equals(other: Any?) = other === this
         override fun hashCode() = 0
     }
diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt
index 684e3af93f6ab..86641a4fb6c55 100644
--- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt
+++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.leafGroups.txt
@@ -9,7 +9,7 @@
 8 								val x = foo(<bold>fun(n: Int) = n</bold>)
 8 									val x = foo(fun(n: Int) = <bold>n</bold>)
 8 										val x = foo(fun(<bold>n: Int</bold>) = n)
-8 											[LAMBDA CALLS] val x = foo(<bold>fun(n: Int) = n</bold>)
-3 												[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 											[LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>)
+3 												[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 													return f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt
index 6cda09e4fa117..1cb5b05c23d3d 100644
--- a/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt
+++ b/idea/testData/slicer/inflow/anonymousFunBodyExpression.results.txt
@@ -8,6 +8,6 @@
 8 							val x = foo(<bold>fun(n: Int) = n</bold>)
 8 								val x = foo(fun(n: Int) = <bold>n</bold>)
 8 									val x = foo(fun(<bold>n: Int</bold>) = n)
-8 										[LAMBDA CALLS] val x = foo(<bold>fun(n: Int) = n</bold>)
-3 											[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 										[LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int) = n</bold>)
+3 											[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 												return f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt
index 64453afb1f1b5..48be750ee4d4c 100644
--- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt
+++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.leafGroups.txt
@@ -9,7 +9,7 @@
 8 								val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
 8 									val x = foo(fun(n: Int): Int { return <bold>n</bold> })
 8 										val x = foo(fun(<bold>n: Int</bold>): Int { return n })
-8 											[LAMBDA CALLS] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
-3 												[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 											[LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
+3 												[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 													return f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt
index 95ba8dfb5dbd4..7be6b76e83504 100644
--- a/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt
+++ b/idea/testData/slicer/inflow/anonymousFunReturnExpression.results.txt
@@ -8,6 +8,6 @@
 8 							val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
 8 								val x = foo(fun(n: Int): Int { return <bold>n</bold> })
 8 									val x = foo(fun(<bold>n: Int</bold>): Int { return n })
-8 										[LAMBDA CALLS] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
-3 											[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 										[LAMBDA CALLS ARGUMENT #0] val x = foo(<bold>fun(n: Int): Int { return n }</bold>)
+3 											[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 												return f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt
index ed09a376a8edf..203793c7ba3c4 100644
--- a/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt
+++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.leafGroups.txt
@@ -2,7 +2,7 @@
 9 	val <bold>v = value</bold>
 9 		val v = <bold>value</bold>
 8 			foo(fun(<bold>value: Int</bold>) {
-8 				[LAMBDA CALLS] foo(<bold>fun(value: Int) {</bold>
-3 					[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 				[LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold>
+3 					[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 						f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt
index 527b2743a3c20..b0719353375bb 100644
--- a/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt
+++ b/idea/testData/slicer/inflow/anonymousFunctionParameter.results.txt
@@ -1,6 +1,6 @@
 9 val <bold>v = value</bold>
 9 	val v = <bold>value</bold>
 8 		foo(fun(<bold>value: Int</bold>) {
-8 			[LAMBDA CALLS] foo(<bold>fun(value: Int) {</bold>
-3 				[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 			[LAMBDA CALLS ARGUMENT #0] foo(<bold>fun(value: Int) {</bold>
+3 				[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 					f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt
index 9d92db5af74fd..64f6f9b9104fc 100644
--- a/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt
+++ b/idea/testData/slicer/inflow/doubleLambdaResult.leafGroups.txt
@@ -11,11 +11,11 @@
 8 										[LAMBDA IN] val x = foo(1, 2) { <bold>{ it }</bold> }
 8 											val x = foo(1, 2) { <bold>{ it }</bold> }
 8 												val x = foo(1, 2) { { <bold>it</bold> } }
-8 													[LAMBDA CALLS] val x = foo(1, 2) { <bold>{ it }</bold> }
-8 														[LAMBDA CALLS] val x = foo(1, 2) <bold>{ { it } }</bold>
-8 															[LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) <bold>{ { it } }</bold>
-3 																[LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int {
-4 																	[LAMBDA CALLS] return <bold>f(a)</bold>(b)
+8 													[LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { <bold>{ it }</bold> }
+8 														[LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold>
+8 															[LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold>
+3 																[LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int {
+4 																	[LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b)
 4 																		return f(a)(<bold>b</bold>)
 3 																			fun foo(a: Int, <bold>b: Int</bold>, f: (Int) -> (Int) -> Int): Int {
 8 																				val x = foo(1, <bold>2</bold>) { { it } }
diff --git a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt
index f086bb1482874..f878159826a99 100644
--- a/idea/testData/slicer/inflow/doubleLambdaResult.results.txt
+++ b/idea/testData/slicer/inflow/doubleLambdaResult.results.txt
@@ -10,11 +10,11 @@
 8 									[LAMBDA IN] val x = foo(1, 2) { <bold>{ it }</bold> }
 8 										val x = foo(1, 2) { <bold>{ it }</bold> }
 8 											val x = foo(1, 2) { { <bold>it</bold> } }
-8 												[LAMBDA CALLS] val x = foo(1, 2) { <bold>{ it }</bold> }
-8 													[LAMBDA CALLS] val x = foo(1, 2) <bold>{ { it } }</bold>
-8 														[LAMBDA CALLS] [LAMBDA CALLS] val x = foo(1, 2) <bold>{ { it } }</bold>
-3 															[LAMBDA CALLS] [LAMBDA CALLS] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int {
-4 																[LAMBDA CALLS] return <bold>f(a)</bold>(b)
+8 												[LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) { <bold>{ it }</bold> }
+8 													[LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold>
+8 														[LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] val x = foo(1, 2) <bold>{ { it } }</bold>
+3 															[LAMBDA CALLS] [LAMBDA CALLS ARGUMENT #0] fun foo(a: Int, b: Int, <bold>f: (Int) -> (Int) -> Int</bold>): Int {
+4 																[LAMBDA CALLS ARGUMENT #0] return <bold>f(a)</bold>(b)
 4 																	return f(a)(<bold>b</bold>)
 3 																		fun foo(a: Int, <bold>b: Int</bold>, f: (Int) -> (Int) -> Int): Int {
 8 																			val x = foo(1, <bold>2</bold>) { { it } }
diff --git a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt
index bc76f81556186..993c586492288 100644
--- a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.leafGroups.txt
@@ -1,18 +1,18 @@
 4 f("", <bold>1</bold>)
 15 	val v = <bold>it</bold>
-14 		[LAMBDA CALLS] foo <bold>{</bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 		[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{</bold>
+3 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 4 				f("", <bold>1</bold>)
 
 6 "".f(<bold>2</bold>)
 15 	val v = <bold>it</bold>
-14 		[LAMBDA CALLS] foo <bold>{</bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 		[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{</bold>
+3 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 6 				"".f(<bold>2</bold>)
 
 9 f(<bold>3</bold>)
 15 	val v = <bold>it</bold>
-14 		[LAMBDA CALLS] foo <bold>{</bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 		[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{</bold>
+3 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 9 				f(<bold>3</bold>)
 
diff --git a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt
index 0afcb0bf3fac4..719293b6c5242 100644
--- a/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaImplicitParameter.results.txt
@@ -1,6 +1,6 @@
 15 val v = <bold>it</bold>
-14 	[LAMBDA CALLS] foo <bold>{</bold>
-3 		[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 	[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{</bold>
+3 		[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 4 			f("", <bold>1</bold>)
 6 			"".f(<bold>2</bold>)
 9 			f(<bold>3</bold>)
diff --git a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt
index 9f625c5ca9f95..d0b5c6c215a14 100644
--- a/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaParameter.leafGroups.txt
@@ -1,21 +1,21 @@
 4 f("", <bold>1</bold>)
 15 	val v = <bold>i</bold>
 14 		foo { <bold>i</bold> ->
-14 			[LAMBDA CALLS] foo <bold>{ i -></bold>
-3 				[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{ i -></bold>
+3 				[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 4 					f("", <bold>1</bold>)
 
 6 "".f(<bold>2</bold>)
 15 	val v = <bold>i</bold>
 14 		foo { <bold>i</bold> ->
-14 			[LAMBDA CALLS] foo <bold>{ i -></bold>
-3 				[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{ i -></bold>
+3 				[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 6 					"".f(<bold>2</bold>)
 
 9 f(<bold>3</bold>)
 15 	val v = <bold>i</bold>
 14 		foo { <bold>i</bold> ->
-14 			[LAMBDA CALLS] foo <bold>{ i -></bold>
-3 				[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{ i -></bold>
+3 				[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 9 					f(<bold>3</bold>)
 
diff --git a/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt b/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt
index f87457e46a3bb..28f7e32deb7f0 100644
--- a/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaParameter.results.txt
@@ -1,7 +1,7 @@
 15 val v = <bold>i</bold>
 14 	foo { <bold>i</bold> ->
-14 		[LAMBDA CALLS] foo <bold>{ i -></bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
+14 		[LAMBDA CALLS ARGUMENT #0 EXTENSION] foo <bold>{ i -></bold>
+3 			[LAMBDA CALLS ARGUMENT #0 EXTENSION] fun foo(<bold>f: String.(Int) -> Unit</bold>) {
 4 				f("", <bold>1</bold>)
 6 				"".f(<bold>2</bold>)
 9 				f(<bold>3</bold>)
diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt
index 57bf3f8e49d20..047beb80bb0d9 100644
--- a/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.leafGroups.txt
@@ -1,8 +1,8 @@
 4 with(<bold>"A"</bold>) {
 5 	val <bold>v = this</bold>
 5 		val v = <bold>this</bold>
-4 			[LAMBDA CALLS] with("A") <bold>{</bold>
-9 				(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+4 			[LAMBDA CALLS RECEIVER] with("A") <bold>{</bold>
+9 				(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 10 					(INLINE CALL with) return <bold>receiver</bold>.block()
 9 						(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 4 							with(<bold>"A"</bold>) {
diff --git a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt
index 1243168bbab80..85e289d745c74 100644
--- a/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt
+++ b/idea/testData/slicer/inflow/extensionLambdaReceiver.results.txt
@@ -1,7 +1,7 @@
 5 val <bold>v = this</bold>
 5 	val v = <bold>this</bold>
-4 		[LAMBDA CALLS] with("A") <bold>{</bold>
-9 			(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+4 		[LAMBDA CALLS RECEIVER] with("A") <bold>{</bold>
+9 			(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 10 				(INLINE CALL with) return <bold>receiver</bold>.block()
 9 					(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 4 						with(<bold>"A"</bold>) {
diff --git a/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt b/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt
index 5d4506757ef6f..6d4617c1d3125 100644
--- a/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt
+++ b/idea/testData/slicer/inflow/inlineFunctionManyCalls.leafGroups.txt
@@ -1,8 +1,8 @@
 35 <bold>"D"</bold>.letNoInline {
 3 	fun <bold>Any</bold>.extensionFun() {
 36 		<bold>it</bold>.extensionFun()
-35 			[LAMBDA CALLS] "D".letNoInline <bold>{</bold>
-58 				[LAMBDA CALLS] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
+35 			[LAMBDA CALLS ARGUMENT #0] "D".letNoInline <bold>{</bold>
+58 				[LAMBDA CALLS ARGUMENT #0] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
 59 					return block(<bold>this</bold>)
 58 						fun <T, R> <bold>T</bold>.letNoInline(block: (T) -> R): R {
 35 							<bold>"D"</bold>.letNoInline {
@@ -10,8 +10,8 @@
 39 <bold>"C"</bold>.letNoInline {
 3 	fun <bold>Any</bold>.extensionFun() {
 36 		<bold>it</bold>.extensionFun()
-35 			[LAMBDA CALLS] "D".letNoInline <bold>{</bold>
-58 				[LAMBDA CALLS] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
+35 			[LAMBDA CALLS ARGUMENT #0] "D".letNoInline <bold>{</bold>
+58 				[LAMBDA CALLS ARGUMENT #0] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
 59 					return block(<bold>this</bold>)
 58 						fun <T, R> <bold>T</bold>.letNoInline(block: (T) -> R): R {
 39 							<bold>"C"</bold>.letNoInline {
@@ -19,32 +19,32 @@
 27 <bold>"A"</bold>.let {
 3 	fun <bold>Any</bold>.extensionFun() {
 28 		<bold>it</bold>.extensionFun()
-27 			[LAMBDA CALLS] "A".let <bold>{</bold>
-49 				(INLINE CALL let) [LAMBDA CALLS] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+27 			[LAMBDA CALLS ARGUMENT #0] "A".let <bold>{</bold>
+49 				(INLINE CALL let) [LAMBDA CALLS ARGUMENT #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
 50 					(INLINE CALL let) return block(<bold>this</bold>)
 49 						(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 27 							<bold>"A"</bold>.let {
 
 19 withNoInline(<bold>1</bold>) {
 3 	fun <bold>Any</bold>.extensionFun() {
-19 		[LAMBDA CALLS] withNoInline(1) <bold>{</bold>
-53 			[LAMBDA CALLS] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
+19 		[LAMBDA CALLS RECEIVER] withNoInline(1) <bold>{</bold>
+53 			[LAMBDA CALLS RECEIVER] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
 54 				val result = <bold>receiver</bold>.block()
 53 					fun <T, R> withNoInline(<bold>receiver: T</bold>, block: T.() -> R): R {
 19 						withNoInline(<bold>1</bold>) {
 
 7 with(<bold>123</bold>) {
 3 	fun <bold>Any</bold>.extensionFun() {
-7 		[LAMBDA CALLS] with(123) <bold>{</bold>
-44 			(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+7 		[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+44 			(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 45 				(INLINE CALL with) val result = <bold>receiver</bold>.block()
 44 					(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 7 						with(<bold>123</bold>) {
 
 23 withNoInline(<bold>2</bold>) {
 3 	fun <bold>Any</bold>.extensionFun() {
-19 		[LAMBDA CALLS] withNoInline(1) <bold>{</bold>
-53 			[LAMBDA CALLS] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
+19 		[LAMBDA CALLS RECEIVER] withNoInline(1) <bold>{</bold>
+53 			[LAMBDA CALLS RECEIVER] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
 54 				val result = <bold>receiver</bold>.block()
 53 					fun <T, R> withNoInline(<bold>receiver: T</bold>, block: T.() -> R): R {
 23 						withNoInline(<bold>2</bold>) {
@@ -52,8 +52,8 @@
 11 with(<bold>456</bold>) {
 3 	fun <bold>Any</bold>.extensionFun() {
 12 		<bold>this</bold>.extensionFun()
-11 			[LAMBDA CALLS] with(456) <bold>{</bold>
-44 				(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+11 			[LAMBDA CALLS RECEIVER] with(456) <bold>{</bold>
+44 				(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 45 					(INLINE CALL with) val result = <bold>receiver</bold>.block()
 44 						(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 11 							with(<bold>456</bold>) {
diff --git a/idea/testData/slicer/inflow/inlineFunctionManyCalls.nullnessGroups.txt b/idea/testData/slicer/inflow/inlineFunctionManyCalls.nullnessGroups.txt
index 3f8b0244afa87..550ab3e5010eb 100644
--- a/idea/testData/slicer/inflow/inlineFunctionManyCalls.nullnessGroups.txt
+++ b/idea/testData/slicer/inflow/inlineFunctionManyCalls.nullnessGroups.txt
@@ -1,8 +1,8 @@
 [NotNull Values]
 7 	with(<bold>123</bold>) {
 3 		fun <bold>Any</bold>.extensionFun() {
-7 			[LAMBDA CALLS] with(123) <bold>{</bold>
-44 				(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+7 			[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+44 				(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 45 					(INLINE CALL with) val result = <bold>receiver</bold>.block()
 44 						(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 7 							with(<bold>123</bold>) {
@@ -11,15 +11,15 @@
 12 			<bold>this</bold>.extensionFun()
 19 	withNoInline(<bold>1</bold>) {
 3 		fun <bold>Any</bold>.extensionFun() {
-19 			[LAMBDA CALLS] withNoInline(1) <bold>{</bold>
-53 				[LAMBDA CALLS] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
+19 			[LAMBDA CALLS RECEIVER] withNoInline(1) <bold>{</bold>
+53 				[LAMBDA CALLS RECEIVER] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
 54 					val result = <bold>receiver</bold>.block()
 53 						fun <T, R> withNoInline(<bold>receiver: T</bold>, block: T.() -> R): R {
 19 							withNoInline(<bold>1</bold>) {
 23 	withNoInline(<bold>2</bold>) {
 3 		fun <bold>Any</bold>.extensionFun() {
-19 			[LAMBDA CALLS] withNoInline(1) <bold>{</bold>
-53 				[LAMBDA CALLS] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
+19 			[LAMBDA CALLS RECEIVER] withNoInline(1) <bold>{</bold>
+53 				[LAMBDA CALLS RECEIVER] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
 54 					val result = <bold>receiver</bold>.block()
 53 						fun <T, R> withNoInline(<bold>receiver: T</bold>, block: T.() -> R): R {
 23 							withNoInline(<bold>2</bold>) {
diff --git a/idea/testData/slicer/inflow/inlineFunctionManyCalls.results.txt b/idea/testData/slicer/inflow/inlineFunctionManyCalls.results.txt
index 5f40fb9cc74e8..04afb7118d3eb 100644
--- a/idea/testData/slicer/inflow/inlineFunctionManyCalls.results.txt
+++ b/idea/testData/slicer/inflow/inlineFunctionManyCalls.results.txt
@@ -1,30 +1,30 @@
 3 fun <bold>Any</bold>.extensionFun() {
-7 	[LAMBDA CALLS] with(123) <bold>{</bold>
-44 		(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+7 	[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+44 		(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 45 			(INLINE CALL with) val result = <bold>receiver</bold>.block()
 44 				(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 7 					with(<bold>123</bold>) {
 12 	<bold>this</bold>.extensionFun()
-11 		[LAMBDA CALLS] with(456) <bold>{</bold>
-44 			(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+11 		[LAMBDA CALLS RECEIVER] with(456) <bold>{</bold>
+44 			(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 45 				(INLINE CALL with) val result = <bold>receiver</bold>.block()
 44 					(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 11 						with(<bold>456</bold>) {
-19 	[LAMBDA CALLS] withNoInline(1) <bold>{</bold>
-53 		[LAMBDA CALLS] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
+19 	[LAMBDA CALLS RECEIVER] withNoInline(1) <bold>{</bold>
+53 		[LAMBDA CALLS RECEIVER] fun <T, R> withNoInline(receiver: T, <bold>block: T.() -> R</bold>): R {
 54 			val result = <bold>receiver</bold>.block()
 53 				fun <T, R> withNoInline(<bold>receiver: T</bold>, block: T.() -> R): R {
 19 					withNoInline(<bold>1</bold>) {
 23 					withNoInline(<bold>2</bold>) {
 28 	<bold>it</bold>.extensionFun()
-27 		[LAMBDA CALLS] "A".let <bold>{</bold>
-49 			(INLINE CALL let) [LAMBDA CALLS] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+27 		[LAMBDA CALLS ARGUMENT #0] "A".let <bold>{</bold>
+49 			(INLINE CALL let) [LAMBDA CALLS ARGUMENT #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
 50 				(INLINE CALL let) return block(<bold>this</bold>)
 49 					(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 27 						<bold>"A"</bold>.let {
 36 	<bold>it</bold>.extensionFun()
-35 		[LAMBDA CALLS] "D".letNoInline <bold>{</bold>
-58 			[LAMBDA CALLS] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
+35 		[LAMBDA CALLS ARGUMENT #0] "D".letNoInline <bold>{</bold>
+58 			[LAMBDA CALLS ARGUMENT #0] fun <T, R> T.letNoInline(<bold>block: (T) -> R</bold>): R {
 59 				return block(<bold>this</bold>)
 58 					fun <T, R> <bold>T</bold>.letNoInline(block: (T) -> R): R {
 35 						<bold>"D"</bold>.letNoInline {
diff --git a/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt b/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt
index 74c485a47eced..5cbea6bf2fe13 100644
--- a/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt
+++ b/idea/testData/slicer/inflow/lambdaImplicitParameter.leafGroups.txt
@@ -1,6 +1,6 @@
 4 f(<bold>1</bold>)
 9 	val v = <bold>it</bold>
-8 		[LAMBDA CALLS] foo <bold>{</bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 		[LAMBDA CALLS ARGUMENT #0] foo <bold>{</bold>
+3 			[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 				f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt b/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt
index 29383bcc54e2a..4a221edec8582 100644
--- a/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt
+++ b/idea/testData/slicer/inflow/lambdaImplicitParameter.results.txt
@@ -1,4 +1,4 @@
 9 val v = <bold>it</bold>
-8 	[LAMBDA CALLS] foo <bold>{</bold>
-3 		[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 	[LAMBDA CALLS ARGUMENT #0] foo <bold>{</bold>
+3 		[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 			f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt b/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt
index a8566b9388e29..bcfb66420fa25 100644
--- a/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt
+++ b/idea/testData/slicer/inflow/lambdaParameter.leafGroups.txt
@@ -1,7 +1,7 @@
 4 f(<bold>1</bold>)
 9 	val v = <bold>value</bold>
 8 		foo { <bold>value</bold> ->
-8 			[LAMBDA CALLS] foo <bold>{ value -></bold>
-3 				[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 			[LAMBDA CALLS ARGUMENT #0] foo <bold>{ value -></bold>
+3 				[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 					f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/lambdaParameter.results.txt b/idea/testData/slicer/inflow/lambdaParameter.results.txt
index 310aec046503e..c723b61100074 100644
--- a/idea/testData/slicer/inflow/lambdaParameter.results.txt
+++ b/idea/testData/slicer/inflow/lambdaParameter.results.txt
@@ -1,5 +1,5 @@
 9 val v = <bold>value</bold>
 8 	foo { <bold>value</bold> ->
-8 		[LAMBDA CALLS] foo <bold>{ value -></bold>
-3 			[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Unit</bold>) {
+8 		[LAMBDA CALLS ARGUMENT #0] foo <bold>{ value -></bold>
+3 			[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Unit</bold>) {
 4 				f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt
index e4f7a3b07fa77..b67a6270b0f0c 100644
--- a/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt
+++ b/idea/testData/slicer/inflow/lambdaResult.leafGroups.txt
@@ -8,7 +8,7 @@
 8 							[LAMBDA IN] val x = foo <bold>{ it }</bold>
 8 								val x = foo <bold>{ it }</bold>
 8 									val x = foo { <bold>it</bold> }
-8 										[LAMBDA CALLS] val x = foo <bold>{ it }</bold>
-3 											[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 										[LAMBDA CALLS ARGUMENT #0] val x = foo <bold>{ it }</bold>
+3 											[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 												return f(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/lambdaResult.results.txt b/idea/testData/slicer/inflow/lambdaResult.results.txt
index b6bc949f447e6..046eb0a9e72a3 100644
--- a/idea/testData/slicer/inflow/lambdaResult.results.txt
+++ b/idea/testData/slicer/inflow/lambdaResult.results.txt
@@ -7,6 +7,6 @@
 8 						[LAMBDA IN] val x = foo <bold>{ it }</bold>
 8 							val x = foo <bold>{ it }</bold>
 8 								val x = foo { <bold>it</bold> }
-8 									[LAMBDA CALLS] val x = foo <bold>{ it }</bold>
-3 										[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+8 									[LAMBDA CALLS ARGUMENT #0] val x = foo <bold>{ it }</bold>
+3 										[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
 4 											return f(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt
index 00573786d7806..f44f1998b007e 100644
--- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt
+++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.leafGroups.txt
@@ -10,9 +10,9 @@
 9 									[LAMBDA IN] val y = foo <bold>{ it }</bold>
 9 										val y = foo <bold>{ it }</bold>
 9 											val y = foo { <bold>it</bold> }
-9 												[LAMBDA CALLS] val y = foo <bold>{ it }</bold>
-3 													[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
-4 														[LAMBDA CALLS] val x = <bold>f</bold>
-4 															[LAMBDA CALLS] val <bold>x = f</bold>
+9 												[LAMBDA CALLS ARGUMENT #0] val y = foo <bold>{ it }</bold>
+3 													[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+4 														[LAMBDA CALLS ARGUMENT #0] val x = <bold>f</bold>
+4 															[LAMBDA CALLS ARGUMENT #0] val <bold>x = f</bold>
 5 																return x(<bold>1</bold>)
 
diff --git a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt
index e37ef26d9674e..97b168d237843 100644
--- a/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt
+++ b/idea/testData/slicer/inflow/lambdaResultWithAssignments.results.txt
@@ -9,8 +9,8 @@
 9 								[LAMBDA IN] val y = foo <bold>{ it }</bold>
 9 									val y = foo <bold>{ it }</bold>
 9 										val y = foo { <bold>it</bold> }
-9 											[LAMBDA CALLS] val y = foo <bold>{ it }</bold>
-3 												[LAMBDA CALLS] fun foo(<bold>f: (Int) -> Int</bold>): Int {
-4 													[LAMBDA CALLS] val x = <bold>f</bold>
-4 														[LAMBDA CALLS] val <bold>x = f</bold>
+9 											[LAMBDA CALLS ARGUMENT #0] val y = foo <bold>{ it }</bold>
+3 												[LAMBDA CALLS ARGUMENT #0] fun foo(<bold>f: (Int) -> Int</bold>): Int {
+4 													[LAMBDA CALLS ARGUMENT #0] val x = <bold>f</bold>
+4 														[LAMBDA CALLS ARGUMENT #0] val <bold>x = f</bold>
 5 															return x(<bold>1</bold>)
diff --git a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt
index ab4bc6d7bd138..1a4bd07895e6c 100644
--- a/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt
+++ b/idea/testData/slicer/inflow/nonLocalReturn.leafGroups.txt
@@ -9,8 +9,8 @@
 5 								fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
 5 									fun bar(a: Int): Int = foo(a) { <bold>if (it > 0) it else return 0</bold> }
 5 										fun bar(a: Int): Int = foo(a) { if (it > 0) <bold>it</bold> else return 0 }
-5 											[LAMBDA CALLS] fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
-3 												(INLINE CALL foo) [LAMBDA CALLS] inline fun foo(a: Int, <bold>f: (Int) -> Int</bold>) = f(a)
+5 											[LAMBDA CALLS ARGUMENT #0] fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
+3 												(INLINE CALL foo) [LAMBDA CALLS ARGUMENT #0] inline fun foo(a: Int, <bold>f: (Int) -> Int</bold>) = f(a)
 3 													(INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(<bold>a</bold>)
 3 														(INLINE CALL foo) inline fun foo(<bold>a: Int</bold>, f: (Int) -> Int) = f(a)
 5 															fun bar(a: Int): Int = foo(<bold>a</bold>) { if (it > 0) it else return 0 }
diff --git a/idea/testData/slicer/inflow/nonLocalReturn.results.txt b/idea/testData/slicer/inflow/nonLocalReturn.results.txt
index a22bf7a34d85e..34d330161e202 100644
--- a/idea/testData/slicer/inflow/nonLocalReturn.results.txt
+++ b/idea/testData/slicer/inflow/nonLocalReturn.results.txt
@@ -8,8 +8,8 @@
 5 							fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
 5 								fun bar(a: Int): Int = foo(a) { <bold>if (it > 0) it else return 0</bold> }
 5 									fun bar(a: Int): Int = foo(a) { if (it > 0) <bold>it</bold> else return 0 }
-5 										[LAMBDA CALLS] fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
-3 											(INLINE CALL foo) [LAMBDA CALLS] inline fun foo(a: Int, <bold>f: (Int) -> Int</bold>) = f(a)
+5 										[LAMBDA CALLS ARGUMENT #0] fun bar(a: Int): Int = foo(a) <bold>{ if (it > 0) it else return 0 }</bold>
+3 											(INLINE CALL foo) [LAMBDA CALLS ARGUMENT #0] inline fun foo(a: Int, <bold>f: (Int) -> Int</bold>) = f(a)
 3 												(INLINE CALL foo) inline fun foo(a: Int, f: (Int) -> Int) = f(<bold>a</bold>)
 3 													(INLINE CALL foo) inline fun foo(<bold>a: Int</bold>, f: (Int) -> Int) = f(a)
 5 														fun bar(a: Int): Int = foo(<bold>a</bold>) { if (it > 0) it else return 0 }
diff --git a/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt b/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt
index 730eb38e07935..38c6b506da8a5 100644
--- a/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt
+++ b/idea/testData/slicer/inflow/onFunctionReceiverType.leafGroups.txt
@@ -17,8 +17,8 @@
 
 18 with(<bold>123</bold>) {
 8 	fun <bold>Any</bold>.extensionFun() {
-18 		[LAMBDA CALLS] with(123) <bold>{</bold>
-27 			(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+18 		[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+27 			(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 28 				(INLINE CALL with) return <bold>receiver</bold>.block()
 27 					(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 18 						with(<bold>123</bold>) {
diff --git a/idea/testData/slicer/inflow/onFunctionReceiverType.nullnessGroups.txt b/idea/testData/slicer/inflow/onFunctionReceiverType.nullnessGroups.txt
index 82765b28b4b14..b1e4390d4a55d 100644
--- a/idea/testData/slicer/inflow/onFunctionReceiverType.nullnessGroups.txt
+++ b/idea/testData/slicer/inflow/onFunctionReceiverType.nullnessGroups.txt
@@ -7,8 +7,8 @@
 14 			<bold>1</bold>.extensionFun()
 18 	with(<bold>123</bold>) {
 8 		fun <bold>Any</bold>.extensionFun() {
-18 			[LAMBDA CALLS] with(123) <bold>{</bold>
-27 				(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+18 			[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+27 				(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 28 					(INLINE CALL with) return <bold>receiver</bold>.block()
 27 						(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 18 							with(<bold>123</bold>) {
diff --git a/idea/testData/slicer/inflow/onFunctionReceiverType.results.txt b/idea/testData/slicer/inflow/onFunctionReceiverType.results.txt
index 195f45364ee30..f807be99e14bf 100644
--- a/idea/testData/slicer/inflow/onFunctionReceiverType.results.txt
+++ b/idea/testData/slicer/inflow/onFunctionReceiverType.results.txt
@@ -4,8 +4,8 @@
 24 		<bold>"A"</bold>.foo()
 12 	<bold>""</bold>.extensionFun()
 14 	<bold>1</bold>.extensionFun()
-18 	[LAMBDA CALLS] with(123) <bold>{</bold>
-27 		(INLINE CALL with) [LAMBDA CALLS] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+18 	[LAMBDA CALLS RECEIVER] with(123) <bold>{</bold>
+27 		(INLINE CALL with) [LAMBDA CALLS RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
 28 			(INLINE CALL with) return <bold>receiver</bold>.block()
 27 				(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 18 					with(<bold>123</bold>) {
diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt
index 9a3a0e6f40167..79bb59916d36d 100644
--- a/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt
+++ b/idea/testData/slicer/outflow/invokeExtensionLambda.results.txt
@@ -2,9 +2,9 @@
 4 	val v1 = f(<bold>p</bold>, { this })
 11 		fun f(<bold>receiver: String</bold>, lambda: String.() -> String): String {
 12 			return lambda.invoke(<bold>receiver</bold>)
-12 				[LAMBDA RECEIVER IN] return <bold>lambda</bold>.invoke(receiver)
-11 					[LAMBDA RECEIVER IN] fun f(receiver: String, <bold>lambda: String.() -> String</bold>): String {
-4 						[LAMBDA RECEIVER IN] val v1 = f(p, <bold>{ this }</bold>)
+12 				[LAMBDA RECEIVER] return <bold>lambda</bold>.invoke(receiver)
+11 					[LAMBDA RECEIVER] fun f(receiver: String, <bold>lambda: String.() -> String</bold>): String {
+4 						[LAMBDA RECEIVER] val v1 = f(p, <bold>{ this }</bold>)
 4 							val v1 = f(p, { <bold>this</bold> })
 4 								val v1 = f(p, <bold>{ this }</bold>)
 4 									[LAMBDA CALLS] val v1 = f(p, <bold>{ this }</bold>)
@@ -17,9 +17,9 @@
 6 	val v2 = g("a", "b", <bold>p</bold>, { p1, p2 -> p2 })
 15 		fun g(a: String, b: String, <bold>c: String</bold>, lambda: String.(String, String) -> String): String {
 16 			return lambda.invoke(a, b, <bold>c</bold>)
-16 				[LAMBDA ARGUMENT IN] return <bold>lambda</bold>.invoke(a, b, c)
-15 					[LAMBDA ARGUMENT IN] fun g(a: String, b: String, c: String, <bold>lambda: String.(String, String) -> String</bold>): String {
-6 						[LAMBDA ARGUMENT IN] val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
+16 				[LAMBDA PARAMETER #1] return <bold>lambda</bold>.invoke(a, b, c)
+15 					[LAMBDA PARAMETER #1] fun g(a: String, b: String, c: String, <bold>lambda: String.(String, String) -> String</bold>): String {
+6 						[LAMBDA PARAMETER #1] val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
 6 							val v2 = g("a", "b", p, { p1, <bold>p2</bold> -> p2 })
 6 								val v2 = g("a", "b", p, { p1, p2 -> <bold>p2</bold> })
 6 									val v2 = g("a", "b", p, <bold>{ p1, p2 -> p2 }</bold>)
@@ -33,9 +33,9 @@
 8 	val v3 = inlineF(<bold>p</bold>, { this })
 19 		(INLINE CALL inlineF) inline fun inlineF(<bold>receiver: String</bold>, lambda: String.() -> String): String {
 20 			(INLINE CALL inlineF) return lambda.invoke(<bold>receiver</bold>)
-20 				(INLINE CALL inlineF) [LAMBDA RECEIVER IN] return <bold>lambda</bold>.invoke(receiver)
-19 					(INLINE CALL inlineF) [LAMBDA RECEIVER IN] inline fun inlineF(receiver: String, <bold>lambda: String.() -> String</bold>): String {
-8 						[LAMBDA RECEIVER IN] val v3 = inlineF(p, <bold>{ this }</bold>)
+20 				(INLINE CALL inlineF) [LAMBDA RECEIVER] return <bold>lambda</bold>.invoke(receiver)
+19 					(INLINE CALL inlineF) [LAMBDA RECEIVER] inline fun inlineF(receiver: String, <bold>lambda: String.() -> String</bold>): String {
+8 						[LAMBDA RECEIVER] val v3 = inlineF(p, <bold>{ this }</bold>)
 8 							val v3 = inlineF(p, { <bold>this</bold> })
 8 								val v3 = inlineF(p, <bold>{ this }</bold>)
 8 									[LAMBDA CALLS] val v3 = inlineF(p, <bold>{ this }</bold>)
diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt
index 578610aa85d0a..e1b958860b17e 100644
--- a/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt
+++ b/idea/testData/slicer/outflow/invokeExtensionLambda2.results.txt
@@ -2,12 +2,12 @@
 4 	val v1 = bar(<bold>p</bold>) { { this } }
 7 		(INLINE CALL bar) inline fun bar(<bold>x: String</bold>, lambda: () -> String.() -> String): String {
 8 			(INLINE CALL bar) return lambda()(<bold>x</bold>)
-8 				(INLINE CALL bar) [LAMBDA RECEIVER IN] return <bold>lambda()</bold>(x)
-8 					(INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER IN] return <bold>lambda</bold>()(x)
-7 						(INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER IN] inline fun bar(x: String, <bold>lambda: () -> String.() -> String</bold>): String {
-4 							[LAMBDA IN] [LAMBDA RECEIVER IN] val v1 = bar(p) <bold>{ { this } }</bold>
-4 								[LAMBDA RECEIVER IN] val v1 = bar(p) <bold>{ { this } }</bold>
-4 									[LAMBDA RECEIVER IN] val v1 = bar(p) { <bold>{ this }</bold> }
+8 				(INLINE CALL bar) [LAMBDA RECEIVER] return <bold>lambda()</bold>(x)
+8 					(INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER] return <bold>lambda</bold>()(x)
+7 						(INLINE CALL bar) [LAMBDA IN] [LAMBDA RECEIVER] inline fun bar(x: String, <bold>lambda: () -> String.() -> String</bold>): String {
+4 							[LAMBDA IN] [LAMBDA RECEIVER] val v1 = bar(p) <bold>{ { this } }</bold>
+4 								[LAMBDA RECEIVER] val v1 = bar(p) <bold>{ { this } }</bold>
+4 									[LAMBDA RECEIVER] val v1 = bar(p) { <bold>{ this }</bold> }
 4 										val v1 = bar(p) { { <bold>this</bold> } }
 4 											val v1 = bar(p) { <bold>{ this }</bold> }
 4 												[LAMBDA CALLS] val v1 = bar(p) { <bold>{ this }</bold> }
diff --git a/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt b/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt
index 95ea185ff143a..9c16a2f114f5f 100644
--- a/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt
+++ b/idea/testData/slicer/outflow/invokeExtensionLambda3.results.txt
@@ -2,10 +2,10 @@
 4 	val v = bar(<bold>p</bold>) { this }
 7 		fun <T, R> bar(<bold>receiver: T</bold>, block: T.() -> R): R {
 9 			return <bold>receiver</bold>.b()
-8 				[LAMBDA RECEIVER IN] val <bold>b = block</bold>
-8 					[LAMBDA RECEIVER IN] val b = <bold>block</bold>
-7 						[LAMBDA RECEIVER IN] fun <T, R> bar(receiver: T, <bold>block: T.() -> R</bold>): R {
-4 							[LAMBDA RECEIVER IN] val v = bar(p) <bold>{ this }</bold>
+8 				[LAMBDA RECEIVER] val <bold>b = block</bold>
+8 					[LAMBDA RECEIVER] val b = <bold>block</bold>
+7 						[LAMBDA RECEIVER] fun <T, R> bar(receiver: T, <bold>block: T.() -> R</bold>): R {
+4 							[LAMBDA RECEIVER] val v = bar(p) <bold>{ this }</bold>
 4 								val v = bar(p) { <bold>this</bold> }
 4 									val v = bar(p) <bold>{ this }</bold>
 4 										[LAMBDA CALLS] val v = bar(p) <bold>{ this }</bold>
diff --git a/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt b/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt
index d5be4c76ed6c9..b685ffa2c3657 100644
--- a/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt
+++ b/idea/testData/slicer/outflow/invokeLambdaSecondParam.results.txt
@@ -2,8 +2,8 @@
 4 	val v = f({ p1, p2 -> p2 }, <bold>p</bold>)
 7 		fun f(lambda: (String, String) -> String, <bold>receiver: String</bold>): String {
 8 			return lambda("a", <bold>receiver</bold>)
-7 				[LAMBDA ARGUMENT IN] fun f(<bold>lambda: (String, String) -> String</bold>, receiver: String): String {
-4 					[LAMBDA ARGUMENT IN] val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
+7 				[LAMBDA PARAMETER #1] fun f(<bold>lambda: (String, String) -> String</bold>, receiver: String): String {
+4 					[LAMBDA PARAMETER #1] val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
 4 						val v = f({ p1, <bold>p2</bold> -> p2 }, p)
 4 							val v = f({ p1, p2 -> <bold>p2</bold> }, p)
 4 								val v = f(<bold>{ p1, p2 -> p2 }</bold>, p)
diff --git a/idea/testData/slicer/outflow/letResult.results.txt b/idea/testData/slicer/outflow/letResult.results.txt
index 8494a2a592938..e86e5011aacfc 100644
--- a/idea/testData/slicer/outflow/letResult.results.txt
+++ b/idea/testData/slicer/outflow/letResult.results.txt
@@ -2,8 +2,8 @@
 4 	val v1 = <bold>p</bold>.let { value -> bar(value) }
 19 		(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 20 			(INLINE CALL let) return block(<bold>this</bold>)
-19 				(INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-4 					[LAMBDA ARGUMENT IN] val v1 = p.let <bold>{ value -> bar(value) }</bold>
+19 				(INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+4 					[LAMBDA PARAMETER #0] val v1 = p.let <bold>{ value -> bar(value) }</bold>
 4 						val v1 = p.let { <bold>value</bold> -> bar(value) }
 4 							val v1 = p.let { value -> bar(<bold>value</bold>) }
 16 								fun bar(<bold>s: String</bold>) = s
@@ -19,8 +19,8 @@
 6 	val v2 = <bold>p</bold>.let { it }
 19 		(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 20 			(INLINE CALL let) return block(<bold>this</bold>)
-19 				(INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-6 					[LAMBDA ARGUMENT IN] val v2 = p.let <bold>{ it }</bold>
+19 				(INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+6 					[LAMBDA PARAMETER #0] val v2 = p.let <bold>{ it }</bold>
 6 						val v2 = p.let { <bold>it</bold> }
 6 							val v2 = p.let <bold>{ it }</bold>
 6 								[LAMBDA CALLS] val v2 = p.let <bold>{ it }</bold>
@@ -31,13 +31,13 @@
 8 	val v3 = <bold>p</bold>.let {
 19 		(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 20 			(INLINE CALL let) return block(<bold>this</bold>)
-19 				(INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-8 					[LAMBDA ARGUMENT IN] val v3 = p.let <bold>{</bold>
+19 				(INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+8 					[LAMBDA PARAMETER #0] val v3 = p.let <bold>{</bold>
 13 	val v4 = <bold>p</bold>.let(::zoo)
 19 		(INLINE CALL let) inline fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 20 			(INLINE CALL let) return block(<bold>this</bold>)
-19 				(INLINE CALL let) [LAMBDA ARGUMENT IN] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-13 					[LAMBDA ARGUMENT IN] val v4 = p.let(<bold>::zoo</bold>)
+19 				(INLINE CALL let) [LAMBDA PARAMETER #0] inline fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+13 					[LAMBDA PARAMETER #0] val v4 = p.let(<bold>::zoo</bold>)
 17 						fun zoo(<bold>s: String</bold>) = s
 17 							fun zoo(s: String) = <bold>s</bold>
 17 								fun <bold>zoo(s: String) = s</bold>
diff --git a/idea/testData/slicer/outflow/nonInlineLetResult.results.txt b/idea/testData/slicer/outflow/nonInlineLetResult.results.txt
index a6edbba90f650..a0f70e405fac4 100644
--- a/idea/testData/slicer/outflow/nonInlineLetResult.results.txt
+++ b/idea/testData/slicer/outflow/nonInlineLetResult.results.txt
@@ -2,8 +2,8 @@
 4 	val v1 = <bold>p</bold>.let { value -> bar(value) }
 16 		fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 17 			return block(<bold>this</bold>)
-16 				[LAMBDA ARGUMENT IN] fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-4 					[LAMBDA ARGUMENT IN] val v1 = p.let <bold>{ value -> bar(value) }</bold>
+16 				[LAMBDA PARAMETER #0] fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
+4 					[LAMBDA PARAMETER #0] val v1 = p.let <bold>{ value -> bar(value) }</bold>
 4 						val v1 = p.let { <bold>value</bold> -> bar(value) }
 4 							val v1 = p.let { value -> bar(<bold>value</bold>) }
 14 								fun bar(<bold>s: String</bold>) = s
@@ -21,12 +21,12 @@
 6 																		val <bold>v2 = p.let { it }</bold>
 8 																	val v3 = p.<bold>let {</bold>
 8 																		val <bold>v3 = p.let {</bold>
-6 					[LAMBDA ARGUMENT IN] val v2 = p.let <bold>{ it }</bold>
+6 					[LAMBDA PARAMETER #0] val v2 = p.let <bold>{ it }</bold>
 6 						val v2 = p.let { <bold>it</bold> }
 6 							val v2 = p.let <bold>{ it }</bold>
 6 								[LAMBDA CALLS] val v2 = p.let <bold>{ it }</bold>
 16 									[LAMBDA CALLS] DUPLICATE: fun <T, R> T.let(<bold>block: (T) -> R</bold>): R {
-8 					[LAMBDA ARGUMENT IN] val v3 = p.let <bold>{</bold>
+8 					[LAMBDA PARAMETER #0] val v3 = p.let <bold>{</bold>
 6 	val v2 = <bold>p</bold>.let { it }
 16 		DUPLICATE: fun <T, R> <bold>T</bold>.let(block: (T) -> R): R {
 8 	val v3 = <bold>p</bold>.let {
diff --git a/idea/testData/slicer/outflow/nullableLambda.results.txt b/idea/testData/slicer/outflow/nullableLambda.results.txt
index db685ff980206..ac54c9bf2f5e4 100644
--- a/idea/testData/slicer/outflow/nullableLambda.results.txt
+++ b/idea/testData/slicer/outflow/nullableLambda.results.txt
@@ -2,10 +2,10 @@
 4 	val v = bar(<bold>p</bold>, true, { this })
 7 		fun bar(<bold>receiver: String</bold>, b: Boolean, lambda: (String.() -> String)?): String {
 8 			return if (b) lambda!!.invoke(<bold>receiver</bold>) else ""
-8 				[LAMBDA RECEIVER IN] return if (b) <bold>lambda!!</bold>.invoke(receiver) else ""
-8 					[LAMBDA RECEIVER IN] return if (b) <bold>lambda</bold>!!.invoke(receiver) else ""
-7 						[LAMBDA RECEIVER IN] fun bar(receiver: String, b: Boolean, <bold>lambda: (String.() -> String)?</bold>): String {
-4 							[LAMBDA RECEIVER IN] val v = bar(p, true, <bold>{ this }</bold>)
+8 				[LAMBDA RECEIVER] return if (b) <bold>lambda!!</bold>.invoke(receiver) else ""
+8 					[LAMBDA RECEIVER] return if (b) <bold>lambda</bold>!!.invoke(receiver) else ""
+7 						[LAMBDA RECEIVER] fun bar(receiver: String, b: Boolean, <bold>lambda: (String.() -> String)?</bold>): String {
+4 							[LAMBDA RECEIVER] val v = bar(p, true, <bold>{ this }</bold>)
 4 								val v = bar(p, true, { <bold>this</bold> })
 4 									val v = bar(p, true, <bold>{ this }</bold>)
 4 										[LAMBDA CALLS] val v = bar(p, true, <bold>{ this }</bold>)
diff --git a/idea/testData/slicer/outflow/withResult.results.txt b/idea/testData/slicer/outflow/withResult.results.txt
index 002a6421182e9..62dcdd0d090a5 100644
--- a/idea/testData/slicer/outflow/withResult.results.txt
+++ b/idea/testData/slicer/outflow/withResult.results.txt
@@ -2,8 +2,8 @@
 4 	val v1 = with(<bold>p</bold>) { this }
 16 		(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 17 			(INLINE CALL with) return <bold>receiver</bold>.block()
-16 				(INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
-4 					[LAMBDA RECEIVER IN] val v1 = with(p) <bold>{ this }</bold>
+16 				(INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+4 					[LAMBDA RECEIVER] val v1 = with(p) <bold>{ this }</bold>
 4 						val v1 = with(p) { <bold>this</bold> }
 4 							val v1 = with(p) <bold>{ this }</bold>
 4 								[LAMBDA CALLS] val v1 = with(p) <bold>{ this }</bold>
@@ -14,8 +14,8 @@
 6 	val v2 = with(<bold>p</bold>) { bar(this) }
 16 		(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 17 			(INLINE CALL with) return <bold>receiver</bold>.block()
-16 				(INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
-6 					[LAMBDA RECEIVER IN] val v2 = with(p) <bold>{ bar(this) }</bold>
+16 				(INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+6 					[LAMBDA RECEIVER] val v2 = with(p) <bold>{ bar(this) }</bold>
 6 						val v2 = with(p) { bar(<bold>this</bold>) }
 13 							fun bar(<bold>s: String</bold>) = s
 13 								fun bar(s: String) = <bold>s</bold>
@@ -30,13 +30,13 @@
 8 	val v3 = with(<bold>p</bold>) { this@foo }
 16 		(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 17 			(INLINE CALL with) return <bold>receiver</bold>.block()
-16 				(INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
-8 					[LAMBDA RECEIVER IN] val v3 = with(p) <bold>{ this@foo }</bold>
+16 				(INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+8 					[LAMBDA RECEIVER] val v3 = with(p) <bold>{ this@foo }</bold>
 10 	val v4 = with(<bold>p</bold>, ::zoo)
 16 		(INLINE CALL with) inline fun <T, R> with(<bold>receiver: T</bold>, block: T.() -> R): R {
 17 			(INLINE CALL with) return <bold>receiver</bold>.block()
-16 				(INLINE CALL with) [LAMBDA RECEIVER IN] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
-10 					[LAMBDA RECEIVER IN] val v4 = with(p, <bold>::zoo</bold>)
+16 				(INLINE CALL with) [LAMBDA RECEIVER] inline fun <T, R> with(receiver: T, <bold>block: T.() -> R</bold>): R {
+10 					[LAMBDA RECEIVER] val v4 = with(p, <bold>::zoo</bold>)
 14 						fun zoo(<bold>s: String</bold>) = s
 14 							fun zoo(s: String) = <bold>s</bold>
 14 								fun <bold>zoo(s: String) = s</bold>