diff --git a/idea/testData/intentions/specifyType/afterBadCaretPosition.kt b/idea/testData/intentions/specifyType/afterBadCaretPosition.kt
index bb249aeb919..c065b032efa 100644
--- a/idea/testData/intentions/specifyType/afterBadCaretPosition.kt
+++ b/idea/testData/intentions/specifyType/afterBadCaretPosition.kt
@@ -1,2 +1,3 @@
-// "Specify type explicitly" "false"
+// "class org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction" "false"
+
 val x = "<caret>"
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyType/afterUnknownType.kt b/idea/testData/intentions/specifyType/afterUnknownType.kt
index 30568691514..f148fbdc44b 100644
--- a/idea/testData/intentions/specifyType/afterUnknownType.kt
+++ b/idea/testData/intentions/specifyType/afterUnknownType.kt
@@ -1,2 +1,3 @@
-// "Specify type explicitly" "false"
+// "class org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction" "false"
+
 val <caret>x = BadType()
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt b/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt
index bb249aeb919..c065b032efa 100644
--- a/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt
+++ b/idea/testData/intentions/specifyType/beforeBadCaretPosition.kt
@@ -1,2 +1,3 @@
-// "Specify type explicitly" "false"
+// "class org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction" "false"
+
 val x = "<caret>"
