diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
index 22778a4ecd8..4bcc893761c 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
@@ -80,6 +80,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
             disableDefaultScriptingPlugin = true
             buildFile = moduleFile.canonicalPath
             reportOutputFiles = true
+            useFirLT = false
         }
         val argsArray = ArgumentUtils.convertArgumentsToStringList(args).toTypedArray()
 
@@ -166,6 +167,7 @@ abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() {
             reportOutputFiles = true
             freeArgs = filesToCompile.map { it.canonicalPath }
             forceDeprecatedLegacyCompilerUsage = true
+            useFirLT = false
         }
         configureAdditionalArgs(args)
         return runJSCompiler(args, env)
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
index f92324e88e9..4464ec19bfa 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
@@ -2,6 +2,6 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun <T : /*p:foo*/A?, B : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Iterable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, C, D> test()
-        where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, D : B
+/*p:foo*/fun <T : /*p:bar p:foo*/A?, B : /*p:bar p:foo*/Iterable</*p:bar p:foo*/Number>, C, D> test()
+        where C : /*p:bar p:foo*/Number, C : /*p:bar p:foo*/Comparable</*p:bar p:foo*/Number>, D : /*p:bar p:foo*/B
 {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
index 8ffc37cfc1d..a1edcc30a47 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
@@ -3,69 +3,69 @@ package foo
 import bar.*
 
 /*p:foo*/class A {
-    val a = /*p:kotlin(Int)*/1
-    var b = /*p:kotlin(String)*/""
+    val a = 1
+    var b = ""
 
-    val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
-        get() = /*c:foo.A p:kotlin(String)*/b
+    val c: /*p:bar p:foo*/String
+        get() = /*p:A p:foo.A p:kotlin(String)*/b
 
-    var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd"
-        get() = /*p:kotlin(String)*/field
-        set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v }
+    var d: /*p:bar p:foo*/String = "ddd"
+        get() = field
+        set(v) { field = v }
 
     fun foo() {
-        /*c:foo.A p:kotlin(Int)*/a
-        /*c:foo.A*/foo()
-        /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a
-        /*p:foo(A)*/this./*c:foo.A*/foo()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
+        /*p:A p:foo.A p:kotlin(Int)*/a
+        /*p:A p:foo.A p:kotlin(Unit)*/foo()
+        /*p:A(a) p:foo.A(a) p:kotlin(Int)*/this.a
+        /*p:A(foo) p:foo.A(foo) p:kotlin(Unit)*/this.foo()
+        /*p:A.Companion p:bar p:foo p:foo.A p:foo.A.Companion p:kotlin(Unit)*/baz()
+        /*p:A.Companion(a) p:bar p:foo p:foo.A p:foo.A(a) p:foo.A.Companion p:foo.A.Companion(a) p:kotlin(Int)*/Companion.a
+        /*p:A.O(v) p:bar p:foo p:foo.A p:foo.A.Companion p:foo.A.O(v) p:kotlin(String)*/O.v = "OK"
     }
 
     class B {
-        val a = /*p:kotlin(Int)*/1
+        val a = 1
 
         companion object CO {
-            fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
+            fun bar(a: /*p:bar p:foo*/Int) {}
         }
     }
 
     inner class C
 
     companion object {
-        val a = /*p:kotlin(Int)*/1
+        val a = 1
         fun baz() {}
     }
 
     object O {
-        var v = /*p:kotlin(String)*/"vvv"
+        var v = "vvv"
     }
 }
 
 /*p:foo*/interface I {
-    var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int
+    var a: /*p:bar p:foo*/Int
     fun foo()
 
     class NI
 }
 
