diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java
index 325cab085f1..c17f8afec08 100644
--- a/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java
@@ -50,9 +50,8 @@ import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
 public class JetChangeFunctionSignatureAction implements QuestionAction {
     public static final DescriptorRenderer SIGNATURE_RENDERER = new DescriptorRendererBuilder()
             .setWithDefinedIn(false)
-            .setModifiers(DescriptorRenderer.Modifier.OVERRIDE)
+            .setModifiers()
             .setShortNames(true)
-            .setOverrideRenderingPolicy(DescriptorRenderer.OverrideRenderingPolicy.RENDER_OVERRIDE)
             .setUnitReturnType(false).build();
 
     private final Project project;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
index e926ba5ee20..1e34398ade8 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Queues;
@@ -112,13 +114,20 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction<JetNamedFunc
         FunctionDescriptor functionDescriptor = context.get(BindingContext.FUNCTION, functionElement);
         if (functionDescriptor == null) return Lists.newArrayList();
         List<FunctionDescriptor> superFunctions = getPossibleSuperFunctionsDescriptors(functionDescriptor);
-        Map<String, FunctionDescriptor> possibleSignatures = Maps.newHashMap();
+        final Map<String, FunctionDescriptor> possibleSignatures = Maps.newHashMap();
         for (FunctionDescriptor superFunction : superFunctions) {
             if (!superFunction.getKind().isReal()) continue;
             FunctionDescriptor signature = changeSignatureToMatch(functionDescriptor, superFunction);
             possibleSignatures.put(getFunctionSignatureString(signature), signature);
         }
-        return Lists.newArrayList(possibleSignatures.values());
+        List<String> keys = new ArrayList<String>(possibleSignatures.keySet());
+        Collections.sort(keys);
+        return new ArrayList<FunctionDescriptor>(Collections2.transform(keys, new Function<String, FunctionDescriptor>() {
+            @Override
+            public FunctionDescriptor apply(String key) {
+                return possibleSignatures.get(key);
+            }
+        }));
     }
 
     /**
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt b/idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt
index 4d7459cfad4..140e3dad9bb 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterAddParameter.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt
index 09804c2dd8f..4545caca6e6 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterGenericClass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+// "Change function signature to 'fun f(a: Int, x: T)'" "true"
 trait A<R> {
     fun f(a: Int, b: R)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt
index 3cf433b4f7c..4526cfb63c4 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterPreserveVisibility.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt
index 28349e38ff3..6519cdd6b28 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertraits.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt
index efd3f3200f8..93088fd591f 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterAddParameterTwoSupertypes.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt
index 1c1bf701be9..db653ede172 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterType.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt
index 03d64186794..521e879ea7f 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeAbstractSuperclass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 abstract class A {
     abstract fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt
index c4468a9c43f..f3ddffa3f11 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeInTrait.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt
index e843f654da4..59504ba105a 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeMatchNames.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(x: Int, t: String, z: Double)'" "true"
+// "Change function signature to 'fun f(x: Int, t: String, z: Double)'" "true"
 open class A {
     open fun f(x: Int, y: String, z: Double) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt
index c280837de4b..7b4acf1391b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeModifyOrder.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: Int, x: String)'" "true"
+// "Change function signature to 'fun f(y: Int, x: String)'" "true"
 open class A {
     open fun f(a: Int, b: String) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt
index 2ede413a7a2..878fed00e66 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeOpenOverride.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 open class A {
     open fun f() {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt
index b235b9d31df..19e47be4f46 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSingleExpressionFunction.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 open class A {
     open fun f(a: Int): Int {
         return 0
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt
index 4d7459cfad4..140e3dad9bb 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeParameterTypeSuperTrait.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt
index 190243d063f..086f245a6c7 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterChangeReturnType.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
 open class A {
     open fun f(a: Int): Int = 0
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt b/idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt
index 54d511dff87..05d9e6d1a4b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterDoNotLooseAnnotations.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 annotation class annon
 
 open class A {
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt b/idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt
index 7a3b543ad65..cbc48825f40 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterOverrideJavaMethod.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun next(p0: Int): Int'" "true"
+// "Change function signature to 'fun next(p0: Int): Int'" "true"
 import java.util.Random
 
 class MyRandom : Random() {
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt b/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt
index 44696b02571..78bdd68d27f 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameter.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt
index 0cb7b35402c..437b44dba53 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterRemoveParameterTwoTraits.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt
index 285b28cb7a3..9564cbe6cdb 100644
--- a/idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/afterSwapParametersGenericClass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+// "Change function signature to 'fun f(y: S, x: List<Set<R>>)'" "true"
 trait A<P,Q> {
     fun f(a: Q, b: List<Set<P>>)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt
index d5b66e27daf..2b000bfd26d 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt
index 4fae2df2a06..877ea9b002f 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int, x: T)'" "true"
+// "Change function signature to 'fun f(a: Int, x: T)'" "true"
 trait A<R> {
     fun f(a: Int, b: R)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt
index 1f80caabb67..535e0fc57b5 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt
index 37ec0c70c1b..0dec998ca03 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt
index 144907eca27..703485e879b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt
index 8904a51e5c3..56fa5d7b6e1 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 open class A {
     open fun f(a: Int) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt
index c9148e272c6..28fc8c2d8e7 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 abstract class A {
     abstract fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt
index 8f6da8f7bff..939c58e2e18 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt
index 87ce6ad8bee..a8d0ed1cd95 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(x: Int, t: String, z: Double)'" "true"
+// "Change function signature to 'fun f(x: Int, t: String, z: Double)'" "true"
 open class A {
     open fun f(x: Int, y: String, z: Double) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt
index aa8b1ecea47..b82bfda0e5f 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: Int, x: String)'" "true"
+// "Change function signature to 'fun f(y: Int, x: String)'" "true"
 open class A {
     open fun f(a: Int, b: String) {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt
index 83a19095b7b..1d0c7ee46a1 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 open class A {
     open fun f() {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt
index 1c09664622f..6901254af7a 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 open class A {
     open fun f(a: Int): Int {
         return 0
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt
index b8b4b0c7be8..e862a9182e3 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 trait A {
     fun f(a: Int)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt b/idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt
index cf157657a13..210a7d79fdf 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int): Int'" "true"
+// "Change function signature to 'fun f(a: Int): Int'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>kotlin.String</td></tr></table></html>
 open class A {
     open fun f(a: Int): Int = 0
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt b/idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt
index 8fd9e633409..bc4f485d85b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeDoNotLooseAnnotations.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: Int)'" "true"
+// "Change function signature to 'fun f(a: Int)'" "true"
 annotation class annon
 
 open class A {
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt b/idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt
index 8477dbcfde1..e8cc3428809 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun next(p0: Int): Int'" "true"
+// "Change function signature to 'fun next(p0: Int): Int'" "true"
 import java.util.Random
 
 class MyRandom : Random() {
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt b/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt
index 0ddc0348ce8..ff09f07cb7b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt b/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt
index 36567bcab4c..ed30fb7ec6d 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f()'" "true"
+// "Change function signature to 'fun f()'" "true"
 trait A {
     fun f()
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt b/idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt
index b8dac5dbef7..b27aa30931e 100644
--- a/idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(y: S, x: List<Set<R>>)'" "true"
+// "Change function signature to 'fun f(y: S, x: List<Set<R>>)'" "true"
 trait A<P,Q> {
     fun f(a: Q, b: List<Set<P>>)
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/import.after.kt b/idea/testData/quickfix/override/nothingToOverride/import.after.kt
index a992650eea6..6798d7b9cee 100644
--- a/idea/testData/quickfix/override/nothingToOverride/import.after.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/import.after.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 import a.A
diff --git a/idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt b/idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt
index 5b33b30a5d5..884185aad5a 100644
--- a/idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 
diff --git a/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt b/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
index e7419cc9402..b776daaa4c4 100644
--- a/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/twoPackages.after.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 class A {}
diff --git a/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt b/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt
index e75eb1222ba..753478fd31b 100644
--- a/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt
+++ b/idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt
@@ -1,4 +1,4 @@
-// "Change function signature to 'override fun f(a: A)'" "true"
+// "Change function signature to 'fun f(a: A)'" "true"
 // ERROR: 'f' overrides nothing
 import a.B
 class A {}