diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceUtil.kt
index baa769ad078..7fcf0f14425 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceUtil.kt
@@ -299,7 +299,7 @@ class CoroutineInferenceSupport(
 private fun KotlinType.containsTypeTemplate() = contains { it is TypeTemplate || it is StubTypeForBuilderInference }
 
 fun isApplicableCallForBuilderInference(descriptor: CallableDescriptor, languageVersionSettings: LanguageVersionSettings): Boolean {
-    if (languageVersionSettings.supportsFeature(LanguageFeature.StableBuilderInference)) return true
+    if (languageVersionSettings.supportsFeature(LanguageFeature.UnrestrictedBuilderInference)) return true
 
     if (!languageVersionSettings.supportsFeature(LanguageFeature.ExperimentalBuilderInference)) {
         return isGoodCallForOldCoroutines(descriptor)
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.fir.kt
index f58e2f745da..44057f699b0 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // WITH_RUNTIME
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.kt b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.kt
index 5fb7f59b4c2..837510fd8a3 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/violating.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // WITH_RUNTIME
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.fir.kt
index 76633086c28..d0a2d26f284 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // WITH_RUNTIME
 // !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE_ERROR -CAST_NEVER_SUCCEEDS
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.kt
index a80c68794d2..5df09031f2c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/constraints/withExpectedType.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // WITH_RUNTIME
 // !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE_ERROR -CAST_NEVER_SUCCEEDS
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
index de0a08b3b08..26a13277993 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
index e2411e5cfa0..b78cbe07598 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperType.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
index f1dd708bf7c..1495c56ef5c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
index 2c791455049..e6e6afa951e 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeContravariant.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
index bee76e9179c..be0ac68e7dd 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
index b509e17052f..c1080efe39c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeCovariant.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
index 8cfc75c61ef..cb01221d89c 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
index a63fc8d2106..acbacf26174 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeInvariant.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
index 3937ba0b316..d9af3813243 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
index 50d6abbc8a9..62e467d60d6 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/commonSuperTypeNullable.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
index 84fb81b5441..e6caa8beb7d 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNCHECKED_CAST -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
index a59e9a74c23..714b9e6bcd1 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/intersect.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNCHECKED_CAST -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
index a008f5736dd..b3d4512da3d 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
index 2e50aada8e9..a68c53c79fa 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/memberScope.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
index af2f0cf308c..7f264088d28 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
index 85c1fc42fe5..d9502e63837 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/nullability.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
index 91537f723e8..5e9e16562c2 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
index 31cf37f3dae..388222c109a 100644
--- a/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/renderingStubTypes.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATION -EXPERIMENTAL_IS_NOT_ENABLED -UNUSED_VARIABLE
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.fir.kt
index f6d4f6f7c2c..2e04a9642a5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 // !WITH_NEW_INFERENCE
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
index 00cab60f3a0..18bc1c971a6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/incorrectCalls.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.fir.kt
index 1772fd86f64..2657730ab42 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Builder<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt
index 9ee76c60b2f..871f58e247e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/inferCoroutineTypeInOldVersion.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Builder<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.fir.kt
index de86984800b..8d193179a4e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
index 9b8ccd3d8e3..10a6d87c8da 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/resolveUsualCallWithBuilderInference.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.fir.kt
index 050ca6ddb3a..56c14cf632a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !WITH_NEW_INFERENCE
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
index a89632281d3..0b34f3fe1ee 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/builderInference/useInferenceInformationFromExtension.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: +StableBuilderInference
+// !LANGUAGE: +UnrestrictedBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // FILE: annotation.kt
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
index 26948a0d999..97cd797443c 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
@@ -206,7 +206,7 @@ enum class LanguageFeature(
     AbstractClassMemberNotImplementedWithIntermediateAbstractClass(KOTLIN_1_6, kind = BUG_FIX),
 
     SuspendFunctionAsSupertype(KOTLIN_1_6),
-    StableBuilderInference(KOTLIN_1_6),
+    UnrestrictedBuilderInference(KOTLIN_1_6),
     ProperTypeInferenceConstraintsProcessing(KOTLIN_1_6, kind = BUG_FIX),
 
     // Temporarily disabled, see KT-27084/KT-22379