diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 7359f3169cc..a400417fab3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -119,8 +119,8 @@ fun List<TypeCandidate>.getTypeByRenderedType(renderedType: String): KotlinType?
 class CallableBuilderConfiguration(
         val callableInfos: List<CallableInfo>,
         val originalElement: KtElement,
-        val currentFile: KtFile,
-        val currentEditor: Editor?,
+        val currentFile: KtFile = originalElement.getContainingKtFile(),
+        val currentEditor: Editor? = null,
         val isExtension: Boolean = false,
         val enableSubstitutions: Boolean = true
 )
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
index 2fa298ba0a1..6416ff76969 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt
@@ -93,7 +93,24 @@ abstract class CreateCallableFromUsageFixBase<E : KtElement>(
                 append(kind)
 
                 if (it.name.isNotEmpty()) {
-                    append(" '${it.name}'")
+                    append(" '")
+
+                    if (isExtension) {
+                        val callableBuilder =
+                                CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension)
+                                .createBuilder()
+                        val receiverType = callableBuilder
+                                .computeTypeCandidates(callableInfos.first().receiverTypeInfo)
+                                .firstOrNull()
+                                ?.theType
+                        if (receiverType != null) {
+                            val receiverTypeText = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(receiverType)
+                            val isFunctionType = receiverType.constructor.declarationDescriptor is FunctionClassDescriptor
+                            append(if (isFunctionType) "($receiverTypeText)" else receiverTypeText).append('.')
+                        }
+                    }
+
+                    append("${it.name}'")
                 }
             }
         }
@@ -123,7 +140,7 @@ abstract class CreateCallableFromUsageFixBase<E : KtElement>(
         // TODO: Remove after companion object extensions are supported
         if (isExtension && receiverInfo.staticContextRequired) return false
 
-        val callableBuilder = CallableBuilderConfiguration(callableInfos, element, file, null, isExtension).createBuilder()
+        val callableBuilder = CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension).createBuilder()
         val receiverTypeCandidates = callableBuilder.computeTypeCandidates(callableInfos.first().receiverTypeInfo)
         val propertyInfo = callableInfos.firstOrNull { it is PropertyInfo } as PropertyInfo?
         val isFunction = callableInfos.any { it.kind == CallableKind.FUNCTION }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
