diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2InspectionTest.kt b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2InspectionTest.kt
index e21dc6f7ad15..5a0d4358db21 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2InspectionTest.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2InspectionTest.kt
@@ -19,7 +19,7 @@ abstract class AbstractK2InspectionTest : AbstractInspectionTest() {
     }
 
     override fun doTest(path: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(path)
         }
     }
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt
index 539e8a4a3df1..777b31d4f06a 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt
@@ -30,7 +30,7 @@ abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() {
     }
 
     override fun doTestFor(mainFile: File, inspection: LocalInspectionTool, fileText: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             doTestForInternal(mainFile, inspection, fileText)
         }
     }
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2MultiFileLocalInspectionTest.kt b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2MultiFileLocalInspectionTest.kt
index 4d836ac417df..9065e054f93e 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2MultiFileLocalInspectionTest.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2MultiFileLocalInspectionTest.kt
@@ -27,7 +27,7 @@ abstract class AbstractK2MultiFileLocalInspectionTest: AbstractMultiFileLocalIns
 
     override fun doTest(pathInString: String) {
         val path = Path(pathInString)
-        IgnoreTests.runTestIfNotDisabledByFileDirective(path, IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(path, IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             super.doTest(pathInString)
         }
     }
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt b/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
index 70d7bd34ae64..fbb6693a3d36 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
@@ -9,4 +9,4 @@ fun main() {
     val c = my.simple.name.Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after b/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
index dc709ab90758..23faffe688b0 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
@@ -9,4 +9,4 @@ fun main() {
     val c = Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/inspections-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/inspections/shared/AbstractK2SharedQuickFixTest.kt b/plugins/kotlin/code-insight/inspections-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/inspections/shared/AbstractK2SharedQuickFixTest.kt
index 6665736fb9af..3c6646b8d6fd 100644
--- a/plugins/kotlin/code-insight/inspections-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/inspections/shared/AbstractK2SharedQuickFixTest.kt
+++ b/plugins/kotlin/code-insight/inspections-shared/tests/k2/test/org/jetbrains/kotlin/idea/k2/codeInsight/inspections/shared/AbstractK2SharedQuickFixTest.kt
@@ -6,8 +6,6 @@ import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
-import org.jetbrains.kotlin.test.utils.IgnoreTests
-import kotlin.io.path.Path
 
 abstract class AbstractK2SharedQuickFixTest : AbstractQuickFixTest() {
     override fun checkForUnexpectedErrors() {}
@@ -24,10 +22,4 @@ abstract class AbstractK2SharedQuickFixTest : AbstractQuickFixTest() {
           { super.tearDown() }
         )
     }
-
-    override fun doTest(beforeFileName: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(beforeFileName), IgnoreTests.DIRECTIVES.IGNORE_K2) {
-            super.doTest(beforeFileName)
-        }
-    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/AbstractK2IntentionTest.kt b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/AbstractK2IntentionTest.kt
index 689854fd6232..249d17df99af 100644
--- a/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/AbstractK2IntentionTest.kt
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/test/org/jetbrains/kotlin/idea/k2/intentions/tests/AbstractK2IntentionTest.kt
@@ -28,7 +28,7 @@ abstract class AbstractK2IntentionTest : AbstractIntentionTestBase() {
     }
 
     override fun doTestFor(mainFile: File, pathToFiles: Map<String, PsiFile>, intentionAction: IntentionAction, fileText: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTestFor(mainFile, pathToFiles, intentionAction, fileText)
         }
     }
diff --git a/plugins/kotlin/code-insight/line-markers/test/org/jetbrains/kotlin/idea/k2/codeInsight/lineMarkers/test/AbstractLineMarkersK2Test.kt b/plugins/kotlin/code-insight/line-markers/test/org/jetbrains/kotlin/idea/k2/codeInsight/lineMarkers/test/AbstractLineMarkersK2Test.kt
index 91f157eff3db..b60e3405cfa9 100644
--- a/plugins/kotlin/code-insight/line-markers/test/org/jetbrains/kotlin/idea/k2/codeInsight/lineMarkers/test/AbstractLineMarkersK2Test.kt
+++ b/plugins/kotlin/code-insight/line-markers/test/org/jetbrains/kotlin/idea/k2/codeInsight/lineMarkers/test/AbstractLineMarkersK2Test.kt
@@ -21,7 +21,7 @@ import kotlin.io.path.Path
 
 abstract class AbstractLineMarkersK2Test : AbstractLineMarkersTest() {
     override fun doTest(path: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Path(path), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(path)
         }
     }
diff --git a/plugins/kotlin/code-insight/postfix-templates/test/org/jetbrains/kotlin/idea/k2/codeInsight/postfix/test/AbstractKotlinPostfixTemplateTest.kt b/plugins/kotlin/code-insight/postfix-templates/test/org/jetbrains/kotlin/idea/k2/codeInsight/postfix/test/AbstractKotlinPostfixTemplateTest.kt
index bbef286f410a..96e025ec4950 100644
--- a/plugins/kotlin/code-insight/postfix-templates/test/org/jetbrains/kotlin/idea/k2/codeInsight/postfix/test/AbstractKotlinPostfixTemplateTest.kt
+++ b/plugins/kotlin/code-insight/postfix-templates/test/org/jetbrains/kotlin/idea/k2/codeInsight/postfix/test/AbstractKotlinPostfixTemplateTest.kt
@@ -24,7 +24,7 @@ abstract class AbstractKotlinPostfixTemplateTest : NewLightKotlinCodeInsightFixt
     }
 
     protected fun performTest() {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(testRootPath.resolve(testMethodPath), IgnoreTests.DIRECTIVES.IGNORE_FIR, "after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(testRootPath.resolve(testMethodPath), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") {
             myFixture.configureByDefaultFile()
             myFixture.type(".$templateName\t")
             myFixture.checkContentByExpectedPath(".after")
diff --git a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/assert/call.kt b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/assert/call.kt
index 7b1d455db41d..fe0acd9a3371 100644
--- a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/assert/call.kt
+++ b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/assert/call.kt
@@ -6,4 +6,4 @@ object Processor {
     fun shouldProcess(): Boolean = true
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests-shared/test/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt b/plugins/kotlin/completion/tests-shared/test/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt
index 333bc960f7b3..780c84a975d0 100644
--- a/plugins/kotlin/completion/tests-shared/test/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt
+++ b/plugins/kotlin/completion/tests-shared/test/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.kt
@@ -155,7 +155,7 @@ object ExpectedCompletionUtils {
         BLOCK_CODE_FRAGMENT,
         AstAccessControl.ALLOW_AST_ACCESS_DIRECTIVE,
         IgnoreTests.DIRECTIVES.FIR_COMPARISON,
-        IgnoreTests.DIRECTIVES.IGNORE_FIR,
+        IgnoreTests.DIRECTIVES.IGNORE_K2,
         IgnoreTests.DIRECTIVES.FIR_IDENTICAL,
         IgnoreTests.DIRECTIVES.FIR_COMPARISON_MULTILINE_COMMENT,
         IgnoreTests.DIRECTIVES.IGNORE_FE10,
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/AbstractFirParameterInfoTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/AbstractFirParameterInfoTest.kt
index e616d6e4d1b6..e54859130437 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/AbstractFirParameterInfoTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/AbstractFirParameterInfoTest.kt
@@ -19,7 +19,7 @@ abstract class AbstractFirParameterInfoTest : AbstractParameterInfoTest() {
     }
 
     override fun doTest(fileName: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(Paths.get(fileName), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(Paths.get(fileName), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             super.doTest(fileName)
         }
     }
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt
index 8ec9c911c603..bcfdb1a09ea4 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixMultiFileTest.kt
@@ -22,7 +22,7 @@ abstract class AbstractHighLevelQuickFixMultiFileTest : AbstractQuickFixMultiFil
     override fun doTestWithExtraFile(beforeFileName: String) {
         IgnoreTests.runTestIfNotDisabledByFileDirective(
             Paths.get(beforeFileName),
-            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT,
+            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT,
             directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE,
             computeAdditionalFiles = { mainTestFile -> listOfNotNull(mainTestFile.getAfterFileIfExists()) },
             test = { super.doTestWithExtraFile(beforeFileName) }
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
index eba0ae6b83b1..1546748aa1c9 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
@@ -27,7 +27,7 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
 
     }
 
-    override val disableTestDirective: String get() =  IgnoreTests.DIRECTIVES.IGNORE_FIR_MULTILINE_COMMENT
+    override val disableTestDirective: String get() =  IgnoreTests.DIRECTIVES.IGNORE_K2_MULTILINE_COMMENT
 
     override fun doTest(beforeFileName: String) {
         val firBeforeFileName = getFirBeforeFileName(beforeFileName)
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt
index b7abc31391a5..c72954a1aa2d 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/AbstractFirShortenRefsTest.kt
@@ -58,7 +58,7 @@ abstract class AbstractFirShortenRefsTest : AbstractImportsTest() {
     override val runTestInWriteCommand: Boolean = false
 
     protected fun doTestWithMuting(unused: String) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR, ".after") {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, ".after") {
             doTest(unused)
         }
     }
diff --git a/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt b/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
index 9fc59ff17f00..a981bf1ea56e 100644
--- a/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
+++ b/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
@@ -229,18 +229,23 @@ object IgnoreTests {
     }
 
     object DIRECTIVES {
-        @Deprecated(message = "use IGNORE_FIR instead")
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_COMPARISON = "// FIR_COMPARISON"
-        @Deprecated(message = "use IGNORE_FIR instead")
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_COMPARISON_MULTILINE_COMMENT = "/* FIR_COMPARISON */"
 
-        const val IGNORE_FIR_LOG = "// IGNORE_FIR_LOG"
-
-        const val IGNORE_FIR = "// IGNORE_FIR"
         const val IGNORE_K2 = "// IGNORE_K2"
+        const val IGNORE_K2_MULTILINE_COMMENT = "/* IGNORE_K2 */"
+        const val IGNORE_K2_LOG = "// IGNORE_K2_LOG"
+
+        @Deprecated(message = "use IGNORE_K2 instead")
+        const val IGNORE_FIR = "// IGNORE_FIR"
+        @Deprecated(message = "use IGNORE_K2_MULTILINE_COMMENT instead")
         const val IGNORE_FIR_MULTILINE_COMMENT = "/* IGNORE_FIR */"
 
         const val FIX_ME = "// FIX_ME: "
+
+        @Deprecated(message = "use IGNORE_K2 instead")
         const val FIR_IDENTICAL = "// FIR_IDENTICAL"
 
         const val IGNORE_FE10_BINDING_BY_FIR = "// IGNORE_FE10_BINDING_BY_FIR"
diff --git a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt
index 841a042ea29d..ca7717c2531f 100644
--- a/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt
+++ b/plugins/kotlin/highlighting/highlighting-k2/test/org/jetbrains/kotlin/idea/k2/highlighting/AbstractK2HighlightingMetaInfoTest.kt
@@ -29,7 +29,7 @@ abstract class AbstractK2HighlightingMetaInfoTest : AbstractHighlightingMetaInfo
 
         IgnoreTests.runTestIfNotDisabledByFileDirective(
             testKtFile.toPath(),
-            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_FIR,
+            disableTestDirective = IgnoreTests.DIRECTIVES.IGNORE_K2,
             additionalFilesExtensions = arrayOf(HIGHLIGHTING_EXTENSION, HIGHLIGHTING_FIR_EXTENSION)
         ) {
             // warnings are not supported yet
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
index 0f7d2f8961da..c108c19e051d 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
@@ -126,7 +126,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
     }
 
     private fun doMultiOverrideImplement(handler: AbstractGenerateMembersHandler<T>) {
-        if (isFirPlugin && InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, IgnoreTests.DIRECTIVES.IGNORE_FIR)) {
+        if (isFirPlugin && InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, IgnoreTests.DIRECTIVES.IGNORE_K2)) {
             return
         }
         val elementAtCaret = myFixture.file.findElementAt(myFixture.editor.caretModel.offset)
@@ -176,7 +176,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
         val resultFile = if (isFirPlugin) {
             if (InTextDirectivesUtils.isDirectiveDefined(
                     goldenResultFile.readText(StandardCharsets.UTF_8),
-                    IgnoreTests.DIRECTIVES.IGNORE_FIR
+                    IgnoreTests.DIRECTIVES.IGNORE_K2
                 )
             ) {
                 return
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
index b30f1885f8dc..bc7915370726 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.kotlin.idea.test.configureCodeStyleAndRun
 import org.jetbrains.kotlin.test.utils.IgnoreTests
 import java.io.File
-import kotlin.io.path.Path
 
 abstract class AbstractMoveStatementTest : AbstractCodeMoverTest() {
     protected fun doTestClassBodyDeclaration(unused: String) {
@@ -45,7 +44,7 @@ abstract class AbstractMoveStatementTest : AbstractCodeMoverTest() {
     }
 
     private fun doTest(defaultMoverClass: Class<out StatementUpDownMover>, trailingComma: Boolean = false) {
-        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_FIR) {
+        IgnoreTests.runTestIfNotDisabledByFileDirective(dataFile().toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2) {
             doTest(trailingComma) { isApplicableExpected, direction ->
                 val movers = Extensions.getExtensions(StatementUpDownMover.STATEMENT_UP_DOWN_MOVER_EP)
                 val info = StatementUpDownMover.MoveInfo()
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
index f85073ab98fe..eb094a209f95 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
@@ -96,7 +96,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q
     }
 
     protected open val disableTestDirective: String
-        get() = if (isFirPlugin) IgnoreTests.DIRECTIVES.IGNORE_FIR else IgnoreTests.DIRECTIVES.IGNORE_FE10
+        get() = if (isFirPlugin) IgnoreTests.DIRECTIVES.IGNORE_K2 else IgnoreTests.DIRECTIVES.IGNORE_FE10
 
 
     protected open fun doTest(beforeFileName: String) {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt
index 24a8f1edc59f..981ffd207d42 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt
@@ -31,7 +31,7 @@ abstract class AbstractReferenceResolveTest : KotlinLightCodeInsightFixtureTestC
     protected open fun doTest(path: String) {
         configureTest()
         val controlDirective = if (isFirPlugin()) {
-            IgnoreTests.DIRECTIVES.IGNORE_FIR
+            IgnoreTests.DIRECTIVES.IGNORE_K2
         } else {
             IgnoreTests.DIRECTIVES.IGNORE_FE10
         }
diff --git a/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.fir.kt b/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.fir.kt
index 6fc18048f037..fc0814ba8303 100644
--- a/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.fir.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/diagnosticsMessage/incompleteTypeArgumentList.fir.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 interface ApplicationFeature<in P : Pipeline<*>, B : Any, V>
 open class Pipeline<TSubject : Any>()
diff --git a/plugins/kotlin/idea/tests/testData/checker/regression/javaStyleClassLiteralInAnnotationArguments.kt b/plugins/kotlin/idea/tests/testData/checker/regression/javaStyleClassLiteralInAnnotationArguments.kt
index 91f7166837c8..72022f98998d 100644
--- a/plugins/kotlin/idea/tests/testData/checker/regression/javaStyleClassLiteralInAnnotationArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/regression/javaStyleClassLiteralInAnnotationArguments.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 annotation class A
 
 class B
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt
index 065b85f694af..0fb668354841 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt
@@ -7,4 +7,4 @@ var x: String
         // test
     }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt
index e39725edf0ec..fd744daa2084 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt
@@ -7,4 +7,4 @@ var x: String
         // test
     }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
index 8d95862f0832..f365dbda7e3e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 import foo.A
 
 class B : A() {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
index cc2ffe6b352e..7cd0cce320ce 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 import foo.A
 
 class B : A() {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
index 259e1bb1ed3f..96a2b8b20057 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 @JvmInline
 value class <caret>V(val v: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
index 96e6ee6f2787..fe34ba09d08b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 @JvmInline
 value class V(val v: Int) {
     override fun toString(): String {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
index 5bf374834605..f4e98c5be65a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+GenericInlineClassParameter
 @JvmInline
 value class <caret>V(val v: Int)
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
index 7ae2010a1ae1..a0401538a04a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+GenericInlineClassParameter
 @JvmInline
 value class V(val v: Int) {
diff --git a/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt b/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt
index fa3456188f1b..deee77500a35 100644
--- a/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt
@@ -7,4 +7,4 @@ fun some() {
     r.foo("")
 }<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt.after
index 8910ae2d70eb..742e4f4b462d 100644
--- a/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/autoImport/extFunctionWithGenerics/extFunctionWithGenerics.kt.after
@@ -8,4 +8,4 @@ fun some() {
     r.foo("")
 }<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/ConventionUsages.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/ConventionUsages.0.java
index 2bb9118a92c4..70271556e073 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/ConventionUsages.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/ConventionUsages.0.java
@@ -6,4 +6,4 @@ public class Small {
     }
 }
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/JavaWithGroovyInvoke.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/JavaWithGroovyInvoke.0.java
index 014ef64c8c1e..28c7622b6791 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/JavaWithGroovyInvoke.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/JavaWithGroovyInvoke.0.java
@@ -12,4 +12,4 @@ public class JavaWithGroovyInvoke_0 {
 
 // CRI_IGNORE
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
index 9ecb208e81e0..314bd0c87ebe 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/MismatchedAccessor.0.java
@@ -11,4 +11,4 @@ public class Bar {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaComponentFunctions.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaComponentFunctions.0.java
index 5dc4a8a84b8d..613ab58de77d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaComponentFunctions.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaComponentFunctions.0.java
@@ -11,4 +11,4 @@ public class JavaClass {
     }
 }
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvoke.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvoke.0.java
index 076c6b110a76..186196f20fa4 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvoke.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvoke.0.java
@@ -25,4 +25,4 @@ public class JavaClassInvoke {
     }
 }
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.0.java
index aa01dac3dc0e..0b0e219e8b57 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/javaInvokeWithStaticImport.0.java
@@ -11,4 +11,4 @@ public class JavaClassWI {
     }
 }
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/compareTo.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/compareTo.0.kt
index 6d6a1f11f283..db714f8cfb65 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/compareTo.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/compareTo.0.kt
@@ -21,4 +21,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/SAM.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/SAM.0.kt
index e8e63acff139..699dc878118b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/SAM.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/SAM.0.kt
@@ -8,4 +8,4 @@ data class A(val <caret>a: Int, val b: String)
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
index cbd379171dec..14b086fa3467 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/callableReferences.0.kt
@@ -28,4 +28,4 @@ fun foo(x: X) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
index 6b72ea570f33..3d1002668d67 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/companionObjectAccess.0.kt
@@ -16,4 +16,4 @@ fun foo() {
 
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt
index a11eb47c782c..caa2a54722f2 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType1.0.kt
@@ -15,4 +15,4 @@ fun test() {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt
index 186f4200f311..7f508a73fb3d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/componentFunForGenericType2.0.kt
@@ -22,4 +22,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
index 46f942403d9f..72030c364208 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClass.0.kt
@@ -30,4 +30,4 @@ fun <T> T.getThis(): T = this
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
index c3a8637b806f..9e95bc6187e5 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRef.0.kt
@@ -13,4 +13,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt
index c8dfab6b6dfa..e88741877882 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassComponentByRefLocal.0.kt
@@ -12,4 +12,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
index a9b9a87800c5..4d25e527cecb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/dataClassInsideDataClass.0.kt
@@ -19,4 +19,4 @@ fun f(b: B, c: C) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt
index 924ac307b20d..8128fcc4cad8 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/extensionComponentFun.0.kt
@@ -32,4 +32,4 @@ fun g(z1: Z1, z2: Z2) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt
index 8d19cbb4545b..02c630cc709f 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/for.0.kt
@@ -14,4 +14,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
index a28832a9abdf..9cca9fe6ab3a 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
@@ -17,4 +17,4 @@ fun y(o: Any) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
index fdb77a1a21f7..705a35b9f528 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/lambdas.0.kt
@@ -43,4 +43,4 @@ fun f() {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
index 6a8d6d3b82f0..1e98e980f650 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/mayTypeAffectAncestors.0.kt
@@ -35,4 +35,4 @@ fun y3(a: A) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt
index 047f533f84d3..3e62b7a3ea73 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/memberComponentFun.0.kt
@@ -30,4 +30,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt
index b1d0d69f08fe..18b1f0587a2d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/operators.0.kt
@@ -18,4 +18,4 @@ fun f(b1: B, b2: B) {
 }
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
index e853dab3995a..3e15ffc1d9fd 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass1.0.kt
@@ -11,4 +11,4 @@ fun f(a: A) {
 
 
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
index f3c04b01d2a1..5c9e571b907c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/recursiveDataClass2.0.kt
@@ -11,4 +11,4 @@ fun f(a: A) {
     val (a1, s) = b
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt
index ae8f3093f087..0656c4329713 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/components/when.0.kt
@@ -28,4 +28,4 @@ fun when2(o: Any) {
     }
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt
index 57e6ed5fc853..9f351803e12b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/contains.0.kt
@@ -17,4 +17,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt
index a1e4da7ca92b..6fb2ae804643 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/forIteration.0.kt
@@ -22,4 +22,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt
index 564fc1052690..ffc987d2b6a7 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/get.0.kt
@@ -20,4 +20,4 @@ typealias DescriptorData = C<B.Key>
 class C<T>
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt
index 6db34a23074e..7828b895ee7f 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt
@@ -11,4 +11,4 @@ class Delegate() {
 val p: String by Delegate()
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt
index 753f89163c2b..3d146a06d17d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/inc.0.kt
@@ -14,4 +14,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt
index 0900176bcf42..1f4dae6441ad 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtension.0.kt
@@ -15,4 +15,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt
index 9f88b9459727..f42b8c30e123 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeAsTypeParameterExtensionWithSmartCast.0.kt
@@ -19,4 +19,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt
index 04493b2f3fd5..0f5a7170b791 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invoke/invokeInObjectAsFunction.0.kt
@@ -13,4 +13,4 @@ fun test() {
     Foo()
 }
 
-// IGNORE_FIR_LOG
+// IGNORE_K2_LOG
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt
index e8d0b3fd53ff..77fab33a9084 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeExtension.0.kt
@@ -13,4 +13,4 @@ fun f(p: P) {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt
index 84477252ff0f..4d3af65c145c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/invokeWithVarArg.0.kt
@@ -16,4 +16,4 @@ fun f(p: P) {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt
index 76c6883872f3..d95a3d4faab8 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plus.0.kt
@@ -24,4 +24,4 @@ fun test(array: Array<A>) {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt
index 8d964ef57960..df057c102032 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/plusAssign.0.kt
@@ -20,4 +20,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt
index d738ec7852d4..f62ac3f25bb7 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt
@@ -15,4 +15,4 @@ class Delegate() {
 var p: String by Delegate()
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt
index 9ac45bcbf62f..69baa38b6a7a 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/severalOperators.0.kt
@@ -41,4 +41,4 @@ fun test4() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt
index 8d1b1e054000..c3b54aac8318 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/conventions/unaryMinus.0.kt
@@ -12,4 +12,4 @@ fun test() {
 }
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
index 440988fa5abf..b5bac2b62c53 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
@@ -6,4 +6,4 @@ package test
 public data class KotlinDataClass(val <caret>foo: Int, val bar: String)
 
 
-// IGNORE_FIR_LOG
\ No newline at end of file
+// IGNORE_K2_LOG
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/Annotations.kt b/plugins/kotlin/idea/tests/testData/highlighter/Annotations.kt
index f394e0c4f40a..d674227f4d5b 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/Annotations.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/Annotations.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 <symbolName descr="null" textAttributesKey="KOTLIN_ANNOTATION">@Target</symbolName>(<symbolName descr="null" textAttributesKey="KOTLIN_ENUM">AnnotationTarget</symbolName>.<symbolName descr="null" textAttributesKey="KOTLIN_ENUM_ENTRY">CLASS</symbolName>, <symbolName descr="null" textAttributesKey="KOTLIN_ENUM">AnnotationTarget</symbolName>.<symbolName descr="null" textAttributesKey="KOTLIN_ENUM_ENTRY">EXPRESSION</symbolName>)
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/DelegateFunctionMissing.kt b/plugins/kotlin/idea/tests/testData/highlighter/DelegateFunctionMissing.kt
index 70944e37947f..32ee828d236c 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/DelegateFunctionMissing.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/DelegateFunctionMissing.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 class <symbolName descr="null">X</symbolName><<symbolName descr="null">T</symbolName>>{}
 fun <<symbolName descr="null">T</symbolName>> <symbolName descr="null">foo</symbolName>() : <symbolName descr="null">X</symbolName><<symbolName descr="null">T</symbolName>> {<error descr="[NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY] A 'return' expression required in a function with a block body ('{...}')">}</error>
 val x <symbolName descr="null">by</symbolName> <error descr="[DELEGATE_SPECIAL_FUNCTION_MISSING] Type 'X<TypeVariable(T)>' has no method 'getValue(Nothing?, KProperty<*>)' and thus it cannot serve as a delegate" textAttributesKey="ERRORS_ATTRIBUTES">foo<<error descr="Type expected">></error>()</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/DelegatingCtor.kt b/plugins/kotlin/idea/tests/testData/highlighter/DelegatingCtor.kt
index 21a956065cbc..db8eb96f078e 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/DelegatingCtor.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/DelegatingCtor.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 <symbolName descr="null" textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">open</symbolName> class <symbolName descr="null" textAttributesKey="KOTLIN_CLASS">Foo</symbolName> {
     <symbolName descr="null" textAttributesKey="KOTLIN_KEYWORD">constructor</symbolName>(<warning descr="[UNUSED_PARAMETER] Parameter 'i' is never used" textAttributesKey="NOT_USED_ELEMENT_ATTRIBUTES"><symbolName descr="null" textAttributesKey="KOTLIN_PARAMETER">i</symbolName></warning>: <symbolName descr="null" textAttributesKey="KOTLIN_CLASS">Int</symbolName>)
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/Destructuring.kt b/plugins/kotlin/idea/tests/testData/highlighter/Destructuring.kt
index 8535eafb0330..6b10e66ac55b 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/Destructuring.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/Destructuring.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 <symbolName descr="null">data</symbolName> class <symbolName descr="null">Box</symbolName>(val <symbolName descr="null">v</symbolName>: <symbolName descr="null">Int</symbolName>)
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/Dynamic.kt b/plugins/kotlin/idea/tests/testData/highlighter/Dynamic.kt
index 8964d32de163..4c8162f8dfa3 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/Dynamic.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/Dynamic.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package testing
 
 fun <symbolName textAttributesKey="KOTLIN_FUNCTION_DECLARATION">tst</symbolName>(<symbolName textAttributesKey="KOTLIN_PARAMETER">d</symbolName>: <error><symbolName>dynamic</symbolName></error>) {
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/InaccessibleExpression.kt b/plugins/kotlin/idea/tests/testData/highlighter/InaccessibleExpression.kt
index 1a98a4faa943..6ca3a7bb7195 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/InaccessibleExpression.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/InaccessibleExpression.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 interface <symbolName textAttributesKey="KOTLIN_TRAIT">Zoo</symbolName><<symbolName textAttributesKey="KOTLIN_TYPE_PARAMETER">T</symbolName>> {
     <error descr="[WRONG_MODIFIER_TARGET] Modifier 'inner' is not applicable to 'enum class'" textAttributesKey="ERRORS_ATTRIBUTES"><symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">inner</symbolName></error> <symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">enum</symbolName> class <symbolName textAttributesKey="KOTLIN_ENUM">Var</symbolName> : <symbolName textAttributesKey="KOTLIN_TRAIT">Zoo</symbolName><<error descr="[INACCESSIBLE_OUTER_CLASS_EXPRESSION] Expression is inaccessible from a nested class 'Var'" textAttributesKey="ERRORS_ATTRIBUTES"><symbolName descr="null" textAttributesKey="KOTLIN_TYPE_PARAMETER">T</symbolName></error>>
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/KotlinInjection.kt b/plugins/kotlin/idea/tests/testData/highlighter/KotlinInjection.kt
index 3235d8fbf646..89955b09169a 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/KotlinInjection.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/KotlinInjection.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package language_injection
 
 <symbolName descr="null">import</symbolName> org.intellij.lang.annotations.<symbolName descr="null">Language</symbolName>
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/RecursiveTypes.kt b/plugins/kotlin/idea/tests/testData/highlighter/RecursiveTypes.kt
index f2ca0a08bcc2..701184f00bd6 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/RecursiveTypes.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/RecursiveTypes.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 // ISSUE: KT-42263
 
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/SmartCast.kt b/plugins/kotlin/idea/tests/testData/highlighter/SmartCast.kt
index 30f156066535..d3a9f778624a 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/SmartCast.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/SmartCast.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 class <symbolName textAttributesKey="KOTLIN_CLASS">My</symbolName>(val <symbolName textAttributesKey="KOTLIN_INSTANCE_PROPERTY">x</symbolName>: <symbolName textAttributesKey="KOTLIN_CLASS">Int</symbolName>?)
 
 fun <symbolName textAttributesKey="KOTLIN_CLASS">My</symbolName>?.<symbolName textAttributesKey="KOTLIN_FUNCTION_DECLARATION">foo</symbolName>(): <symbolName textAttributesKey="KOTLIN_CLASS">Int</symbolName> {
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/Suspend.kt b/plugins/kotlin/idea/tests/testData/highlighter/Suspend.kt
index 3663f50373cc..249549ea8b33 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/Suspend.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/Suspend.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // EXPECTED_DUPLICATED_HIGHLIGHTING
 
 val <symbolName descr="null" textAttributesKey="KOTLIN_PACKAGE_PROPERTY">fnType</symbolName> : <symbolName descr="null" textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">suspend</symbolName> () -> <symbolName descr="null" textAttributesKey="KOTLIN_OBJECT">Unit</symbolName> = {}
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/SyntheticExtensionProperty.kt b/plugins/kotlin/idea/tests/testData/highlighter/SyntheticExtensionProperty.kt
index c0d6664fbf4c..e748bf421371 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/SyntheticExtensionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/SyntheticExtensionProperty.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val <symbolName textAttributesKey="KOTLIN_PACKAGE_PROPERTY">weekYear</symbolName> = java.util.<symbolName textAttributesKey="KOTLIN_ABSTRACT_CLASS">Calendar</symbolName>.<symbolName textAttributesKey="KOTLIN_FUNCTION_CALL">getInstance</symbolName>().<symbolName textAttributesKey="KOTLIN_SYNTHETIC_EXTENSION_PROPERTY">weekYear</symbolName>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/TooManyArguments.kt b/plugins/kotlin/idea/tests/testData/highlighter/TooManyArguments.kt
index 4b6ba1312a02..0daa6cffceba 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/TooManyArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/TooManyArguments.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 fun <symbolName descr="null">fooxxx</symbolName>() {}
 
 fun <symbolName descr="null">main</symbolName>() {
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/TopLevelDestructuring.kt b/plugins/kotlin/idea/tests/testData/highlighter/TopLevelDestructuring.kt
index a6571f5e8bfe..89ad1b165033 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/TopLevelDestructuring.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/TopLevelDestructuring.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 val <error descr="Destructuring declarations are only allowed for local variables/values">(a, b)</error> by <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">lazy</error> { <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">Pair</error>(1, 2) }
 val <error descr="Destructuring declarations are only allowed for local variables/values">(c, d)</error> = <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">run</error> { <error descr="[DEBUG] Reference is not resolved to anything, but is not marked unresolved">Pair</error>(3, 4) }
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/TopLevelOpenSuspendFun.kt b/plugins/kotlin/idea/tests/testData/highlighter/TopLevelOpenSuspendFun.kt
index e5d5d52b3fcd..1839a60464a0 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/TopLevelOpenSuspendFun.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/TopLevelOpenSuspendFun.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 <error descr="[WRONG_MODIFIER_TARGET] Modifier 'open' is not applicable to 'top level function'"><symbolName descr="null">open</symbolName></error> <symbolName descr="null">suspend</symbolName> fun <symbolName descr="null">f</symbolName>() {}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/TypeAlias2.kt b/plugins/kotlin/idea/tests/testData/highlighter/TypeAlias2.kt
index 855df95f8f23..6d92e5a9edc5 100644
--- a/plugins/kotlin/idea/tests/testData/highlighter/TypeAlias2.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighter/TypeAlias2.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 
 <symbolName textAttributesKey="KOTLIN_BUILTIN_ANNOTATION">annotation</symbolName> class <symbolName textAttributesKey="KOTLIN_ANNOTATION">Anno</symbolName>
 typealias <symbolName textAttributesKey="KOTLIN_ANNOTATION">AnnoAlias</symbolName> = <symbolName textAttributesKey="KOTLIN_ANNOTATION">Anno</symbolName>
diff --git a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/class/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/class/inspectionData/inspections.test
index fbe255ba7baf..6755fb075fbf 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/class/inspectionData/inspections.test
+++ b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/class/inspectionData/inspections.test
@@ -1,4 +1,4 @@
 // INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection
 // K2_INSPECTION_CLASS: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UnusedSymbolInspection
 // RUNTIME_WITH_FULL_JDK
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test
index e226d376e6e4..4f1f4b76c6c2 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test
+++ b/plugins/kotlin/idea/tests/testData/inspections/unusedSymbol/enum/inspectionData/inspections.test
@@ -2,4 +2,4 @@
 // K2_INSPECTION_CLASS: org.jetbrains.kotlin.idea.k2.codeinsight.inspections.UnusedSymbolInspection
 // COMPILER_ARGUMENTS: -XXLanguage:+EnumEntries -opt-in=kotlin.ExperimentalStdlibApi
 // WITH_STDLIB
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/setWithVararg.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/setWithVararg.kt
index 333211db83f4..241ae7d3f04c 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/setWithVararg.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/conventionNameCalls/replaceGetOrSet/setWithVararg.kt
@@ -1,6 +1,6 @@
 // PROBLEM: none
 // ERROR: 'operator' modifier is inapplicable on this function: last parameter should not have a default value or be a vararg
-// IGNORE_FIR
+// IGNORE_K2
 
 class C {
     operator fun set(s: String, vararg value: Int): Boolean = true
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt
index ce31177de2d0..8f27e4980b65 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt
@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt.after
index 4a8f419bbd8d..de9c4a90f7f2 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithCast.kt.after
@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt
index cf7bfbe58aaa..ce208c5bb3f0 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt
@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt.after
index 6ff4f5264390..7fe68601fb3a 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/callInsideEnumWithoutCast.kt.after
@@ -8,4 +8,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt
index f80a97bf8edf..a16dab3e769b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt
@@ -9,4 +9,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt.after
index c84e3e7ebc00..ae098b1b60a5 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/enumValuesSoftDeprecate/forEachInsideEnumBody.kt.after
@@ -9,4 +9,4 @@ enum class EnumClass {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt
index 3ea68ba4a21c..6dabdfc4e6d8 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt
@@ -10,4 +10,4 @@ class With<caret>Constructor(x: Int, s: String) {
     override fun hashCode(): Int = 1
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt.after
index 471cfa65e3bd..052efc7aa544 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam.kt.after
@@ -21,4 +21,4 @@ class WithConstructor(x: Int, s: String) {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt
index 98ac83f66786..21cf690bf406 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt
@@ -10,4 +10,4 @@ class With<caret>Constructor(x: Int, s: String) {
     override fun hashCode(): Int = 1
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt.after
index 0f4d5aa4e134..a0527a27f2f7 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinAnyParam2.kt.after
@@ -23,4 +23,4 @@ class WithConstructor(x: Int, s: String) {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt
index c22e2c4e6e4a..4a46f16ee5af 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt
@@ -10,4 +10,4 @@ class With<caret>Constructor(x: Int, s: String) {
     override fun hashCode(): Int = 1
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt.after
index 41f3cbbdb009..e92ba57de695 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/equalsWithKotlinBoolean.kt.after
@@ -21,4 +21,4 @@ class WithConstructor(x: Int, s: String) {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt
index 59fdc7bb5096..d236df5fafdb 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt
@@ -1,7 +1,7 @@
 // ERROR: Unresolved reference: javaClass
 // ERROR: Unresolved reference: javaClass
 
-// IGNORE_FIR
+// IGNORE_K2
 
 open class Any {
     override fun hashCode(): Int = 0
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt.after
index fb6e38afd077..e9820544f093 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/equalsOrHashCode/inheritUserDefinedClassAny.kt.after
@@ -1,7 +1,7 @@
 // ERROR: Unresolved reference: javaClass
 // ERROR: Unresolved reference: javaClass
 
-// IGNORE_FIR
+// IGNORE_K2
 
 open class Any {
     override fun hashCode(): Int = 0
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/privateIsOkForSealedConstructor.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/privateIsOkForSealedConstructor.kt
index 433a6a0dc498..47d2fc77b2e4 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/privateIsOkForSealedConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/privateIsOkForSealedConstructor.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // PROBLEM: none
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces
 sealed class Foo {
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt
index 959af3b43b32..f4af57c3b2e8 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces
 sealed class Foo {
     <caret>protected constructor()
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt.after
index 0401ca1e1246..f2f975aed41c 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/protectedIsDefaultForSealedConstructor.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces
 sealed class Foo {
     <caret>constructor()
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt
index d2f252f07f54..08f04b42b450 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt
@@ -13,4 +13,4 @@ fun main() {
     val c = my.simple.name<caret>.Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt.after
index 8c08492844b1..1ae250ec781e 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/companionOnClass.kt.after
@@ -13,4 +13,4 @@ fun main() {
     val c = Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
index 70d7bd34ae64..fbb6693a3d36 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt
@@ -9,4 +9,4 @@ fun main() {
     val c = my.simple.name.Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
index dc709ab90758..23faffe688b0 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression.kt.after
@@ -9,4 +9,4 @@ fun main() {
     val c = Foo()
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt
index d0ab0f77d5d2..2055df24892b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt
@@ -7,4 +7,4 @@ fun main() {
     val c = kotlin.Int.Companion::MAX_VALUE
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt.after
index e335b1471cbb..8a32322158b7 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expression3.kt.after
@@ -7,4 +7,4 @@ fun main() {
     val c = kotlin.Int.Companion::MAX_VALUE
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt
index 87699e15c4cd..01042d5515d4 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt
@@ -10,4 +10,4 @@ fun main() {
     val b = my.simple.name.go(::run)
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt.after
index b0f30aee02a8..c1546d86d94d 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/expressionWithParameter.kt.after
@@ -10,4 +10,4 @@ fun main() {
     val b = go(::run)
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanion.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanion.kt
index 01ba726305c5..734d4544dc74 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanion.kt
@@ -11,4 +11,4 @@ class Child {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanionOtherName.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanionOtherName.kt
index 968213123b43..b9568d969a5b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanionOtherName.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableCompanionOtherName.kt
@@ -11,4 +11,4 @@ class Child {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableLocalVariable2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableLocalVariable2.kt
index 7b86ad9aa09b..037e2e389829 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableLocalVariable2.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableLocalVariable2.kt
@@ -11,4 +11,4 @@ class Inner {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject3.kt
index d36bb9cc7492..8706dee77a48 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject3.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject3.kt
@@ -10,4 +10,4 @@ object C : A({
     fun foo() = <caret>B.prop.toString()
 })
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject4.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject4.kt
index b06e4fb01752..ceaf2dbfdf93 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject4.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableObject4.kt
@@ -14,4 +14,4 @@ constructor(): super(
 )
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable.kt
index 8997046e2949..5c8c3a1b02b5 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable.kt
@@ -7,4 +7,4 @@ sealed class Foo {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable2.kt
index 834cfb3eedca..381f50311226 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable2.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/notApplicableSameNameVariable2.kt
@@ -8,4 +8,4 @@ sealed class Foo {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt
index c30a334dbe97..1df6000c810a 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt
@@ -14,4 +14,4 @@ class Outer {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt.after
index 22c004c1542a..fa358bc033bb 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/secondaryConstructor.kt.after
@@ -14,4 +14,4 @@ class Outer {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt
index 5c9cb100314c..6d03e00190e4 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt
@@ -8,4 +8,4 @@ fun foo(a: my.simple.name<caret>.Foo) {
     val c: my.simple.name.Foo
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt.after
index 552ce5a7989e..ff9cde63de32 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/removeRedundantQualifierName/type.kt.after
@@ -8,4 +8,4 @@ fun foo(a: Foo) {
     val c: Foo
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/dataInlineClassDeclarationk1.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/dataInlineClassDeclarationk1.kt
index da21a667cf91..b8f328851ca4 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/dataInlineClassDeclarationk1.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/dataInlineClassDeclarationk1.kt
@@ -2,6 +2,6 @@
 // ERROR: Modifier 'data' is incompatible with 'inline'
 // ERROR: Modifier 'inline' is incompatible with 'data'
 // ERROR: Unresolved reference: Unresolved
-// IGNORE_FIR
+// IGNORE_K2
 
 data inline class Foo(val x: <caret>Unresolved)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt
index d8785d4109c6..1942515c8078 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt
@@ -1,4 +1,4 @@
 class A(
     private val <caret>x: Int
 )
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt.after
index 322131a3981a..ea70ea3d3ca9 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/lastPropertyInPrimaryConstructor.kt.after
@@ -1,2 +1,2 @@
 class A
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt
index 288d35cd138c..0f8d07cbfa39 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt
@@ -15,4 +15,4 @@ val Any.foo get() = Fake
 fun foo() {
     SomeEnum.foo.entries
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt.after
index c3a3a5a6d43c..572f86f6ca9c 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries.kt.after
@@ -14,4 +14,4 @@ val Any.foo get() = Fake
 fun foo() {
     SomeEnum.foo.entries
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt
index caf21b0d3823..f0315115a8d4 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt
@@ -11,4 +11,4 @@ enum class SomeEnum {
         }
     }
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt.after
index f9229c074bb2..21fe92e2f776 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries2.kt.after
@@ -10,4 +10,4 @@ enum class SomeEnum {
         }
     }
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt
index c99c3068e4d4..e0060c0ae50b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt
@@ -12,4 +12,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt.after
index c81807b5ea27..9f3b68c7b4dc 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries3.kt.after
@@ -11,4 +11,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt
index 77738601a2c8..c90f95f124c2 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt
@@ -12,4 +12,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt.after
index 7fe8ac1117a3..223d3ca6b21b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries4.kt.after
@@ -11,4 +11,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt
index 6b824020050d..60cb5f56b263 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt
@@ -13,4 +13,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.entries(1)
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt.after
index 8d3043bec644..a5c21a7d773e 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries5.kt.after
@@ -12,4 +12,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.entries(1)
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt
index 30c4b73c61a6..45e03fff2ad5 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt
@@ -10,4 +10,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.entries
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt.after
index 76c62d153f1c..50e6fabf0e86 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumEntries6.kt.after
@@ -9,4 +9,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.entries
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt
index 01408a1bcbc6..7b1b09490abb 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt
@@ -13,4 +13,4 @@ val Any.foo get() = Fake
 fun foo() {
     SomeEnum.foo.values()
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt.after
index 0b6029bb6602..9156c95e3f14 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues.kt.after
@@ -12,4 +12,4 @@ val Any.foo get() = Fake
 fun foo() {
     SomeEnum.foo.values()
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt
index 8663dd44fdd0..ed61cd023023 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt
@@ -10,4 +10,4 @@ enum class SomeEnum {
         }
     }
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt.after
index a08f677f3723..d791662ba88a 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues2.kt.after
@@ -9,4 +9,4 @@ enum class SomeEnum {
         }
     }
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt
index 2f485d54f898..39845d195c41 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt
@@ -10,4 +10,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt.after
index c639471e1674..bb6feeed416f 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues3.kt.after
@@ -9,4 +9,4 @@ enum class Main {
 
     }
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt
index aeca964de380..faa19523438b 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt
@@ -11,4 +11,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.values(1)
 }
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt.after
index 47ec00273d3a..25715cd0f1db 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/unusedSymbol/unusedEnumValues4.kt.after
@@ -10,4 +10,4 @@ enum class SomeEnum {
 fun main() {
     SomeEnum.values(1)
 }
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt
index 2608b5ce2dfe..c8fc7eeabaa4 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt
@@ -9,4 +9,4 @@ fun foo(b: Boolean) {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt.after
index 770285e46030..cc118687f9bf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/comment.kt.after
@@ -6,4 +6,4 @@ fun foo(b: Boolean) {
     else 2
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt
index 14d04f7bfb57..77d8264a14ba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt
@@ -11,4 +11,4 @@ fun foo(a: Int) {
 
 fun bar(p: Int){}
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt.after
index 8bc54c788c9f..f86317d46f6b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/kt12040.kt.after
@@ -11,4 +11,4 @@ fun foo(a: Int) {
 
 fun bar(p: Int){}
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
index 15697a86b32f..e162bcee24fd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
@@ -8,4 +8,4 @@ fun foo(i : Int) {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
index b7a6b6bd93d9..3b9d28c45f54 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
@@ -6,4 +6,4 @@ fun foo(i : Int) {
     else if (0 == i) 2
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt
index 6ec04d64b7ab..cd6af7ca30cd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt
@@ -12,4 +12,4 @@ fun test(x: Int, y: Int): String {
     }
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt.after
index 84fc981443b7..9981f9f0be39 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt.after
@@ -10,4 +10,4 @@ fun test(x: Int, y: Int): String {
     else return "big"
 }
 
-// IGNORE_FIR
\ No newline at end of file
+// IGNORE_K2
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt
index 64bbce5cf6ed..0884e230c3c5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 interface I1
 interface I2
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after
index ac11c65be404..fe4d4aec8488 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 interface I1
 interface I2
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/importMember/AlreadyImportedSameNameClass2.kt b/plugins/kotlin/idea/tests/testData/intentions/importMember/AlreadyImportedSameNameClass2.kt
index cc0d386f6c7e..6d4ed28f534c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/importMember/AlreadyImportedSameNameClass2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/importMember/AlreadyImportedSameNameClass2.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // IS_APPLICABLE: false
 package foo.bar
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt
index bc9dd217a73a..e0f755e7fac3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo: <caret>() -> String = fun(): String { return "" }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt.after
index 1c6ac1bdc9d8..6801a460935e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer.kt.after
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo = fun(): String { return "" }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt
index 8cd46d60bd08..7afc130d2e50 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo: <caret>(Int, Int) -> String = fun(i: Int, j: Int): String { return (i + j).toString() }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt.after
index 3c93934449ce..9bce3680498c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/anonymousFunctionInitializer2.kt.after
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo = fun(i: Int, j: Int): String { return (i + j).toString() }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt
index 18c1ba7108bb..65b7ef888a43 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo: <caret>() -> String = { "" }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt.after
index 2811bcb9b758..b2f73f933ce6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer.kt.after
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo = { "" }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt
index e62e031f4eb6..1cf26e99f0f3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo: <caret>(Int, Int) -> String = { i: Int, j: Int -> (i + j).toString() }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt.after
index 880f82c09335..de78fdce6eeb 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer2.kt.after
@@ -1,2 +1,2 @@
-// IGNORE_FIR
+// IGNORE_K2
 val foo = { i: Int, j: Int -> (i + j).toString() }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt
index 97f46a4ce293..2e0e84c74093 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // AFTER-WARNING: Variable 'foo' is never used
 
 fun <T> foo(x: T & Any) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt.after
index 41a565278b03..e581bfc35546 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/lambdaInitializer6.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // AFTER-WARNING: Variable 'foo' is never used
 
 fun <T> foo(x: T & Any) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt
index 0051c0f3ebe3..c11c23a228ee 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 val x: <caret>Set<Int> = setOf()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt.after
index 25d99f073ab6..3b8b3cd8f3b6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument.kt.after
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 val x = setOf<Int>()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt
index 11dabded5765..df49fbf2a090 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 class Foo<T, U>
 val foo: <caret>Foo<Int, String> = Foo()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt.after
index b582c711f08b..c1aaf03b00cf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument2.kt.after
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 class Foo<T, U>
 val foo = Foo<Int, String>()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt
index 123dfd821f7d..4fe631c5c40d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 // AFTER-WARNING: Variable 'x' is never used
 fun <T> foo() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt.after
index 24f73e2882c3..7acf9c581334 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgument3.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 // AFTER-WARNING: Variable 'x' is never used
 fun <T> foo() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt
index aecec1ea00cb..5b651b2c9544 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun foo(): <caret>Set<Int> = setOf()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt.after
index 4710443b5174..6ba7232fd89d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitType/needTypeArgumentInFunctionDefinition.kt.after
@@ -1,3 +1,3 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun foo() = setOf<Int>()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt
index 39f2cda10c1e..5b18b705560d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 // ERROR: 'public' function exposes its 'local' return type argument <no name provided>
 // SKIP_ERRORS_AFTER
diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt.after b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt.after
index b8b3c08e399b..271f8153533e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/anonymousObjectJavaClass.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 // ERROR: 'public' function exposes its 'local' return type argument <no name provided>
 // SKIP_ERRORS_AFTER
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt
index 07d11f42ee97..f7ba3ae70ce8 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // Here K2 has Disabled: true instead
 class A {
     operator fun get(x: Int) {}
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/DataClassCopy.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/DataClassCopy.kt
index 360c04609218..696734df9616 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/DataClassCopy.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/DataClassCopy.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 data class A(val i: Int, val j: Int)
 
 fun usage(a: A) {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/FunctionalValue2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/FunctionalValue2.kt
index 804cad4e5df8..931521271bdf 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/FunctionalValue2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/FunctionalValue2.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 val header = { s: String, s1: String -> }
 fun header(name: String, value: Int) { }
 
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
index 3a197d587e09..b8580ccac94c 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 class A
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
index fff4b7c0ddd0..0c76b7cb5c80 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 fun A.some(s: String) {
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt
index e55ecbdb4bc9..ec1be390dfc7 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 lateinit var x: java.lang.Readable
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
index 8874f27c31d7..a49a425b0735 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Nullability.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 fun test() {
     J.foo(<caret>"1", "2", "3", "4", "5")
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoSmartCasts.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoSmartCasts.kt
index 5d804f07fed8..cd1f56b997cb 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoSmartCasts.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoSmartCasts.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -XXLanguage:-TrailingCommas
 // See KT-14484
 
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt
index 241ea0910625..7818ff791dcb 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/withLib3/useJavaSAMFromLib.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package test
 
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt
index 03eaa822d186..d914141e4fad 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() {}
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
index 339491f78225..de8106883c12 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody.kt.after
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo()
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt
index d1ee89bb67bb..e27885afd465 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() : Any { return "a" }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
index d1daba40f73b..8d4b8d971742 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody2.kt.after
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() : Any
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt
index 92120939171a..e64aa99a3e4d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() : Any = 1
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
index d1daba40f73b..8d4b8d971742 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBody3.kt.after
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() : Any
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
index 410a9e36a6ce..8962f29addf9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt
@@ -5,5 +5,5 @@ abstract class A() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
index e3642d605b91..42e8890e72a2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments.kt.after
@@ -3,5 +3,5 @@ abstract class A() {
     <caret>abstract fun foo() /*1*/
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
index 46ae4d275a22..93d2c87c6fb5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt
@@ -4,5 +4,5 @@ abstract class A() {
             { "" /*2*/ } // 3
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
index 50780664a430..14d1d550500c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractFunctionWithBodyWithComments2.kt.after
@@ -4,5 +4,5 @@ abstract class A() {
     abstract fun foo()  // 3
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
index dba1edb1f1c6..afdcf48fe349 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt
@@ -3,5 +3,5 @@ abstract class A {
     abstract var i = 0<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
index 76cc135ed54e..a8969e3d1a25 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt.after
@@ -3,5 +3,5 @@ abstract class A {
     abstract var i: Int
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
index 1fe400840668..78fd4c70cd3e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt
@@ -3,5 +3,5 @@ abstract class A {
     abstract var i: Int = 0<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
index 3131ee99242f..8c5371eabf6e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt.after
@@ -3,5 +3,5 @@ abstract class A {
     abstract var i: Int<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
index 61414504a7d2..3c34a5fd9dfd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt
@@ -3,5 +3,5 @@ abstract class B {
     abstract val i = <caret>0
         get() = field
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
index 72154a3e64e7..099516879cae 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/abstractPropertyWithGetter2.kt.after
@@ -2,5 +2,5 @@
 abstract class B {
     abstract val i: Int<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
index 060d110b1297..7607c370b458 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt
@@ -1,5 +1,5 @@
 // "Add function body" "true"
 fun <caret>foo()
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
index ad9137d8f76c..8e032e84a800 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/nonMemberFunctionNoBody.kt.after
@@ -1,5 +1,5 @@
 // "Add function body" "true"
 fun foo() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddFunctionBodyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt
index e44d82606aae..69907b72686d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt
@@ -7,6 +7,6 @@ fun test(foo: Foo?) {
     val f = foo::f<caret>
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after
index d9e32ab605a6..c32fc3427f29 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference.kt.after
@@ -7,6 +7,6 @@ fun test(foo: Foo?) {
     val f = foo!!::f
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt
index 80c165063cd1..af5a66c60ea8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt
@@ -11,6 +11,6 @@ fun test(foo: Foo?) {
     val f = foo?.bar::f<caret>
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after
index 5930bfe90f04..2591a8611999 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference2.kt.after
@@ -11,6 +11,6 @@ fun test(foo: Foo?) {
     val f = foo?.bar!!::f
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt
index c7c17fe278bb..afd247a2fa79 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt
@@ -7,6 +7,6 @@ fun Foo?.test() {
     val f = ::f<caret>
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after
index cbf0b76b959d..3c638ef9e5e5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/functionReference3.kt.after
@@ -7,6 +7,6 @@ fun Foo?.test() {
     val f = this!!::f
 }
 // TODO: Enable when FIR reports UNSAFE_CALL for function reference on nullable (currently UNRESOLVED_REFERENCE)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt
index c22ef84ec38e..50c3c66c13fa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt
@@ -4,6 +4,6 @@ fun test() {
     i /=<caret> 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after
index 16cf7f099b16..6bf4d3866bda 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationDivAssign.kt.after
@@ -4,6 +4,6 @@ fun test() {
     i = i!! / 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt
index 72f3d296cd3c..3b4701d345a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt
@@ -4,6 +4,6 @@ fun test() {
     i -=<caret> 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after
index eb90107a951d..9d8047891904 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationMinusAssign.kt.after
@@ -4,6 +4,6 @@ fun test() {
     i = i!! - 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt
index 34a12a88ee32..42bbd081fd85 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt
@@ -4,6 +4,6 @@ fun test() {
     i +=<caret> 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after
index 350ab2e33fe5..2c2b6b6c308f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssign.kt.after
@@ -4,6 +4,6 @@ fun test() {
     i = i!! + 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt
index 304ef4d857c6..b890b124a515 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt
@@ -4,7 +4,7 @@ fun test(map: MutableMap<Int, Int>) {
     map[3] +=<caret> 5
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after
index ec61756eba3d..27f46fd9bbb8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationPlusAssignOnMutableMap.kt.after
@@ -4,7 +4,7 @@ fun test(map: MutableMap<Int, Int>) {
     map[3] = map[3]!! + 5
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt
index 465770d30f24..47624b84e86c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt
@@ -4,6 +4,6 @@ fun test() {
     i %=<caret> 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after
index 699d50a3d572..7e150f0ce994 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationRemAssign.kt.after
@@ -4,6 +4,6 @@ fun test() {
     i = i!! % 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt
index 1332c82dc2c7..232f990576e2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt
@@ -4,6 +4,6 @@ fun test() {
     i *=<caret> 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after
index 6593e75e8ecf..adaf66b9345a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addExclExclCall/operationTimesAssign.kt.after
@@ -4,6 +4,6 @@ fun test() {
     i = i!! * 2
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddExclExclCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.after.kt
index 0aaa7b57960d..9764f25917a1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.after.kt
@@ -10,4 +10,4 @@ import another.topVal
 fun use() {
     topVal<selection></selection>()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt
index 2324d6e177dc..1cc539e8b84a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ImportOperatorInvokeWithConvention.before.Main.kt
@@ -9,4 +9,4 @@ import another.topVal
 fun use() {
     topVal<caret>()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.after.kt
index c63d69e20ee5..2cd1773adeab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.after.kt
@@ -8,4 +8,4 @@ import dependency.Date
 fun foo(d: Date<caret>) {
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt
index a271d715b19c..53e05b867f4f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt
@@ -7,4 +7,4 @@ import dependency.*
 fun foo(d: Date<caret>) {
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/annotationOuterClass.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/annotationOuterClass.test
index a6183da0f00a..1c3f8c2a7616 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/annotationOuterClass.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/annotationOuterClass.test
@@ -7,7 +7,7 @@ package foo
 
 @Outer<caret>.Anno
 fun test() {}
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FILE: first.after.kt
@@ -21,7 +21,7 @@ import bar.Outer
 
 @Outer<caret>.Anno
 fun test() {}
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FILE: second.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.after.kt
index 593472ae4ddf..b3ee3e752d26 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.after.kt
@@ -18,4 +18,4 @@ class X {
     }
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
index ba5527826184..1dfb38bedee1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callWithTrailingComma.before.Main.kt
@@ -16,4 +16,4 @@ class X {
     }
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.after.kt
index 3ffc77836edf..a5f842f924fd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.after.kt
@@ -4,4 +4,4 @@ import dependency.extensionFun
 // ERROR: Unresolved reference: extensionFun
 val v = String::extensionFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
index 2fa39a3b3a7d..76b8f8cf86fb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt
@@ -2,4 +2,4 @@
 // ERROR: Unresolved reference: extensionFun
 val v = String::extensionFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.after.kt
index 0d9d3790aeb3..400840820604 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.after.kt
@@ -4,4 +4,4 @@ import dependency.extensionFun
 // ERROR: Unresolved reference: extensionFun
 val v = "a"::extensionFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.before.Main.kt
index 54933694ec37..414872bc9cf6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceExtension2.before.Main.kt
@@ -2,4 +2,4 @@
 // ERROR: Unresolved reference: extensionFun
 val v = "a"::extensionFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
index d0bc829c4de7..9bee2bac7591 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.after.kt
@@ -4,4 +4,4 @@ import dependency.topLevelFun
 // ERROR: Unresolved reference: topLevelFun
 val v = ::topLevelFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt
index 1fd0725b4c6e..bd4511842273 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt
@@ -2,4 +2,4 @@
 // ERROR: Unresolved reference: topLevelFun
 val v = ::topLevelFun<caret>
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt
index 97a3f7937cf9..aa96146da1c4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt
@@ -16,4 +16,4 @@ fun usage {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt.after
index 5a41bd999f56..89e3d583672f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/abstractExtensionSingleImport.kt.after
@@ -18,4 +18,4 @@ fun usage {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt
index e8f557c6b23e..b5bf99633214 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt.after
index 0f268e665c5d..39b3cb005997 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectDeepInheritance.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt
index f814fd274424..aa671c509b14 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt.after
index 101f7a9cc219..57566917ae00 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObject.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt
index 107b1760017a..72a45f907daf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt.after
index 2bc7c9f21895..0e5751dadc41 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInClassImportFromChildObjectNoClassName.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt
index ef7795f1b181..7274cd45d68a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt
@@ -16,4 +16,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt.after
index b1a7e171e662..15ab64caa042 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClass.kt.after
@@ -18,4 +18,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt
index 904398a3676d..2abed5a48bf6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt
@@ -18,4 +18,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt.after
index 48f77c947ab4..46e1abad1ad5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionInUnrelatedClassNamedCompanion.kt.after
@@ -20,4 +20,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt
index e7dbe20c8258..99d82f4b57b0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt
@@ -25,4 +25,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt.after
index 7ccc642b8688..28a110abd5e7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesA.kt.after
@@ -27,4 +27,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt
index 496a8acc6d52..7f3bc6fb6d27 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt
@@ -25,4 +25,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt.after
index ddb9dccdc229..25cf78fe8d7c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/companionObjectExtensionFunctionTwoCandidatesB.kt.after
@@ -27,4 +27,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt
index f53526a8ab92..93ab9a93879a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt.after
index 19854b3b6c8f..c9152f9e01b8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericClassSpecificTypeChild.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt
index d7df5518a559..b35b68b7de26 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt.after
index 75f9da555fb7..9f70606c2ed8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunction.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt
index 32c5d2d7d5af..707fff3e357c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt
@@ -15,4 +15,4 @@ open class C {
 object CObject : C()
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt.after
index 48a7eb136a8e..d6d46f76a8c6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionSubtype.kt.after
@@ -17,4 +17,4 @@ open class C {
 object CObject : C()
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt
index 1b4670cea6df..f10aa7b8d782 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt.after
index 502489f68762..57430986e926 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraint.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt
index bb0b57e0cdad..4204c8d1fb4b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt.after
index f874a922dc18..262ab64bfdc8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionTypeConstraintVariable.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt
index 84d71728c914..a28423853569 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt.after
index 0b2301bb93fd..50d1796e9b35 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericExtensionFunctionVariable.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt
index 5a606314fdde..06cef6d5bbc2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt.after
index ecdb742622e7..a6d285389312 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension1.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt
index 46aae45284bd..9d026538f5c2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt.after
index eaf17eac4501..e00afcce3761 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/genericTypeExtension2.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt
index 9e4505cf0690..c39089f81ea5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt.after
index 29c7de3c9e95..e533ec731bc4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunction.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt
index 05b70cdd5d00..5a2c4c7f017d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt.after
index ca364ce9baa3..8ba41d176e8a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionCallChainVariable.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt
index 5c315d67006f..bdda450463b1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt.after
index 5374603f29ec..a8eccabad1fa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainLiteral.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt
index 96355f2ac7d9..1311ae64863a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt.after
index fe28c7fcbc45..f41e82f4bc2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionUnnecessaryCallChainVariable.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt
index f8bbbff7a7ad..6e1ca02912a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt.after
index d7a2193c5e66..61a5bf3cf27e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/intTypeExtensionFunctionVariable.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt
index 90608ff934ef..3a1d0614bc93 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt
@@ -27,4 +27,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt.after
index 26fb986a641e..ac44408b7c48 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate1.kt.after
@@ -29,4 +29,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt
index b40b9fa6060c..8e867e33ab48 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt
@@ -27,4 +27,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt.after
index e6513aace983..0c0eeff4db9e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/multipleReceiversSingleCandidate2.kt.after
@@ -29,4 +29,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt
index e8b3c0adb8f4..274f5e351140 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt
@@ -13,4 +13,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt.after
index 6147eb1490fd..9a6466e732e7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/objectExtensionFunctionInClass.kt.after
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt
index 391058e763af..542d2ab78ea8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt.after
index f19bc865c4fd..666086bbb9b2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularFunction.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt
index 459793635430..04325a75b540 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt
@@ -12,4 +12,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt.after
index c40bd4b40805..a6fbd1c0ee3a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/regularProperty.kt.after
@@ -14,4 +14,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt
index 2583c8672923..f1a0069f9f28 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt
@@ -12,4 +12,4 @@ fun Int.anotherExt() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt.after
index dc6dcefcb847..2ad88471a820 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/thisExtensionReceiver.kt.after
@@ -14,4 +14,4 @@ fun Int.anotherExt() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt
index 153727adc92d..25b3697ef0f0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt
@@ -18,4 +18,4 @@ fun usage(c: Other) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt.after
index db05c0dda09b..4f40b8798e4c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes1.kt.after
@@ -20,4 +20,4 @@ fun usage(c: Other) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt
index 426173f9aa02..0d0273dfd9a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt
@@ -18,4 +18,4 @@ fun usage(c: Other) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt.after
index 2d33fada4ec3..7179f2275d11 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/twoSupertypes2.kt.after
@@ -20,4 +20,4 @@ fun usage(c: Other) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt
index e03b47c3ccd9..6fba47a37279 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt.after
index b38cba8d12d6..d8837d427aeb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension1.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt
index ddc665f362fa..7d77f2704191 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt.after
index 0af14f4bff25..2ac19721d131 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension2.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt
index 8408e959b580..212753652056 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt.after
index 0a12126d2ec6..8162cee83b57 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension3.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt
index 59faf440d1e7..cb98b8aa3f69 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt
@@ -15,4 +15,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt.after
index 3add5d7ca8c5..9c4158a53fad 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/callablesDeclaredInClasses/typealiasExtension4.kt.after
@@ -17,4 +17,4 @@ fun usage() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
index 904d32cb6420..8be501419eb4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
@@ -11,4 +11,4 @@ fun usage(t: T) {
     t.<caret>foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
index ab65bafada36..926c35bd97fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
@@ -13,4 +13,4 @@ fun usage(t: T) {
     t.<caret>foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
index 1a09ccfb4357..a1ae30f649ba 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
@@ -11,4 +11,4 @@ fun usage(t: T) {
     t.<caret>foobar
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
index 7d6a8ed76bd7..decd48536433 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/companionObjectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
@@ -13,4 +13,4 @@ fun usage(t: T) {
     t.<caret>foobar
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.after.kt
index e38da7a95b20..539f6f057f1d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.after.kt
@@ -8,4 +8,4 @@ import p2.receiveSomeCtor
 fun a() {
     receiveSomeCtor(::Some<caret>)
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.before.Main.kt
index 43307fdc6adb..0a5043fdfd59 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/constructorReference.before.Main.kt
@@ -7,4 +7,4 @@ import p2.receiveSomeCtor
 fun a() {
     receiveSomeCtor(::Some<caret>)
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
index a8ad52eecc22..546dbd973f54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
@@ -2,7 +2,7 @@
 // "Import operators 'DelegateImpl.getValue', 'DelegateImpl.setValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
 // ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [Error type: Error delegation type for DelegateImpl<Int>()])' and thus it cannot serve as a delegate for var (read-write property)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -30,7 +30,7 @@ public operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProper
 // "Import operators 'DelegateImpl.getValue', 'DelegateImpl.setValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
 // ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [Error type: Error delegation type for DelegateImpl<Int>()])' and thus it cannot serve as a delegate for var (read-write property)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionGet.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionGet.test
index 354c3fdb748f..6dd6261ea146 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionGet.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionGet.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'DelegateImpl.getValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -29,7 +29,7 @@ public operator fun <T> DelegateImpl<T>.getValue(thisRef: Any?, property: KPrope
 // FILE: first.after.kt
 // "Import operator 'DelegateImpl.getValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionProvideDelegate.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionProvideDelegate.test
index 53d56766d453..247d44cb76cf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionProvideDelegate.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionProvideDelegate.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'A.provideDelegate'" "true"
 // ERROR: Type 'A' has no method 'getValue(MyUI, KProperty<*>)' and thus it cannot serve as a delegate
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package bs
 
@@ -35,7 +35,7 @@ operator fun A.provideDelegate(
 // FILE: first.after.kt
 // "Import operator 'A.provideDelegate'" "true"
 // ERROR: Type 'A' has no method 'getValue(MyUI, KProperty<*>)' and thus it cannot serve as a delegate
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package bs
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionSet.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionSet.test
index 8ecdf3c96bbc..0836dc32b532 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionSet.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionSet.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'DelegateImpl.setValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, Int)' and thus it cannot serve as a delegate for var (read-write property)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -30,7 +30,7 @@ operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProperty<*>,
 // FILE: first.after.kt
 // "Import operator 'DelegateImpl.setValue'" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, Int)' and thus it cannot serve as a delegate for var (read-write property)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.after.kt
index c96425baf335..27db684a4ed8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.after.kt
@@ -11,4 +11,4 @@ class Some(a: A, b: B) {
     val x1 by a<caret>
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.before.Main.kt
index a699cd74710d..121879029874 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateGetValueFunction.before.Main.kt
@@ -10,4 +10,4 @@ class Some(a: A, b: B) {
     val x1 by a<caret>
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.after.kt
index f5a1a0945b03..28ccf5a40ed9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.after.kt
@@ -11,4 +11,4 @@ fun f(h: H) {
     h / 3
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.before.Main.kt
index 2eb06afa57af..9c1f39435462 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/divOperator.before.Main.kt
@@ -9,4 +9,4 @@ fun f(h: H) {
     h <caret>/ 3
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.after.kt
index 55e04cda78a0..9e81ec3db87b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.after.kt
@@ -11,4 +11,4 @@ fun test() {
         }
     }
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.before.Main.kt
index 97c8e320e9dd..676fa7f3818a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkers.before.Main.kt
@@ -9,4 +9,4 @@ fun test() {
         }
     }
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.after.kt
index 55e04cda78a0..9e81ec3db87b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.after.kt
@@ -11,4 +11,4 @@ fun test() {
         }
     }
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.before.Main.kt
index 97c8e320e9dd..676fa7f3818a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/dslMarkersOnReceiver.before.Main.kt
@@ -9,4 +9,4 @@ fun test() {
         }
     }
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt
index 04795408373f..6da9cbedb28b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt
@@ -7,4 +7,4 @@ enum class ImportEnum {
 
 val v5 = <caret>BLUE
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt.after
index 9bea1f3467b8..bf1c426e9fb1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntries.kt.after
@@ -7,4 +7,4 @@ enum class ImportEnum {
 
 val v5 = ImportEnum.BLUE
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt
index 9c6d3c9ba6b9..57c0eed61654 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt
@@ -13,4 +13,4 @@ class ImportClass {
 
 val v5 = <caret>BLUE
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt.after
index 1372a00df779..ff0b678e55a6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/enumEntriesJsRuntime.kt.after
@@ -15,4 +15,4 @@ class ImportClass {
 
 val v5 = BLUE
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.after.kt
index ab091e8cc05d..24165ce46200 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.after.kt
@@ -10,4 +10,4 @@ fun some() {
     r.foo(<caret>"")
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.before.Main.kt
index a157dc5bbe62..27a82acf0409 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionFunctionWithGenericImport.before.Main.kt
@@ -9,4 +9,4 @@ fun some() {
     r.foo(<caret>"")
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceApplicable.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceApplicable.test
index d3ac8060c1bb..40249f1cb27e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceApplicable.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceApplicable.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -37,7 +37,7 @@ operator fun Some.component1() = 1
 // FILE: first.after.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceNotApplicable.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceNotApplicable.test
index 08c057a1b624..e03f67b37348 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceNotApplicable.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/extensionPreferDeprecatedSinceNotApplicable.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -37,7 +37,7 @@ operator fun Some.component1() = 1
 // FILE: first.after.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.after.kt
index 33784eca3530..6d28df009660 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.after.kt
@@ -5,4 +5,4 @@ import editor.completion.apx.ImportedClass as Class2
 fun context() {
     val c: Class2
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.before.Main.kt
index cbf6e59586e3..3e4420d6d71f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasClassAlreadyExists.before.Main.kt
@@ -5,4 +5,4 @@ import editor.completion.apx.ImportedClass as Class2
 fun context() {
     val c: <caret>ImportedClass
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.after.kt
index b71b876c19ed..095c64565726 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.after.kt
@@ -6,4 +6,4 @@ fun context() {
     val funA = 42
     funA()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.before.Main.kt
index bf42de81f0c2..dcd08c60495d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasFunctionAlreadyExists.before.Main.kt
@@ -6,4 +6,4 @@ fun context() {
     val funA = 42
     <caret>importedFunA()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt
index 0e2db952f62b..6338aa9c41ef 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt
@@ -9,4 +9,4 @@ fun main() {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt.after
index 8bc528faa7de..a63b746b012f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasLetAlreadyExists.kt.after
@@ -9,4 +9,4 @@ fun main() {
     }
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.after.kt
index dc8148c494df..6bae9ab182b4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.after.kt
@@ -5,4 +5,4 @@ import editor.completion.apx.importedValA as valA
 fun context() {
     valA()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.before.Main.kt
index 10a3bf647360..eb6dee8b9ac2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importAliasPropertyAlreadyExists.before.Main.kt
@@ -5,4 +5,4 @@ import editor.completion.apx.importedValA as valA
 fun context() {
     <caret>importedValA()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.after.kt
index 262e27d49754..a7e946f6a537 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.after.kt
@@ -13,4 +13,4 @@ fun test() {
     var x by <caret>Some("OK")
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.before.Main.kt
index b6bb69ce8699..4581b8e142bb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importDelegateFunctions.before.Main.kt
@@ -11,4 +11,4 @@ fun test() {
     var x by <caret>Some("OK")
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.after.kt
index 8a22d2f814f7..d9a23256ba62 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.after.kt
@@ -13,4 +13,4 @@ fun test() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.before.Main.kt
index 1bc673d327b5..62aa1ce0db2c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateInsideRun.before.Main.kt
@@ -12,4 +12,4 @@ fun test() {
     }
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.after.kt
index c8a811919240..cf18059e1cc9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.after.kt
@@ -8,4 +8,4 @@ import base.MyDelegate
 import base.getValue
 
 val myVal by MyDelegate { false }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.before.Main.kt
index 938bb7fe706c..dfb62c48b734 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importGetValueExtensionForDelegateWithLambda.before.Main.kt
@@ -7,4 +7,4 @@ package import
 import base.MyDelegate
 
 val myVal by <caret>MyDelegate { false }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInFirstPartInUserType.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInFirstPartInUserType.test
index f890562c1f81..635736106334 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInFirstPartInUserType.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/importInFirstPartInUserType.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import class 'Some'" "true"
 // ERROR: Unresolved reference: Some
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -23,7 +23,7 @@ public class Some {
 // FILE: first.after.kt
 // "Import class 'Some'" "true"
 // ERROR: Unresolved reference: Some
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGet.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGet.test
index 6550538ddbff..15330b3f9efe 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGet.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGet.test
@@ -2,7 +2,7 @@
 // "Import operator 'Some.get'" "true"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -29,7 +29,7 @@ operator fun Some.get(s: String) {}
 // "Import operator 'Some.get'" "true"
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportGetOnNoOperatorWarning.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportGetOnNoOperatorWarning.test
index e4f4ab1f4cc0..1f5284feba59 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportGetOnNoOperatorWarning.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportGetOnNoOperatorWarning.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.get'" "true"
 // ERROR: 'operator' modifier is required on 'get' in 'some.Some'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -29,7 +29,7 @@ operator fun Some.get(s: String) {}
 // FILE: first.after.kt
 // "Import operator 'Some.get'" "true"
 // ERROR: 'operator' modifier is required on 'get' in 'some.Some'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportSetOnNoOperatorWarning.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportSetOnNoOperatorWarning.test
index 3e818a4db9a6..50304c6523cb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportSetOnNoOperatorWarning.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionImportSetOnNoOperatorWarning.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.set'" "true"
 // ERROR: 'operator' modifier is required on 'set' in 'some.Some'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -29,7 +29,7 @@ operator fun Some.set(s: String, i: Int) {}
 // FILE: first.after.kt
 // "Import operator 'Some.set'" "true"
 // ERROR: 'operator' modifier is required on 'set' in 'some.Some'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionSet.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionSet.test
index 13c8cd93e276..306c1cc564f1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionSet.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionSet.test
@@ -2,7 +2,7 @@
 // "Import operator 'Some.set'" "true"
 // ERROR: Unresolved reference: foo()["other"]
 // ERROR: No set method providing array access
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -28,7 +28,7 @@ operator fun Some.set(s: String) {}
 // "Import operator 'Some.set'" "true"
 // ERROR: Unresolved reference: foo()["other"]
 // ERROR: No set method providing array access
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt
index 559fc5c0cd9f..4c5e28817a5e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt
@@ -2,4 +2,4 @@ package my.pack
 
 private annotation class F
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt
index a6b271fe5344..f053bd9e172a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt
@@ -2,4 +2,4 @@ package simple
 
 annotation class F
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.after.kt
index 4f3f8fb1689c..5bdda610a877 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.after.kt
@@ -3,7 +3,7 @@
 // ERROR: Type mismatch: inferred type is String but Property<String> was expected
 // ERROR: Val cannot be reassigned
 // COMPILER_PLUGIN_OPTIONS: plugin:org.jetbrains.kotlin.assignment:annotation=test.assignment.SupportsKotlinAssignmentOverloading
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 import test.assignment.Property
 import test.assignment.assign
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.before.Main.kt
index b120877d9655..9356714f2d39 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/assignmentOperator.before.Main.kt
@@ -3,7 +3,7 @@
 // ERROR: Type mismatch: inferred type is String but Property<String> was expected
 // ERROR: Val cannot be reassigned
 // COMPILER_PLUGIN_OPTIONS: plugin:org.jetbrains.kotlin.assignment:annotation=test.assignment.SupportsKotlinAssignmentOverloading
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 import test.assignment.Property
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt
index 08e68b566afc..e4b5c408df7d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt
@@ -2,4 +2,4 @@ package my.pack
 
 private class F
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt
index a9c8864ba7cc..7e1f7875fbc6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt
@@ -2,4 +2,4 @@ package simple
 
 class F
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt
index a6e211564281..f5a26e5838ee 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt
@@ -2,4 +2,4 @@ package my.pack
 
 private fun f() = Unit
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt
index afbe14829f13..1bc4c4756b10 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt
@@ -2,4 +2,4 @@ package simple
 
 fun f() = Unit
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt
index bd66516f5e53..4152e93bc2ff 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt
@@ -2,4 +2,4 @@ package my.pack
 
 private val f = 42
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt
index 8d3b9e53f999..ea36a76da9bb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt
@@ -2,4 +2,4 @@ package simple
 
 val f = 42
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension.test
index efc828d71e0b..ac1e84b3cf5e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.invoke'" "true"
 // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -28,7 +28,7 @@ operator fun Some.invoke(s: String) {}
 // FILE: first.after.kt
 // "Import operator 'Some.invoke'" "true"
 // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension2.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension2.test
index d651d6904a4c..0b6faf067ceb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension2.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtension2.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'A.invoke'" "true"
 // ERROR: Expression 'a' of type 'A' cannot be invoked as a function. The function 'invoke()' is not found
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package b
 
@@ -17,7 +17,7 @@ fun main() {
 // FILE: second.kt
 // "Import extension function 'A.invoke'" "true"
 // ERROR: Expression 'a' of type 'A' cannot be invoked as a function. The function 'invoke()' is not found
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package a
 
@@ -29,7 +29,7 @@ operator fun A.invoke() = 42
 // FILE: first.after.kt
 // "Import operator 'A.invoke'" "true"
 // ERROR: Expression 'a' of type 'A' cannot be invoked as a function. The function 'invoke()' is not found
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package b
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.after.kt
index d9ba89102427..7f1af0f2a194 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.after.kt
@@ -10,4 +10,4 @@ import foo.iterator
 fun foo(start: Foo, end: Foo) {
     for (date in start<caret>..end) {}
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.before.Main.kt
index 7c9b8daafbdd..5dae3712426b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/iteratorOperator.before.Main.kt
@@ -9,4 +9,4 @@ import foo.Foo
 fun foo(start: Foo, end: Foo) {
     for (date in start<caret>..end) {}
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt
index 44acd0c315a0..07bb452735a3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt
@@ -15,4 +15,4 @@ class Foo : Bar() {
     val a = <caret>FromBarCompanion::foo
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt.after
index d8d92973afa8..1c34b3769797 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/callableReferenceFromDeprecated.kt.after
@@ -15,4 +15,4 @@ class Foo : Bar() {
     val a = Companion.FromBarCompanion::foo
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt
index e802439e42a9..a94245ca7aa2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt
@@ -13,4 +13,4 @@ class Foo : Bar() {
     val a: <caret>FromBarCompanion? = null
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt.after
index 3cef4426757d..d0280a8439b8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/classifierFromCompanionObjectDeprecationEnabled.kt.after
@@ -13,4 +13,4 @@ class Foo : Bar() {
     val a: Companion.FromBarCompanion? = null
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt
index f02ff998f5c3..35a14889ae60 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt
@@ -13,4 +13,4 @@ class Foo : Bar() {
     val a = <caret>FromBarCompanion()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt.after
index eed4b348da10..10712a7fe699 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/kt21515/constructorFromDeprecated.kt.after
@@ -13,4 +13,4 @@ class Foo : Bar() {
     val a = Companion.FromBarCompanion()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt
index b8e5298908dd..727860ae8583 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt
@@ -8,4 +8,4 @@ fun foo() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after
index fa22a43be46a..38a2138ac7c8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt.after
@@ -10,4 +10,4 @@ fun foo() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt
index ddf8fab3525a..d9443420766b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt
@@ -7,4 +7,4 @@ fun testFun() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after
index 66d8896142bb..661f2dc16c40 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt.after
@@ -9,4 +9,4 @@ fun testFun() {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.after.kt
index 5d4d25acbe34..4ad2a92fc068 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.after.kt
@@ -1,6 +1,6 @@
 // "Import operator 'H.minus'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h in file minusOperator.before.Main.kt<br>public fun String.minus(str: String): String defined in h in file minusOperator.before.Main.kt
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package h
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.before.Main.kt
index c870014c9fd8..fef77ff5ed27 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/minusOperator.before.Main.kt
@@ -1,6 +1,6 @@
 // "Import operator 'H.minus'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h in file minusOperator.before.Main.kt<br>public fun String.minus(str: String): String defined in h in file minusOperator.before.Main.kt
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package h
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/constantExpectedTypeMismatch.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/constantExpectedTypeMismatch.test
index b316e60eb2f0..be0e6db56987 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/constantExpectedTypeMismatch.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/constantExpectedTypeMismatch.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: The integer literal does not conform to the expected type String
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -25,7 +25,7 @@ fun X.foo(p: Int) {
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: The integer literal does not conform to the expected type String
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/expectedTypeRequired.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/expectedTypeRequired.test
index 5d06672c1673..d1d69fa7636e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/expectedTypeRequired.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/expectedTypeRequired.test
@@ -2,7 +2,7 @@
 // "Import extension function 'X.foo'" "true"
 // ERROR: No value passed for parameter 'p'
 // ERROR: Type mismatch: inferred type is Unit but String was expected
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -26,7 +26,7 @@ fun <T> X.foo(): T = TODO()
 // "Import extension function 'X.foo'" "true"
 // ERROR: No value passed for parameter 'p'
 // ERROR: Type mismatch: inferred type is Unit but String was expected
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionExplicitReceiver.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionExplicitReceiver.test
index cdab6e083a1f..8ce9da152baf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionExplicitReceiver.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionExplicitReceiver.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -26,7 +26,7 @@ fun X.foo(p: Int) {
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionImplicitReceiver.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionImplicitReceiver.test
index 91f5ac765525..e96b4da36386 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionImplicitReceiver.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionImplicitReceiver.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -25,7 +25,7 @@ fun X.foo(p: Int) {
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
index f03020d2d295..45008236be7f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
@@ -6,4 +6,4 @@ fun foo() {
     2 <selection><caret></selection>/ ""
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
index 4da01587e223..de1298416081 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
@@ -4,4 +4,4 @@ fun foo() {
     2 <caret>/ ""
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam.test
index 4f6ff3c854dc..94b66fcc785f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam.test
@@ -2,7 +2,7 @@
 // "Import extension function 'Shadow.shade'" "true"
 // ERROR: No type arguments expected for fun shade(): Unit
 // ACTION: Create type parameter in function 'shade'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
@@ -26,7 +26,7 @@ fun <X> Shadow.shade() {}
 // "Import extension function 'Shadow.shade'" "true"
 // ERROR: No type arguments expected for fun shade(): Unit
 // ACTION: Create type parameter in function 'shade'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam2.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam2.test
index 0dc7bc7a7417..eb993ce2719c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam2.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam2.test
@@ -2,7 +2,7 @@
 // "Import function 'foo'" "true"
 // ERROR: Not enough information to infer type variable T
 // ACTION: Create type parameter in function 'shade'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
@@ -20,7 +20,7 @@ fun foo() {}
 // "Import function 'foo'" "true"
 // ERROR: Not enough information to infer type variable T
 // ACTION: Create type parameter in function 'shade'
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam3.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam3.test
index 9d8c2551a6f0..d3bb6b8429ed 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam3.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionWrongTypeParam3.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import function 'foo'" "true"
 // ERROR: Not enough information to infer type variable T
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
@@ -18,7 +18,7 @@ fun foo() {}
 // FILE: first.after.kt
 // "Import function 'foo'" "true"
 // ERROR: Not enough information to infer type variable T
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package pack_one
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/ignoreErrorsOutsideCall.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/ignoreErrorsOutsideCall.test
index 71a1da85816e..cc6f695051ba 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/ignoreErrorsOutsideCall.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/ignoreErrorsOutsideCall.test
@@ -4,7 +4,7 @@
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 // ERROR: Unresolved reference: XXX
 // ERROR: Unresolved reference: xxx
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -31,7 +31,7 @@ fun X.foo(p: Int) {
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 // ERROR: Unresolved reference: XXX
 // ERROR: Unresolved reference: xxx
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/namedArgument.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/namedArgument.test
index bf5c62777362..58110f947c57 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/namedArgument.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/namedArgument.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Cannot find a parameter with this name: p2
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -24,7 +24,7 @@ fun X.foo(p1: Int = 1, p2: Int = 2, p3: Int = 3){}
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Cannot find a parameter with this name: p2
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/smartCast.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/smartCast.test
index ce9c386affe4..a47cb334bb3e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/smartCast.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/smartCast.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -27,7 +27,7 @@ fun X.foo(p: String) {
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/topLevelFun.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/topLevelFun.test
index 6398e51edc47..0d2385706a2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/topLevelFun.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/topLevelFun.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import function 'foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -23,7 +23,7 @@ fun foo(p: Int) {
 // FILE: first.after.kt
 // "Import function 'foo'" "true"
 // ERROR: Too many arguments for public final fun foo(): Unit defined in main.X
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/typeMismatch.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/typeMismatch.test
index eb4b6c4a8ee9..2557c5b60440 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/typeMismatch.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/typeMismatch.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Type mismatch: inferred type is Int but String was expected
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
@@ -25,7 +25,7 @@ fun X.foo(p: Int) {
 // FILE: first.after.kt
 // "Import extension function 'X.foo'" "true"
 // ERROR: Type mismatch: inferred type is Int but String was expected
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package main
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
index 6f61cd19977b..f80c900ceab0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test
@@ -2,7 +2,7 @@
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -30,7 +30,7 @@ operator fun Some.component2() = 3
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
index 3687a7f30f15..18d7723876a3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test
@@ -2,7 +2,7 @@
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -39,7 +39,7 @@ operator fun Some.component2() = 3
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
index a4da691d5126..f313a5e21606 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test
@@ -2,7 +2,7 @@
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -38,7 +38,7 @@ operator fun Some.component1() = 1
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
index 817ec2819daa..c5d17576758c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test
@@ -2,7 +2,7 @@
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -40,7 +40,7 @@ operator fun Some.component2() = 3
 // "Import operators 'Some.component1', 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
index 4a20e4f3ad94..a38530682121 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -28,7 +28,7 @@ operator fun Some.component2() = 3
 // FILE: first.after.kt
 // "Import operator 'Some.component1'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
index e959a6bdea7f..cf8de575987e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -29,7 +29,7 @@ operator fun Some.component2() = 3
 // FILE: first.after.kt
 // "Import operator 'Some.component2'" "true"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt
index 41d1fed4dd84..928566ce5868 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt
@@ -23,4 +23,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt.after
index 7d2294648681..0c4a6678feba 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject1.kt.after
@@ -25,4 +25,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt
index 1bd428dfc119..b2401f8603fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt
@@ -23,4 +23,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt.after
index fcb985cc2a9c..dbb5a370a239 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject2.kt.after
@@ -25,4 +25,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt
index 800cc27447db..6dd19a1cbf98 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt
@@ -23,4 +23,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt.after
index 0a1bcc5dc38e..0c879166c444 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multipleReceiversSingleCandidateExtensionInObject3.kt.after
@@ -25,4 +25,4 @@ fun usage(a: A, b: B, c: C) {
 }
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.after.kt
index 5f90631c8e75..5bdb5b1587e4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.after.kt
@@ -5,4 +5,4 @@ import test.Test
 
 val a = <caret>Test.Nested
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.before.Main.kt
index 603363b3e130..be68be2546c1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/nestedClass.before.Main.kt
@@ -3,4 +3,4 @@
 
 val a = <caret>Nested
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noFunctionImportOnSimpleName.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noFunctionImportOnSimpleName.test
index 5fa20d96699d..4ccb0d50f8ab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noFunctionImportOnSimpleName.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noFunctionImportOnSimpleName.test
@@ -14,7 +14,7 @@ package foo
 fun f() {
     foobar<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FILE: dependency.before.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
index c4f4014c3a37..876fc4fc8e2e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
@@ -6,4 +6,4 @@
 package testing
 
 class Some: testing.<caret>SomeTest
-/* IGNORE_FIR */
+/* IGNORE_K2 */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noMemberFunctionImportOnSimpleName.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noMemberFunctionImportOnSimpleName.test
index d630a6f337a9..28bd8176b572 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noMemberFunctionImportOnSimpleName.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noMemberFunctionImportOnSimpleName.test
@@ -14,7 +14,7 @@ package foo
 fun f() {
     foobar<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FILE: dependency.before.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.after.kt
index 545dee984f13..065798d02ec8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.after.kt
@@ -8,4 +8,4 @@ fun useSite() {
     val bar = Bar()
     bar.buz<caret>("1", "2")
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.before.Main.kt
index 91c9ad901083..c734700d8afe 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/noneApplicableFromInstanceButExtension.before.Main.kt
@@ -7,4 +7,4 @@ fun useSite() {
     val bar = Bar()
     bar.buz<caret>("1", "2")
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
index 10401f140273..24b7b6515f61 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt
@@ -25,4 +25,4 @@ fun NotTT.usage(t: T) {
     t.<caret>foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
index 61656eccd18c..e3f2209f7820 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionImportWhenExplicitReceiverPresent.kt.after
@@ -27,4 +27,4 @@ fun NotTT.usage(t: T) {
     t.foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt
index b4814ee4e5e7..042effec5612 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt
@@ -11,4 +11,4 @@ fun usage(t: T) {
     t.<caret>foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt.after
index 6c03c8bb1291..de1d9d57f0fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionFunctionWithGenericImportWhenExplicitReceiverPresent.kt.after
@@ -13,4 +13,4 @@ fun usage(t: T) {
     t.foobar()
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
index d600b6e74b22..4fa53d685c20 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt
@@ -25,4 +25,4 @@ fun NotTT.usage(t: T) {
     t.foobar<caret>
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
index d127b3c02661..9ffb1f4ed799 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyImportWhenExplicitReceiverPresent.kt.after
@@ -27,4 +27,4 @@ fun NotTT.usage(t: T) {
     t.foobar
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt
index d15ee77c0f57..ebc10953dc33 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt
@@ -11,4 +11,4 @@ fun usage(t: T) {
     t.<caret>foobar
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt.after
index eb33a3921588..4753693d91eb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/objectMemberExtensionPropertyWithGenericImportWhenExplicitReceiverPresent.kt.after
@@ -13,4 +13,4 @@ fun usage(t: T) {
     t.<caret>foobar
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlus.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlus.test
index 36948d62eef3..351a44f0318c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlus.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlus.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.plus'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -25,7 +25,7 @@ operator fun Some.plus(i: Int) : Some = this
 // FILE: first.after.kt
 // "Import operator 'Some.plus'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusAssign.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusAssign.test
index e75d34747efa..7069dbd26475 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusAssign.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusAssign.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operator 'Some.plusAssign'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -25,7 +25,7 @@ operator fun Some.plusAssign(i: Int) {}
 // FILE: first.after.kt
 // "Import operator 'Some.plusAssign'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
index 5aba35bade6c..ba33847991ae 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import operators 'Some.plus', 'Some.plusAssign'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
@@ -33,7 +33,7 @@ operator fun Some.plus(i: Int) : Some = this
 // FILE: first.after.kt
 // "Import operators 'Some.plus', 'Some.plusAssign'" "true"
 // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.after.kt
index 6926d239bd1c..a21f76103594 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.after.kt
@@ -10,4 +10,4 @@ interface H
 fun f(h: H?) {
     h <caret>+ "other"
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.before.Main.kt
index f0ba87a02883..4e2239a2486e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/plusOperator.before.Main.kt
@@ -8,4 +8,4 @@ interface H
 fun f(h: H?) {
     h <caret>+ "other"
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.after.kt
index a051a88bd1dc..e0fdf5ed4118 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.after.kt
@@ -11,4 +11,4 @@ fun f(h: H?) {
     var h1 = h
     h1++
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.before.Main.kt
index 7b8c57e47d20..c45fc9f96553 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/postfixOperator.before.Main.kt
@@ -9,4 +9,4 @@ fun f(h: H?) {
     var h1 = h
     h1<caret>++
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt
index a334fbc67615..50c417fc5917 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt
@@ -9,4 +9,4 @@ fun foo() {
     )
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after
index 09d5984d8bae..869c3c721d80 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/sAMConstructorFromLambda.kt.after
@@ -10,4 +10,4 @@ fun foo() {
     )
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.after.kt
index c51aa53152f1..bc3832194ea5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.after.kt
@@ -11,4 +11,4 @@ fun f(h: H) {
     h *= 3
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.before.Main.kt
index d8348f022e6c..db3b0cf167fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/timesAssign.before.Main.kt
@@ -9,4 +9,4 @@ fun f(h: H) {
     h <caret>*= 3
 }
 
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.after.kt
index c3550318f1d4..0c286e61b1f3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.after.kt
@@ -7,4 +7,4 @@ import dep.ext
 fun use(taa: TTA) {
     taa.ext<caret>()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.before.Main.kt
index b576fff10f0e..469a3fb35f51 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/typeAliasExtensionFunctionInTypeAliasChain.before.Main.kt
@@ -6,4 +6,4 @@ import dep.TTA
 fun use(taa: TTA) {
     taa.ext<caret>()
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.after.kt
index 2f6a2e4430f5..04ce5f4f95a0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.after.kt
@@ -10,4 +10,4 @@ interface H
 fun f(h: H?) {
     -h
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt
index 8b16e5c85c79..3a95528a5c84 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt
@@ -8,4 +8,4 @@ interface H
 fun f(h: H?) {
     <caret>-h
 }
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.after.kt
index 5d1dcc9b66cd..4c4590a1bdb1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.after.kt
@@ -14,4 +14,4 @@ fun f(h: H?) {
 class A()
 
 operator fun A.unaryPlus(): Int = 3
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
index cd34dfe5196e..515c04d9a47f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
@@ -12,4 +12,4 @@ fun f(h: H?) {
 class A()
 
 operator fun A.unaryPlus(): Int = 3
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt
index 05c39a9cafa0..670cd13f5656 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt
@@ -16,4 +16,4 @@ fun test() {
     t.foo(<caret>ArrayList)
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after
index d28de49c85a7..c218fd8b6fc9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/unresolvedReferenceInCall.kt.after
@@ -18,4 +18,4 @@ fun test() {
     t.foo(ArrayList)
 }
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ImportFix
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt
index 4fa5061b9082..3ba52eca0f6d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt
@@ -4,5 +4,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt.after
index 04aaf9c65104..69a9a9298e32 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckForNull.kt.after
@@ -4,5 +4,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt
index 67e3476f879c..5f037e803f8d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt
@@ -6,5 +6,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt.after
index 032fcdf2b9bc..e3b16eefb53c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessForNull.kt.after
@@ -6,5 +6,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt
index 6b2d2e7c8b6d..dd1aed504896 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt
@@ -6,5 +6,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt.after
index a539ba6a95b2..99a6140bab5c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckInWhenExpressionlessNegateForNull.kt.after
@@ -6,5 +6,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt
index 3872cb2ecaeb..26955fb40f54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt
@@ -4,5 +4,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt.after
index 85f83e1f6ef6..0b0fb6b5b3b6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/removeUselessIsCheckNegateForNull.kt.after
@@ -4,5 +4,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveUselessIsCheckFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt
index 77a18c426cb8..11dedf9200e8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt
@@ -4,5 +4,5 @@ class A {
     <caret>lateinit var str: String
         get() = ""
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt.after
index 3a8dd90bf1f8..837d06f2a3b7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetter.kt.after
@@ -3,5 +3,5 @@
 class A {
     <caret>lateinit var str: String
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt
index 59aa749e0517..4b6fd3a369ec 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt
@@ -5,5 +5,5 @@ class A {
         get() = ""
         set(value) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt.after
index 0e0f38a14caf..0f8fb1bf8c0b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withGetterSetter.kt.after
@@ -3,5 +3,5 @@
 class A {
     <caret>lateinit var str: String
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt
index 23133138126e..a561f88308b0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt
@@ -3,5 +3,5 @@
 class A {
     <caret>lateinit var str = ""
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt.after
index b34836214de2..83c053c8dad9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withInitializer.kt.after
@@ -3,5 +3,5 @@
 class A {
     <caret>lateinit var str: String
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt
index f2055579cfd0..7841df39cce3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt
@@ -4,5 +4,5 @@ class A {
     <caret>lateinit var str: String
         set(value) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt.after
index 4ec0ab5d5219..e8ca453f2015 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/lateinit/withSetter.kt.after
@@ -3,5 +3,5 @@
 class A {
     <caret>lateinit var str: String
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemovePartsFromPropertyFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt
index d065186507ba..7e6c2266ab75 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt
@@ -6,5 +6,5 @@ class A {
 fun foo() {
     A() xyz<caret>zy 5
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt.after
index c5839c87deee..4a1edf5d0ebd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/infixModifier.kt.after
@@ -6,5 +6,5 @@ class A {
 fun foo() {
     A() xyz<caret>zy 5
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt
index 7805071f942d..23273f8ccc39 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt
@@ -3,5 +3,5 @@ class fancy
 
 @fancy<caret> class foo {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
index 042741a8f186..4ec8033da235 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/notAnAnnotationClass.kt.after
@@ -3,5 +3,5 @@ annotation class fancy
 
 @fancy class foo {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt
index b515021cdd10..8d34a942450d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt
@@ -7,5 +7,5 @@ fun foo() {
     A() <caret>+ A()
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt.after
index 2213ef1739b6..28cfc37cad42 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifier.kt.after
@@ -7,5 +7,5 @@ fun foo() {
     A() <caret>+ A()
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt
index f7f3842a52f8..e237383b766c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt
@@ -5,5 +5,5 @@ class A {
 
 fun foo() = 0 i<caret>n A()
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt.after
index 2aa01de69a66..db2bb0718e34 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierCollection.kt.after
@@ -5,5 +5,5 @@ class A {
 
 fun foo() = 0 in A()
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt
index e90d16d8238d..b0b45e314c64 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt
@@ -11,5 +11,5 @@ fun foo() {
 }
 
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt.after
index 28e478ce8969..8ec461449970 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierComponent.kt.after
@@ -11,5 +11,5 @@ fun foo() {
 }
 
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt
index 6f77ccb9279b..9e035236cce9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt
@@ -5,5 +5,5 @@ class A {
 
 fun foo() = A()<caret>[0]
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt.after
index 4c00af97e145..565be61bf660 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierGet.kt.after
@@ -5,5 +5,5 @@ class A {
 
 fun foo() = A()[0]
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt
index 9074643e92ea..7f2b12f53d9d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt
@@ -9,5 +9,5 @@ fun test(): Any {
     return Bar<caret>[5]
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt.after
index 635f401cd2ea..9ae246f80620 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/operatorModifierInherited.kt.after
@@ -9,5 +9,5 @@ fun test(): Any {
     return Bar<caret>[5]
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory$createAction$1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt
index e73a7cc3e39a..c5d1e169238d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt
@@ -6,5 +6,5 @@ interface My {
 
 // Ignore in K2 as the `RedundantOpenInInterface` quickfix has been removed in K2 and a `TOOL_FIR` test directive doesn't exist. In K2,
 // this test case is covered by `redundantOpenFunctionInInterface.kt` in the `inspections-k2` module.
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
index 0aa1749776e5..687cb042e9df 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/redundantOpenInInterface.kt.after
@@ -6,5 +6,5 @@ interface My {
 
 // Ignore in K2 as the `RedundantOpenInInterface` quickfix has been removed in K2 and a `TOOL_FIR` test directive doesn't exist. In K2,
 // this test case is covered by `redundantOpenFunctionInInterface.kt` in the `inspections-k2` module.
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt
index 20299d47dfce..1087bb16c4c8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt
@@ -5,5 +5,5 @@ class Foo
 object Test {
     <caret>const val c = Foo()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after
index b9e9377f85fb..d6a3585b257e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeConst.kt.after
@@ -5,5 +5,5 @@ class Foo
 object Test {
     val c = Foo()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt
index 05cc45913abf..6b5b9bb39e35 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt
@@ -3,5 +3,5 @@ interface A {
     inne<caret>r class B
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after
index bd13a8b12ab5..54bba89bab4c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeInnerForClassInInterface.kt.after
@@ -3,5 +3,5 @@ interface A {
     class B
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
index ded389378a16..95d5b971f0cd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt
@@ -4,5 +4,5 @@
 object A {
     operator<caret> fun mod(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
index 19ea8a92ae83..a0cb0ba8384f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromForbiddenOperatorMod.kt.after
@@ -4,5 +4,5 @@
 object A {
     fun mod(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
index 7204ae34b650..a768dd82c086 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt
@@ -3,5 +3,5 @@
 object A {
     operator<caret> fun mod(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
index 352f8fac2152..c93700c0b8ea 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorMod.kt.after
@@ -3,5 +3,5 @@
 object A {
     <caret>fun mod(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
index bfad7af73ce4..d7a4dd97e1ba 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt
@@ -3,5 +3,5 @@
 object A {
     operator<caret> fun modAssign(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
index fd6d83190157..e7c3ab72fb54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeModifierFromOperatorModAssign.kt.after
@@ -3,5 +3,5 @@
 object A {
     <caret>fun modAssign(x: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveModifierFixBase
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt
index 647a29f99f3e..bc61851375f2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1(), C2<caret>() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt.after
index 718bc4c9f05a..5446ae6ba23b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype1.kt.after
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt
index 862f46029bc3..d11d6da03f6e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1(),C2<caret>() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt.after
index 718bc4c9f05a..5446ae6ba23b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype2.kt.after
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt
index 37eae1f1b037..4a921c2dd9ef 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1(), C2<caret> {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt.after
index 718bc4c9f05a..5446ae6ba23b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype3.kt.after
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt
index e90f2a6cea6e..2d5544931773 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1(), /* Hello, world! */ C2<caret>() {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt.after
index 9f64ba588653..97d3a39ecfd6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeSupertype4.kt.after
@@ -3,5 +3,5 @@ open class C1 {}
 open class C2 {}
 class C3: C1() /* Hello, world! */ {}
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveSupertypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt
index a5688d29f201..79534295af7f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt
@@ -7,5 +7,5 @@ class B : A() {
     <caret>private override fun run() {}
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt.after
index 64568e5969cd..3b9f29ebb4eb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer1.kt.after
@@ -7,5 +7,5 @@ class B : A() {
     <caret>override fun run() {}
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt
index e7a0b63e9177..c98d87ae071d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt
@@ -7,5 +7,5 @@ class B : A() {
     <caret>internal override fun run() {}
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt.after
index 64568e5969cd..3b9f29ebb4eb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModifer2.kt.after
@@ -7,5 +7,5 @@ class B : A() {
     <caret>override fun run() {}
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
index 74979321ddae..dacbe2ab3e00 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt
@@ -6,5 +6,5 @@ abstract class C : ClassLoader() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
index ce2b684a85eb..d14de6120ed9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt.after
@@ -6,5 +6,5 @@ abstract class C : ClassLoader() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt
index a8e11f47dbd1..db7b43303008 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt
@@ -7,5 +7,5 @@ interface ParseResult<out T> {
 class Success<T>(<caret>internal override val value : T) : ParseResult<T> {
     public override val success : Boolean = true
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
index 5e0f3f10d689..d49f285802bc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/visibilityModiferParameter.kt.after
@@ -7,5 +7,5 @@ interface ParseResult<out T> {
 class Success<T>(override val value : T) : ParseResult<T> {
     public override val success : Boolean = true
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVisibilityModifierFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt
index 75be0afeb489..e3049443174e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt
@@ -3,5 +3,5 @@ fun main(args : Array<String>) {
     val x : Int??<caret> = 15
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveNullableFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt.after
index 5c8aaef5cac5..f31b06b4d0f6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeRedundantNullable.kt.after
@@ -3,5 +3,5 @@ fun main(args : Array<String>) {
     val x : Int? = 15
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveNullableFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt
index 3f701340f869..48082a09e201 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt
@@ -2,5 +2,5 @@
 fun f(a: Int) : Boolean {
     return a is Int?<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveNullableFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt.after
index 1e05eeaadfb2..a6ee35fff9ad 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/removeUselessNullable.kt.after
@@ -2,5 +2,5 @@
 fun f(a: Int) : Boolean {
     return a is Int<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveNullableFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicFunctionNotApplicable.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicFunctionNotApplicable.kt
index 5a2df00032d0..122a0ec1c8b4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicFunctionNotApplicable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicFunctionNotApplicable.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'bar'" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_STDLIB
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt
index 7d6e39fff91e..40d6bf390b8a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt
@@ -1,5 +1,5 @@
 // "Add '-opt-in=test.MyExperimentalAPI' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // PRIORITY: LOW
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // COMPILER_ARGUMENTS_AFTER: -opt-in=kotlin.RequiresOptIn -opt-in=test.MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt.after
index 1c78e5b2b817..868d28d3a497 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/basicModule.kt.after
@@ -1,5 +1,5 @@
 // "Add '-opt-in=test.MyExperimentalAPI' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // PRIORITY: LOW
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // COMPILER_ARGUMENTS_AFTER: -opt-in=kotlin.RequiresOptIn -opt-in=test.MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/nestedClasses.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/nestedClasses.kt
index d7c70dc147a2..dfb0fc24886c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/nestedClasses.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/nestedClasses.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Outer'" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_STDLIB
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/optInUnused.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/optInUnused.kt
index 15bf0ad3914d..20134e5dd8bf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/optInUnused.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/optInUnused.kt
@@ -1,5 +1,5 @@
 // "Safe delete 'Marker'" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn -opt-in=test.Marker
 // WITH_STDLIB
 // ACTION: Rename file to Marker.kt
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/override.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/override.kt
index e6610e79c194..c180fe39ebbc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/override.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/override.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Derived'" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_STDLIB
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/propagateOptIn8.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/propagateOptIn8.kt
index c50c4247661f..771e05a64ff8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/propagateOptIn8.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/propagateOptIn8.kt
@@ -1,5 +1,5 @@
 // "Propagate 'SubclassOptInRequired(UnstableApi::class)' opt-in requirement to 'SomeImplementation'" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // ERROR: This declaration needs opt-in. Its usage must be marked with '@UnstableApi' or '@OptIn(UnstableApi::class)'
 // ACTION: Add '-opt-in=UnstableApi' to module light_idea_test_case compiler arguments
 // ACTION: Introduce import alias
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt
index 22c6060f835d..1707483cf846 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt
@@ -1,5 +1,5 @@
 // "Add '-opt-in=kotlin.RequiresOptIn' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -version
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt.after
index 64bb6268620f..2e80fb6bdd34 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOn.kt.after
@@ -1,5 +1,5 @@
 // "Add '-opt-in=kotlin.RequiresOptIn' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -version
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt
index f4b9d98e1492..af9afa162902 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt
@@ -1,5 +1,5 @@
 // "Add '-opt-in=kotlin.RequiresOptIn' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -version -opt-in=AnotherMarker
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt.after
index 4d7a3cdc918d..89e66b3f0c6c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optIn/switchOnWithAnotherMarker.kt.after
@@ -1,5 +1,5 @@
 // "Add '-opt-in=kotlin.RequiresOptIn' to module light_idea_test_case compiler arguments" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // COMPILER_ARGUMENTS: -version -opt-in=AnotherMarker
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/notRemoveImportsForTypeAliases.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/notRemoveImportsForTypeAliases.before.Main.kt
index c3800c1a0f65..68626232784c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/notRemoveImportsForTypeAliases.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/optimizeImports/notRemoveImportsForTypeAliases.before.Main.kt
@@ -6,4 +6,4 @@ import p1.AnnAlias
 
 @AnnAlias
 val some = SomeAlias()
-/* IGNORE_FIR */
\ No newline at end of file
+/* IGNORE_K2 */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt
index 1c07aa4dbd20..b13854f2aaab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt
@@ -5,6 +5,6 @@ open class A {
 }
 
 class B : A<caret> {}
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SuperClassNotInitialized$AddParenthesisFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt.after
index 0aabb08d1783..239faff571c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/changeToInvocation.kt.after
@@ -5,6 +5,6 @@ open class A {
 }
 
 class B : A<caret>() {}
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SuperClassNotInitialized$AddParenthesisFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt
index c706573ab54d..561991dd3167 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt
@@ -18,6 +18,6 @@ interface Z {
 class B : A(), X, Y, Z {
     override<caret> fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after
index 48e6de3c1f57..febcdffcf8fb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overriddingMultipleFinalMethods.kt.after
@@ -18,6 +18,6 @@ interface Z {
 class B : A(), X, Y, Z {
     override<caret> fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt
index 66301dd59be4..ac2edcb077f6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt
@@ -16,6 +16,6 @@ class B(y: XX) : A(y) {
     override<caret> fun foo() {
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt.after
index ec8b6bdb6de0..d8d6cc9e7aab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingDelegatedMethod.kt.after
@@ -16,6 +16,6 @@ class B(y: XX) : A(y) {
     override fun foo() {
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt
index 39ca29b3208c..6a0c21f8d15e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt
@@ -16,6 +16,6 @@ class B() : Y {
     override<caret> fun foo() {
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt.after
index 7eb2ff469088..0da8926b3a6f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFakeOverride.kt.after
@@ -16,6 +16,6 @@ class B() : Y {
     override fun foo() {
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt
index b2b16a9a6bdb..ac68d3e93787 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt
@@ -6,6 +6,6 @@ open class A {
 class B : A() {
     override<caret> fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt.after
index f2680e10fb58..06e996bd4017 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethod.kt.after
@@ -6,6 +6,6 @@ open class A {
 class B : A() {
     override<caret> fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt
index 720ee33df306..364234fec5ce 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt
@@ -8,6 +8,6 @@ fun test() {
         <caret>override fun foo() {}
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt.after
index 57168e9fb19a..24583ef8d8a6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalMethodInLocal.kt.after
@@ -8,6 +8,6 @@ fun test() {
         <caret>override fun foo() {}
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt
index 4cf0f0153597..237190a34168 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt
@@ -10,6 +10,6 @@ open class B : A() {
 class C : B() {
     override<caret> fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt.after
index fbdee4aa85eb..308e9241f1b5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalOverrideMethod.kt.after
@@ -10,6 +10,6 @@ open class B : A() {
 class C : B() {
     override fun foo() {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt
index 706fefaea843..2a6a500eb3ca 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt
@@ -6,6 +6,6 @@ open class A {
 class B : A() {
     override<caret> var x = 24;
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt.after
index 17f0b0e497e0..3d9dcca83bb9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/overridingFinalProperty.kt.after
@@ -6,6 +6,6 @@ open class A {
 class B : A() {
     override<caret> var x = 24;
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt
index 3a8fbc5d7fc2..4982bb727322 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt
@@ -13,6 +13,6 @@ class B : A(), X {
         return agr
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after
index 797dfa19aa0f..b7e57407af9a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt.after
@@ -13,6 +13,6 @@ class B : A(), X {
         return arg
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt
index d68b827593b2..4df28a8a3649 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt
@@ -9,6 +9,6 @@ class B : A() {
         return agr
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after
index e73a7edd9fe1..ad7730a94432 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/parameterNameChangedRenamePossible.kt.after
@@ -9,6 +9,6 @@ class B : A() {
         return arg
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
index a36f7d0ecb7c..d67635dc895b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt
@@ -7,5 +7,5 @@ abstract class B : A() {
     override abstract var x<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix$OnType
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
index d41c9b0f7487..2a4579d8e322 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt.after
@@ -7,5 +7,5 @@ abstract class B : A() {
     override abstract var x<caret>: Int
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix$OnType
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/assignmentFake.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/assignmentFake.kt
index ec4922458778..f0660a1fccc0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/assignmentFake.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/assignmentFake.kt
@@ -10,7 +10,7 @@ fun bar(p: Int) {
     <caret>if (p > 0) v2 = true else v1 = false
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // Note: K2 does not support all of inspections, intentions, and quickfixes yet. When enabling K2,
 // this test fails because the last two actions are missing at this moment. After implementing all
-// inspections/intentions/quickfixes based on K2, we should remove the above "IGNORE_FIR" directive.
\ No newline at end of file
+// inspections/intentions/quickfixes based on K2, we should remove the above "IGNORE_K2" directive.
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/notAvailableOnCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/notAvailableOnCondition.kt
index dad79eb91881..f9a34f463ba5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/notAvailableOnCondition.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/redundantIf/notAvailableOnCondition.kt
@@ -1,7 +1,7 @@
 // "Remove redundant 'if' statement" "false"
 // ACTION: Expand boolean expression to 'if else'
 // ACTION: Remove braces from all 'if' statements
-// IGNORE_FIR
+// IGNORE_K2
 fun bar(value: Int): Boolean {
     if (<caret>value % 2 == 0) {
         return true
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt
index 8bf37da1206b..0f7f0cef2d0b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt
@@ -1,5 +1,5 @@
 // "Remove @JvmField annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 class Foo {
     <caret>@JvmField private val bar = 0
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt.after
index 51e4a62df8b0..287713fe7d54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmField.kt.after
@@ -1,5 +1,5 @@
 // "Remove @JvmField annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 class Foo {
     private val bar = 0
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt
index f61a6af287ac..62b180a45708 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt
@@ -1,5 +1,5 @@
 // "Remove @JvmField annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 interface I {
     val x: Int
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt.after
index 1b69f2f44f13..c59871695a3e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmFieldOnOverridingProperty.kt.after
@@ -1,5 +1,5 @@
 // "Remove @JvmField annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 interface I {
     val x: Int
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt
index 439e5dbbadad..7c3b1eb7ab29 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt
@@ -1,5 +1,5 @@
 // "Remove @JvmOverloads annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 interface T {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt.after
index 5a603a9f2f92..b917684e9e1a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloads.kt.after
@@ -1,5 +1,5 @@
 // "Remove @JvmOverloads annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 interface T {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt
index 2ad6bd3659ca..63f270ad4b49 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt
@@ -1,5 +1,5 @@
 // "Remove @JvmOverloads annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 annotation class A <caret>@JvmOverloads constructor(val x: Int = 1)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt.after
index 55345a6c4229..ffecda369435 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/jvmOverloadsOnAnnotationClassConstructor.kt.after
@@ -1,5 +1,5 @@
 // "Remove @JvmOverloads annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 
 annotation class A constructor(val x: Int = 1)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/useSiteGetOnClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/useSiteGetOnClass.kt
index f49aa8ffaeb3..22fd27b74b09 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/useSiteGetOnClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/useSiteGetOnClass.kt
@@ -1,5 +1,5 @@
 // "Remove annotation, since it has no effect. See https://youtrack.jetbrains.com/issue/KT-48141" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // ACTION: Create test
 // ACTION: Make internal
 // ACTION: Make private
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt
index b95b4ad263fe..b851eb388f32 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt
@@ -1,5 +1,5 @@
 // "Remove inapplicable @ExtensionFunctionType annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun bar(f: <caret>@ExtensionFunctionType () -> Int): Int = TODO()
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt.after
index 89192ce6736b..18c470339f5e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionType.kt.after
@@ -1,5 +1,5 @@
 // "Remove inapplicable @ExtensionFunctionType annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun bar(f: () -> Int): Int = TODO()
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt
index bfcedcaaf911..f84cf6f2d211 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt
@@ -1,5 +1,5 @@
 // "Remove inapplicable @ExtensionFunctionType annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun bar(f: <caret>@ExtensionFunctionType Int): Int = TODO()
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.RemoveAnnotationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt.after
index ba487e7d07ac..84f90bea82da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeAnnotation/wrongExtenstionFunctionTypeWarning.kt.after
@@ -1,5 +1,5 @@
 // "Remove inapplicable @ExtensionFunctionType annotation" "true"
-// IGNORE_FIR
+// IGNORE_K2
 // WITH_STDLIB
 fun bar(f: Int): Int = TODO()
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.RemoveAnnotationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeUseSiteTarget/useSiteGetOnClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeUseSiteTarget/useSiteGetOnClass.kt
index b66df6d2da66..7a5a78536915 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/removeUseSiteTarget/useSiteGetOnClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeUseSiteTarget/useSiteGetOnClass.kt
@@ -1,5 +1,5 @@
 // "Remove 'get:' to make the annotation effective. (changes semantics. See: https://youtrack.jetbrains.com/issue/KT-48141)" "false"
-// IGNORE_FIR
+// IGNORE_K2
 // ACTION: Create test
 // ACTION: Make internal
 // ACTION: Make private
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt
index 1bd9061061ba..d566601a6d14 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo?.bar<caret>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt.after
index 7577efb7b032..8e52b53933ce 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified.kt.after
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo?.bar?.invoke()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt
index 6c985652cea3..513113cb5831 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt
@@ -10,5 +10,5 @@ fun test(foo: Foo?) {
     foo // comment1
         ?. /* comment2 */ bar<caret>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt.after
index a099c83179c4..0ed26557ab66 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/callExpressionInSafeQualified2.kt.after
@@ -10,5 +10,5 @@ fun test(foo: Foo?) {
     foo // comment1
         ?. /* comment2 */ bar?.invoke()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt
index a0c02d1a8652..71322a75376e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt
@@ -4,7 +4,7 @@ fun test(map: MutableMap<Int, Int?>) {
     map[3] +=<caret> 5
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt.after
index b2edbabb178b..59ab06f690ac 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceInfixOrOperatorCall/plusAssignOnMutableMapWithNullableValueType.kt.after
@@ -4,7 +4,7 @@ fun test(map: MutableMap<Int, Int?>) {
     map[3] = map[3]?.plus(5)
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt
index 8a0a7df63338..e773c95508d7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt
@@ -5,6 +5,6 @@ annotation class Some(vararg val strings: String)
 
 @Some(strings = <caret>"value")
 class My
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithArrayCallInAnnotationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt.after
index 6a86068f7dad..ccf20ea6e39e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithArrayCallInAnnotation/replaceSingleElementInNamedForm_1_2.kt.after
@@ -5,6 +5,6 @@ annotation class Some(vararg val strings: String)
 
 @Some(strings = ["value"])
 class My
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithArrayCallInAnnotationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
index eb66c9c8e79c..ef69be9a1aa8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
@@ -4,6 +4,6 @@
 fun <T : Any> foo(x: T) {
     val y = x?.toString()<caret>
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
index cc3a3b1a35a3..0c001e138d00 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
@@ -4,6 +4,6 @@
 fun <T : Any> foo(x: T) {
     val y = x.toString()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
index 3dc0d8904f5d..5076970efa6e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
@@ -4,6 +4,6 @@
 fun test(x: String) {
     x?.le<caret>ngth
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
index 6c2f98f56f43..d9f44c1126c8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
@@ -4,6 +4,6 @@
 fun test(x: String) {
     x.length
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
index 6c39ed7c8c76..10d3bce6ff94 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
@@ -9,5 +9,5 @@ class Baz(val qux: Int)
 fun test(foo: Foo) {
     foo?.bar?<caret>.baz?.qux
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
index c3ffba3fda0a..a19e96788d0b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
@@ -9,5 +9,5 @@ class Baz(val qux: Int)
 fun test(foo: Foo) {
     foo?.bar.baz.qux
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceWithDotCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
index 44b3e7573716..34c18fca7db2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt
@@ -5,5 +5,5 @@ fun foo(a: String?) {
         <caret>toLowerCase()
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceImplicitReceiverCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
index e29113e2a51c..84909dee5b96 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/applyWithImplicitParameterFunctionCall.kt.after
@@ -5,5 +5,5 @@ fun foo(a: String?) {
         this?.toLowerCase()
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceImplicitReceiverCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt
index 523f3c56aa8b..32ec2b9c08df 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt
@@ -3,5 +3,5 @@
 fun String?.foo() {
     <caret>toLowerCase()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceImplicitReceiverCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
index 1fe0f464978d..df239f976271 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/extFunction.kt.after
@@ -3,5 +3,5 @@
 fun String?.foo() {
     this?.toLowerCase()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceImplicitReceiverCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
index d68dcc972f4c..483eaabdb7fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt
@@ -4,5 +4,5 @@
 val functions: Map<String, () -> Any> = TODO()
 
 fun run(name: String) = functions[name]<caret>()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
index 84559c3fa5c4..c6958681545e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator.kt.after
@@ -4,5 +4,5 @@
 val functions: Map<String, () -> Any> = TODO()
 
 fun run(name: String) = functions[name]?.invoke()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt
index c6dc88423ae1..492c3b5b6969 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo<caret>.bar()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after
index 7577efb7b032..8e52b53933ce 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo?.bar?.invoke()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ReplaceInfixOrOperatorCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt
index 5b75787a4167..540063d2495c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt
@@ -18,6 +18,6 @@ fun test() {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.suppress.KotlinSuppressIntentionAction
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt.after
index 2c9b555ce9a4..666cf0ce25d0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaFun.kt.after
@@ -19,6 +19,6 @@ fun test() {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.suppress.KotlinSuppressIntentionAction
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaParameter.kt
index 64db047d8a2b..2a338dee040e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForDestructuredLambdaParameter.kt
@@ -18,5 +18,5 @@ fun test() {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // IGNORE_FE10
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForLambdaParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForLambdaParameter.kt
index f63ba324c0ab..e0d4c0124053 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForLambdaParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/availability/parameterSuppressForLambdaParameter.kt
@@ -11,4 +11,4 @@ val x = { <caret>a: Int ->
     5
 }
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/external/suppressActive.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/external/suppressActive.kt
index b2454fbb0083..fddd284263ac 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/external/suppressActive.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/external/suppressActive.kt
@@ -8,4 +8,4 @@
 @Suppress("SpellCheckingInspection")
 val str = "<caret>kjsghkjshtiurhuig"
 
-// IGNORE_FIR
+// IGNORE_K2
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt
index 04e3c7c82b9f..f63273473637 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt
@@ -5,5 +5,5 @@ fun foo() {
     <caret>a
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.suppress.KotlinSuppressIntentionAction
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt.after
index 6c828a991652..ca2521b9e547 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/forStatement/simpleName.kt.after
@@ -6,5 +6,5 @@ fun foo() {
     a
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.suppress.KotlinSuppressIntentionAction
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt
index ccefa73fa3ae..0c376f18c926 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt
@@ -5,6 +5,6 @@ fun foo() {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: org.jetbrains.kotlin.idea.inspections.ConstantConditionIfInspection
 // FUS_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt.after
index 6ab5b1f31044..94d93e7dc530 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/inspections/constantConditionIf.kt.after
@@ -6,6 +6,6 @@ fun foo() {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: org.jetbrains.kotlin.idea.inspections.ConstantConditionIfInspection
 // FUS_QUICKFIX_NAME: com.intellij.codeInspection.SuppressIntentionActionFromFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt
index 2eb5476b9368..7daf5761944b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt
@@ -5,7 +5,7 @@ fun function() {
     
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: com.intellij.codeInspection.RedundantSuppressInspection
 // K1_TOOL: org.jetbrains.kotlin.idea.inspections.MoveVariableDeclarationIntoWhenInspection
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt.after
index 9696ed99d95d..6d44d6cd8c44 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotation.kt.after
@@ -4,7 +4,7 @@
     
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: com.intellij.codeInspection.RedundantSuppressInspection
 // K1_TOOL: org.jetbrains.kotlin.idea.inspections.MoveVariableDeclarationIntoWhenInspection
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt
index 86e4f890e4c2..1120e9c70ced 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt
@@ -5,7 +5,7 @@ fun function() {
 
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: com.intellij.codeInspection.RedundantSuppressInspection
 // K1_TOOL: org.jetbrains.kotlin.idea.inspections.MoveVariableDeclarationIntoWhenInspection
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt.after
index 6125c9c3bafd..25a96f811c56 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/RemoveAnnotationEntry.kt.after
@@ -5,7 +5,7 @@ fun function() {
 
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: com.intellij.codeInspection.RedundantSuppressInspection
 // K1_TOOL: org.jetbrains.kotlin.idea.inspections.MoveVariableDeclarationIntoWhenInspection
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/Suppressed.kt b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/Suppressed.kt
index 012be73f2d25..91089222603a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/Suppressed.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/suppress/redundant/Suppressed.kt
@@ -12,6 +12,6 @@ fun a(i: Int) {
     }
 }
 
-// IGNORE_FIR
+// IGNORE_K2
 // TOOL: com.intellij.codeInspection.RedundantSuppressInspection
 // K1_TOOL: org.jetbrains.kotlin.idea.inspections.MoveVariableDeclarationIntoWhenInspection
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt
index b1bd57d1fac1..7cb578e9051e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt
@@ -6,5 +6,5 @@ fun anyFoo(vararg a: Any) {}
 fun test() {
     anyFoo(a = intArr<caret>ayOf(1))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt.after
index 0c6ccd26be89..3b955f445660 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForVarargOfAny.kt.after
@@ -6,5 +6,5 @@ fun anyFoo(vararg a: Any) {}
 fun test() {
     anyFoo(a = *arrayOf(intArrayOf(1)))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt
index 5a4787293c71..7ac60f35476f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt
@@ -7,6 +7,6 @@ fun anyFoo(vararg a: Any) {}
 fun test() {
     anyFoo(a = in<caret>tArrayOf(1))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt.after
index b821c76684ce..e16c24e17565 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceForbiddenAssigningIntoArrayCall.kt.after
@@ -7,6 +7,6 @@ fun anyFoo(vararg a: Any) {}
 fun test() {
     anyFoo(a = *arrayOf(intArrayOf(1)))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt
index d60ee9098a2c..f76401cf164f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt
@@ -6,6 +6,6 @@ fun foo(vararg s: Int) {}
 fun test() {
     foo(s = <caret>1)
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt.after
index 28868375f5ff..a3ee05ee633a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/replaceToArrayOfPrimitiveTypes_1_2.kt.after
@@ -6,6 +6,6 @@ fun foo(vararg s: Int) {}
 fun test() {
     foo(s = <caret>*intArrayOf(1))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt
index 75f0752520bb..002212bb386c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt
@@ -6,6 +6,6 @@ fun foo(vararg s: String) {}
 fun test() {
     foo(s = <caret>"value")
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt.after
index c088a76812fe..acfbb152a750 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/simpleNamedArgumentToVararg_1_2.kt.after
@@ -6,6 +6,6 @@ fun foo(vararg s: String) {}
 fun test() {
     foo(s = *arrayOf("value"))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt
index 78ef47026a81..e8b10e01dbca 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt
@@ -6,6 +6,6 @@ class Foo<T>(vararg val p: T)
 fun test() {
     Foo(p = 123<caret>)
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt.after
index 39a6fc9fd342..7ecc1c5d1a5c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithArrayOfForNamedArgumentsToVarargs/surroundWithSpreadForConstructorCall_1_2.kt.after
@@ -6,6 +6,6 @@ class Foo<T>(vararg val p: T)
 fun test() {
     Foo(p = *arrayOf(123))
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.SurroundWithArrayOfWithSpreadOperatorInFunctionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt
index 03bf9575ebc0..6851266ec54f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt
@@ -3,6 +3,6 @@ class A {
     val x: (String) -> Int
         get(): Int<caret> = {42}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after
index 03219967b01e..3432d4b6b83e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt.after
@@ -3,6 +3,6 @@ class A {
     val x: (String) -> Int
         get(): (String) -> Int<caret> = {42}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt
index d688b5c525d0..08423ec9708d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt
@@ -10,6 +10,6 @@
 class A() {
     public val <caret>t = hashCode()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt.after
index f137e9e90eb9..6627d6c2985e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/noAddErrorType.kt.after
@@ -10,6 +10,6 @@
 class A() {
     public val t: Int<caret> = hashCode()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt
index b7073fd9f679..1535a049f5fa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt
@@ -12,6 +12,6 @@ class My {
             return 3.14
         }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt.after
index b7073fd9f679..1535a049f5fa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithBlockBody.kt.after
@@ -12,6 +12,6 @@ class My {
             return 3.14
         }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt
index c433e09eeab6..5005290bb0d2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt
@@ -4,6 +4,6 @@ class My {
     val <caret>x
         get() = "abc"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt.after
index 41545fa8e2cb..3e9ada049d37 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithInferredType.kt.after
@@ -4,6 +4,6 @@ class My {
     val x: String
         get() = "abc"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt
index 83dca4166062..16281aceb58b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt
@@ -2,6 +2,6 @@
 
 val <caret>x
     get(): Int = 42
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after
index 1c4eb661f8e5..713ac93833e3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithGetterWithoutType.kt.after
@@ -2,6 +2,6 @@
 
 val x: Int
     get(): Int = 42
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt
index c7d2e5366c6a..6f29682f9788 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt
@@ -10,6 +10,6 @@ class A {
     val a<caret>
         get() = a
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt.after
index c7d2e5366c6a..6f29682f9788 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithRecursiveGetter.kt.after
@@ -10,6 +10,6 @@ class A {
     val a<caret>
         get() = a
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt
index 4f40f9ee0f71..8825ea43a77d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt
@@ -10,6 +10,6 @@ class My {
             yy = arg + 1
         }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after
index 5f6a8585d1e2..cc23246a9d4c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/propertyWithSetterWithoutType.kt.after
@@ -10,6 +10,6 @@ class My {
             yy = arg + 1
         }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt
index 3de7c8540e96..f1fc827d4708 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt
@@ -4,6 +4,6 @@ package a
 class A() {
     protected fun <caret>foo() = 1
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after
index a69a3ad6a55f..bb314cfa41e3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt.after
@@ -4,6 +4,6 @@ package a
 class A() {
     protected fun foo(): Int<caret> = 1
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt
index 8b60a35c502b..f69e840b1689 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt
@@ -4,6 +4,6 @@ package a
 class A() {
     public fun <caret>foo() = "a"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after
index 0723b6414a16..018f7990f2fe 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt.after
@@ -4,6 +4,6 @@ package a
 class A() {
     public fun foo(): String<caret> = "a"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt
index 88ead33370bf..fdde205a5240 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt
@@ -4,6 +4,6 @@ package a
 class A() {
     public fun foo(<caret>p: String) = "a"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after
index 7e6e9132128b..620a6e724357 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt.after
@@ -4,6 +4,6 @@ package a
 class A() {
     public fun foo(p: String): String<caret> = "a"
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
index 728ed3aac00f..3ad22933d06c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
@@ -4,6 +4,6 @@ package a
 public fun <T> emptyList(): List<T> = null!!
 
 public val <caret>l = emptyList<Int>()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
index 10226cb1501e..94f3252cc196 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
@@ -4,6 +4,6 @@ package a
 public fun <T> emptyList(): List<T> = null!!
 
 public val l: List<Int><caret> = emptyList<Int>()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
index 69e56a6c0168..e833c4412cc1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
@@ -4,6 +4,6 @@ package a
 public fun <T> emptyList(): List<T> = null!!
 
 <caret>public val l = emptyList<Int>()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
index 10226cb1501e..94f3252cc196 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
@@ -4,6 +4,6 @@ package a
 public fun <T> emptyList(): List<T> = null!!
 
 public val l: List<Int><caret> = emptyList<Int>()
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt
index 58934cf8b178..6833e48df86c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt
@@ -3,6 +3,6 @@ class A() {
     val i: Int
         get(): <caret>Any = 1
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after
index d2835309027e..cf8a8f228691 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterType.kt.after
@@ -3,6 +3,6 @@ class A() {
     val i: Int
         get(): Int = 1
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt
index 23cba6e7ed4c..7ef35bfae0aa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt
@@ -4,6 +4,6 @@ class A() {
     val i: java.util.HashSet<Int>
         get(): <caret>Any = java.util.LinkedHashSet<Int>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
index 9aca25d0dfc5..5a522cf35277 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt.after
@@ -6,6 +6,6 @@ class A() {
     val i: java.util.HashSet<Int>
         get(): HashSet<Int> = java.util.LinkedHashSet<Int>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt
index a06ce7a197d0..6b226c963b44 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt
@@ -3,6 +3,6 @@ class A() {
     var i: Int = 0
         set(v: <caret>Any) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after
index 3f1555aa2d1b..43bfb8243788 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/wrongSetterParameterType.kt.after
@@ -3,6 +3,6 @@ class A() {
     var i: Int = 0
         set(v: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeAccessorTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt
index 3463fc720e65..1a84d34d4b5a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt
@@ -5,6 +5,6 @@ fun foo() {
         x += 21<caret>
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralReturnTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after
index 02cb5690c183..d86b2caf077c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt.after
@@ -5,6 +5,6 @@ fun foo() {
         x += 21<caret>
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeFunctionLiteralReturnTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt
index 2d99d8515765..68f7073de8c3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt
@@ -2,6 +2,6 @@
 
 val complex: (Int) -> String
     get() = { it.toLong()<caret> }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt.after
index 4de11f8c014f..4de2ee7fcc66 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/literalPropertyWithGetter.kt.after
@@ -2,6 +2,6 @@
 
 val complex: (Int) -> Long
     get() = { it.toLong() }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt
index c4c43bff6e43..322e2fce3064 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt
@@ -7,6 +7,6 @@ fun foo(n: Int): Boolean {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt.after
index 8b549e833695..1e09be03370b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/labeledReturn.kt.after
@@ -7,6 +7,6 @@ fun foo(n: Int): Any {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt
index 9bd5eb963c69..325ba904937e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt
@@ -4,7 +4,7 @@ fun test(x: Int) {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt.after
index b3dc127b81ba..ad8795e689c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnDifferentType.kt.after
@@ -4,7 +4,7 @@ fun test(x: Int): Any {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt
index 80c151dd3ae9..c595f80fb503 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt
@@ -4,6 +4,6 @@ fun test() {
     return null
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt.after
index 528d393459ef..f1542a2398e6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull.kt.after
@@ -4,6 +4,6 @@ fun test(): String? {
     return null
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt
index a3fa6075a32c..c4b0dc6ea365 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt
@@ -4,6 +4,6 @@ fun test() {
     return null<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt.after
index 963a9ab832cd..58c2093e2509 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNull2.kt.after
@@ -4,6 +4,6 @@ fun test(): String? {
     return null<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt
index 696e857f96b7..cda79d50e592 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt
@@ -4,6 +4,6 @@ fun test(x: String?) {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt.after
index 3368c9fb9a41..615332b2475c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnNullable.kt.after
@@ -4,6 +4,6 @@ fun test(x: String?): String? {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt
index 06b66d574c72..78eb8463bd4c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt
@@ -4,6 +4,6 @@ fun test(x: CharSequence) {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt.after
index 28ce596988cb..a2ce6c232717 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/returnSuperType.kt.after
@@ -4,6 +4,6 @@ fun test(x: CharSequence): CharSequence {
     return x
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt
index 1218ed6fa316..7680f5205d96 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt
@@ -8,6 +8,6 @@ fun bar(n: Int): Boolean {
     return null
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt.after
index 5ccd0a1cdd53..4e50d21aa1f6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiReturn/unrelatedLabeledReturn.kt.after
@@ -8,6 +8,6 @@ fun bar(n: Int): String? {
     return null
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt
index 78e22a99294b..b034d9e74bec 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt
@@ -4,6 +4,6 @@ class A {
         get(): Int = if (true) { {42}<caret> } else { {24} }
         set(i: Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after
index f207d82c049d..ab75db3cba2e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt.after
@@ -4,6 +4,6 @@ class A {
         get(): () -> Int = if (true) { {42}<caret> } else { {24} }
         set(i: () -> Int) {}
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt
index 9316e9d29c9e..c3d58d9c0db0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt
@@ -4,6 +4,6 @@ class P
 
 val foo: O get() = if (true) O() else P()<caret>
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt.after
index b06926e77a1f..76c6ce07e321 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf.kt.after
@@ -4,6 +4,6 @@ class P
 
 val foo: Any get() = if (true) O() else P()
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt
index badb3a4f086c..51f050871d1c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt
@@ -7,6 +7,6 @@ val foo: O
         return if (true) O() else P()<caret>
     }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt.after
index 940ad80d01d7..0cce2f482c2c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf2.kt.after
@@ -7,6 +7,6 @@ val foo: Any
         return if (true) O() else P()
     }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt
index f7d60118586e..ab5e556091ca 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt
@@ -7,7 +7,7 @@ val foo: O
         if (true) return O() else return P()<caret>
     }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt.after
index ba2fe7b47650..8ed592db7737 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterWithIf3.kt.after
@@ -7,7 +7,7 @@ val foo: Any
         if (true) return O() else return P()
     }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt
index 564de6e66fba..b45cf14a9118 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt
@@ -4,6 +4,6 @@ class P
 
 val foo: O = if (true) O() else P()<caret>
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt.after
index 82f3a82accae..8bcbe108a289 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithIf.kt.after
@@ -4,6 +4,6 @@ class P
 
 val foo: Any = if (true) O() else P()
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt
index 7affba07bc2a..58b5c2986842 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt
@@ -7,6 +7,6 @@ val foo: O = when {
     else -> P()<caret>
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt.after
index 924942feb961..26a011510a9b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyInitializerWithWhen.kt.after
@@ -7,6 +7,6 @@ val foo: Any = when {
     else -> P()
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt
index b7752ed9f1ad..563c62288fbf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt
@@ -4,6 +4,6 @@ fun foo(f: () -> Int) {
         ""<caret>
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after
index 623b44e1fcb8..36fb9127597b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt.after
@@ -4,6 +4,6 @@ fun foo(f: () -> String) {
         ""<caret>
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt
index b9d46a80cb98..47a4423ca411 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt
@@ -3,5 +3,5 @@
 val a: Array<Int> = arrayOf(1)
 val b: Array<Int> = <caret>arrayOf(a)
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt.after
index aadb7d32dd21..6b9553e97324 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalArray2.kt.after
@@ -3,5 +3,5 @@
 val a: Array<Int> = arrayOf(1)
 val b: Array<Array<Int>> = arrayOf(a)
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt
index a5705a620287..fb854265d3e0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt
@@ -3,5 +3,5 @@
 val a: List<Int> = listOf(1)
 val b: List<Int> = <caret>listOf(a)
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt.after
index 2a796a7c0d9a..4edf10658756 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/twoDimensionalList2.kt.after
@@ -3,5 +3,5 @@
 val a: List<Int> = listOf(1)
 val b: List<List<Int>> = listOf(a)
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
index 36eded49850a..3c61d846f89d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
@@ -10,6 +10,6 @@ fun foo() {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
index 849fc1bf0d17..a9da0c76fad3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
@@ -10,6 +10,6 @@ fun foo() {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.ChangeCallableReturnTypeFix$ForEnclosing
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
index 63c8278d29df..d1f921cf2801 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt
@@ -10,5 +10,5 @@ class Delegate {
         return ""
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
index eab81de53387..47b963c5ff80 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/delegatedProperty.kt.after
@@ -10,5 +10,5 @@ class Delegate {
         return ""
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
index 9e799340198f..3f1e6961a622 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt
@@ -7,5 +7,5 @@ fun foo(p: Int) {
 fun getPair(): Pair<Int, String>? = null
 
 data class Pair<T1, T2>(val a: T1, val b: T2)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
index a77183c65130..875bfd49293e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/multiVariable.kt.after
@@ -7,5 +7,5 @@ fun foo(p: Int) {
 fun getPair(): Pair<Int, String>? = null
 
 data class Pair<T1, T2>(val a: T1, val b: T2)
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
index 77c7b60ae78e..c069622b905d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt
@@ -3,5 +3,5 @@ fun foo(p: Int) {
     <caret>var v: Int
     if (p > 0) v = 1 else v = 2
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
index 85ce4ea75f36..652fe90f4318 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/singleVariable.kt.after
@@ -3,5 +3,5 @@ fun foo(p: Int) {
     <caret>val v: Int
     if (p > 0) v = 1 else v = 2
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
index ce30643c27d8..e886946c83ef 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt
@@ -14,5 +14,5 @@ class Test {
         t.some()
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
index 5385f694e0cb..09b684e186ab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedMemberValInitialization.kt.after
@@ -14,5 +14,5 @@ class Test {
         t.some()
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
index 91cf7c09a877..0d185984f9be 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt
@@ -8,5 +8,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
index ea81d08c155b..4a3d2efd4a63 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/capturedValInitialization.kt.after
@@ -8,5 +8,5 @@ fun foo() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt
index 8c981e760409..0c82a5a11e87 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt
@@ -6,5 +6,5 @@ object A {
         <caret>A = 10
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt.after
index c903398c3b5e..a6aafa2107f0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/const.kt.after
@@ -6,5 +6,5 @@ object A {
         <caret>A = 10
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt
index 621476e5c9e6..a1f8a75b2855 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt
@@ -6,5 +6,5 @@ val String.prop: Int
         <caret>p = 2
         return p
     }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt.after
index f0783480c5ec..3f46a8ea922b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/localInGetter.kt.after
@@ -6,5 +6,5 @@ val String.prop: Int
         <caret>p = 2
         return p
     }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
index 44c9beba6b55..79a2c5ff6df7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt
@@ -4,5 +4,5 @@ fun foo() {
     <caret>a = 3
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
index 6d1778476c91..4482d33f4049 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt.after
@@ -4,5 +4,5 @@ fun foo() {
     <caret>a = 3
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
index 48613bf85515..d9eb06abbc77 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt
@@ -5,5 +5,5 @@ fun bar() {
     <caret>a = 5
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
index 02370679f02f..6618c424e0a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt.after
@@ -5,5 +5,5 @@ fun bar() {
     <caret>a = 5
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
index 41731e75dd94..726f20b65ca6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt
@@ -7,5 +7,5 @@ class A() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
index 07b40c7ae760..5c01b420ddd0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt.after
@@ -7,5 +7,5 @@ class A() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
index 84952875048e..1778fc50d3a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt
@@ -5,5 +5,5 @@ class A(val a: Int) {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
index 564f2d8ee630..7c68efbc19fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/valReassignmentPropertyConstructorParameter.kt.after
@@ -5,5 +5,5 @@ class A(var a: Int) {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.ChangeVariableMutabilityFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt
index c627c1a2af21..9a430e93e743 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt
@@ -23,6 +23,6 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt.after
index 48c7b1ae3b60..fe95af5c00d9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport4.kt.after
@@ -28,6 +28,6 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddWhenRemainingBranchesFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt
index fd87bcfe12ec..24f357ca06d7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt
@@ -16,6 +16,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt.after
index cc0678685db2..6236b1db73c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhen.kt.after
@@ -16,6 +16,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt
index d02366fde745..7d1e5167ee43 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt
@@ -13,6 +13,6 @@ fun foo(chars: CharArray) {
         pos++
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt.after
index b65d8d0cd4a8..b7346169a68c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/breakInWhenInLabeled.kt.after
@@ -13,6 +13,6 @@ fun foo(chars: CharArray) {
         pos++
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt
index b2c469acefa3..e84b4eea4e95 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt
@@ -13,5 +13,5 @@ fun test(i: Int, j: Int) {
         else -> { /* other code */ }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.CommaInWhenConditionWithoutArgumentFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt.after
index 977f0d6cd062..6eaabf8e27b3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments.kt.after
@@ -13,5 +13,5 @@ fun test(i: Int, j: Int) {
         else -> { /* other code */ }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.CommaInWhenConditionWithoutArgumentFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt
index e06b553f53a9..723e22737fd2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt
@@ -6,6 +6,6 @@ fun test(a: Boolean, b: Boolean, c: Boolean) {
         else -> "e"
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.CommaInWhenConditionWithoutArgumentFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt.after
index de4030eb8e86..ef3737902ee3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/commasInConditionWithNoArguments2.kt.after
@@ -6,6 +6,6 @@ fun test(a: Boolean, b: Boolean, c: Boolean) {
         else -> "e"
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.CommaInWhenConditionWithoutArgumentFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt
index 407d7d76b98b..31abe5076bcb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt
@@ -16,6 +16,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt.after
index c4146c7cc1d0..df668c4a760e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhen.kt.after
@@ -16,6 +16,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt
index 9c7ddf9b8355..02d954cc876e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt
@@ -13,6 +13,6 @@ fun foo(chars: CharArray) {
         pos++
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt.after
index 61c9e473cf13..3fc92d57151c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenInLabeled.kt.after
@@ -13,6 +13,6 @@ fun foo(chars: CharArray) {
         pos++
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt
index 304f8b47a7d3..9317a0b3adb2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt
@@ -18,6 +18,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt.after
index 2e28319c9d63..ea0ed34f68cf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/continueInWhenWithLabel.kt.after
@@ -18,6 +18,6 @@ fun breakContinueInWhen(i: Int) {
         }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.codeinsights.impl.base.quickFix.AddLoopLabelFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt
index 76a7c3a0da11..7a5f2971e78c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt
@@ -7,6 +7,6 @@ fun test() {
         2 -> { /* some more code */ }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt.after
index 6b0b041f4127..ed5e5f5102fe 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/elseNotLastInWhen.kt.after
@@ -7,6 +7,6 @@ fun test() {
         el<caret>se -> { /* other code */ }
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
index b0fe501f239f..1b8f95bea32d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
@@ -10,6 +10,6 @@ fun main() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveWhenConditionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
index af289da57724..5ae21ced8074 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
@@ -10,6 +10,6 @@ fun main() {
     }
 }
 
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveWhenConditionFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt
index c03b04bd9fc7..6208381b60df 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt
@@ -7,6 +7,6 @@ fun foo(b: Boolean) {
         <caret>else -> error()
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveWhenBranchFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt.after
index 644c6a2012bb..2ef5cbf42fdc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantElse.kt.after
@@ -6,6 +6,6 @@ fun foo(b: Boolean) {
         false -> {}
     }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.RemoveWhenBranchFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt
index da05e4e6457f..8592712c5e6e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo?.bar<caret>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.WrapWithSafeLetCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt.after
index 2ef319ef6eec..95c9138d4528 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator.kt.after
@@ -9,5 +9,5 @@ class Bar {
 fun test(foo: Foo?) {
     foo?.bar?.let { it() }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.WrapWithSafeLetCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt
index 1515ca17e0ba..3ef3863e72be 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt
@@ -11,5 +11,5 @@ class Baz {
 fun test(foo: Foo) {
     foo.bar?.baz<caret>()
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.WrapWithSafeLetCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt.after
index 1f10132e1967..1304802d86b2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/invokeOperator2.kt.after
@@ -11,5 +11,5 @@ class Baz {
 fun test(foo: Foo) {
     foo.bar?.baz?.let { it() }
 }
-/* IGNORE_FIR */
+/* IGNORE_K2 */
 // FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.WrapWithSafeLetCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt b/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt
index 545e4f1dfe3c..e3c66f9f889a 100644
--- a/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package a.b.c
 
 fun test(n: Int) {
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt.after b/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt.after
index 4bc16f069457..2a16a2c21efa 100644
--- a/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/quailfiers/TwoVariablesInKtUseType.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package a.b.c
 
 import x.y.z.Outer
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt
index 5e9bff5b310f..e6b1c398b719 100644
--- a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package test
 
 class Foo
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt.after b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt.after
index 752531b50cf4..1ba72fcda1e0 100644
--- a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt.after
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeConflictingTopLevelClassUsed.kt.after
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 package test
 
 class Foo
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/env/kotlin/AbstractFirUastTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/env/kotlin/AbstractFirUastTest.kt
index 1156cf487930..4d77a5652bde 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/env/kotlin/AbstractFirUastTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/test/org/jetbrains/fir/uast/test/env/kotlin/AbstractFirUastTest.kt
@@ -35,11 +35,11 @@ import java.nio.file.Paths
 
 abstract class AbstractFirUastTest : KotlinLightCodeInsightFixtureTestCase(), UastPluginSelection {
     companion object {
-        private const val IGNORE_FIR_DIRECTIVE = "IGNORE_FIR"
+        private const val IGNORE_K2_DIRECTIVE = "IGNORE_K2"
 
         val String.withIgnoreFirDirective: Boolean
             get() {
-                return IGNORE_FIR_DIRECTIVE in KotlinTestUtils.parseDirectives(this)
+                return IGNORE_K2_DIRECTIVE in KotlinTestUtils.parseDirectives(this)
             }
     }
 
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/declaration/build.gradle.kts b/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/declaration/build.gradle.kts
index 8683d8241d30..c958a431356c 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/declaration/build.gradle.kts
+++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/declaration/build.gradle.kts
@@ -1,4 +1,4 @@
-// IGNORE_FIR
+// IGNORE_K2
 // KT-61431
 
 plugins {
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/SimpleScript.kts b/plugins/kotlin/uast/uast-kotlin/tests/testData/SimpleScript.kts
index d97ea8027a90..b355226248ec 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/SimpleScript.kts
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/SimpleScript.kts
@@ -1,4 +1,4 @@
-// !IGNORE_FIR
+// !IGNORE_K2
 
 println("Hello World!")