diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
index ca209a50e23..b817e205da6 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
@@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty
 }
 
 
-/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1()
-/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1()
+/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue)*/D1()
+/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1()
 
-/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2()
-/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2()
+/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2()
+/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2()
 
-/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3()
-/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3()
+/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3()
+/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3()