index d518ad4a74b..5405d88f7c0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt
@@ -66,7 +66,7 @@ open class CreateParameterFromUsageFix<E : KtElement>(
         ) : CreateParameterFromUsageFix<E>? {
             val receiverClassDescriptor: ClassDescriptor
 
-            val builder = CallableBuilderConfiguration(listOf(info), element, element.getContainingKtFile(), null, false).createBuilder()
+            val builder = CallableBuilderConfiguration(listOf(info), element).createBuilder()
             val receiverTypeCandidate = builder.computeTypeCandidates(info.receiverTypeInfo).firstOrNull()
             if (receiverTypeCandidate != null) {
                 builder.placement = CallablePlacement.WithReceiver(receiverTypeCandidate)
diff --git a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
index 0b19433ccb3..1c418270d84 100644
--- a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "false"
-// ACTION: Create extension function 'inc'
+// ACTION: Create extension function 'H?.inc'
 // ACTION: Create member function 'inc'
 // ACTION: Replace overloaded operator with function call
 // ERROR: Unresolved reference: ++
diff --git a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
index c07fdefe555..93d745c2e9a 100644
--- a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
+++ b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test
@@ -2,7 +2,7 @@
 // "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
-// ACTION: Create extension function 'get'
+// ACTION: Create extension function 'Some.get'
 // ACTION: Create member function 'get'
 // ACTION: Replace overloaded operator with function call
 
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
index 35a5c5a5e20..bf37e3a51d5 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test
@@ -2,7 +2,7 @@
 // "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No set method providing array access
-// ACTION: Create extension function 'set'
+// ACTION: Create extension function 'Some.set'
 // ACTION: Create member function 'set'
 // ACTION: Replace overloaded operator with function call
 
diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
index bc84129f304..eafa01f4de9 100644
--- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
+++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test
@@ -2,7 +2,7 @@
 // "Import" "false"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
-// ACTION: Create extension function 'get'
+// ACTION: Create extension function 'Some.get'
 // ACTION: Create member function 'get'
 // ACTION: Replace overloaded operator with function call
 
diff --git a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
index 167b5beb8c8..85a4bb5a86c 100644
--- a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt
@@ -1,6 +1,6 @@
 // "Import" "false"
 // ERROR: Unresolved reference: foo
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'H.foo'
 // ACTION: Create member function 'foo'
 // ACTION: Replace infix call with ordinary call
 
diff --git a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
index f9729d32f7a..b4a4b3725a3 100644
--- a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
+++ b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "false"
 // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
-// ACTION: Create extension function 'invoke'
+// ACTION: Create extension function 'Some.invoke'
 // ACTION: Create member function 'invoke'
 
 
diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
index ed556cda66c..d884bd4aba2 100644
--- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
+++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "false"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-// ACTION: Create extension function 'component1'
+// ACTION: Create extension function 'Some.component1'
 // ACTION: Create member function 'component1'
 
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt
index 35222bd794c..43287087cbe 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt
@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "false"
-// ACTION: Create extension function 'Foo'
+// ACTION: Create extension function 'Int.Foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: Foo
 // WITH_RUNTIME
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt
index 36215629ae5..f9d8ca98b67 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt
@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "false"
-// ACTION: Create extension function 'Foo'
+// ACTION: Create extension function 'List<T>.Foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: Foo
 // WITH_RUNTIME
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt
index ac395c8c0e3..cb7370d74b8 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt
@@ -1,5 +1,5 @@
 // "Create class 'A'" "false"
-// ACTION: Create extension property 'A'
+// ACTION: Create extension property 'X.A'
 // ACTION: Create member property 'A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt
index c465cb7336c..5bb13530d9b 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt
@@ -1,5 +1,5 @@
 // "Create enum constant 'A'" "false"
-// ACTION: Create extension property 'A'
+// ACTION: Create extension property 'X.A'
 // ACTION: Create member property 'A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt
index fd6ac6d6814..a9dfe7e88ca 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt
@@ -1,5 +1,5 @@
 // "Create object 'A'" "false"
-// ACTION: Create extension property 'A'
+// ACTION: Create extension property 'X.A'
 // ACTION: Create member property 'A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt
index a989ddfba52..57f2ab7d8ff 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'plus'" "true"
+// "Create extension function 'Int.plus'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
index 952fb76920c..48724bc120c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'plus'" "true"
+// "Create extension function 'Int.plus'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt
index 8c9c0cf1621..6c0707b7946 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt
@@ -1,4 +1,4 @@
-// "Create extension function '!u00A0'" "true"
+// "Create extension function 'Int.!u00A0'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
index daabd3cca89..a47932e5272 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function '!u00A0'" "true"
+// "Create extension function 'Int.!u00A0'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt
index f0703a047f4..303944ea9eb 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt
@@ -1,6 +1,6 @@
 // "Create abstract function 'foo'" "false"
 // ACTION: Convert to expression body
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'B.foo'
 // ACTION: Create member function 'foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt
index 913a2f9726f..b94fdba00f5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 fun bar(b: Boolean) {
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
index e83a4f52567..170e2bc55e3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 fun bar(b: Boolean) {
 
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt
index c4e610b552d..d41468aaa10 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // WITH_RUNTIME
 fun bar(b: Boolean) {
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
index 4774937adbc..131d2380028 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // WITH_RUNTIME
 fun bar(b: Boolean) {
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt
index 57f96828791..c9d035b74cf 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Property must be initialized
 class A(val n: Int)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
index 57e9b119a80..f23014ef2ab 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Property must be initialized
 class A(val n: Int)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt
index 69442c43820..cd8f4570fae 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Property must be initialized
 class A(val n: Int)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
index 480d7d85bf8..4ffe286857e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Property must be initialized
 class A(val n: Int)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
index 6c5933b05b7..2cfdc19e8aa 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt
index 56834ef55dd..4dce01287ed 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
index c5131745453..7f84aff75c6 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int? {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt
index b8f6018d077..4ad65f9d842 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int? {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
index a4255e896ee..6eee2f9b0cc 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'T.foo'" "true"
 
 interface T
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
index 69670d94aaa..6f8793ea6ac 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'T.foo'" "true"
 
 interface T
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
index 40e0474bda4..730be647df6 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 import package1.A
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt
index bd2c0a42296..e6d3f46b87a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 import package1.A
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt
index af404fd3562..6fc3b3e6682 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create member function 'foo'" "false"
 // ACTION: Convert to expression body
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'A.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt
index f855070c18d..ad94704febe 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Unit.foo'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
index df4afee592d..956c54954a6 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Unit.foo'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt
index e85188bc490..c3149254667 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
index ac13ee82873..970fc6ace9f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt
index 976b9105311..92e9721118d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'bar'" "true"
+// "Create extension function '((Int) -> String).bar'" "true"
 
 fun foo(block: (Int) -> String) {
     block.b<caret>ar()
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
index 05919f50bef..7e9ad84de19 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'bar'" "true"
+// "Create extension function '((Int) -> String).bar'" "true"
 
 fun foo(block: (Int) -> String) {
     block.bar()
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt
index 193d1b4dc2e..acc47d741b9 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
index 8d7ac9be215..194c2c3158d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt
index 99222741007..d5b5bd6e7ff 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
index 175647c3c95..795a111738b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt
index 389d365e35f..645e1f5f6cb 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
index 8d7ac9be215..194c2c3158d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'List<T>.foo'" "true"
 // WITH_RUNTIME
 
 class A<T>(val items: List<T>) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt
index acc1ce69bc0..8a4e841c507 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'bar'" "true"
+// "Create extension function 'T.bar'" "true"
 fun <T> foo(t: T) {
     t.<caret>bar()
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
index 41444a9e5c2..d67bcdcd93e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'bar'" "true"
+// "Create extension function 'T.bar'" "true"
 fun <T> foo(t: T) {
     t.bar()
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/memberWithTypeParameterAsReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/memberWithTypeParameterAsReceiver.kt
index 4473bc70fe1..0772d3b272b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/memberWithTypeParameterAsReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/memberWithTypeParameterAsReceiver.kt
@@ -1,5 +1,5 @@
 // "Create member function 'bar'" "false"
-// ACTION: Create extension function 'bar'
+// ACTION: Create extension function 'T.bar'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: bar
 fun <T> foo(t: T) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt
index 675074c0eca..436fe2f38eb 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 fun <T, U> T.map(f: T.() -> U) = f()
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
index 39d08d986a5..c6d6922a070 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 fun <T, U> T.map(f: T.() -> U) = f()
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt
index 8cbaaaae613..125db400e35 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 fun <T, U> T.map(f: (T) -> U) = f(this)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
index 817be3b5b6b..d7c816672a4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'foo'" "true"
+// "Create extension function 'Int.foo'" "true"
 // WITH_RUNTIME
 fun <T, U> T.map(f: (T) -> U) = f(this)
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
index 7ba63aca15e..f181db7d340 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'component2'" "true"
+// "Create extension function 'Any.component2'" "true"
 // WITH_RUNTIME
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
index 33596bf7a38..c5d58c479d9 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'component2'" "true"
+// "Create extension function 'Any.component2'" "true"
 // WITH_RUNTIME
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt
index 63857ce259f..66f9576b398 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'get'" "true"
+// "Create extension function 'Any.get'" "true"
 // WITH_RUNTIME
 
 fun x (y: Any) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
index 70945c1ea3c..1f9fe1cc17d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'get'" "true"
+// "Create extension function 'Any.get'" "true"
 // WITH_RUNTIME
 
 fun x (y: Any) {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt
index d355eb4b675..2da2494bb54 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'invoke'" "true"
+// "Create extension function 'Int.invoke'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
index 69540a9f16c..af6b4cfffde 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'invoke'" "true"
+// "Create extension function 'Int.invoke'" "true"
 // WITH_RUNTIME
 
 class A<T>(val n: T)
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt
index 0fdd4d0290f..1ac2c5f5e31 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'set'" "true"
+// "Create extension function 'Any.set'" "true"
 // WITH_RUNTIME
 
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index 99101bccdf4..39bb5fa1bc2 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -1,6 +1,6 @@
 import java.util.ArrayList
 
-// "Create extension function 'set'" "true"
+// "Create extension function 'Any.set'" "true"
 // WITH_RUNTIME
 
 class Foo<T> {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
index b99111990ca..45754b7197f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension function 'unaryMinus'" "true"
+// "Create extension function 'Boolean.unaryMinus'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
index a8545c17c77..b0f53605b06 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension function 'unaryMinus'" "true"
+// "Create extension function 'Boolean.unaryMinus'" "true"
 // WITH_RUNTIME
 
 fun test() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inBinaryOperation.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inBinaryOperation.kt
index e9c46371c1a..7f7f0d3196f 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inBinaryOperation.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/inBinaryOperation.kt
@@ -1,6 +1,6 @@
 // "Create local variable 'foo'" "false"
 // ERROR: Unresolved reference: foo
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'Int.foo'
 // ACTION: Replace infix call with ordinary call
 // WITH_RUNTIME
 fun refer() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
index 3e6ab6dadd5..af65ddffa18 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt
@@ -1,5 +1,5 @@
 // "Create local variable '-'" "false"
-// ACTION: Create extension function 'minus'
+// ACTION: Create extension function 'A.minus'
 // ACTION: Create member function 'minus'
 // ACTION: Replace overloaded operator with function call
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt
index 985885b8e8a..65f626cefc5 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt
@@ -1,5 +1,5 @@
 // "Create local variable 'foo'" "false"
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.foo'
 // ACTION: Create member property 'foo'
 // ACTION: Create property 'foo' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inBinaryOperation.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inBinaryOperation.kt
index 09d5e62775a..6c3012378c3 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inBinaryOperation.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inBinaryOperation.kt
@@ -1,6 +1,6 @@
 // "Create parameter 'foo'" "false"
 // ERROR: Unresolved reference: foo
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'Int.foo'
 // ACTION: Replace infix call with ordinary call
 // WITH_RUNTIME
 fun refer() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
index 1aa6648afd9..a8bb2e989d2 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
@@ -2,7 +2,7 @@
 // ACTION: Convert to expression body
 // ACTION: Create local variable 'foo'
 // ACTION: Create property 'foo'
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'T.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
index 510d6f72d6f..09e72c97223 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
@@ -2,7 +2,7 @@
 // ACTION: Convert to expression body
 // ACTION: Create local variable 'foo'
 // ACTION: Create property 'foo'
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'T.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
index f98433cb176..2ba43d97844 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt
@@ -1,5 +1,5 @@
 // "Create parameter '-'" "false"
-// ACTION: Create extension function 'minus'
+// ACTION: Create extension function 'A.minus'
 // ACTION: Create member function 'minus'
 // ACTION: Replace overloaded operator with function call
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin<br>@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin<br>public operator fun <T> Iterable<???>.minus(elements: Array<out ???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Iterable<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<???>.minus(elements: Sequence<???>): List<???> defined in kotlin.collections<br>public operator fun <T> Iterable<A>.minus(element: A): List<A> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Array<out ???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Iterable<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<???>.minus(elements: Sequence<???>): Set<???> defined in kotlin.collections<br>public operator fun <T> Set<A>.minus(element: A): Set<A> defined in kotlin.collections<br>public operator fun <T> Sequence<???>.minus(elements: Array<out ???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Iterable<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<???>.minus(elements: Sequence<???>): Sequence<???> defined in kotlin.sequences<br>public operator fun <T> Sequence<A>.minus(element: A): Sequence<A> defined in kotlin.sequences
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt
index 701f9cbd293..4a2a122e86e 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt
@@ -1,5 +1,5 @@
 // "Create parameter 'foo'" "false"
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.foo'
 // ACTION: Create member property 'foo'
 // ACTION: Create property 'foo' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt
index 8366c4d1caf..6840502080b 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt
@@ -1,6 +1,6 @@
 // "Create member property 'foo' as constructor parameter" "false"
 // ACTION: Create member property 'foo'
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.Companion.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt
index 9f1f1b46949..ac4ccee9ee9 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt
@@ -1,7 +1,7 @@
 // "Create property 'foo' as constructor parameter" "false"
 // ACTION: Create member property 'foo'
 // ACTION: Convert to expression body
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt
index 5734f61fea6..3c0d8b02ad2 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt
@@ -1,5 +1,5 @@
 // "Create property 'foo' as constructor parameter" "false"
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'Int.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 // WITH_RUNTIME
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt
index e0ed57e1a5d..309eef476ca 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt
@@ -1,6 +1,6 @@
 // "Create abstract property 'foo'" "false"
 // ACTION: Convert to expression body
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'B.foo'
 // ACTION: Create member property 'foo'
 // ACTION: Create property 'foo' as constructor parameter
 // ACTION: Rename reference
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt
index fc54387c7c2..82c3ab68d31 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt
@@ -1,5 +1,5 @@
 // "Create property 'foo'" "false"
-// ACTION: Create extension function 'bar'
+// ACTION: Create extension function 'A<Int>.bar'
 // ACTION: Create member function 'bar'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: bar
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
index 0468f6b72be..832dd62d643 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 import package1.A
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt
index 5cde179a260..300a4dcd929 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 import package1.A
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
index af0dab01d05..577e12fc1f4 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 val A.foo: String?
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt
index 0d06c67640b..fc1efc03fb7 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): String? {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
index af0dab01d05..577e12fc1f4 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 val A.foo: String?
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt
index 0d06c67640b..fc1efc03fb7 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): String? {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt
index aca0809f4de..a300a34ee60 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'bar'" "true"
+// "Create extension property 'T.bar'" "true"
 // ERROR: Property must be initialized
 fun consume(n: Int) {}
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
index ba44d547c1d..2d7b8f94a55 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'bar'" "true"
+// "Create extension property 'T.bar'" "true"
 // ERROR: Property must be initialized
 fun consume(n: Int) {}
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/inBinaryOperation.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inBinaryOperation.kt
index aa28aab5038..758540ec2ee 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/inBinaryOperation.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inBinaryOperation.kt
@@ -1,6 +1,6 @@
 // "Create property 'foo'" "false"
 // ERROR: Unresolved reference: foo
-// ACTION: Create extension function 'foo'
+// ACTION: Create extension function 'Int.foo'
 // ACTION: Replace infix call with ordinary call
 // WITH_RUNTIME
 fun refer() {
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/memberWithTypeParameterAsReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/memberWithTypeParameterAsReceiver.kt
index 4a712a1fcd2..03744b178c0 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/memberWithTypeParameterAsReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/memberWithTypeParameterAsReceiver.kt
@@ -1,5 +1,5 @@
 // "Create member property 'bar'" "false"
-// ACTION: Create extension property 'bar'
+// ACTION: Create extension property 'T.bar'
 // ACTION: Rename reference
 // ACTION: Convert to expression body
 // ERROR: Unresolved reference: bar
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt
index ee4d826b791..973f3672dc5 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create property 'foo'" "false"
 // ACTION: Convert to expression body
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
index b1fc074d90e..9d33df780c3 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create property 'foo'" "false"
 // ACTION: Convert to expression body
-// ACTION: Create extension property 'foo'
+// ACTION: Create extension property 'A.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt
index 77b570bd08d..fc83f172231 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Unit.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
index ad6fcac2940..39885ea3ecf 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Unit.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt
index f8294fcfd10..8670748af68 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Int.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
index 61d294aad33..1debb7aa8c5 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Int.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt
index 9127c47d553..0687308293f 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Int.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME
 
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
index 8edd15fc522..b0dde2d0d41 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
@@ -1,4 +1,4 @@
-// "Create extension property 'foo'" "true"
+// "Create extension property 'Int.foo'" "true"
 // ERROR: Property must be initialized
 // WITH_RUNTIME