diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
index b6595d9bbbb..5fa5b67c2da 100644
--- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
+++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt
@@ -1,16 +1,18 @@
 package foo.bar
 
+import kotlin.reflect.KProperty
+
 /*p:foo.bar*/class D1 {
-    fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1 p:foo.bar*/PropertyMetadata) = 1
+    fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1
 }
 
-/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata, v: /*p:foo.bar*/Int) {}
+/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {}
 
 /*p:foo.bar(D2)*/open class D2 {
-    fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2 p:foo.bar*/PropertyMetadata, v: /*c:foo.bar.D2 p:foo.bar*/Int) {}
+    fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {}
 }
 
-/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata) = 1
+/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: KProperty<*>) = 1
 /*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {}
 
 /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
index c2f6c6d4d8f..d4162fbf6f8 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
@@ -7,7 +7,9 @@ Compiling files:
 src/inlineGet.kt
 End of files
 Cleaning output files:
+out/production/module/usage/UsageVal$x$1.class
 out/production/module/usage/UsageVal.class
+out/production/module/usage/UsageVar$x$1.class
 out/production/module/usage/UsageVar.class
 End of files
 Compiling files:
@@ -25,6 +27,7 @@ Compiling files:
 src/inlineSet.kt
 End of files
 Cleaning output files:
+out/production/module/usage/UsageVar$x$1.class
 out/production/module/usage/UsageVar.class
 End of files
 Compiling files:
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
index 1277c339dca..a5ca9157e97 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
@@ -1,5 +1,7 @@
 package inline
 
-inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int {
+import kotlin.reflect.KProperty
+
+inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int {
     return 0
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
index 3ed00a5f3b1..c1e548cf52c 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
@@ -1,5 +1,7 @@
 package inline
 
-inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int {
+import kotlin.reflect.KProperty
+
+inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int {
     return 1
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
index 0a9a76e7be4..36754dd7b0e 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
@@ -1,5 +1,7 @@
 package inline
 
-inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) {
+import kotlin.reflect.KProperty
+
+inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
     println(value)
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
index 446a5ad574c..bec3dc03047 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
@@ -1,5 +1,7 @@
 package inline
 
-inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) {
+import kotlin.reflect.KProperty
+
+inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
     println(value * 2)
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
index eafebdfd179..b85fde4388d 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
@@ -5,7 +5,9 @@ Compiling files:
 src/inline.kt
 End of files
 Cleaning output files:
+out/production/module/usage/UsageVal$x$1.class
 out/production/module/usage/UsageVal.class
+out/production/module/usage/UsageVar$x$1.class
 out/production/module/usage/UsageVar.class
 End of files
 Compiling files:
@@ -21,6 +23,7 @@ Compiling files:
 src/inline.kt
 End of files
 Cleaning output files:
+out/production/module/usage/UsageVar$x$1.class
 out/production/module/usage/UsageVar.class
 End of files
 Compiling files:
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
index 470f1f47d05..059a1a9379d 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
@@ -1,11 +1,13 @@
 package inline
 
+import kotlin.reflect.KProperty
+
 class Inline {
-    inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int {
+    inline fun getValue(receiver: Any?, prop: KProperty<*>): Int {
         return 0
     }
 
-    inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) {
+    inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
         println(value)
     }
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
index 49af798d65d..b983f8237cb 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
@@ -1,11 +1,13 @@
 package inline
 
+import kotlin.reflect.KProperty
+
 class Inline {
-    inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int {
+    inline fun getValue(receiver: Any?, prop: KProperty<*>): Int {
         return 1
     }
 
-    inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) {
+    inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
         println(value)
     }
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
index d0a03b3014f..f65f3c2cf62 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
@@ -1,11 +1,13 @@
 package inline
 
+import kotlin.reflect.KProperty
+
 class Inline {
-    inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int {
+    inline fun getValue(receiver: Any?, prop: KProperty<*>): Int {
         return 1
     }
 
-    inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) {
+    inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
         println(value * 2)
     }
-}
\ No newline at end of file
+}