diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt
index e167f83fe7db..418db8de3ead 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt
@@ -1,3 +1,3 @@
-fun foo(i: Int) {
-    i.fori<caret>
+fun foo(int: Int) {
+    int.fori<caret>
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt.after
index 041321a84cfa..ef8e632786cd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/postfix/forNumber2.kt.after
@@ -1,5 +1,5 @@
-fun foo(i: Int) {
-    for (i1 in 0..i) {
+fun foo(int: Int) {
+    for (i in 0..int) {
         <caret>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt
index 1f83fe2629e4..b62711f56de2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt
@@ -2,4 +2,5 @@
 abstract class AbstractIn<<caret>T>(private val foo: T) {
     fun bar(arg: T) = foo == arg
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt.after
index c4ed6bd5a046..3ceba175d510 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractIn.kt.after
@@ -2,4 +2,5 @@
 abstract class AbstractIn<in T>(private val foo: T) {
     fun bar(arg: T) = foo == arg
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt
index 7475240c5d21..16dfe62cafbd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt
@@ -3,4 +3,5 @@ abstract class AbstractOut<<caret>T> {
     abstract val foo: T
     private var bar = foo
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt.after
index 2c54af72325a..c4ce4e1297a1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addVarianceModifier/abstractOut.kt.after
@@ -3,4 +3,5 @@ abstract class AbstractOut<out T> {
     abstract val foo: T
     private var bar = foo
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.AddVarianceModifierInspection$AddVarianceFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt
index 6345a79fbbc7..966600f7e5f2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt
@@ -3,4 +3,5 @@
 class <caret>C {
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt.after
index dfe1ed6acb08..e6d15781ee11 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/simple.kt.after
@@ -6,4 +6,5 @@
 class C {
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt
index 525ed9ad040c..d1c93294a1ae 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt
@@ -8,4 +8,5 @@ class C {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt.after
index f672bb838b34..288292298ace 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/kdocMissingDocumentation/withIndentation.kt.after
@@ -11,4 +11,5 @@ class C {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.inspections.kdoc.KDocMissingDocumentationInspection$AddDocumentationFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
index 0397ab0cd24f..7e2c0b390d72 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt
@@ -5,4 +5,5 @@ class A(<caret>internal val a: String = "") {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
index db02bfd39635..c35ae1ad7f32 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/constructorParam.kt.after
@@ -5,4 +5,5 @@ class A(private val a: String = "") {
     }
 }
 
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
index 8814e9010662..21645a1d4a51 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
index e8e31ecf770f..0e03316edf2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/internal.kt.after
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
index f5d4b63a0c92..cdbafe765c8c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
index e8e31ecf770f..0e03316edf2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/noModifier.kt.after
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
index 87fbd2fbcc2a..b18fcf081765 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt
@@ -6,4 +6,5 @@ open class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
index ab4c51a3f78c..5ed74ec530f0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/protected.kt.after
@@ -6,4 +6,5 @@ open class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt
index b8046fcebe05..d861e7718f64 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
index e8e31ecf770f..0e03316edf2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/memberVisibilityCanBePrivate/public.kt.after
@@ -6,4 +6,5 @@ class A {
         a
     }
 }
-// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file
+// FUS_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
+// FUS_K2_QUICKFIX_NAME: org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
\ No newline at end of file