-/*p:foo*/object Obj : /*p:foo*/I {
-    override var a = /*p:kotlin(Int)*/1
+/*p:foo*/object Obj : /*p:bar p:foo*/I {
+    override var a = 1
     override fun foo() {}
-    val b = /*p:kotlin(Int)*/1
-    fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I
+    val b = 1
+    fun bar(): /*p:bar p:foo*/I = null as /*p:bar p:foo*/I
 }
 
 /*p:foo*/enum class E {
     X,
     Y;
 
-    val a = /*p:kotlin(Int)*/1
+    val a = 1
     fun foo() {
-        /*c:foo.E p:kotlin(Int)*/a
-        /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a
-        /*c:foo.E c:kotlin.Enum*/foo()
-        /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E c:kotlin.Enum*/foo()
+        /*p:E p:foo.E p:kotlin(Int)*/a
+        /*p:E(a) p:bar p:foo p:foo.E p:foo.E(a) p:kotlin(Int) p:kotlin.Enum p:kotlin.Enum.Companion*/Y.a
+        /*p:E p:foo.E p:kotlin(Unit)*/foo()
+        /*p:E(foo) p:bar p:foo p:foo.E p:foo.E(foo) p:kotlin(Unit) p:kotlin.Enum p:kotlin.Enum.Companion*/X.foo()
     }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
index 21d55ee2cdf..124425205a9 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
@@ -2,49 +2,49 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
+/*p:foo*/fun usages(i: /*p:bar p:foo*/I) {
+    /*p:A(a) p:foo p:foo.A(a) p:kotlin(Int)*/A().a
+    /*p:A(b) p:foo p:foo.A(b) p:kotlin(String)*/A().b
+    /*p:A(c) p:foo p:foo.A(c) p:kotlin(String)*/A().c
+    /*p:A(d) p:foo p:foo.A(d) p:kotlin(String)*/A().d = "new value"
+    /*p:A(foo) p:foo p:foo.A(foo) p:kotlin(Unit)*/A().foo()
+    /*p:A.B(a) p:foo p:foo(B) p:foo.A.B(a) p:kotlin(Int)*/A.B().a
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.bar(1)
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.CO.bar(1)
+    /*p:foo*/A
+    /*p:A.Companion(a) p:foo p:foo.A(a) p:foo.A.Companion(a) p:kotlin(Int)*/A.a
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.baz()
+    /*p:foo*/A.Companion
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.Companion.baz()
+    /*p:foo*/A.O
+    /*p:A.O(v) p:foo p:foo.A.O(v) p:kotlin(String)*/A.O.v = "OK"
 
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/i.a = 2
+    /*p:Obj(a) p:foo p:foo.Obj(a) p:kotlin(Int)*/Obj.a
+    /*p:Obj(foo) p:bar(foo) p:foo p:foo(foo) p:foo.Obj(foo) p:kotlin(Unit)*/Obj.foo()
+    var ii: /*p:bar p:foo*/I = /*p:foo*/Obj
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/ii.a
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/ii.foo()
+    /*p:Obj(b) p:foo p:foo.Obj(b) p:kotlin(Int)*/Obj.b
+    val iii = /*p:Obj(bar) p:bar(bar) p:foo p:foo(I) p:foo(bar) p:foo.Obj(bar)*/Obj.bar()
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/iii.foo()
 
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
+    /*p:bar p:foo*/E.X
+    /*p:E(a) p:bar p:foo p:foo.E(a) p:kotlin(Int)*/E.X.a
+    /*p:E(foo) p:bar p:foo p:foo.E(foo) p:kotlin(Unit)*/E.Y.foo()
+    /*p:bar p:foo p:kotlin(Array)*/E.values()
+    /*p:bar p:foo*/E.valueOf("")
 }
 
 /*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
+        a: /*p:bar p:foo*/A,
+        ab: /*p:bar p:foo*/A.B,
+        ac: /*p:bar p:foo*/A.C,
+        abCo: /*p:bar p:foo*/A.B.CO,
+        aCompanion: /*p:bar p:foo*/A.Companion,
+        aO: /*p:bar p:foo*/A.O,
+        i: /*p:bar p:foo*/I,
+        ni: /*p:bar p:foo*/I.NI,
+        obj: /*p:bar p:foo*/Obj,
+        e: /*p:bar p:foo*/E
 ) {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
index afa0f3ed148..4b0eeada9a4 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
@@ -2,53 +2,53 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun usages(i: /*p:foo*/I) {
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara()
+/*p:foo*/fun usages(i: /*p:bar p:foo*/I) {
+    /*p:A(a) p:foo p:foo.A(a) p:kotlin(Int)*/A().a
+    /*p:A(b) p:foo p:foo.A(b) p:kotlin(String)*/A().b
+    /*p:A(c) p:foo p:foo.A(c) p:kotlin(String)*/A().c
+    /*p:A(d) p:foo p:foo.A(d) p:kotlin(String)*/A().d = "new value"
+    /*p:A(foo) p:foo p:foo.A(foo) p:kotlin(Unit)*/A().foo()
+    /*p:A.B(a) p:foo p:foo(B) p:foo.A.B(a) p:kotlin(Int)*/A.B().a
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.bar(1)
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.CO.bar(1)
+    /*p:foo*/A
+    /*p:A.Companion(a) p:foo p:foo.A(a) p:foo.A.Companion(a) p:kotlin(Int)*/A.a
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.baz()
+    /*p:foo*/A.Companion
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.Companion.baz()
+    /*p:foo*/A.O
+    /*p:A.O(v) p:foo p:foo.A.O(v) p:kotlin(String)*/A.O.v = "OK"
+    /*p:bar(vala) p:foo p:foo(vala) p:foo.A(vala) p:foo.A.Companion(vala)*/A.vala
+    /*p:bar(vara) p:foo p:foo(vara) p:foo.A(vara) p:foo.A.Companion(vara)*/A.vara()
 
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/i.a = 2
+    /*p:Obj(a) p:foo p:foo.Obj(a) p:kotlin(Int)*/Obj.a
+    /*p:Obj(foo) p:bar(foo) p:foo p:foo(foo) p:foo.Obj(foo) p:kotlin(Unit)*/Obj.foo()
+    var ii: /*p:bar p:foo*/I = /*p:foo*/Obj
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/ii.a
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/ii.foo()
+    /*p:Obj(b) p:foo p:foo.Obj(b) p:kotlin(Int)*/Obj.b
+    val iii = /*p:Obj(bar) p:bar(bar) p:foo p:foo(I) p:foo(bar) p:foo.Obj(bar)*/Obj.bar()
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/iii.foo()
 
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar()
+    /*p:bar p:foo*/E.X
+    /*p:E(a) p:bar p:foo p:foo.E(a) p:kotlin(Int)*/E.X.a
+    /*p:E(foo) p:bar p:foo p:foo.E(foo) p:kotlin(Unit)*/E.Y.foo()
+    /*p:bar p:foo p:kotlin(Array)*/E.values()
+    /*p:bar p:foo*/E.valueOf("")
+    /*p:bar p:bar(foo) p:foo p:foo(foo)*/E.foo
+    /*p:bar p:bar(bar) p:foo p:foo(bar)*/E.bar()
 }
 
 /*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
+        a: /*p:bar p:foo*/A,
+        ab: /*p:bar p:foo*/A.B,
+        ac: /*p:bar p:foo*/A.C,
+        abCo: /*p:bar p:foo*/A.B.CO,
+        aCompanion: /*p:bar p:foo*/A.Companion,
+        aO: /*p:bar p:foo*/A.O,
+        i: /*p:bar p:foo*/I,
+        ni: /*p:bar p:foo*/I.NI,
+        obj: /*p:bar p:foo*/Obj,
+        e: /*p:bar p:foo*/E
 ) {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
index 59eb2b987eb..d977ca30719 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
@@ -1,18 +1,18 @@
 package foo.bar
 
-/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null
+/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) {
+    a == c
+    a != c
+    na == a
+    na == null
 
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a > b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a < b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a >= b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a <= b
 
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a > c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a < c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a >= c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a <= c
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
index 08ab50385d4..990f92c4675 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
@@ -1,35 +1,35 @@
 package foo.bar
 
 /*p:foo.bar*/class A {
-    operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-    operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-    operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this
+    operator fun plus(a: /*p:foo.bar*/Int) = this
+    operator fun timesAssign(a: /*p:foo.bar*/Any?) {}
+    operator fun inc(): /*p:foo.bar*/A = this
 
-    operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1
-    operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
+    operator fun get(i: /*p:foo.bar*/Int) = 1
+    operator fun contains(a: /*p:foo.bar*/Int): /*p:foo.bar*/Boolean = false
     operator fun invoke() {}
 
-    operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0
+    operator fun compareTo(a: /*p:foo.bar*/Int) = 0
 
-    operator fun component1() = /*p:foo.bar(A)*/this
+    operator fun component1() = this
 
-    operator fun iterator() = /*p:foo.bar(A)*/this
-    operator fun next() = /*p:foo.bar(A)*/this
+    operator fun iterator() = this
+    operator fun next() = this
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this
 
 /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {}
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {}
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:kotlin(Int)*/0
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = this
 
 /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!!
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
index 66cd987ff61..01c3883d464 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
@@ -3,28 +3,28 @@ package foo.bar
 /*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty
 
 /*p:foo.bar*/class D1 {
-    operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
+    operator fun getValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>) = 1
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D1.setValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin.reflect*/Int) {}
 
 /*p:foo.bar(D2)*/open class D2 {
-    operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
+    operator fun setValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin.reflect*/Int) {}
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D2.getValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>) = 1
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D2.provideDelegate(p: /*p:foo.bar p:kotlin.reflect*/Any?, k: /*p:foo.bar p:kotlin.reflect*/Any) = this
 
-/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
-    operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this
+/*p:foo.bar*/class D3 : /*p:foo.bar p:kotlin.reflect*/D2() {
+    operator fun provideDelegate(p: /*p:foo.bar p:kotlin.reflect*/Any?, k: /*p:foo.bar p:kotlin.reflect*/Any) = this
 }
 
 
-/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
+/*p:foo.bar*/val x1 by /*p:D1(getValue) p:foo.bar p:foo.bar(D2) p:foo.bar(provideDelegate) p:foo.bar.D1(getValue) p:foo.bar.D1(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(provideDelegate)*/D1()
+/*p:foo.bar*/var y1 by /*p:D1(getValue) p:foo.bar p:foo.bar(D2) p:foo.bar(provideDelegate) p:foo.bar(setValue) p:foo.bar.D1(getValue) p:foo.bar.D1(provideDelegate) p:foo.bar.D1(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(provideDelegate) p:kotlin.reflect(setValue)*/D1()
 
-/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
+/*p:foo.bar*/val x2 by /*p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate) p:foo.bar.D2(getValue) p:foo.bar.D2(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(getValue) p:kotlin.reflect(provideDelegate)*/D2()
+/*p:foo.bar*/var y2 by /*p:D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate) p:foo.bar.D2(getValue) p:foo.bar.D2(provideDelegate) p:foo.bar.D2(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(getValue) p:kotlin.reflect(provideDelegate)*/D2()
 
-/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3()
-/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3()
+/*p:foo.bar*/val x3 by /*p:D3(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar.D3(getValue) p:foo.bar.D3(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(getValue)*/D3()
+/*p:foo.bar*/var y3 by /*p:D2(setValue) p:D3(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar.D3(getValue) p:foo.bar.D3(provideDelegate) p:foo.bar.D3(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(getValue)*/D3()
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
index c3dda9f895f..2d018271965 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
@@ -1,24 +1,24 @@
 package foo.bar
 
-/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {
-    var d = /*p:foo.bar(A)*/a
+/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) {
+    var d = a
 
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++
-    /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/--
-    /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d
+    d/*p:A(inc) p:foo.bar(A) p:foo.bar.A(inc)*/++
+    /*p:A(inc) p:foo.bar(A) p:foo.bar.A(inc)*/++d
+    d/*p:foo.bar(A) p:foo.bar(dec) p:foo.bar.A(dec)*/--
+    /*p:foo.bar(A) p:foo.bar(dec) p:foo.bar.A(dec)*/--d
 
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b
-    /*c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a
+    /*p:A(plus) p:foo.bar(A) p:foo.bar.A(plus)*/a + b
+    /*p:foo.bar(A) p:foo.bar(minus) p:foo.bar.A(minus)*/a - b
+    /*p:foo.bar(not) p:foo.bar.A(not) p:kotlin(Unit)*/!a
 
     // for val
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b
+    /*p:A(timesAssign) p:foo.bar(times) p:foo.bar.A(times) p:foo.bar.A(timesAssign) p:kotlin(Unit)*/a *= b
+    /*p:foo.bar(div) p:foo.bar(divAssign) p:foo.bar.A(div) p:foo.bar.A(divAssign) p:kotlin(Unit)*/a /= b
 
     // for var
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b
+    /*p:A(plus) p:foo.bar(A) p:foo.bar(plusAssign) p:foo.bar.A(plus) p:foo.bar.A(plusAssign)*/d += b
+    /*p:foo.bar(A) p:foo.bar(minus) p:foo.bar(minusAssign) p:foo.bar.A(minus) p:foo.bar.A(minusAssign)*/d -= b
+    /*p:A(timesAssign) p:foo.bar(times) p:foo.bar.A(times) p:foo.bar.A(timesAssign) p:kotlin(Unit)*/d *= b
+    /*p:foo.bar(div) p:foo.bar(divAssign) p:foo.bar.A(div) p:foo.bar.A(divAssign) p:kotlin(Unit)*/d /= b
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
index 0fb034380d4..ab250a15039 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
@@ -1,16 +1,16 @@
 package foo.bar
 
-/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) {
-    /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2]
+/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) {
+    /*p:foo.bar(set) p:foo.bar.A(set) p:kotlin(Unit)*/a[1] = /*p:A(get) p:foo.bar.A(get) p:kotlin(Int)*/a[2]
 
-    /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a
-    /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a
+    /*p:A(contains) p:foo.bar.A(contains) p:kotlin(Boolean)*/b in a
+    /*p:A(contains) p:Boolean(not) p:foo.bar(contains) p:foo.bar.A(contains) p:kotlin(Boolean) p:kotlin.Boolean(not)*/"s" !in a
 
-    /*c:foo.bar.A(invoke)*/a()
-    /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1)
+    /*p:A(invoke) p:foo.bar(A) p:foo.bar.A(invoke) p:kotlin(Unit)*/a()
+    /*p:A(invoke) p:foo.bar p:foo.bar(A) p:foo.bar(invoke) p:foo.bar.A(invoke) p:kotlin(Unit)*/a(1)
 
-    val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a;
+    val (/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/h, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/t) = a;
 
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a);
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na);
+    for ((/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/f, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/s) in /*p:A(iterator) p:A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar.A(hasNext) p:foo.bar.A(iterator) p:foo.bar.A(next) p:kotlin(Boolean)*/a);
+    for ((/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/f, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/s) in /*p:A(iterator) p:A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator) p:foo.bar.A(hasNext) p:foo.bar.A(next) p:foo.bar.A?(iterator) p:kotlin(Boolean)*/na);
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
index dd0722893b2..58fbb728bb0 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
@@ -2,14 +2,14 @@ package foo
 
 // From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25
 
