diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
index e2b2d2e2fd7..1ed50155566 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.fir.kt
@@ -2,18 +2,18 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
 @kotlin.jvm.JvmName("myFlatMapIterable")
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Iterable<R>): Sequence<R> {
     TODO()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
index 3a7b5c4ce38..b06f91dcffe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.kt
@@ -2,18 +2,18 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
 @kotlin.jvm.JvmName("myFlatMapIterable")
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R> Sequence<T>.myFlatMap(transform: (T) -> Iterable<R>): Sequence<R> {
     TODO()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.txt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.txt
index 75fc73cb15c..d1ae6c4e230 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/independentResolutionInLambda.txt
@@ -2,7 +2,7 @@ package
 
 public fun </*0*/ K : kotlin.Any> elvis(/*0*/ x: K?, /*1*/ y: K): K
 public fun test(/*0*/ a: A): kotlin.Unit
-@kotlin.jvm.JvmName(name = "myFlatMapIterable") @annotations.FactoryPattern public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.collections.Iterable<R>): kotlin.sequences.Sequence<R>
+@kotlin.jvm.JvmName(name = "myFlatMapIterable") @kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.collections.Iterable<R>): kotlin.sequences.Sequence<R>
 public fun </*0*/ T, /*1*/ R> kotlin.sequences.Sequence<T>.myFlatMap(/*0*/ transform: (T) -> kotlin.sequences.Sequence<R>): kotlin.sequences.Sequence<R>
 
 public interface A {
@@ -25,10 +25,10 @@ public interface C {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-package annotations {
+package kotlin {
 
-    public final annotation class FactoryPattern : kotlin.Annotation {
-        public constructor FactoryPattern()
+    public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
+        public constructor OverloadResolutionByLambdaReturnType()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
index fe05dcde048..31b30656b87 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.fir.kt
@@ -2,22 +2,22 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <R> UByteArray.fooMap(t: (UByte) -> Iterable<R>): List<R> {
     TODO("ub.fm")
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R> Iterable<T>.fooMap(t: (T) -> Iterable<R>): List<R> {
     TODO("i.fm(i)")
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
index ab532327056..1203446c796 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.kt
@@ -2,22 +2,22 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <R> UByteArray.fooMap(t: (UByte) -> Iterable<R>): List<R> {
     TODO("ub.fm")
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R> Iterable<T>.fooMap(t: (T) -> Iterable<R>): List<R> {
     TODO("i.fm(i)")
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.txt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.txt
index 9ab0ab630ce..51753592f70 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_1.txt
@@ -2,14 +2,14 @@ package
 
 public fun takeUByteList(/*0*/ list: kotlin.collections.List<kotlin.UByte>): kotlin.Unit
 public fun test(): kotlin.Unit
-@annotations.FactoryPattern public fun </*0*/ R> kotlin.UByteArray.fooMap(/*0*/ t: (kotlin.UByte) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
-@annotations.FactoryPattern public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ R> kotlin.UByteArray.fooMap(/*0*/ t: (kotlin.UByte) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.collections.Iterable<R>): kotlin.collections.List<R>
 @kotlin.jvm.JvmName(name = "fooMapSeq") public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fooMap(/*0*/ t: (T) -> kotlin.sequences.Sequence<R>): kotlin.collections.List<R>
 
-package annotations {
+package kotlin {
 
-    public final annotation class FactoryPattern : kotlin.Annotation {
-        public constructor FactoryPattern()
+    public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
+        public constructor OverloadResolutionByLambdaReturnType()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
index 9ae888bad92..d5534900d64 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.fir.kt
@@ -2,21 +2,21 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R : Comparable<R>> Iterable<T>.myMaxOf(selector: (T) -> R): R = TODO()
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T> Iterable<T>.myMaxOf(selector: (T) -> Double): Double = TODO()
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T> Iterable<T>.myMaxOf(selector: (T) -> Float): Float = TODO()
 
 fun Double.pow(v: Int): Double = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
index 560c4f1e521..b0fcde84074 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.kt
@@ -2,21 +2,21 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION -EXPERIMENTAL_API_USAGE -EXPERIMENTAL_UNSIGNED_LITERALS
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T, R : Comparable<R>> Iterable<T>.myMaxOf(selector: (T) -> R): R = TODO()
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T> Iterable<T>.myMaxOf(selector: (T) -> Double): Double = TODO()
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <T> Iterable<T>.myMaxOf(selector: (T) -> Float): Float = TODO()
 
 fun Double.pow(v: Int): Double = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.txt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.txt
index 6c067fb3333..09a8f0a9099 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/multipleOverloads_2.txt
@@ -2,15 +2,15 @@ package
 
 public fun takeDouble(/*0*/ value: kotlin.Double): kotlin.Unit
 public fun test(): kotlin.Unit
-@annotations.FactoryPattern public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> R): R
-@annotations.FactoryPattern public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Double): kotlin.Double
-@annotations.FactoryPattern public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Float): kotlin.Float
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> R): R
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Double): kotlin.Double
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ T> kotlin.collections.Iterable<T>.myMaxOf(/*0*/ selector: (T) -> kotlin.Float): kotlin.Float
 public fun kotlin.Double.pow(/*0*/ v: kotlin.Int): kotlin.Double
 
-package annotations {
+package kotlin {
 
-    public final annotation class FactoryPattern : kotlin.Annotation {
-        public constructor FactoryPattern()
+    public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
+        public constructor OverloadResolutionByLambdaReturnType()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
index 968ec7c2efb..af77b9a790e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
@@ -2,17 +2,17 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun create(f: (Int) -> Int): Int = 1
 fun create(f: (Int) -> String): String = ""
 
@@ -33,7 +33,7 @@ fun test_3() {
     val x = <!AMBIGUITY!>create<!> { 1.0 }
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
@@ -45,4 +45,4 @@ fun test_4() {
 fun test_5() {
     val x = <!AMBIGUITY!>create<!>("") { 1 }
     takeInt(x)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
index dbef1ccfd4b..94dd36c271d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
@@ -2,17 +2,17 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun create(f: (Int) -> Int): Int = 1
 fun create(f: (Int) -> String): String = ""
 
@@ -33,7 +33,7 @@ fun test_3() {
     val x = <!OVERLOAD_RESOLUTION_AMBIGUITY!>create<!> { 1.0 }
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.txt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.txt
index fbc236fdd50..db0cf51fe1e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.txt
@@ -1,8 +1,8 @@
 package
 
-@annotations.FactoryPattern public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
+@kotlin.OverloadResolutionByLambdaReturnType public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
 public fun create(/*0*/ f: (kotlin.Int) -> kotlin.String): kotlin.String
-@annotations.FactoryPattern public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
 public fun </*0*/ T> create(/*0*/ x: T, /*1*/ f: (T) -> kotlin.String): kotlin.String
 public fun takeInt(/*0*/ s: kotlin.Int): kotlin.Unit
 public fun takeString(/*0*/ s: kotlin.String): kotlin.Unit
@@ -12,10 +12,10 @@ public fun test_3(): kotlin.Unit
 public fun test_4(): kotlin.Unit
 public fun test_5(): kotlin.Unit
 
-package annotations {
+package kotlin {
 
-    public final annotation class FactoryPattern : kotlin.Annotation {
-        public constructor FactoryPattern()
+    public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
+        public constructor OverloadResolutionByLambdaReturnType()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
index dc277897d01..01eb419bfe6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.fir.kt
@@ -2,17 +2,17 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun create(f: (Int) -> Int): Int = 1
 fun create(f: (Int) -> String): String = ""
 
@@ -33,7 +33,7 @@ fun test_3() {
     val x = <!AMBIGUITY!>create<!> { 1.0 }
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
@@ -45,4 +45,4 @@ fun test_4() {
 fun test_5() {
     val x = <!AMBIGUITY!>create<!>("") { 1 }
     takeInt(x)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt
index f6258409ab2..3b4ccc2e7d5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.kt
@@ -2,17 +2,17 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
-// FILE: FactoryPattern.kt
+// FILE: OverloadResolutionByLambdaReturnType.kt
 
-package annotations
+package kotlin
 
-annotation class FactoryPattern
+annotation class OverloadResolutionByLambdaReturnType
 
 // FILE: main.kt
 
-import annotations.FactoryPattern
+import kotlin.OverloadResolutionByLambdaReturnType
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun create(f: (Int) -> Int): Int = 1
 fun create(f: (Int) -> String): String = ""
 
@@ -30,10 +30,10 @@ fun test_2() {
 }
 
 fun test_3() {
-    val x = create { <!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!> }
+    val x = create <!TYPE_MISMATCH!>{ <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!> }<!>
 }
 
-@FactoryPattern
+@OverloadResolutionByLambdaReturnType
 fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.txt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.txt
index fbc236fdd50..db0cf51fe1e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled.txt
@@ -1,8 +1,8 @@
 package
 
-@annotations.FactoryPattern public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
+@kotlin.OverloadResolutionByLambdaReturnType public fun create(/*0*/ f: (kotlin.Int) -> kotlin.Int): kotlin.Int
 public fun create(/*0*/ f: (kotlin.Int) -> kotlin.String): kotlin.String
-@annotations.FactoryPattern public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
+@kotlin.OverloadResolutionByLambdaReturnType public fun </*0*/ K> create(/*0*/ x: K, /*1*/ f: (K) -> kotlin.Int): kotlin.Int
 public fun </*0*/ T> create(/*0*/ x: T, /*1*/ f: (T) -> kotlin.String): kotlin.String
 public fun takeInt(/*0*/ s: kotlin.Int): kotlin.Unit
 public fun takeString(/*0*/ s: kotlin.String): kotlin.Unit
@@ -12,10 +12,10 @@ public fun test_3(): kotlin.Unit
 public fun test_4(): kotlin.Unit
 public fun test_5(): kotlin.Unit
 
-package annotations {
+package kotlin {
 
-    public final annotation class FactoryPattern : kotlin.Annotation {
-        public constructor FactoryPattern()
+    public final annotation class OverloadResolutionByLambdaReturnType : kotlin.Annotation {
+        public constructor OverloadResolutionByLambdaReturnType()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled_no_annotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled_no_annotation.fir.kt
index e3cde147844..2b38b1b6e5f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled_no_annotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_enabled_no_annotation.fir.kt
@@ -33,4 +33,4 @@ fun test_4() {
 fun test_5() {
     val x = <!AMBIGUITY!>create<!>("") { 1 }
     takeInt(x)
-}
+}
\ No newline at end of file