diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java
index 3268af85e6b5..0d14bbea2d3a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after1.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class a {
     void g() throws Exception {
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java
index 87ab38b6deb3..919f16699e89 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after3.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class a {
     void g() throws Exception {
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java
index 6236317f61bb..985d936f25d6 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after4.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class MyException1 extends Exception {}
 class MyException2 extends Exception {}
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java
index 9c6a55dc4aaf..0d31b7129b1e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after5.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 import java.io.IOException;
 
 class Test {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java
index 6aed7f9fd571..ce48f95b9bed 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after6.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java
index 1f2be7703875..a48f13fd23d4 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/after7.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java
index a1a6f464e26b..ac42e9d6047b 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/afterHierarchy.java
@@ -1,7 +1,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class CatchExceptions {
 
 	void foo() throws java.io.IOException, java.io.FileNotFoundException {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before1.java
index 4b76f3f463be..8e283ee04cb8 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before1.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class a {
     void g() throws Exception {
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before2.java
index ba3f330d1cb9..718f751e56ac 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before2.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "false"
+// "Add 'catch' clause(s)" "false"
 // should not try to add catch clauses across method boundaries
 class s {
     int f() throws Exception {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before3.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before3.java
index c78bb7d084a5..b33bd706578f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before3.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before3.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class a {
     void g() throws Exception {
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before4.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before4.java
index 3cb9bab9ffea..1ae7abc2feb1 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before4.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before4.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class MyException1 extends Exception {}
 class MyException2 extends Exception {}
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before5.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before5.java
index 80958b60604d..58fb008717e2 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before5.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before5.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 import java.io.IOException;
 
 class Test {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before6.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before6.java
index 28b339c05b4c..3159802ff60c 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before6.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before6.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before7.java
index 1404c4502cfe..ca9181da63a2 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before7.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/before7.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class Test {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeHierarchy.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeHierarchy.java
index 85f076c6c7ba..c9d60290b115 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeHierarchy.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addCatchBlock/beforeHierarchy.java
@@ -1,4 +1,4 @@
-// "Add Catch Clause(s)" "true"
+// "Add 'catch' clause(s)" "true"
 class CatchExceptions {
 
 	void foo() throws java.io.IOException, java.io.FileNotFoundException {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after1.java
index 76c72d6ff754..14dc1f5fe667 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after1.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
     static class E1 extends Exception { }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after2.java
index a1a2e93021cd..558707171384 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/after2.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternal.java
index 056c098fcf7e..74b1d7a6bb6a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternal.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternal.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
   interface I {
     void a() throws InterruptedException;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternalInsideCallable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternalInsideCallable.java
index a12bf17b33c8..cdc28a841085 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternalInsideCallable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterLambdaInternalInsideCallable.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
   interface I {
     void a() throws InterruptedException;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterMultiple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterMultiple.java
index 790159f28287..c5c1dad079d5 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterMultiple.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/afterMultiple.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 import java.io.*;
 
 class C {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before1.java
index 8555c0e7e9b9..5a43ef133248 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before1.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before1.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
     static class E1 extends Exception { }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before2.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before2.java
index c3c30fe62eee..3aeee0457c65 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before2.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/before2.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
     static class E1 extends Exception { }
     static class E2 extends Exception { }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaExternal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaExternal.java
index 5aac457b22ef..8f4afb9b35a1 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaExternal.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaExternal.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "false"
+// "Add exception to method signature" "false"
 class C {
 
   public static void main(String[] args) throws InterruptedException {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternal.java
index 9c62d2b6cff1..4f6f5a51ad2e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternal.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternal.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
   interface I {
     void a();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternalInsideCallable.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternalInsideCallable.java
index f178a90ecaba..5076995149e0 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternalInsideCallable.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeLambdaInternalInsideCallable.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 class C {
   interface I {
     void a();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeMultiple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeMultiple.java
index 7502ecbed3ad..dcf043b4c7ab 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeMultiple.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addToThrows/beforeMultiple.java
@@ -1,4 +1,4 @@
-// "Add Exception to Method Signature" "true"
+// "Add exception to method signature" "true"
 import java.io.*;
 
 class C {
diff --git a/resources-en/src/messages/QuickFixBundle.properties b/resources-en/src/messages/QuickFixBundle.properties
index ad1759d282df..1ccbc0de0b7c 100644
--- a/resources-en/src/messages/QuickFixBundle.properties
+++ b/resources-en/src/messages/QuickFixBundle.properties
@@ -5,12 +5,12 @@ access.static.via.class.reference.text=Access static ''{1}.{0}'' via class ''{2}
 add.default.constructor.family=Add Default Constructor
 add.default.constructor.text=Add {0} no-args constructor to {1}
 add.catch.clause.family=Add Exception to Catch Clause
-add.catch.clause.text=Add Catch Clause(s)
+add.catch.clause.text=Add 'catch' clause(s)
 add.exception.to.throws.inherited.method.warning.text=Method ''{0}'' is inherited.\n\
   Do you want to add exceptions to method signatures in the whole method hierarchy?
 method.is.inherited.warning.title=Method Is Inherited
-add.exception.to.throws.text=Add {0, choice, 0#Exception|2#Exceptions} to Method Signature
-add.exception.to.throws.family=Add Exception to Method Signature
+add.exception.to.throws.text=Add {0, choice, 0#exception|2#exceptions} to method signature
+add.exception.to.throws.family=Add exception to method signature
 add.method.body.text=Add method body
 add.method.family=Add Method
 add.method.text=Add Method ''{0}'' to Class ''{1}''