-/*p:foo*/fun <T> identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T
+/*p:foo*/fun <T> identity(): (/*p:foo*/T) -> /*p:foo*/T = null as (/*p:foo*/T) -> /*p:foo*/T
 
-/*p:foo*/fun <T> compute(f: () -> T) {
-    val result = f()
+/*p:foo*/fun <T> compute(f: () -> /*p:foo*/T) {
+    val result = /*p:Function0(invoke) p:kotlin(Function0) p:kotlin.Function0<T>(invoke)*/f()
 }
 
-/*p:foo*/class Bar<T>(val t: T) {
+/*p:foo*/class Bar<T>(val t: /*p:foo*/T) {
     init {
-        val a = /*c:foo.Bar c:foo.Bar(T)*/t
+        val a = /*p:Bar p:foo.Bar<T>*/t
     }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
index cc97bd76b8b..eda328c1874 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
@@ -6,14 +6,14 @@ package foo
 /*p:foo*/fun getA() = /*p:foo*/A()
 /*p:foo*/fun getB() = /*p:foo*/B()
 
-/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A())
-/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B())
+/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin.collections(List)*/listOf(/*p:foo*/A())
+/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin.collections(List)*/listOf(/*p:foo*/B())
 
-/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/A>) {}
-/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/B>) {}
+/*p:foo*/fun useListOfA(a: /*p:foo*/List</*p:foo*/A>) {}
+/*p:foo*/fun useListOfB(b: /*p:foo*/List</*p:foo*/B>) {}
 
 /*p:foo*/fun testInferredType() {
-    /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
-    /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-    /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
+    /*p:foo p:kotlin(Unit)*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
+    /*p:foo p:kotlin(Unit)*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
+    /*p:foo p:kotlin(Unit)*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
index 4040103b8ae..12884e471e3 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
@@ -2,10 +2,10 @@ package foo
 
 /*p:foo*/class C
 
-/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
-/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
+/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo*/Unit) {}
+/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo*/Unit) {}
 
 /*p:foo*/fun testLambdaParameterType() {
-    /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it }
-    /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this }
+    /*p:foo p:kotlin(Unit)*/lambdaConsumer /*p:foo(A) p:kotlin(Function1) p:kotlin(Unit)*/{ /*p:kotlin(Unit)*/it }
+    /*p:foo p:kotlin(Unit)*/extensionConsumer /*p:foo(A) p:kotlin(Function1) p:kotlin(Unit)*/{ /*p:kotlin(Unit)*/this }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
index c9e10d74f07..32643288a6e 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
@@ -5,5 +5,5 @@ package foo
         inner class B
     }
 
-    val b = A().B()
+    val b = /*p:A.B(B)*/A().B()
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
index 59056dd2de2..42df264c5c1 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
@@ -2,48 +2,48 @@ package local.declarations
 
 import bar.*
 