\ No newline at end of file
diff --git a/idea/testData/intentions/specifyType/beforeUnknownType.kt b/idea/testData/intentions/specifyType/beforeUnknownType.kt
index 30568691514..f148fbdc44b 100644
--- a/idea/testData/intentions/specifyType/beforeUnknownType.kt
+++ b/idea/testData/intentions/specifyType/beforeUnknownType.kt
@@ -1,2 +1,3 @@
-// "Specify type explicitly" "false"
+// "class org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction" "false"
+
 val <caret>x = BadType()
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt
index 89e58141855..ef4f69e79a8 100644
--- a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt
+++ b/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt
@@ -1,5 +1,4 @@
-// "Add '<*, *>'" "false"
-// "Add '<*>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: 2 type arguments expected
 public fun foo(a: Any) {
     a is Map<Int>
diff --git a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt
index 8078456b367..5a16bf5523d 100644
--- a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt
+++ b/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt
@@ -1,5 +1,4 @@
-// "Add '<*, *>'" "false"
-// "Add '<*>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: 2 type arguments expected
 public fun foo(a: Any) {
     a is <caret>Map<Int>
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt
index 2dd8487de0b..f2d704178b5 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt
+++ b/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt
@@ -1,4 +1,4 @@
-// "Add '<*, *>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: Type argument expected
 class C2<T>
 
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt
index 4738bca4829..3fde48746a7 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt
+++ b/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt
@@ -1,5 +1,4 @@
-// "Add '<*>'" "false"
-// "Add '<*, *>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 class C
 
 fun test() {
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt
index 2dd8487de0b..f2d704178b5 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt
+++ b/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt
@@ -1,4 +1,4 @@
-// "Add '<*, *>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: Type argument expected
 class C2<T>
 
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt
index 3f00e7d7d07..22653272075 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt
+++ b/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt
@@ -1,5 +1,4 @@
-// "Add '<*>'" "false"
-// "Add '<*, *>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 class C
 
 fun test() {
diff --git a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt
index 2dcb5c7632c..a10166fbe8b 100644
--- a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt
+++ b/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt
@@ -1,5 +1,4 @@
-// "Add '<*, *>'" "false"
-// "Add '<*>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: 2 type arguments expected
 public fun foo(a: Any) {
     when (a) {
diff --git a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt
index c8f90c88840..4073f595e96 100644
--- a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt
+++ b/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt
@@ -1,12 +1,5 @@
-// "Add '<*, *>'" "false"
-// "Add '<*>'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false"
 // ERROR: 2 type arguments expected
-// ACTION: Disable 'Eliminate Argument of 'when''
-// ACTION: Disable 'Replace 'when' with 'if''
-// ACTION: Edit intention settings
-// ACTION: Edit intention settings
-// ACTION: Eliminate argument of 'when'
-// ACTION: Replace 'when' with 'if'
 public fun foo(a: Any) {
     when (a) {
         is <caret>Map<Int> -> {}
diff --git a/idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt b/idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
index bee676f3fed..2447ffc0f55 100644
--- a/idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
+++ b/idea/testData/quickfix/autoImports/afterCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
@@ -1,5 +1,4 @@
-// "Import Class" "false"
-
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar
 // ERROR: Unresolved reference: SomeImpossibleName
diff --git a/idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt b/idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt
index 4039e4861d8..4a96bf08d8f 100644
--- a/idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt
+++ b/idea/testData/quickfix/autoImports/afterNoImportAlreadyImported.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 
diff --git a/idea/testData/quickfix/autoImports/afterNoImportForIndex.kt b/idea/testData/quickfix/autoImports/afterNoImportForIndex.kt
index 1b254db93ee..72ea34e3c0c 100644
--- a/idea/testData/quickfix/autoImports/afterNoImportForIndex.kt
+++ b/idea/testData/quickfix/autoImports/afterNoImportForIndex.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 
 package Teting
 
diff --git a/idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt b/idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
index bee676f3fed..b2716bff9a7 100644
--- a/idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
+++ b/idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 
 // KT-3165 Weird stack overflow in IDE
 // ERROR: Unresolved reference: Bar
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessClass.kt b/idea/testData/quickfix/autoImports/beforeNamelessClass.kt
index 83b50e7ee8b..b9b35b3e8fd 100644
--- a/idea/testData/quickfix/autoImports/beforeNamelessClass.kt
+++ b/idea/testData/quickfix/autoImports/beforeNamelessClass.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: TTT
 
 class {
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessFunction.kt b/idea/testData/quickfix/autoImports/beforeNamelessFunction.kt
index 7cc5b264f81..05d0de5fb0b 100644
--- a/idea/testData/quickfix/autoImports/beforeNamelessFunction.kt
+++ b/idea/testData/quickfix/autoImports/beforeNamelessFunction.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: TTTTT
 
 fun () {
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessObject.kt b/idea/testData/quickfix/autoImports/beforeNamelessObject.kt
index 59af1db619f..807ab214043 100644
--- a/idea/testData/quickfix/autoImports/beforeNamelessObject.kt
+++ b/idea/testData/quickfix/autoImports/beforeNamelessObject.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: TTT
 
 object {
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessParameter.kt b/idea/testData/quickfix/autoImports/beforeNamelessParameter.kt
index 932463134a6..1d2046b6ca7 100644
--- a/idea/testData/quickfix/autoImports/beforeNamelessParameter.kt
+++ b/idea/testData/quickfix/autoImports/beforeNamelessParameter.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Function 'f' must have a body
 // ERROR: Unresolved reference: TTT
 
diff --git a/idea/testData/quickfix/autoImports/beforeNamelessProperty.kt b/idea/testData/quickfix/autoImports/beforeNamelessProperty.kt
index 5b4f113db1a..b9076708b97 100644
--- a/idea/testData/quickfix/autoImports/beforeNamelessProperty.kt
+++ b/idea/testData/quickfix/autoImports/beforeNamelessProperty.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: TTT
 
 val : Int
diff --git a/idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt b/idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt
index aacb9257a3e..95b733d4564 100644
--- a/idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt
+++ b/idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: someFun
 // ERROR: Unresolved reference: test
 
diff --git a/idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt b/idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt
index bad742562a9..29ccb481ec7 100644
--- a/idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt
+++ b/idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: some[12]
 // ERROR: No get method providing array access
 
diff --git a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
index 87756e6c90a..7a6c3dbe393 100644
--- a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: externalFun
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
index 87756e6c90a..7a6c3dbe393 100644
--- a/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: externalFun
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt b/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
index 225e623a55a..8947e07d757 100644
--- a/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportForPrivateClass.after.kt
@@ -1,4 +1,4 @@
-// "Import Class" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: PrivateClass
 
 fun test() {
diff --git a/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt b/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
index 7df5815c5d2..05957335046 100644
--- a/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: PrivateClass
 
 fun test() {
diff --git a/idea/testData/quickfix/autoImports/noImportInImports.after.kt b/idea/testData/quickfix/autoImports/noImportInImports.after.kt
index 5c3faf9e4a8..c2879907b39 100644
--- a/idea/testData/quickfix/autoImports/noImportInImports.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInImports.after.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
index 5c3faf9e4a8..c2879907b39 100644
--- a/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
index 9cd3ed822ca..7f248285bbc 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
index c5fe6af4f30..e75dc3b995e 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
index 2622c46bac5..d7ae7fface7 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
index 2622c46bac5..d7ae7fface7 100644
--- a/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
index 0075eebc5e2..12443030b22 100644
--- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
+++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.after.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
index 0075eebc5e2..12443030b22 100644
--- a/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
 
 package testing
diff --git a/idea/testData/quickfix/autoImports/packageClass.before.Main.kt b/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
index fcb6a47c9f8..73a11e81935 100644
--- a/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/packageClass.before.Main.kt
@@ -1,4 +1,4 @@
-// "Import" "false"
+// "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: FooPackage
 
 package packageClass
diff --git a/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt
index d2d7dace2d8..22bce86908c 100644
--- a/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt
+++ b/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt
@@ -1,4 +1,4 @@
-// "Add parameter to function 'component1'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
 //ERROR: Too many arguments for internal final fun component1(): jet.Int defined in Data
 
 data class Data(val i: Int) {}
diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt
index 1c59de1f7b4..085d255e09f 100644
--- a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt
+++ b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt
@@ -1,4 +1,4 @@
-// "Add parameter to function 'equals'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
 // ERROR: Too many arguments for public fun jet.Any?.equals(other: jet.Any?): jet.Boolean defined in jet
 
 fun f(d: Any) {
diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
index b1634ca560a..e62a6189b9e 100644
--- a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
+++ b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt
@@ -1,4 +1,4 @@
-// "Add parameter to function 'equals'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
 // ERROR: Too many arguments for public open fun equals(p0: jet.Any?): jet.Boolean defined in java.lang.Object
 
 fun f(d: java.lang.Object) {
diff --git a/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt
index 4431162f609..64da6bf7665 100644
--- a/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt
+++ b/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt
@@ -1,4 +1,4 @@
-// "Add parameter to function 'component1'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false"
 //ERROR: Too many arguments for internal final fun component1(): jet.Int defined in Data
 
 data class Data(val i: Int) {}
diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt
index 3e647e5a812..5eabb8d602a 100644
--- a/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt
+++ b/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt
@@ -1,4 +1,4 @@
-// "Remove parameter 'other'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.RemoveFunctionParametersFix" "false"
 // ERROR: No value passed for parameter other
 
 fun f(d: Boolean) {
diff --git a/idea/testData/quickfix/migration/afterBareSure.kt b/idea/testData/quickfix/migration/afterBareSure.kt
deleted file mode 100644
index f14b883f8a8..00000000000
--- a/idea/testData/quickfix/migration/afterBareSure.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// "Replace sure() calls by !! in project" "false"
-// ERROR: Unresolved reference: sure
-
-fun test() {
-    sure()
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/migration/beforeBareSure.kt b/idea/testData/quickfix/migration/beforeBareSure.kt
index 120af475699..525b8fee5e0 100644
--- a/idea/testData/quickfix/migration/beforeBareSure.kt
+++ b/idea/testData/quickfix/migration/beforeBareSure.kt
@@ -1,4 +1,4 @@
-// "Replace sure() calls by !! in project" "false"
+// "class org.jetbrains.jet.plugin.quickfix.MigrateSureInProjectFix" "false"
 // ERROR: Unresolved reference: sure
 
 fun test() {
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt
index 968a2ebf595..924dafb7c6e 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt
@@ -1,4 +1,4 @@
-// "Make E open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
 // ERROR: Cannot access '<init>': it is 'private' in 'E'
 enum class E {}
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt
index fb49ff2db01..da8b3c3aa4b 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt
@@ -1,3 +1,3 @@
-// "Make E open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 enum class E {}
 class A<T : E<caret>> {}
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt
index 569379893a5..0b4558432e4 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt
@@ -1,3 +1,3 @@
-// "Make String open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
 class A : String<caret>() {}
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt
index bbc77e243b2..0fc5ccf0845 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt
@@ -1,2 +1,2 @@
-// "Make String open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 class A<T : String<caret>> {}
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt
index ca73e8329a3..59c8773159e 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt
@@ -1,4 +1,4 @@
-// "Make JavaClass open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
 import testPackage.*
 
diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt
index 2c0c7044dd0..7dd0b282d83 100644
--- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt
+++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt
@@ -1,4 +1,4 @@
-// "Make JavaClass open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false"
 import testPackage.*
 
 class foo<T : JavaClass>() {}
diff --git a/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt b/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt
index 0b07ad8d99e..4f85ff25d9f 100644
--- a/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt
+++ b/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt
@@ -1,3 +1,3 @@
-// "Make 'String' an annotation class" "false"
+// "class org.jetbrains.jet.plugin.quickfix.MakeClassAnAnnotationClassFix" "false"
 // ERROR: 'String' is not an annotation class
 [String<caret>] class foo {}
diff --git a/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt b/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt
index 2ce86ba6223..107cd921238 100644
--- a/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt
+++ b/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt
@@ -1,8 +1,5 @@
-// "Make Object.notify open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false"
 // ERROR: 'notify' in 'Object' is final and cannot be overridden
-// ACTION: Convert to extension
-// ACTION: Disable 'Convert to extension'
-// ACTION: Edit intention settings
 class A : Object() {
     override<caret> fun notify() {}
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt b/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt
index f14c5761bec..12e0988aa09 100644
--- a/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt
+++ b/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt
@@ -1,10 +1,7 @@
-// "Make 'ordinal' in E and X open" "false"
+// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false"
 // ERROR: This type is final, so it cannot be inherited from
 // ERROR: Cannot access '<init>': it is 'private' in 'E'
 // ERROR: 'ordinal' in 'E' is final and cannot be overridden
-// ACTION: Convert to extension
-// ACTION: Disable 'Convert to extension'
-// ACTION: Edit intention settings
 enum class E {}
 trait X {
     final fun ordinal() : Int = 42
diff --git a/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt b/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt
index 42be1de9256..abb1a5e4a93 100644
--- a/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt
+++ b/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt
@@ -1,4 +1,5 @@
-// "Rename parameter to match overridden method" "false"
+// "class org.jetbrains.jet.plugin.quickfix.RenameParameterToMatchOverriddenMethodFix" "false"
+
 abstract class A {
     abstract fun foo(arg : Int) : Int;
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt b/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt
index 732382fd428..7e714e9480a 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt
@@ -1,10 +1,5 @@
-// "Change function signature to 'override fun f(a: Int)'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeMemberFunctionSignatureFix" "false"
 // ERROR: 'f' overrides nothing
-// ACTION: Add 'open fun f(a: String)' to 'A'
-// ACTION: Remove 'override' modifier
-// ACTION: Convert to extension
-// ACTION: Disable 'Convert to extension'
-// ACTION: Edit intention settings
 open class A {
     open fun foo() {}
     fun f(a: Int) {}
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
index 1a7149f1ca8..51f25c29307 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt
@@ -1,4 +1,4 @@
-// "Change 'A.x' type to 'String'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
 // ERROR: <html>Var-property type is 'jet.String', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.Int <i>defined in</i> A</html>
 trait A {
     var x: Int
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt
index c47babf6e69..e480b3bf90a 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt
@@ -1,4 +1,4 @@
-// "Change 'C.x' type to 'String'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false"
 // ERROR: <html>Var-property type is 'jet.Int', which is not a type of overridden<br/><b>internal</b> <b>abstract</b> <b>var</b> x: jet.String <i>defined in</i> A</html>
 trait A {
     var x: String
diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt
index 302ed8d5be4..cad33e344b6 100644
--- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt
+++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt
@@ -1,4 +1,4 @@
-// "Change 'A.foo' function return type to 'Long'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
 // ERROR: <html>Return type is 'jet.Long', which is not a subtype of overridden<br/><b>internal</b> <b>abstract</b> <b>fun</b> foo(): jet.Int <i>defined in</i> A</html>
 trait A {
     fun foo(): Int
diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt b/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt
index 08f96ab5755..eb257bc33b0 100644
--- a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt
+++ b/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt
@@ -1,4 +1,4 @@
-// "Change to constructor invocation" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeToConstructorInvocationFix" "false"
 // ERROR: This type has a constructor, and thus must be initialized here
 open class A(x : Int) {}
 class B : A<caret> {}
diff --git a/idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt b/idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt
index 132e43e84c6..5a3cb6d1d78 100644
--- a/idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt
+++ b/idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt
@@ -1,4 +1,4 @@
-// "Suppress 'REDUNDANT_NULLABLE' for fun foo" "false"
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 [suppress("REDUNDANT_NULLABLE")]
 fun foo(): String?<caret>? = null
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt
index d10b1deb3e2..c0eacffc21f 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt
@@ -1,5 +1,4 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 [suppress("FOO"<caret>!!)]
 fun foo() {}
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt
index dd69a597825..bd76490b6da 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt
@@ -1,5 +1,4 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 open class Base(s: String)
 class Child: Base(""<caret>!!)
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt
index 814997eda2e..a0dfaf56c6b 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt
@@ -1,4 +1,3 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo(s: String = ""<caret>!!) {}
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt
index 06c4a12096d..215db232400 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt
@@ -1,4 +1,3 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo() = ""<caret>!!
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt
index dfcd4099e83..ce1d8d1c68a 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt
@@ -1,8 +1,4 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Disable 'Split Property Declaration'
-// ACTION: Edit intention settings
-// ACTION: Remove unnecessary non-null assertion (!!)
-// ACTION: Split property declaration
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo() {
     val bar = ""<caret>!!
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt
index ad91af11a4f..3cbb707f1cd 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt
@@ -1,4 +1,3 @@
-// "Suppress 'REDUNDANT_NULLABLE' for statement " "false"
-// ACTION: Remove redundant '?'
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo(s: String?<caret>?) {}
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt
index 95eba9d061f..6f1fa648b13 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt
@@ -1,5 +1,4 @@
-// "Suppress 'REDUNDANT_NULLABLE' for statement " "false"
-// ACTION: Remove redundant '?'
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo() {
     any {
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt
index 7019a9cbc44..78fcd8b9c3e 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt
@@ -1,4 +1,3 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 val foo = ""<caret>!!
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt
index 69e841ef557..1340b0755cc 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt
@@ -1,5 +1,4 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for object <anonymous>" "false"
-// ACTION: Remove unnecessary non-null assertion (!!)
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo() {
     object : Base(""<caret>!!) {
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt
index bfa8397bf5d..0fb466191a8 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt
@@ -1,8 +1,4 @@
-// "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for object <anonymous>" "false"
-// ACTION: Disable 'Split Property Declaration'
-// ACTION: Edit intention settings
-// ACTION: Remove unnecessary non-null assertion (!!)
-// ACTION: Split property declaration
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 fun foo() {
     val a = object : Base(""<caret>!!) {
diff --git a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt
index 50cc067ba5c..0116565a033 100644
--- a/idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt
+++ b/idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt
@@ -1,5 +1,4 @@
-// "Suppress 'REDUNDANT_NULLABLE' for statement " "false"
-// ACTION: Remove redundant '?'
+// "class com.intellij.codeInspection.SuppressIntentionAction" "false"
 
 open class Base<T>
 class Child: Base<String?<caret>?>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt
index b90d4f3e1a6..2eabcef3e98 100644
--- a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt
+++ b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt
@@ -1,6 +1,5 @@
-// "Cast expression 'a: A' to 'B'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.CastExpressionFix" "false"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>B</td></tr><tr><td>Found:</td><td>A</td></tr></table></html>
-// ACTION: Change 'foo' function return type to 'A'
 open class A
 class B : A()
 
diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt
index 80f37c15a85..b8e00cd36a9 100644
--- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt
+++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt
@@ -1,4 +1,4 @@
-// "Change parameter 'y' type of function 'foo' to 'Int'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
 fun foo(y: Int = 0, z: (Int) -> String = {""}) {
     foo(""<caret>: Int)
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
index 8161c29c287..6d5a74d833f 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt
@@ -1,6 +1,3 @@
-// "Change function 'foo' return type to 'String'" "false"
+// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>jet.Int</td></tr><tr><td>Found:</td><td>jet.String</td></tr></table></html>
-// ACTION: Disable 'Replace 'if' with 'when''
-// ACTION: Edit intention settings
-// ACTION: Replace 'if' with 'when'
 fun foo(): Int = if (true) ""<caret>: Int else 4
\ No newline at end of file
diff --git a/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt b/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
index 6ff3c7d7e1e..7e977b64c6a 100644
--- a/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
+++ b/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt
@@ -1,14 +1,8 @@
-// "Move else branch to the end" "false"
+// "class org.jetbrains.jet.plugin.quickfix.MoveWhenElseBranchFix" "false"
 // ERROR: 'else' entry must be the last one in a when-expression
 // ERROR: 'else' entry must be the last one in a when-expression
 // WARNING: Unreachable code
 // WARNING: Unreachable code
-// ACTION: Disable 'Eliminate Argument of 'when''
-// ACTION: Disable 'Replace 'when' with 'if''
-// ACTION: Edit intention settings
-// ACTION: Edit intention settings
-// ACTION: Eliminate argument of 'when'
-// ACTION: Replace 'when' with 'if'
 package foo
 
 fun foo() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
index 5c663aa1bc0..233efcde50a 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
+import junit.framework.Assert;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -53,7 +54,7 @@ public abstract class AbstractQuickFixTest extends LightQuickFixTestCase {
             }
 
             doSingleTest(getTestName(false) + ".kt");
-            checkAvailableActionsAreExpected();
+            checkForUnexpectedActions();
             checkForUnexpectedErrors();
         }
         finally {
@@ -63,12 +64,26 @@ public abstract class AbstractQuickFixTest extends LightQuickFixTestCase {
         }
     }
 
-    public void checkAvailableActionsAreExpected() {
-        List<IntentionAction> actions = getAvailableActions();
+    private void checkForUnexpectedActions() throws ClassNotFoundException {
         Pair<String, Boolean> pair = parseActionHintImpl(getFile(), getEditor().getDocument().getText());
-        if (!pair.getSecond()) {
-            // Action shouldn't be found. Check that other actions are expected and thus tested action isn't there under another name.
-            QuickFixActionsUtils.checkAvailableActionsAreExpected((JetFile) getFile(), actions);
+        if (!pair.second) {
+            List<IntentionAction> actions = getAvailableActions();
+
+            String prefix = "class ";
+            if (pair.first.startsWith(prefix)) {
+                String className = pair.first.substring(prefix.length());
+                Class<?> aClass = Class.forName(className);
+                assert IntentionAction.class.isAssignableFrom(aClass) : className + " should be inheritor of IntentionAction";
+                for (IntentionAction action : actions) {
+                    if (aClass.isAssignableFrom(action.getClass())) {
+                        Assert.fail("Unexpected intention action " + action.getClass() + " found");
+                    }
+                }
+            }
+            else {
+                // Action shouldn't be found. Check that other actions are expected and thus tested action isn't there under another name.
+                QuickFixActionsUtils.checkAvailableActionsAreExpected((JetFile) getFile(), actions);
+            }
         }
     }