diff --git a/compiler/visualizer/render-psi/src/org/jetbrains/kotlin/compiler/visualizer/PsiVisualizer.kt b/compiler/visualizer/render-psi/src/org/jetbrains/kotlin/compiler/visualizer/PsiVisualizer.kt
index 7b7142afb19..e79cd29c719 100644
--- a/compiler/visualizer/render-psi/src/org/jetbrains/kotlin/compiler/visualizer/PsiVisualizer.kt
+++ b/compiler/visualizer/render-psi/src/org/jetbrains/kotlin/compiler/visualizer/PsiVisualizer.kt
@@ -143,7 +143,7 @@ class PsiVisualizer(private val file: KtFile, analysisResult: AnalysisResult) :
                 return null
             }
 
-            val descriptor = resolvedCall.resultingDescriptor
+            val descriptor = resolvedCall.candidateDescriptor
             val typeArguments = resolvedCall.typeArguments
                 .takeIf { it.isNotEmpty() }
                 ?.values?.joinToString(", ", "<", ">") { renderType(it) } ?: ""
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/contracts/oldSyntax/contractDescription.kt b/compiler/visualizer/testData/rawBuilder/declarations/contracts/oldSyntax/contractDescription.kt
index c0be54fe85c..c5fdda0b6f0 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/contracts/oldSyntax/contractDescription.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/contracts/oldSyntax/contractDescription.kt
@@ -19,11 +19,11 @@ fun test_2() {
 //                   │        │
     kotlin.contracts.contract {
 //      this@0
-//      fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<???>, contracts/InvocationKind = ...): contracts/CallsInPlace
+//      fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<R>, contracts/InvocationKind = ...): contracts/CallsInPlace
 //      │
         callsInPlace()
 //      this@0
-//      fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<???>, contracts/InvocationKind = ...): contracts/CallsInPlace
+//      fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<R>, contracts/InvocationKind = ...): contracts/CallsInPlace
 //      │
         callsInPlace()
     }
@@ -55,11 +55,11 @@ var test_3: Int = 1
 //                       │        │
         kotlin.contracts.contract {
 //          this@0
-//          fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<???>, contracts/InvocationKind = ...): contracts/CallsInPlace
+//          fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<R>, contracts/InvocationKind = ...): contracts/CallsInPlace
 //          │
             callsInPlace()
 //          this@0
-//          fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<???>, contracts/InvocationKind = ...): contracts/CallsInPlace
+//          fun <R> (contracts/ContractBuilder).callsInPlace<???>(Function<R>, contracts/InvocationKind = ...): contracts/CallsInPlace
 //          │
             callsInPlace()
         }
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/delegates.kt b/compiler/visualizer/testData/rawBuilder/declarations/delegates.kt
index 220b0f54a82..9472f19c4ee 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/delegates.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/delegates.kt
@@ -1,7 +1,7 @@
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
-//            fun <T> lazy<Int>(() -> Int): Lazy<Int>
+//            fun <T> lazy<Int>(() -> T): Lazy<T>
 //            │      Int
 //            │      │ fun (Int).plus(Int): Int
 //  Int       │      │ │ Int
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt b/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
index 59253717f19..323de1891c6 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
@@ -13,14 +13,14 @@ fun test() {
 //  │
     A()::class
 
-//  class A  val <T> reflect/KClass<A>.java: java/lang/Class<A>
+//  class A  val <T> reflect/KClass<T>.java: java/lang/Class<T>
 //  │        │
     A::class.java
-//                val <T> reflect/KClass<A>.java: java/lang/Class<A>
+//                val <T> reflect/KClass<T>.java: java/lang/Class<T>
 //                │
     test.A::class.java
 //  constructor A()
-//  │          val <T> reflect/KClass<out A>.java: java/lang/Class<out A>
+//  │          val <T> reflect/KClass<T>.java: java/lang/Class<T>
 //  │          │
     A()::class.java
 }
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt b/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
index 8d61c681d65..f0886fccdcb 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
@@ -6,15 +6,15 @@ fun <T> nullableValue(): T? = null
 
 fun test() {
 //      Int?
-//      │   fun <T> nullableValue<Int>(): Int?
+//      │   fun <T> nullableValue<Int>(): T?
 //      │   │
     val n = nullableValue<Int>()
 //      Double?
-//      │   fun <T> nullableValue<Double>(): Double?
+//      │   fun <T> nullableValue<Double>(): T?
 //      │   │
     val x = nullableValue<Double>()
 //      String?
-//      │   fun <T> nullableValue<String>(): String?
+//      │   fun <T> nullableValue<String>(): T?
 //      │   │
     val s = nullableValue<String>()
 }
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/lambda.kt b/compiler/visualizer/testData/rawBuilder/expressions/lambda.kt
index 11ec00de3ff..fca7aafecf8 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/lambda.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/lambda.kt
@@ -74,15 +74,15 @@ fun bar(): Int {
 //             │
 fun test(list: List<Int>) {
 //      collections/MutableMap<Int, String>
-//      │     fun <K, V> collections/mutableMapOf<Int, String>(): collections/MutableMap<Int, String>
+//      │     fun <K, V> collections/mutableMapOf<Int, String>(): collections/MutableMap<K, V>
 //      │     │
     val map = mutableMapOf<Int, String>()
 //  test.list: collections/List<Int>
-//  │    fun <T> collections/Iterable<Int>.forEach<Int>((Int) -> Unit): Unit
+//  │    fun <T> collections/Iterable<T>.forEach<Int>((T) -> Unit): Unit
 //  │    │         val test.map: collections/MutableMap<Int, String>
-//  │    │         │   fun <K, V> collections/MutableMap<Int, String>.getOrPut<Int, String>(Int, () -> String): String
+//  │    │         │   fun <K, V> collections/MutableMap<K, V>.getOrPut<Int, String>(K, () -> V): V
 //  │    │         │   │        test.<anonymous>.it: Int
-//  │    │         │   │        │     fun <T> collections/mutableListOf<???>(): collections/MutableList<???>
+//  │    │         │   │        │     fun <T> collections/mutableListOf<???>(): collections/MutableList<T>
 //  │    │         │   │        │     │                  fun (String).plus(Any?): String
 //  │    │         │   │        │     │                  │
     list.forEach { map.getOrPut(it, { mutableListOf() }) += "" }
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/lambdaAndAnonymousFunction.kt b/compiler/visualizer/testData/rawBuilder/expressions/lambdaAndAnonymousFunction.kt
index ad9d6e009bc..10ab80d27af 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/lambdaAndAnonymousFunction.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/lambdaAndAnonymousFunction.kt
@@ -4,16 +4,16 @@
 fun <T> run(block: () -> T): T = block()
 
 fun test_1() {
-//  fun <T> run<Unit>(() -> Unit): Unit
+//  fun <T> run<Unit>(() -> T): T
 //  │
     run { return@run }
-//  fun <T> run<???>(() -> ???): ???
+//  fun <T> run<???>(() -> T): T
 //  │
     run { return }
 }
 
 fun test_2() {
-//  fun <T> run<Int>(() -> Int): Int
+//  fun <T> run<Int>(() -> T): T
 //  │                        Int
 //  │                        │
     run(fun (): Int { return 1 })
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt b/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
index 54c326df980..215e4f8f64d 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
@@ -29,17 +29,17 @@ fun simple() {
 //  collections/List<String>
 //  │
 fun List<String>.modify() {
-//       fun <T> collections/Collection<String>.plus<String>(String): collections/List<String>
+//       fun <T> collections/Collection<T>.plus<String>(T): collections/List<T>
 //       │
     this += "Alpha"
-//       fun <T> collections/Collection<String>.plus<String>(String): collections/List<String>
+//       fun <T> collections/Collection<T>.plus<String>(T): collections/List<T>
 //       │
     this += "Omega"
 }
 
 fun Any.modify() {
 //           collections/List<Int>
-//           │          fun <T> collections/Collection<Int>.plus<Int>(Int): collections/List<Int>
+//           │          fun <T> collections/Collection<T>.plus<Int>(T): collections/List<T>
 //           │          │  Int
 //           │          │  │
     (this as List<Int>) += 42
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/these.kt b/compiler/visualizer/testData/rawBuilder/expressions/these.kt
index 874189363a9..83e2386f8e2 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/these.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/these.kt
@@ -30,7 +30,7 @@ class Some {
 fun Some.extension() = this.bar()
 
 fun test(some: Some): Int {
-//         fun <T, R> with<Some, Int>(Some, Some.() -> Int): Int
+//         fun <T, R> with<Some, Int>(T, T.() -> R): R
 //         │    test.some: Some
 //         │    │     with@0
 //         │    │     │
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
index 0a2f5d848ad..508d664cd56 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
@@ -14,7 +14,7 @@ class B {
 }
 
 fun foo(a: Int, b: Int): Int {
-//  fun <T, R> with<A, Int>(A, A.() -> Int): Int
+//  fun <T, R> with<A, Int>(T, T.() -> R): R
 //  │    constructor A()
 //  │    │    with@0
 //  │    │    │
@@ -24,7 +24,7 @@ fun foo(a: Int, b: Int): Int {
 //      │
         aProp
 
-//      fun <T, R> with<B, Int>(B, B.() -> Int): Int
+//      fun <T, R> with<B, Int>(T, T.() -> R): R
 //      │    constructor B()
 //      │    │    with@1
 //      │    │    │
@@ -44,7 +44,7 @@ fun foo(a: Int, b: Int): Int {
         }
     }
 
-//  fun <T, R> with<A, Int>(A, A.() -> Int): Int
+//  fun <T, R> with<A, Int>(T, T.() -> R): R
 //  │    constructor A()
 //  │    │    with@0
 //  │    │    │
@@ -54,7 +54,7 @@ fun foo(a: Int, b: Int): Int {
 //      │
         aProp
 
-//      fun <T, R> with<B, Int>(B, B.() -> Int): Int
+//      fun <T, R> with<B, Int>(T, T.() -> R): R
 //      │    constructor B()
 //      │    │    with@1
 //      │    │    │
@@ -69,7 +69,7 @@ fun foo(a: Int, b: Int): Int {
             bProp
         }
 
-//      fun <T, R> with<B, Int>(B, B.() -> Int): Int
+//      fun <T, R> with<B, Int>(T, T.() -> R): R
 //      │    constructor B()
 //      │    │    with@1
 //      │    │    │
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/lists.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/lists.kt
index ce9f321ae3c..57287829d71 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/lists.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/lists.kt
@@ -2,7 +2,7 @@
 package org.jetbrains.kotlin.test
 
 //  collections/List<Int>
-//  │           fun <T> collections/listOf<Int>(vararg Int): collections/List<Int>
+//  │           fun <T> collections/listOf<Int>(vararg T): collections/List<T>
 //  │           │      Int
 //  │           │      │  Int
 //  │           │      │  │  Int
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/superTypes.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/superTypes.kt
index 18d123b33b0..35cb50d5fc9 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/superTypes.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/superTypes.kt
@@ -5,7 +5,7 @@ abstract class Base<T>(var x: T) {
     fun replace(newValue: T)
 }
 
-//                         constructor Base<T>(Int)
+//                         constructor Base<T>(T)
 //                         │         Derived.<init>.x: Int
 //                         │         │
 class Derived(var x: Int): Base<Int>(x) {
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/where.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/where.kt
index a965877ea02..2426a53e8b7 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/where.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/where.kt
@@ -9,7 +9,7 @@ fun <T> copyWhenGreater(list: List<T>, threshold: T): List<String>
 //         │    │        copyWhenGreater.<anonymous>.it: T
 //         │    │        │  fun (Comparable<T>).compareTo(T): Int
 //         │    │        │  │ copyWhenGreater.threshold: T
-//         │    │        │  │ │           fun <T, R> collections/Iterable<T>.map<T, String>((T) -> String): collections/List<String>
+//         │    │        │  │ │           fun <T, R> collections/Iterable<T>.map<T, String>((T) -> R): collections/List<R>
 //         │    │        │  │ │           │     copyWhenGreater.<anonymous>.it: T
 //         │    │        │  │ │           │     │  fun (Any).toString(): String
 //         │    │        │  │ │           │     │  │
@@ -18,11 +18,11 @@ fun <T> copyWhenGreater(list: List<T>, threshold: T): List<String>
 
 fun main() {
 //      collections/List<String>
-//      │      fun <T> collections/listOf<String>(vararg String): collections/List<String>
+//      │      fun <T> collections/listOf<String>(vararg T): collections/List<T>
 //      │      │
     val list = listOf("1", "2", "3")
 //      collections/List<String>
-//      │      fun <T : CharSequence> copyWhenGreater<String>(collections/List<String>, String): collections/List<String> where T : Comparable<String>
+//      │      fun <T : CharSequence> copyWhenGreater<String>(collections/List<T>, T): collections/List<String> where T : Comparable<T>
 //      │      │               val main.list: collections/List<String>
 //      │      │               │
     val copy = copyWhenGreater(list, "2")