-/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Any) /*p:kotlin(Int)*/{
-    /*p:kotlin(Any) p:kotlin(String)*/p./*c:kotlin.Any*/toString()
+/*p:local.declarations*/fun f(p: /*p:bar p:local.declarations*/Any) {
+    /*p:Any(toString) p:kotlin(String) p:kotlin.Any(toString)*/p.toString()
 
-    val a = /*p:kotlin(Int)*/1
-    val b = /*p:kotlin(Int)*/a
-    fun localFun() = /*p:kotlin(Int)*/b
-    fun /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
+    val a = 1
+    val b = a
+    fun localFun() = b
+    fun /*p:bar p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
 
     abstract class LocalI {
-        abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int
+        abstract var a: /*p:bar p:local.declarations*/Int
         abstract fun foo()
     }
 
-    class LocalC : LocalI() {
-        override var a = /*p:kotlin(Int)*/1
+    class LocalC : /*p:bar p:local.declarations*/LocalI() {
+        override var a = 1
 
         override fun foo() {}
 
-        var b = /*p:kotlin(String)*/"bbb"
+        var b = "bbb"
 
-        fun bar() = /*p:kotlin(Int)*/b
+        fun bar() = b
     }
 
     val o = object {
-        val a = /*p:kotlin(String)*/"aaa"
-        fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI
+        val a = "aaa"
+        fun foo(): /*p:bar p:local.declarations*/LocalI = null as /*p:bar p:local.declarations*/LocalI
     }
 
     /*p:kotlin(Int)*/localFun()
-    /*p:kotlin(Int)*/1./*c:kotlin.Int c:kotlin.Number*/localExtFun()
+    /*p:IOT(localExtFun) p:kotlin(Int)*/1.localExtFun()
 
     val c = LocalC()
     /*p:kotlin(Int)*/c.a
     /*p:kotlin(String)*/c.b
-    c.foo()
+    /*p:kotlin(Unit)*/c.foo()
     /*p:kotlin(Int)*/c.bar()
 
-    val i: LocalI = c
+    val i: /*p:bar p:local.declarations*/LocalI = c
     /*p:kotlin(Int)*/i.a
-    i.foo()
+    /*p:kotlin(Unit)*/i.foo()
 
-    /*p:kotlin(String)*/o.a
-    val ii = o.foo()
+    /*p:<anonymous>(a) p:kotlin(String)*/o.a
+    val ii = /*p:<anonymous>(foo)*/o.foo()
     /*p:kotlin(Int)*/ii.a
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
index c39a73ac084..cc60d130fac 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
@@ -3,15 +3,15 @@ package foo
 import bar.*
 /*p:baz(C)*/import baz.C
 
-/*p:foo*/val a = /*p:bar p:foo*/A()
-/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B()
+/*p:foo*/val a = /*p:bar p:baz p:foo*/A()
+/*p:foo*/var b: /*p:bar p:baz p:foo*/baz.B = /*p:bar p:baz p:baz(B) p:foo*/baz.B()
 
-/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{
-    /*p:bar(A) p:foo*/a
-    /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B()
+/*p:foo*/fun function(p: /*p:bar p:baz p:foo*/B): /*p:bar p:baz p:foo*/B {
+    /*p:baz p:foo*/a
+    return /*p:bar p:baz p:foo*/B()
 }
 
-/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:bar p:foo*/B>, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{
-    /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b
-    /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass()
+/*p:foo*/fun /*p:bar p:baz p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:baz p:foo*/Array</*p:bar p:baz p:foo*/B>, e: /*p:bar p:baz p:foo*/MyEnum, c: /**???*//*p:bar p:baz p:foo*/C): /*p:bar p:baz p:foo*/MyInterface {
+    /*p:bar p:baz p:foo p:foo.MyClass*/b
+    return /*p:bar p:baz p:foo p:foo.MyClass*/MyClass()
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
index 68363c90532..33b7fbf143c 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
@@ -1,6 +1,6 @@
 package foo.bar
 
-/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String>) {
-    val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int>
-    val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
+/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array</*p:foo.bar*/String>) {
+    val f: /*p:foo.bar*/Array</*p:foo.bar*/Int>
+    val s: /*p:foo.bar*/String
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
index c39722b7e04..4762f635f6f 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
@@ -2,13 +2,13 @@ package foo
 /*p:bar(C)*/import bar.C
 /*p:bar(SAMInterface)*/import bar.SAMInterface
 
-/*p:foo*/fun foo(c: /*p:bar*/C) /*p:bar(SAMInterface)*/{
-    /*p:bar(C)*/c./*c:bar.C c:bar.C(getFOO) c:bar.C(getFoo) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/foo()
-    /*p:bar(C)*/c./*c:bar.C c:bar.SAMInterface(<SAM-CONSTRUCTOR>)*/foo /*p:kotlin(Function1) p:kotlin(String)*/{  }
+/*p:foo*/fun foo(c: /*p:bar p:foo*/C) {
+    /*p:C(foo) p:bar(foo) p:bar.C(foo) p:foo(foo) p:kotlin(Unit)*/c.foo()
+    /*p:C(foo) p:bar(SAMInterface) p:bar.C(foo) p:bar/SAMInterface(<SAM-CONSTRUCTOR>) p:kotlin(Unit)*/c.foo /*p:kotlin(Function1) p:kotlin(Unit)*/{  /*p:kotlin(Unit)*/}
 
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/bar()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C c:bar.SAMInterface(<SAM-CONSTRUCTOR>)*/bar /*p:kotlin(Function1) p:kotlin(String)*/{}
+    /*p:bar p:bar(bar) p:foo p:foo(bar) p:kotlin(Unit)*/C.bar()
+    /*p:bar p:bar(SAMInterface) p:bar/SAMInterface(<SAM-CONSTRUCTOR>) p:foo p:kotlin(Unit)*/C.bar /*p:kotlin(Function1) p:kotlin(Unit)*/{/*p:kotlin(Unit)*/}
 
-    /*c:bar.SAMInterface(<SAM-CONSTRUCTOR>) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/SAMInterface()
-    /*c:bar.SAMInterface(<SAM-CONSTRUCTOR>) p:bar*/SAMInterface /*p:kotlin(Function1) p:kotlin(String)*/{}
+    /*p:bar p:foo*/SAMInterface()
+    /*p:bar*/SAMInterface /*p:kotlin(Function1) p:kotlin(Unit)*/{/*p:kotlin(Unit)*/}
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
index 400f192507b..4464ec19bfa 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
@@ -2,6 +2,6 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun <T : /*p:foo*/A?, B : /*p:foo p:kotlin.collections*/Iterable</*p:foo p:kotlin*/Number>, C, D> test()
-        where C : /*p:foo p:kotlin*/Number, C : /*p:foo p:kotlin*/Comparable</*p:foo p:kotlin*/Number>, D : B
+/*p:foo*/fun <T : /*p:bar p:foo*/A?, B : /*p:bar p:foo*/Iterable</*p:bar p:foo*/Number>, C, D> test()
+        where C : /*p:bar p:foo*/Number, C : /*p:bar p:foo*/Comparable</*p:bar p:foo*/Number>, D : /*p:bar p:foo*/B
 {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
index af279c0683b..a1edcc30a47 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
@@ -3,69 +3,69 @@ package foo
 import bar.*
 
 /*p:foo*/class A {
-    val a = /*p:kotlin(Int)*/1
-    var b = /*p:kotlin(String)*/""
+    val a = 1
+    var b = ""
 
-    val c: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String
-        get() = /*c:foo.A p:kotlin(String)*/b
+    val c: /*p:bar p:foo*/String
+        get() = /*p:A p:foo.A p:kotlin(String)*/b
 
-    var d: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String = /*p:kotlin(String)*/"ddd"
-        get() = /*p:kotlin(String)*/field
-        set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v }
+    var d: /*p:bar p:foo*/String = "ddd"
+        get() = field
+        set(v) { field = v }
 
     fun foo() {
-        /*c:foo.A p:kotlin(Int)*/a
-        /*c:foo.A*/foo()
-        /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a
-        /*p:foo(A)*/this./*c:foo.A*/foo()
-        /*c:foo.A c:foo.A(getBAZ) c:foo.A(getBaz) c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
+        /*p:A p:foo.A p:kotlin(Int)*/a
+        /*p:A p:foo.A p:kotlin(Unit)*/foo()
+        /*p:A(a) p:foo.A(a) p:kotlin(Int)*/this.a
+        /*p:A(foo) p:foo.A(foo) p:kotlin(Unit)*/this.foo()
+        /*p:A.Companion p:bar p:foo p:foo.A p:foo.A.Companion p:kotlin(Unit)*/baz()
+        /*p:A.Companion(a) p:bar p:foo p:foo.A p:foo.A(a) p:foo.A.Companion p:foo.A.Companion(a) p:kotlin(Int)*/Companion.a
+        /*p:A.O(v) p:bar p:foo p:foo.A p:foo.A.Companion p:foo.A.O(v) p:kotlin(String)*/O.v = "OK"
     }
 
     class B {
-        val a = /*p:kotlin(Int)*/1
+        val a = 1
 
         companion object CO {
-            fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:foo p:kotlin*/Int) {}
+            fun bar(a: /*p:bar p:foo*/Int) {}
         }
     }
 
     inner class C
 
     companion object {
-        val a = /*p:kotlin(Int)*/1
+        val a = 1
         fun baz() {}
     }
 
     object O {
-        var v = /*p:kotlin(String)*/"vvv"
+        var v = "vvv"
     }
 }
 
 /*p:foo*/interface I {
-    var a: /*c:foo.I p:foo p:kotlin*/Int
+    var a: /*p:bar p:foo*/Int
     fun foo()
 
     class NI
 }
 
-/*p:foo*/object Obj : /*p:foo*/I {
-    override var a = /*p:kotlin(Int)*/1
+/*p:foo*/object Obj : /*p:bar p:foo*/I {
+    override var a = 1
     override fun foo() {}
-    val b = /*p:kotlin(Int)*/1
-    fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I
+    val b = 1
+    fun bar(): /*p:bar p:foo*/I = null as /*p:bar p:foo*/I
 }
 
 /*p:foo*/enum class E {
     X,
     Y;
 
-    val a = /*p:kotlin(Int)*/1
+    val a = 1
     fun foo() {
-        /*c:foo.E p:kotlin(Int)*/a
-        /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a
-        /*c:foo.E*/foo()
-        /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo()
+        /*p:E p:foo.E p:kotlin(Int)*/a
+        /*p:E(a) p:bar p:foo p:foo.E p:foo.E(a) p:kotlin(Int) p:kotlin.Enum p:kotlin.Enum.Companion*/Y.a
+        /*p:E p:foo.E p:kotlin(Unit)*/foo()
+        /*p:E(foo) p:bar p:foo p:foo.E p:foo.E(foo) p:kotlin(Unit) p:kotlin.Enum p:kotlin.Enum.Companion*/X.foo()
     }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
index 73cde312c1f..124425205a9 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
@@ -2,49 +2,49 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
+/*p:foo*/fun usages(i: /*p:bar p:foo*/I) {
+    /*p:A(a) p:foo p:foo.A(a) p:kotlin(Int)*/A().a
+    /*p:A(b) p:foo p:foo.A(b) p:kotlin(String)*/A().b
+    /*p:A(c) p:foo p:foo.A(c) p:kotlin(String)*/A().c
+    /*p:A(d) p:foo p:foo.A(d) p:kotlin(String)*/A().d = "new value"
+    /*p:A(foo) p:foo p:foo.A(foo) p:kotlin(Unit)*/A().foo()
+    /*p:A.B(a) p:foo p:foo(B) p:foo.A.B(a) p:kotlin(Int)*/A.B().a
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.bar(1)
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.CO.bar(1)
+    /*p:foo*/A
+    /*p:A.Companion(a) p:foo p:foo.A(a) p:foo.A.Companion(a) p:kotlin(Int)*/A.a
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.baz()
+    /*p:foo*/A.Companion
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.Companion.baz()
+    /*p:foo*/A.O
+    /*p:A.O(v) p:foo p:foo.A.O(v) p:kotlin(String)*/A.O.v = "OK"
 
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/i.a = 2
+    /*p:Obj(a) p:foo p:foo.Obj(a) p:kotlin(Int)*/Obj.a
+    /*p:Obj(foo) p:bar(foo) p:foo p:foo(foo) p:foo.Obj(foo) p:kotlin(Unit)*/Obj.foo()
+    var ii: /*p:bar p:foo*/I = /*p:foo*/Obj
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/ii.a
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/ii.foo()
+    /*p:Obj(b) p:foo p:foo.Obj(b) p:kotlin(Int)*/Obj.b
+    val iii = /*p:Obj(bar) p:bar(bar) p:foo p:foo(I) p:foo(bar) p:foo.Obj(bar)*/Obj.bar()
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/iii.foo()
 
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
+    /*p:bar p:foo*/E.X
+    /*p:E(a) p:bar p:foo p:foo.E(a) p:kotlin(Int)*/E.X.a
+    /*p:E(foo) p:bar p:foo p:foo.E(foo) p:kotlin(Unit)*/E.Y.foo()
+    /*p:bar p:foo p:kotlin(Array)*/E.values()
+    /*p:bar p:foo*/E.valueOf("")
 }
 
 /*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
+        a: /*p:bar p:foo*/A,
+        ab: /*p:bar p:foo*/A.B,
+        ac: /*p:bar p:foo*/A.C,
+        abCo: /*p:bar p:foo*/A.B.CO,
+        aCompanion: /*p:bar p:foo*/A.Companion,
+        aO: /*p:bar p:foo*/A.O,
+        i: /*p:bar p:foo*/I,
+        ni: /*p:bar p:foo*/I.NI,
+        obj: /*p:bar p:foo*/Obj,
+        e: /*p:bar p:foo*/E
 ) {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
index 449442ab630..4b0eeada9a4 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
@@ -2,53 +2,53 @@ package foo
 
 import bar.*
 
-/*p:foo*/fun usages(i: /*p:foo*/I) {
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVALA) c:foo.A.Companion(getVala) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVARA) c:foo.A.Companion(getVara) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara()
+/*p:foo*/fun usages(i: /*p:bar p:foo*/I) {
+    /*p:A(a) p:foo p:foo.A(a) p:kotlin(Int)*/A().a
+    /*p:A(b) p:foo p:foo.A(b) p:kotlin(String)*/A().b
+    /*p:A(c) p:foo p:foo.A(c) p:kotlin(String)*/A().c
+    /*p:A(d) p:foo p:foo.A(d) p:kotlin(String)*/A().d = "new value"
+    /*p:A(foo) p:foo p:foo.A(foo) p:kotlin(Unit)*/A().foo()
+    /*p:A.B(a) p:foo p:foo(B) p:foo.A.B(a) p:kotlin(Int)*/A.B().a
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.bar(1)
+    /*p:A.B.CO(bar) p:bar(bar) p:foo p:foo(bar) p:foo.A.B.CO(bar) p:kotlin(Unit)*/A.B.CO.bar(1)
+    /*p:foo*/A
+    /*p:A.Companion(a) p:foo p:foo.A(a) p:foo.A.Companion(a) p:kotlin(Int)*/A.a
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.baz()
+    /*p:foo*/A.Companion
+    /*p:A.Companion(baz) p:bar(baz) p:foo p:foo(baz) p:foo.A(baz) p:foo.A.Companion(baz) p:kotlin(Unit)*/A.Companion.baz()
+    /*p:foo*/A.O
+    /*p:A.O(v) p:foo p:foo.A.O(v) p:kotlin(String)*/A.O.v = "OK"
+    /*p:bar(vala) p:foo p:foo(vala) p:foo.A(vala) p:foo.A.Companion(vala)*/A.vala
+    /*p:bar(vara) p:foo p:foo(vara) p:foo.A(vara) p:foo.A.Companion(vara)*/A.vara()
 
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/i.a = 2
+    /*p:Obj(a) p:foo p:foo.Obj(a) p:kotlin(Int)*/Obj.a
+    /*p:Obj(foo) p:bar(foo) p:foo p:foo(foo) p:foo.Obj(foo) p:kotlin(Unit)*/Obj.foo()
+    var ii: /*p:bar p:foo*/I = /*p:foo*/Obj
+    /*p:I(a) p:foo.I(a) p:kotlin(Int)*/ii.a
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/ii.foo()
+    /*p:Obj(b) p:foo p:foo.Obj(b) p:kotlin(Int)*/Obj.b
+    val iii = /*p:Obj(bar) p:bar(bar) p:foo p:foo(I) p:foo(bar) p:foo.Obj(bar)*/Obj.bar()
+    /*p:I(foo) p:foo.I(foo) p:kotlin(Unit)*/iii.foo()
 
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar()
+    /*p:bar p:foo*/E.X
+    /*p:E(a) p:bar p:foo p:foo.E(a) p:kotlin(Int)*/E.X.a
+    /*p:E(foo) p:bar p:foo p:foo.E(foo) p:kotlin(Unit)*/E.Y.foo()
+    /*p:bar p:foo p:kotlin(Array)*/E.values()
+    /*p:bar p:foo*/E.valueOf("")
+    /*p:bar p:bar(foo) p:foo p:foo(foo)*/E.foo
+    /*p:bar p:bar(bar) p:foo p:foo(bar)*/E.bar()
 }
 
 /*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
+        a: /*p:bar p:foo*/A,
+        ab: /*p:bar p:foo*/A.B,
+        ac: /*p:bar p:foo*/A.C,
+        abCo: /*p:bar p:foo*/A.B.CO,
+        aCompanion: /*p:bar p:foo*/A.Companion,
+        aO: /*p:bar p:foo*/A.O,
+        i: /*p:bar p:foo*/I,
+        ni: /*p:bar p:foo*/I.NI,
+        obj: /*p:bar p:foo*/Obj,
+        e: /*p:bar p:foo*/E
 ) {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
index 480d03ce87e..d977ca30719 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
@@ -1,18 +1,18 @@
 package foo.bar
 
-/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null
+/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) {
+    a == c
+    a != c
+    na == a
+    na == null
 
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a > b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a < b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a >= b
+    /*p:A(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a <= b
 
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a > c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a < c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a >= c
+    /*p:A(compareTo) p:foo.bar(compareTo) p:foo.bar.A(compareTo) p:kotlin(Int)*/a <= c
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
index 46c5c01f611..990f92c4675 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
@@ -1,35 +1,35 @@
 package foo.bar
 
 /*p:foo.bar*/class A {
-    operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this
-    operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Any?) {}
-    operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this
+    operator fun plus(a: /*p:foo.bar*/Int) = this
+    operator fun timesAssign(a: /*p:foo.bar*/Any?) {}
+    operator fun inc(): /*p:foo.bar*/A = this
 
-    operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/1
-    operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int): /*c:foo.bar.A p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false
+    operator fun get(i: /*p:foo.bar*/Int) = 1
+    operator fun contains(a: /*p:foo.bar*/Int): /*p:foo.bar*/Boolean = false
     operator fun invoke() {}
 
-    operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/0
+    operator fun compareTo(a: /*p:foo.bar*/Int) = 0
 
-    operator fun component1() = /*p:foo.bar(A)*/this
+    operator fun component1() = this
 
-    operator fun iterator() = /*p:foo.bar(A)*/this
-    operator fun next() = /*p:foo.bar(A)*/this
+    operator fun iterator() = this
+    operator fun next() = this
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin*/Any?) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this
 
 /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {}
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin*/Int, v: /*p:foo.bar p:kotlin*/Int) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin*/Any): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/true
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {}
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin*/Any) = /*p:kotlin(Int)*/0
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = this
 
 /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!!
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false
+/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
index cfec1fee433..01c3883d464 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
@@ -3,28 +3,28 @@ package foo.bar
 /*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty
 
 /*p:foo.bar*/class D1 {
-    operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
+    operator fun getValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>) = 1
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin*/Int) {}
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D1.setValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin.reflect*/Int) {}
 
 /*p:foo.bar(D2)*/open class D2 {
-    operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Int) {}
+    operator fun setValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin.reflect*/Int) {}
 }
 
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin*/Any?, k: /*p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D2)*/this
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D2.getValue(t: /*p:foo.bar p:kotlin.reflect*/Any?, p: /*p:foo.bar p:kotlin.reflect*/KProperty<*>) = 1
+/*p:foo.bar*/operator fun /*p:foo.bar p:kotlin.reflect*/D2.provideDelegate(p: /*p:foo.bar p:kotlin.reflect*/Any?, k: /*p:foo.bar p:kotlin.reflect*/Any) = this
 
