diff --git a/include/clang/Tooling/Refactor/RefactoringActions.def b/include/clang/Tooling/Refactor/RefactoringActions.def
index f5c2f668e01..4c883c247aa 100644
--- a/include/clang/Tooling/Refactor/RefactoringActions.def
+++ b/include/clang/Tooling/Refactor/RefactoringActions.def
@@ -32,7 +32,7 @@ REFACTORING_SUB_ACTION(Local, Rename, "Rename")
 REFACTORING_OPERATION_ACTION(Extract, "Extract Function", "extract")
 REFACTORING_OPERATION_SUB_ACTION(Method, Extract, "Extract Method",
                                  "extract-method")
-REFACTORING_OPERATION_SUB_ACTION(Expression, Extract, "Extract Expression",
+REFACTORING_OPERATION_SUB_ACTION(Expression, Extract, "Extract Variable",
                                  "extract-expression")
 
 REFACTORING_OPERATION_ACTION(IfSwitchConversion, "Convert to Switch",
@@ -46,7 +46,7 @@ REFACTORING_OPERATION_ACTION(LocalizeObjCStringLiteral,
                              "Wrap in NSLocalizedString",
                              "localize-objc-string-literal")
 REFACTORING_OPERATION_ACTION(ExtractRepeatedExpressionIntoVariable,
-                             "Extract Repeated Expression",
+                             "Extract All Occurrences",
                              "extract-repeated-expr-into-var")
 REFACTORING_OPERATION_ACTION(FillInMissingMethodStubsFromAbstractClasses,
                              "Add Missing Abstract Class Overrides",
diff --git a/test/Refactor/Extract/extract-expression-into-var.cpp b/test/Refactor/Extract/extract-expression-into-var.cpp
index 9fd4f7a54f7..5bd87960f4d 100644
--- a/test/Refactor/Extract/extract-expression-into-var.cpp
+++ b/test/Refactor/Extract/extract-expression-into-var.cpp
@@ -24,7 +24,7 @@ void extractExpressionIntoVar(int x, int y, int z) {
 // RUN: clang-refactor-test perform -action extract-expression -selected=expr1 -selected=expr2 -selected=expr3 -selected=expr4 -emit-associated %s -std=c++11 | FileCheck %s
 
 // RUN: clang-refactor-test list-actions -at=%s:6:13 -selected=%s:6:13-6:18 %s -std=c++11 | FileCheck --check-prefix=CHECK-ACTION %s
-// CHECK-ACTION: Extract Expression
+// CHECK-ACTION: Extract Variable
 
 void dontExtractStatement(int x, int y) {
   // stmt1-begin: +1:3
diff --git a/test/Refactor/ExtractRepeatedExpression/extract-repeated-expr-initiate.cpp b/test/Refactor/ExtractRepeatedExpression/extract-repeated-expr-initiate.cpp
index de8b1d80ac8..a035c714e9a 100644
--- a/test/Refactor/ExtractRepeatedExpression/extract-repeated-expr-initiate.cpp
+++ b/test/Refactor/ExtractRepeatedExpression/extract-repeated-expr-initiate.cpp
@@ -27,7 +27,7 @@ void takesClass(AWrapperClass &wrapper) {
 // RUN: not clang-refactor-test initiate -action extract-repeated-expr-into-var -in=%s:13:20-30 %s 2>&1 | FileCheck --check-prefix=CHECK-NO %s
 
 // RUN: clang-refactor-test list-actions -at=%s:11:11 %s | FileCheck --check-prefix=CHECK-ACTION %s
-// CHECK-ACTION: Extract Repeated Expression
+// CHECK-ACTION: Extract All Occurrences
 
 AClass &returnsReference(int x);
 AClass &returnsAndTakesFunctionPointer(AClass& (*)(int));