diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java
index 15ea06538dbd..29886f09a6b2 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/compiler/RemoveElementQuickFix.java
@@ -29,12 +29,6 @@ public class RemoveElementQuickFix implements LocalQuickFix {
     myName = name;
   }
 
-  @NotNull
-  @Override
-  public String getName() {
-    return myName;
-  }
-
   @NotNull
   @Override
   public String getFamilyName() {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateStaticMethodQuickFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateStaticMethodQuickFix.java
index cdaa2aad68ff..cb81d23a378d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateStaticMethodQuickFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateStaticMethodQuickFix.java
@@ -33,12 +33,6 @@ public class CreateStaticMethodQuickFix implements LocalQuickFix {
   }
 
 
-  @NotNull
-  @Override
-  public String getName() {
-    return QuickFixBundle.message("create.method.from.usage.family");
-  }
-
   @NotNull
   @Override
   public String getFamilyName() {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java
index 07f31972f482..b6fec5cbe294 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java
@@ -70,12 +70,6 @@ public class CreateFieldOrPropertyFix implements IntentionAction, LocalQuickFix
     return QuickFixBundle.message(myMemberType == PropertyMemberType.FIELD ? "create.field.text":"create.property.text", myName);
   }
 
-  @Override
-  @NotNull
-  public String getName() {
-    return getText();
-  }
-
   @Override
   @NotNull
   public String getFamilyName() {
diff --git a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
index 1a1cd17b857b..fbb22e5dca2c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
@@ -307,12 +307,6 @@ public class EmptyMethodInspection extends GlobalJavaBatchInspectionTool {
       myHint = hint;
     }
 
-    @Override
-    @NotNull
-    public String getName() {
-      return QUICK_FIX_NAME;
-    }
-
     @Override
     @NotNull
     public String getFamilyName() {
diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
index 4860cfa1949c..e9b2536eac18 100644
--- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
@@ -108,12 +108,6 @@ public class JavaDocReferenceInspection extends JavaDocReferenceInspectionBase {
       this.originalClasses = originalClasses;
     }
 
-    @Override
-    @NotNull
-    public String getName() {
-      return QuickFixBundle.message("add.qualifier");
-    }
-
     @Override
     @NotNull
     public String getFamilyName() {
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/DelegatingFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/DelegatingFix.java
index 36c3b1e2c5b5..809cb467cf8c 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/DelegatingFix.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/DelegatingFix.java
@@ -28,12 +28,6 @@ public class DelegatingFix extends InspectionGadgetsFix {
     this.delegate = delegate;
   }
 
-  @Override
-  @NotNull
-  public String getName() {
-    return delegate.getName();
-  }
-
   @Override
   @NotNull
   public String getFamilyName() {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java
index a7ab62321b3e..4a32b70fe9ea 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RefusedBequestInspection.java
@@ -61,13 +61,6 @@ public class RefusedBequestInspection extends RefusedBequestInspectionBase {
 
   private static class RefusedBequestFix extends InspectionGadgetsFix {
 
-    @Nls
-    @NotNull
-    @Override
-    public String getName() {
-      return "Insert call to super method";
-    }
-
     @Nls
     @NotNull
     @Override
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/inspections/SecondUnsafeCallQuickFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/inspections/SecondUnsafeCallQuickFix.java
index 705f3ea1ef8c..a7bfa68af6f4 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/inspections/SecondUnsafeCallQuickFix.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/inspections/SecondUnsafeCallQuickFix.java
@@ -31,12 +31,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere
  */
 public class SecondUnsafeCallQuickFix implements LocalQuickFix {
 
-  @Override
-  @NotNull
-  public String getName() {
-    return GroovyInspectionBundle.message("second.unsafe.call");
-  }
-
   @Override
   @NotNull
   public String getFamilyName() {
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrPackageInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrPackageInspection.java
index 4463ab5edee2..2f72013d7091 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrPackageInspection.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrPackageInspection.java
@@ -138,12 +138,6 @@ public class GrPackageInspection extends BaseInspection {
       myNewPackageName = newPackageName;
     }
 
-    @NotNull
-    @Override
-    public String getName() {
-      return GroovyBundle.message("fix.package.name");
-    }
-
     @Override
     @NotNull
     public String getFamilyName() {
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrUnusedIncDecInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrUnusedIncDecInspection.java
index 0e595ac6bba4..45d63594dee2 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrUnusedIncDecInspection.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GrUnusedIncDecInspection.java
@@ -148,12 +148,6 @@ public class GrUnusedIncDecInspection extends BaseInspection {
         myMessage = GroovyInspectionBundle.message("remove.0", expression.getOperationToken().getText());
       }
 
-      @NotNull
-      @Override
-      public String getName() {
-        return myMessage;
-      }
-
       @NotNull
       @Override
       public String getFamilyName() {
@@ -176,12 +170,6 @@ public class GrUnusedIncDecInspection extends BaseInspection {
         myMessage = GroovyInspectionBundle.message("replace.postfix.0.with.prefix.0", expression.getOperationToken().getText());
       }
 
-      @NotNull
-      @Override
-      public String getName() {
-        return myMessage;
-      }
-
       @NotNull
       @Override
       public String getFamilyName() {
@@ -208,12 +196,6 @@ public class GrUnusedIncDecInspection extends BaseInspection {
         myMessage = GroovyInspectionBundle.message("replace.0.with.1", opToken, opToken.substring(0, 1));
       }
 
-      @NotNull
-      @Override
-      public String getName() {
-        return myMessage;
-      }
-
       @NotNull
       @Override
       public String getFamilyName() {
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java
index a25db235d72e..7c1f91b3d678 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxUnusedImportsInspection.java
@@ -93,11 +93,6 @@ public class JavaFxUnusedImportsInspection extends XmlSuppressableInspectionTool
   }
 
   private static class JavaFxOptimizeImportsFix implements LocalQuickFix {
-    @NotNull
-    @Override
-    public String getName() {
-      return QuickFixBundle.message("optimize.imports.fix");
-    }
 
     @Override
     @NotNull
diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertAnnotationInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertAnnotationInspection.java
index 0465c72ea664..03b8dc0352c2 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertAnnotationInspection.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertAnnotationInspection.java
@@ -70,11 +70,6 @@ public class ConvertAnnotationInspection extends BaseJavaLocalInspectionTool {
   private static class ConvertAnnotationQuickFix implements LocalQuickFix {
     private static final Logger LOG = Logger.getInstance("#" + ConvertAnnotationQuickFix.class.getName());
 
-    @NotNull
-    public String getName() {
-      return DISPLAY_NAME;
-    }
-
     @NotNull
     public String getFamilyName() {
       return DISPLAY_NAME;
diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java
index c732c5f0ba0d..838c27cec1e1 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/ConvertJavadocInspection.java
@@ -75,11 +75,6 @@ public class ConvertJavadocInspection extends BaseJavaLocalInspectionTool {
   private static class ConvertJavadocQuickfix implements LocalQuickFix {
     private static final Logger LOG = Logger.getInstance("#" + ConvertJavadocQuickfix.class.getName());
 
-    @NotNull
-    public String getName() {
-      return DISPLAY_NAME;
-    }
-
     @NotNull
     public String getFamilyName() {
       return DISPLAY_NAME;
diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInterpreterInspection.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInterpreterInspection.java
index 1622e5ea3ff3..5d8d2458c9db 100644
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInterpreterInspection.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyInterpreterInspection.java
@@ -106,11 +106,6 @@ public class PyStudyInterpreterInspection extends PyInspection {
   }
 
   private static class ConfigureInterpreterFix implements LocalQuickFix {
-    @NotNull
-    @Override
-    public String getName() {
-      return "Configure Python Interpreter";
-    }
 
     @NotNull
     @Override
diff --git a/python/src/com/jetbrains/python/codeInsight/imports/OptimizeImportsQuickFix.java b/python/src/com/jetbrains/python/codeInsight/imports/OptimizeImportsQuickFix.java
index a2767373861a..b687210ae7ea 100644
--- a/python/src/com/jetbrains/python/codeInsight/imports/OptimizeImportsQuickFix.java
+++ b/python/src/com/jetbrains/python/codeInsight/imports/OptimizeImportsQuickFix.java
@@ -33,10 +33,6 @@ import org.jetbrains.annotations.NotNull;
  * @author yole
  */
 public class OptimizeImportsQuickFix implements LocalQuickFix, IntentionAction, HighPriorityAction {
-  @NotNull
-  public String getName() {
-    return "Optimize imports";
-  }
 
   @NotNull
   @Override
diff --git a/python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java b/python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java
index ca1fef15947c..26e1412a4c66 100644
--- a/python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyChainedComparisonsInspection.java
@@ -242,13 +242,6 @@ public class PyChainedComparisonsInspection extends PyInspection {
 
   private static class DontSimplifyStatementsWithConstantInTheMiddleQuickFix implements LocalQuickFix {
 
-    @Nls
-    @NotNull
-    @Override
-    public String getName() {
-      return ourIgnoreConstantOptionText;
-    }
-
     @Nls
     @NotNull
     @Override
diff --git a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java b/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java
index 42ecb02ab090..0f29353a0f0a 100644
--- a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java
@@ -80,11 +80,6 @@ public class PyInterpreterInspection extends PyInspection {
   }
 
   private static class ConfigureInterpreterFix implements LocalQuickFix {
-    @NotNull
-    @Override
-    public String getName() {
-      return "Configure Python Interpreter";
-    }
 
     @NotNull
     @Override
diff --git a/python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java b/python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
index 8e1023e8c84b..1ef59b9e7e99 100644
--- a/python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
@@ -269,12 +269,6 @@ public class PyPackageRequirementsInspection extends PyInspection {
       myUnsatisfied = unsatisfied;
     }
 
-    @NotNull
-    @Override
-    public String getName() {
-      return myName;
-    }
-
     @NotNull
     @Override
     public String getFamilyName() {
@@ -359,11 +353,6 @@ public class PyPackageRequirementsInspection extends PyInspection {
       mySdk = PythonSdkType.findPythonSdk(myModule);
     }
 
-    @NotNull
-    public String getName() {
-      return "Install and import package " + myPackageName;
-    }
-
     @NotNull
     public String getFamilyName() {
       return "Install and import package " + myPackageName;
diff --git a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
index 678a3cbca9c6..38f91972e63a 100644
--- a/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
@@ -317,13 +317,6 @@ public class PyPep8NamingInspection extends PyInspection {
       myCode = code;
     }
 
-    @Nls
-    @NotNull
-    @Override
-    public String getName() {
-      return  myText;
-    }
-
     @Nls
     @NotNull
     @Override
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/PyMakePublicQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/PyMakePublicQuickFix.java
index b6c7507bc6f5..64e21614737b 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/PyMakePublicQuickFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/PyMakePublicQuickFix.java
@@ -29,11 +29,6 @@ import com.jetbrains.python.psi.PyTargetExpression;
 import org.jetbrains.annotations.NotNull;
 
 public class PyMakePublicQuickFix implements LocalQuickFix {
-  @NotNull
-  @Override
-  public String getName() {
-    return PyBundle.message("QFIX.make.public");
-  }
 
   @NotNull
   @Override
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/PyRenameElementQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/PyRenameElementQuickFix.java
index c3db44d3cf6b..103b404bec70 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/PyRenameElementQuickFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/PyRenameElementQuickFix.java
@@ -45,11 +45,6 @@ import org.jetbrains.annotations.Nullable;
  * User: ktisha
  */
 public class PyRenameElementQuickFix implements LocalQuickFix {
-  @NotNull
-  @Override
-  public String getName() {
-    return "Rename element";
-  }
 
   @NotNull
   @Override
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java b/python/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java
index b577bf07cbd1..6cd8a220e6a6 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/PyRenameUnresolvedRefQuickFix.java
@@ -49,12 +49,6 @@ import java.util.*;
  */
 public class PyRenameUnresolvedRefQuickFix implements LocalQuickFix {
 
-  @NotNull
-  @Override
-  public String getName() {
-    return PyBundle.message("QFIX.rename.unresolved.reference");
-  }
-
   @Override
   @NotNull
   public String getFamilyName() {
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/ReformatFix.java b/python/src/com/jetbrains/python/inspections/quickfix/ReformatFix.java
index 4512df62002e..acb7551f4b36 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/ReformatFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/ReformatFix.java
@@ -37,12 +37,6 @@ public class ReformatFix implements IntentionAction, LocalQuickFix, HighPriority
     return "Reformat file";
   }
 
-  @NotNull
-  @Override
-  public String getName() {
-    return getText();
-  }
-
   @NotNull
   @Override
   public String getFamilyName() {
diff --git a/python/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingBlankLinesFix.java b/python/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingBlankLinesFix.java
index b9d3eb27b57e..a37423225e10 100644
--- a/python/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingBlankLinesFix.java
+++ b/python/src/com/jetbrains/python/inspections/quickfix/RemoveTrailingBlankLinesFix.java
@@ -52,12 +52,6 @@ public class RemoveTrailingBlankLinesFix implements LocalQuickFix, IntentionActi
     return true;
   }
 
-  @NotNull
-  @Override
-  public String getName() {
-    return getText();
-  }
-
   @NotNull
   @Override
   public String getFamilyName() {
diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
index 9067b33aaffa..dac0adc22bfb 100644
--- a/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
+++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/ChangeTo.java
@@ -40,11 +40,6 @@ public class ChangeTo extends ShowSuggestions implements SpellCheckerQuickFix {
   }
 
 
-  @NotNull
-  public String getName() {
-    return SpellCheckerBundle.message("change.to");
-  }
-
   @NotNull
   public String getFamilyName() {
     return SpellCheckerBundle.message("change.to");
diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
index f9c6c01f3a64..b56daf97e3ac 100644
--- a/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
+++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/RenameTo.java
@@ -46,11 +46,6 @@ public class RenameTo extends ShowSuggestions implements SpellCheckerQuickFix {
     super(wordWithTypo);
   }
 
-  @NotNull
-  public String getName() {
-    return SpellCheckerBundle.message("rename.to");
-  }
-
   @NotNull
   public String getFamilyName() {
     return SpellCheckerBundle.message("rename.to");
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java
index 7fee99d0f51c..ac80199dbbf8 100644
--- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java
+++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RemoveExtraClosingTagIntentionAction.java
@@ -47,12 +47,6 @@ public class RemoveExtraClosingTagIntentionAction implements LocalQuickFix, Inte
     return XmlErrorMessages.message("remove.extra.closing.tag.quickfix");
   }
 
-  @Override
-  @NotNull
-  public String getName() {
-    return XmlErrorMessages.message("remove.extra.closing.tag.quickfix");
-  }
-
 
   @Override
   @NotNull