-/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
-    operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this
+/*p:foo.bar*/class D3 : /*p:foo.bar p:kotlin.reflect*/D2() {
+    operator fun provideDelegate(p: /*p:foo.bar p:kotlin.reflect*/Any?, k: /*p:foo.bar p:kotlin.reflect*/Any) = this
 }
 
 
-/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getSETValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
+/*p:foo.bar*/val x1 by /*p:D1(getValue) p:foo.bar p:foo.bar(D2) p:foo.bar(provideDelegate) p:foo.bar.D1(getValue) p:foo.bar.D1(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(provideDelegate)*/D1()
+/*p:foo.bar*/var y1 by /*p:D1(getValue) p:foo.bar p:foo.bar(D2) p:foo.bar(provideDelegate) p:foo.bar(setValue) p:foo.bar.D1(getValue) p:foo.bar.D1(provideDelegate) p:foo.bar.D1(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(provideDelegate) p:kotlin.reflect(setValue)*/D1()
 
-/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
+/*p:foo.bar*/val x2 by /*p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate) p:foo.bar.D2(getValue) p:foo.bar.D2(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(getValue) p:kotlin.reflect(provideDelegate)*/D2()
+/*p:foo.bar*/var y2 by /*p:D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate) p:foo.bar.D2(getValue) p:foo.bar.D2(provideDelegate) p:foo.bar.D2(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(getValue) p:kotlin.reflect(provideDelegate)*/D2()
 
-/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3()
-/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3()
+/*p:foo.bar*/val x3 by /*p:D3(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar.D3(getValue) p:foo.bar.D3(provideDelegate) p:kotlin(Int) p:kotlin.reflect p:kotlin.reflect(KProperty0) p:kotlin.reflect(getValue)*/D3()
+/*p:foo.bar*/var y3 by /*p:D2(setValue) p:D3(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar.D3(getValue) p:foo.bar.D3(provideDelegate) p:foo.bar.D3(setValue) p:kotlin(Int) p:kotlin(Unit) p:kotlin.reflect p:kotlin.reflect(KMutableProperty0) p:kotlin.reflect(getValue)*/D3()
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
index 830e7bc7c40..2d018271965 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
@@ -1,24 +1,24 @@
 package foo.bar
 
-/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int) {
-    var d = /*p:foo.bar(A)*/a
+/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) {
+    var d = a
 
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++
-    /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(dec)*/--
-    /*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d
+    d/*p:A(inc) p:foo.bar(A) p:foo.bar.A(inc)*/++
+    /*p:A(inc) p:foo.bar(A) p:foo.bar.A(inc)*/++d
+    d/*p:foo.bar(A) p:foo.bar(dec) p:foo.bar.A(dec)*/--
+    /*p:foo.bar(A) p:foo.bar(dec) p:foo.bar.A(dec)*/--d
 
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMinus) c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b
-    /*c:foo.bar.A(getNOT) c:foo.bar.A(getNot) c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a
+    /*p:A(plus) p:foo.bar(A) p:foo.bar.A(plus)*/a + b
+    /*p:foo.bar(A) p:foo.bar(minus) p:foo.bar.A(minus)*/a - b
+    /*p:foo.bar(not) p:foo.bar.A(not) p:kotlin(Unit)*/!a
 
     // for val
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDivAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b
+    /*p:A(timesAssign) p:foo.bar(times) p:foo.bar.A(times) p:foo.bar.A(timesAssign) p:kotlin(Unit)*/a *= b
+    /*p:foo.bar(div) p:foo.bar(divAssign) p:foo.bar.A(div) p:foo.bar.A(divAssign) p:kotlin(Unit)*/a /= b
 
     // for var
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getPLUSAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(getMinus) c:foo.bar.A(getMinusAssign) c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getTIMES) c:foo.bar.A(getTimes) c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.jvm(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) c:foo.bar.A(getDIV) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDiv) c:foo.bar.A(getDivAssign) p:foo.bar(div) p:foo.bar(divAssign) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.jvm(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b
+    /*p:A(plus) p:foo.bar(A) p:foo.bar(plusAssign) p:foo.bar.A(plus) p:foo.bar.A(plusAssign)*/d += b
+    /*p:foo.bar(A) p:foo.bar(minus) p:foo.bar(minusAssign) p:foo.bar.A(minus) p:foo.bar.A(minusAssign)*/d -= b
+    /*p:A(timesAssign) p:foo.bar(times) p:foo.bar.A(times) p:foo.bar.A(timesAssign) p:kotlin(Unit)*/d *= b
+    /*p:foo.bar(div) p:foo.bar(divAssign) p:foo.bar.A(div) p:foo.bar.A(divAssign) p:kotlin(Unit)*/d /= b
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
index f087f7f6744..ab250a15039 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
@@ -1,16 +1,16 @@
 package foo.bar
 
-/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) {
-    /*c:foo.bar.A(getSET) c:foo.bar.A(getSet) c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2]
+/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) {
+    /*p:foo.bar(set) p:foo.bar.A(set) p:kotlin(Unit)*/a[1] = /*p:A(get) p:foo.bar.A(get) p:kotlin(Int)*/a[2]
 
-    /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a
-    /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) c:foo.bar.A(getCONTAINS) c:foo.bar.A(getContains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a
+    /*p:A(contains) p:foo.bar.A(contains) p:kotlin(Boolean)*/b in a
+    /*p:A(contains) p:Boolean(not) p:foo.bar(contains) p:foo.bar.A(contains) p:kotlin(Boolean) p:kotlin.Boolean(not)*/"s" !in a
 
-    /*c:foo.bar.A(invoke)*/a()
-    /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1)
+    /*p:A(invoke) p:foo.bar(A) p:foo.bar.A(invoke) p:kotlin(Unit)*/a()
+    /*p:A(invoke) p:foo.bar p:foo.bar(A) p:foo.bar(invoke) p:foo.bar.A(invoke) p:kotlin(Unit)*/a(1)
 
-    val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a;
+    val (/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/h, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/t) = a;
 
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a);
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getITERATOR) c:foo.bar.A(getIterator) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na);
+    for ((/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/f, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/s) in /*p:A(iterator) p:A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar.A(hasNext) p:foo.bar.A(iterator) p:foo.bar.A(next) p:kotlin(Boolean)*/a);
+    for ((/*p:A(component1) p:foo.bar(A) p:foo.bar.A(component1)*/f, /*p:foo.bar(A) p:foo.bar(component2) p:foo.bar.A(component2)*/s) in /*p:A(iterator) p:A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator) p:foo.bar.A(hasNext) p:foo.bar.A(next) p:foo.bar.A?(iterator) p:kotlin(Boolean)*/na);
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
index dd0722893b2..58fbb728bb0 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
@@ -2,14 +2,14 @@ package foo
 
 // From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25
 
-/*p:foo*/fun <T> identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T
+/*p:foo*/fun <T> identity(): (/*p:foo*/T) -> /*p:foo*/T = null as (/*p:foo*/T) -> /*p:foo*/T
 
-/*p:foo*/fun <T> compute(f: () -> T) {
-    val result = f()
+/*p:foo*/fun <T> compute(f: () -> /*p:foo*/T) {
+    val result = /*p:Function0(invoke) p:kotlin(Function0) p:kotlin.Function0<T>(invoke)*/f()
 }
 
-/*p:foo*/class Bar<T>(val t: T) {
+/*p:foo*/class Bar<T>(val t: /*p:foo*/T) {
     init {
-        val a = /*c:foo.Bar c:foo.Bar(T)*/t
+        val a = /*p:Bar p:foo.Bar<T>*/t
     }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
index 7bc5b359e03..eda328c1874 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
@@ -6,14 +6,14 @@ package foo
 /*p:foo*/fun getA() = /*p:foo*/A()
 /*p:foo*/fun getB() = /*p:foo*/B()
 
-/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A())
-/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B())
+/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin.collections(List)*/listOf(/*p:foo*/A())
+/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin.collections(List)*/listOf(/*p:foo*/B())
 
-/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin.collections*/List</*p:foo*/A>) {}
-/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin.collections*/List</*p:foo*/B>) {}
+/*p:foo*/fun useListOfA(a: /*p:foo*/List</*p:foo*/A>) {}
+/*p:foo*/fun useListOfB(b: /*p:foo*/List</*p:foo*/B>) {}
 
 /*p:foo*/fun testInferredType() {
-    /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
-    /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-    /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
+    /*p:foo p:kotlin(Unit)*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
+    /*p:foo p:kotlin(Unit)*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
+    /*p:foo p:kotlin(Unit)*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
index 0aa16b49a29..12884e471e3 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
@@ -2,10 +2,10 @@ package foo
 
 /*p:foo*/class C
 
-/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin*/Unit) {}
-/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin*/Unit) {}
+/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo*/Unit) {}
+/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo*/Unit) {}
 
 /*p:foo*/fun testLambdaParameterType() {
-    /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it }
-    /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this }
+    /*p:foo p:kotlin(Unit)*/lambdaConsumer /*p:foo(A) p:kotlin(Function1) p:kotlin(Unit)*/{ /*p:kotlin(Unit)*/it }
+    /*p:foo p:kotlin(Unit)*/extensionConsumer /*p:foo(A) p:kotlin(Function1) p:kotlin(Unit)*/{ /*p:kotlin(Unit)*/this }
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
index c9e10d74f07..32643288a6e 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
@@ -5,5 +5,5 @@ package foo
         inner class B
     }
 
-    val b = A().B()
+    val b = /*p:A.B(B)*/A().B()
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
index 1c3639643d7..cba253ede52 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
@@ -3,4 +3,4 @@ Compiling files:
   src/usages.kt
 Exit code: COMPILATION_ERROR
   Unresolved reference: IS
-  Unresolved reference: IS
\ No newline at end of file
+  Unresolved reference: C.IS
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
index 27dcd9709c7..9fb4430501e 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
@@ -6,40 +6,40 @@ import baz.*
 /*p:foo*/fun usages() {
     val c = /*p:bar*/C()
 
-    /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field
-    /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field = /*p:kotlin(Int)*/2
-    /*p:bar(C)*/c./*c:bar.C*/func()
-    /*c:bar.C(B) p:bar(C)*/c./*c:bar.C*/B()
+    /*p:C(field) p:bar.C(field) p:kotlin(Int)*/c.field
+    /*p:C(field) p:bar.C(field) p:kotlin(Int)*/c.field = 2
+    /*p:C(func) p:bar.C(func) p:kotlin(Unit)*/c.func()
+    /*p:C.B(B) p:bar(B) p:bar.C(B)*/c.B()
 
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new"
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfunc()
-    /*c:bar.C(S) p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/S()
+    /*p:bar p:baz p:foo*/C.sfield
+    /*p:bar p:baz p:foo*/C.sfield = "new"
+    /*p:bar p:baz p:foo p:kotlin(Unit)*/C.sfunc()
+    /*p:bar p:bar(S) p:baz p:foo*/C.S()
 
     // inherited from I
-    /*p:bar(C)*/c./*c:bar.C*/ifunc()
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/isfield
+    /*p:C(ifunc) p:bar.C(ifunc) p:kotlin(Unit)*/c.ifunc()
+    /*p:bar p:baz p:foo*/C.isfield
     // expected error: Unresolved reference: IS
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/IS()
+    /*p:bar p:bar(IS) p:baz p:baz(IS) p:foo p:foo(IS)*/C.IS()
 
 
-    val i: /*p:foo*/I = /*p:bar(C)*/c
-    /*p:foo(I)*/i./*c:foo.I*/ifunc()
+    val i: /*p:bar p:baz p:foo*/I = c
+    /*p:I(ifunc) p:foo.I(ifunc) p:kotlin(Unit)*/i.ifunc()
 
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/isfield
-    /*c:foo.I(IS) p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/IS()
+    /*p:bar p:baz p:foo*/I.isfield
+    /*p:bar p:baz p:foo p:foo(IS)*/I.IS()
 
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F./*c:baz.E*/field
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/S./*c:baz.E*/func()
+    /*p:bar p:baz p:foo*/E.F
+    /*p:E(field) p:bar p:baz p:baz.E(field) p:foo p:kotlin(Int)*/E.F.field
+    /*p:E(func) p:bar p:baz p:baz.E(func) p:foo p:kotlin(Unit)*/E.S.func()
 }
 
 /*p:foo*/fun classifiers(
-    c: /*p:bar*/C,
-    b: /*p:bar*/C./*c:bar.C*/B,
-    s: /*p:bar*/C./*c:bar.C*/S,
-    cis: /*p:bar*/C./*c:bar.C*/IS,
-    i: /*p:foo*/I,
-    iis: /*p:foo*/I./*c:foo.I*/IS,
-    e: /*p:baz p:foo*/E
+    c: /*p:bar p:baz p:foo*/C,
+    b: /*p:bar p:baz p:foo*/C.B,
+    s: /*p:bar p:baz p:foo*/C.S,
+    cis: /*p:bar p:baz p:foo*/C.IS,
+    i: /*p:bar p:baz p:foo*/I,
+    iis: /*p:bar p:baz p:foo*/I.IS,
+    e: /*p:bar p:baz p:foo*/E
 ) {}
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
index e736a16e41e..42df264c5c1 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
@@ -2,48 +2,48 @@ package local.declarations
 
 import bar.*
 
-/*p:local.declarations*/fun f(p: /*p:kotlin p:local.declarations*/Any) /*p:kotlin(Int)*/{
-    /*p:kotlin(Any) p:kotlin(String)*/p.toString()
+/*p:local.declarations*/fun f(p: /*p:bar p:local.declarations*/Any) {
+    /*p:Any(toString) p:kotlin(String) p:kotlin.Any(toString)*/p.toString()
 
-    val a = /*p:kotlin(Int)*/1
-    val b = /*p:kotlin(Int)*/a
-    fun localFun() = /*p:kotlin(Int)*/b
-    fun /*p:kotlin p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
+    val a = 1
+    val b = a
+    fun localFun() = b
+    fun /*p:bar p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
 
     abstract class LocalI {
-        abstract var a: /*p:kotlin p:local.declarations*/Int
+        abstract var a: /*p:bar p:local.declarations*/Int
         abstract fun foo()
     }
 
-    class LocalC : LocalI() {
-        override var a = /*p:kotlin(Int)*/1
+    class LocalC : /*p:bar p:local.declarations*/LocalI() {
+        override var a = 1
 
         override fun foo() {}
 
-        var b = /*p:kotlin(String)*/"bbb"
+        var b = "bbb"
 
-        fun bar() = /*p:kotlin(Int)*/b
+        fun bar() = b
     }
 
     val o = object {
-        val a = /*p:kotlin(String)*/"aaa"
-        fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI
+        val a = "aaa"
+        fun foo(): /*p:bar p:local.declarations*/LocalI = null as /*p:bar p:local.declarations*/LocalI
     }
 
     /*p:kotlin(Int)*/localFun()
-    /*p:kotlin(Int)*/1./*c:kotlin.Int(getLOCALExtFun) c:kotlin.Int(getLocalExtFun)*/localExtFun()
+    /*p:IOT(localExtFun) p:kotlin(Int)*/1.localExtFun()
 
     val c = LocalC()
     /*p:kotlin(Int)*/c.a
     /*p:kotlin(String)*/c.b
-    c.foo()
+    /*p:kotlin(Unit)*/c.foo()
     /*p:kotlin(Int)*/c.bar()
 
-    val i: LocalI = c
+    val i: /*p:bar p:local.declarations*/LocalI = c
     /*p:kotlin(Int)*/i.a
-    i.foo()
+    /*p:kotlin(Unit)*/i.foo()
 
-    /*p:kotlin(String)*/o.a
-    val ii = o.foo()
+    /*p:<anonymous>(a) p:kotlin(String)*/o.a
+    val ii = /*p:<anonymous>(foo)*/o.foo()
     /*p:kotlin(Int)*/ii.a
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
index ac6c55f0a97..cc60d130fac 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
@@ -3,15 +3,15 @@ package foo
 import bar.*
 /*p:baz(C)*/import baz.C
 
-/*p:foo*/val a = /*p:bar p:foo*/A()
-/*p:foo*/var b: /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B()
+/*p:foo*/val a = /*p:bar p:baz p:foo*/A()
+/*p:foo*/var b: /*p:bar p:baz p:foo*/baz.B = /*p:bar p:baz p:baz(B) p:foo*/baz.B()
 
-/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{
-    /*p:bar(A) p:foo*/a
-    /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B()
+/*p:foo*/fun function(p: /*p:bar p:baz p:foo*/B): /*p:bar p:baz p:foo*/B {
+    /*p:baz p:foo*/a
+    return /*p:bar p:baz p:foo*/B()
 }
 
-/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array</*p:bar p:foo*/B>, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{
-    /*c:foo.MyClass c:foo.MyClass(getB) p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b
-    /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass()
+/*p:foo*/fun /*p:bar p:baz p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:baz p:foo*/Array</*p:bar p:baz p:foo*/B>, e: /*p:bar p:baz p:foo*/MyEnum, c: /**???*//*p:bar p:baz p:foo*/C): /*p:bar p:baz p:foo*/MyInterface {
+    /*p:bar p:baz p:foo p:foo.MyClass*/b
+    return /*p:bar p:baz p:foo p:foo.MyClass*/MyClass()
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
index 09f59f1743c..33b7fbf143c 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
@@ -1,6 +1,6 @@
 package foo.bar
 
-/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin*/Array</*p:foo.bar p:kotlin*/String>) {
-    val f: /*p:foo.bar p:kotlin*/Array</*p:foo.bar p:kotlin*/Int>
-    val s: /*p:foo.bar p:kotlin*/String
+/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array</*p:foo.bar*/String>) {
+    val f: /*p:foo.bar*/Array</*p:foo.bar*/Int>
+    val s: /*p:foo.bar*/String
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
index dc184a951f9..55467148dca 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
@@ -2,7 +2,7 @@ package foo
 
 /*p:<root>(JavaClass)*/import JavaClass
 
-/*p:foo*/class KotlinClass : /*p:<root>*/JavaClass() {
-    override fun getFoo() = /*p:kotlin(Int)*/2
-    fun setFoo(i: /*c:JavaClass c:foo.KotlinClass p:foo p:kotlin*/Int) {}
+/*p:foo*/class KotlinClass : /*p:<root> p:foo*/JavaClass() {
+    override fun getFoo() = 2
+    fun setFoo(i: /*p:<root> p:foo*/Int) {}
 }
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
index 28132674392..627e4a4a15e 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
@@ -5,9 +5,9 @@ Compiling files:
 Exit code: COMPILATION_ERROR
   Unresolved reference: setFoo
   Val cannot be reassigned
-  Unresolved reference: bazBaz
-  Unresolved reference: bazBaz
+  Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int]
+  Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int]
   Unresolved reference: boo
-  Unresolved reference: bazBaz
-  Unresolved reference: bazBaz
+  Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int]
+  Overload resolution ambiguity between candidates: [var bazBaz: Int, val bazBaz: Int]
   Unresolved reference: boo
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
index 89e840a6800..7f73db0f145 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
@@ -4,27 +4,27 @@ package foo.bar
 /*p:foo(KotlinClass)*/import foo.KotlinClass
 
 /*p:foo.bar*/fun test() {
-    val j = /*p:<root>*/JavaClass()
-    val k = /*p:foo*/KotlinClass()
+    val j = /*p:<root> p:foo*/JavaClass()
+    val k = /*p:<root> p:foo*/KotlinClass()
 
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo()
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getSETFoo) c:JavaClass(getSetFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/setFoo(2)
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo
-    /*p:<root>(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar
-    /*p:<root>(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/""
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/""
-    /*p:<root>(JavaClass)*/j./*c:JavaClass*/setBoo(2)
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBOO) c:JavaClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:JavaClass c:foo.KotlinClass*/getFoo() // getFoo may be an inner class in JavaClass
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setFoo(2)
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo
-    /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar
-    /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/""
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/""
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setBoo(2)
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBOO) c:foo.KotlinClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2
+    /*p:JavaClass(getFoo) p:kotlin(Int)*/j.getFoo()
+    /*p:<root>(setFoo) p:JavaClass(setFoo) p:foo(setFoo) p:foo.bar(setFoo)*/j.setFoo(2)
+    /*p:JavaClass(foo) p:kotlin(Int)*/j.foo = 2
+    /*p:JavaClass(foo) p:kotlin(Int)*/j.foo
+    /*p:JavaClass(bar)*/j.bar
+    /*p:JavaClass(bar)*/j.bar = ""
+    /*p:JavaClass(bazBaz) p:kotlin(Int)*/j.bazBaz
+    /*p:JavaClass(bazBaz) p:kotlin(Int)*/j.bazBaz = ""
+    /*p:JavaClass(setBoo) p:kotlin(Unit)*/j.setBoo(2)
+    /*p:<root>(boo) p:JavaClass(boo) p:foo(boo) p:foo.bar(boo)*/j.boo = 2
+    /*p:KotlinClass(getFoo) p:foo.KotlinClass(getFoo) p:kotlin(Int)*/k.getFoo() // getFoo may be an inner class in JavaClass
+    /*p:KotlinClass(setFoo) p:foo.KotlinClass(setFoo) p:kotlin(Unit)*/k.setFoo(2)
+    /*p:KotlinClass(foo) p:foo.KotlinClass(foo) p:kotlin(Int)*/k.foo = 2
+    /*p:KotlinClass(foo) p:foo.KotlinClass(foo) p:kotlin(Int)*/k.foo
+    /*p:JavaClass(bar) p:foo.KotlinClass(bar)*/k.bar
+    /*p:JavaClass(bar) p:foo.KotlinClass(bar)*/k.bar = ""
+    /*p:JavaClass(bazBaz) p:foo.KotlinClass(bazBaz) p:kotlin(Int)*/k.bazBaz
+    /*p:JavaClass(bazBaz) p:foo.KotlinClass(bazBaz) p:kotlin(Int)*/k.bazBaz = ""
+    /*p:JavaClass(setBoo) p:foo.KotlinClass(setBoo) p:kotlin(Unit)*/k.setBoo(2)
+    /*p:<root>(boo) p:foo(boo) p:foo.KotlinClass(boo) p:foo.bar(boo)*/k.boo = 2
 }