50 files changed, 80 insertions, 80 deletions
diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
index 6ab8e6db9d8..b9615cb5cdf 100644
--- a/clang-tools-extra/test/CMakeLists.txt
+++ b/clang-tools-extra/test/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CLANG_TOOLS_TEST_DEPS
   clang clang-headers FileCheck count not
 
   # Individual tools we test.
-  remove-cstr-calls clang-apply-replacements cpp11-migrate modularize clang-tidy
+  remove-cstr-calls clang-apply-replacements clang-modernize modularize clang-tidy
 
   # Unit tests
   ExtraToolsUnitTests
diff --git a/clang-tools-extra/test/cpp11-migrate/AddOverride/basic.cpp b/clang-tools-extra/test/clang-modernize/AddOverride/basic.cpp
index 41a50eb5e31..299138f7e6e 100644
--- a/clang-tools-extra/test/cpp11-migrate/AddOverride/basic.cpp
+++ b/clang-tools-extra/test/clang-modernize/AddOverride/basic.cpp
@@ -1,8 +1,8 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -add-override %t.cpp -- -I %S -std=c++11
+// RUN: clang-modernize -add-override %t.cpp -- -I %S -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -add-override -override-macros %t.cpp -- -I %S -std=c++11
+// RUN: clang-modernize -add-override -override-macros %t.cpp -- -I %S -std=c++11
 // RUN: FileCheck --check-prefix=MACRO --input-file=%t.cpp %s
 
 struct A {
diff --git a/clang-tools-extra/test/cpp11-migrate/AddOverride/pure_specifier_fail.cpp b/clang-tools-extra/test/clang-modernize/AddOverride/pure_specifier_fail.cpp
index a9d4c912ff1..bcf3711764f 100644
--- a/clang-tools-extra/test/cpp11-migrate/AddOverride/pure_specifier_fail.cpp
+++ b/clang-tools-extra/test/clang-modernize/AddOverride/pure_specifier_fail.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -add-override %t.cpp -- -I %S
+// RUN: clang-modernize -add-override %t.cpp -- -I %S
 // RUN: FileCheck -input-file=%t.cpp %s
 // XFAIL: *
 
diff --git a/clang-tools-extra/test/cpp11-migrate/Combined/combined.cpp b/clang-tools-extra/test/clang-modernize/Combined/combined.cpp
index 6971879e576..2918bc045ec 100644
--- a/clang-tools-extra/test/cpp11-migrate/Combined/combined.cpp
+++ b/clang-tools-extra/test/clang-modernize/Combined/combined.cpp
@@ -1,8 +1,8 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t_risky.cpp
-// RUN: cpp11-migrate -loop-convert -use-nullptr %t.cpp -- -std=c++11
+// RUN: clang-modernize -loop-convert -use-nullptr %t.cpp -- -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
-// RUN: cpp11-migrate -loop-convert -use-nullptr -risk=risky %t_risky.cpp -- -std=c++11
+// RUN: clang-modernize -loop-convert -use-nullptr -risk=risky %t_risky.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=RISKY -input-file=%t_risky.cpp %s
 
 #define NULL 0
diff --git a/clang-tools-extra/test/cpp11-migrate/Combined/compilers.cpp b/clang-tools-extra/test/clang-modernize/Combined/compilers.cpp
index 14b29978693..7048bd5e829 100644
--- a/clang-tools-extra/test/cpp11-migrate/Combined/compilers.cpp
+++ b/clang-tools-extra/test/clang-modernize/Combined/compilers.cpp
@@ -1,46 +1,46 @@
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=clang-2.9 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=clang-2.9 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=CLANG-29 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=clang-2.9 -override-macros %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=clang-2.9 -override-macros %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=CLANG-29-OV-MACROS -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=clang-3.0 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=clang-3.0 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=CLANG-30 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=gcc-4.6 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=gcc-4.6 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=GCC-46 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=gcc-4.7 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=gcc-4.7 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=GCC-47 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=icc-13 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=icc-13 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=ICC-13 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=icc-14 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=icc-14 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=ICC-14 -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=msvc-8 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=msvc-8 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=MSVC-8 -input-file=%t.cpp %s
 //
 // Test multiple compilers
 // RUN: grep -Ev "// *[A-Z0-9-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -for-compilers=clang-3.0,gcc-4.6,gcc-4.7 %t.cpp -- -std=c++11
+// RUN: clang-modernize -for-compilers=clang-3.0,gcc-4.6,gcc-4.7 %t.cpp -- -std=c++11
 // RUN: FileCheck -check-prefix=MULTIPLE -input-file=%t.cpp %s
 //
 // Test unknown platform
-// RUN: not cpp11-migrate -for-compilers=foo-10 %t.cpp -- -std=c++11
+// RUN: not clang-modernize -for-compilers=foo-10 %t.cpp -- -std=c++11
 //
 // Test when no transforms can be selected because the compiler lacks support of
 // the needed C++11 features
-// RUN: not cpp11-migrate -for-compilers=clang-2.0 %t.cpp -- -std=c++11
+// RUN: not clang-modernize -for-compilers=clang-2.0 %t.cpp -- -std=c++11
 
 // Test add overrides
 struct A {
diff --git a/clang-tools-extra/test/cpp11-migrate/Core/Reformatting.cpp b/clang-tools-extra/test/clang-modernize/Core/Reformatting.cpp
index a98d1e2fb0d..129871809d8 100644
--- a/clang-tools-extra/test/cpp11-migrate/Core/Reformatting.cpp
+++ b/clang-tools-extra/test/clang-modernize/Core/Reformatting.cpp
@@ -1,8 +1,8 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: not cpp11-migrate -format-style=non_existent_file.yaml -use-auto %t.cpp -- -std=c++11
+// RUN: not clang-modernize -format-style=non_existent_file.yaml -use-auto %t.cpp -- -std=c++11
 // RUN: touch %T/non_format_config.yaml
-// RUN: not cpp11-migrate -format-style=%T/non_format_config.yaml -use-auto %t.cpp -- -std=c++11
-// RUN: cpp11-migrate -format-style=LLVM -use-auto %t.cpp -- -std=c++11
+// RUN: not clang-modernize -format-style=%T/non_format_config.yaml -use-auto %t.cpp -- -std=c++11
+// RUN: clang-modernize -format-style=LLVM -use-auto %t.cpp -- -std=c++11
 // RUN: FileCheck --strict-whitespace -input-file=%t.cpp %s
 
 class MyType012345678901234567890123456789 {};
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/Inputs/no_yaml.h b/clang-tools-extra/test/clang-modernize/HeaderReplacements/Inputs/no_yaml.h
index 8e09412c452..8e09412c452 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/Inputs/no_yaml.h
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/Inputs/no_yaml.h
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common.cpp b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common.cpp
index 9c4f0e543ce..9c4f0e543ce 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common.cpp
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common.cpp
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common.h b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common.h
index 3bb98cc705c..3bb98cc705c 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common.h
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common.h
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
index 67eb1fb9104..67eb1fb9104 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/common_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/main.cpp b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp
index 54cbc92728e..f2ad4435069 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/main.cpp
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp
@@ -7,7 +7,7 @@
 // RUN: rm -rf %T/SerializeTest
 // RUN: mkdir -p %T/SerializeTest
 // RUN: cp %S/main.cpp %S/common.cpp %S/common.h %T/SerializeTest
-// RUN: cpp11-migrate -loop-convert -headers -serialize-replacements -include=%T/SerializeTest %T/SerializeTest/main.cpp %T/SerializeTest/common.cpp --
+// RUN: clang-modernize -loop-convert -headers -serialize-replacements -include=%T/SerializeTest %T/SerializeTest/main.cpp %T/SerializeTest/common.cpp --
 // Check that only 1 file is generated per translation unit
 // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=MAIN_CPP
 // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=COMMON_CPP
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/main_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
index 8702bc17245..8702bc17245 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/main_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
diff --git a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/no_yaml.cpp b/clang-tools-extra/test/clang-modernize/HeaderReplacements/no_yaml.cpp
index 880cc1f5a70..8a33a63ada6 100644
--- a/clang-tools-extra/test/cpp11-migrate/HeaderReplacements/no_yaml.cpp
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/no_yaml.cpp
@@ -4,7 +4,7 @@
 // RUN: mkdir -p %T/Inputs
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/no_yaml.h > %T/Inputs/no_yaml.h
-// RUN: cpp11-migrate -loop-convert %t.cpp -headers -include=%T/Inputs -- -I %T/Inputs/no_yaml.h
+// RUN: clang-modernize -loop-convert %t.cpp -headers -include=%T/Inputs -- -I %T/Inputs/no_yaml.h
 // RUN: FileCheck --input-file=%t.cpp %s
 // RUN: FileCheck --input-file=%T/Inputs/no_yaml.h %S/Inputs/no_yaml.h
 // RUN: ls -1 %T | FileCheck %s --check-prefix=NO_YAML
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/macro_problem.h b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/macro_problem.h
index 42f28fde703..42f28fde703 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/macro_problem.h
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/macro_problem.h
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/negative-header.h b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/negative-header.h
index 3962032da9d..3962032da9d 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/negative-header.h
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/negative-header.h
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/structures.h b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/structures.h
index 9dd04f42b5a..9dd04f42b5a 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/Inputs/structures.h
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/Inputs/structures.h
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/array.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/array.cpp
index 780fc3746bf..239f16e9a7b 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/array.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/array.cpp
@@ -1,9 +1,9 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: cp %t.cpp %t.base
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: cp %t.base %t.cpp
-// NORUN cpp11-migrate -count-only . %t.cpp -- -I %S/Inputs > %T/out
+// NORUN clang-modernize -count-only . %t.cpp -- -I %S/Inputs > %T/out
 // NORUN FileCheck -check-prefix=COUNTONLY -input-file=%T/out %s
 // RUN: diff %t.cpp %t.base
 
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/confidence.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/confidence.cpp
index 8c130f165b9..854844ad796 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/confidence.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/confidence.cpp
@@ -1,7 +1,7 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
-// RUN: cpp11-migrate -loop-convert %t.cpp -risk=risky -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -risk=risky -- -I %S/Inputs
 // RUN: FileCheck -check-prefix=RISKY -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/dependency.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/dependency.cpp
index 15fffbab812..c0d02e99f57 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/dependency.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/dependency.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- && FileCheck -input-file=%t.cpp %s
+// RUN: clang-modernize -loop-convert %t.cpp -- && FileCheck -input-file=%t.cpp %s
 
 void f() {
   const int N = 6;
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/free_begin_end_fail.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/free_begin_end_fail.cpp
index 27f7e8bf75e..598d38e3e8e 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/free_begin_end_fail.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/free_begin_end_fail.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 // XFAIL: *
 
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/iterator.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/iterator.cpp
index b8ba61b0a02..81a236f26a9 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/iterator.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/iterator.cpp
@@ -1,7 +1,7 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
-// RUN: cpp11-migrate -loop-convert %t.cpp -risk=risky -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -risk=risky -- -I %S/Inputs
 // RUN: FileCheck -check-prefix=RISKY -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/macro_problem.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/macro_problem.cpp
index 03dbddc3ea9..7bede63114e 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/macro_problem.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/macro_problem.cpp
@@ -1,6 +1,6 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: cp %t.cpp %t.base
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // See PR15589 for why this test fails.
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/naming-alias.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/naming-alias.cpp
index 0ed3440ab77..343dd0cc650 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/naming-alias.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/naming-alias.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/naming-conflict.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/naming-conflict.cpp
index 2454d078e69..56254a9348a 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/naming-conflict.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/naming-conflict.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-iterator.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-iterator.cpp
index 09c43476be2..16a6a191551 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-iterator.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-iterator.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-multi-end-call.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-multi-end-call.cpp
index 6e50ee72e35..d443c7b11c8 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-multi-end-call.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-multi-end-call.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert -risk=safe %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert -risk=safe %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-pseudoarray-extra.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-pseudoarray-extra.cpp
index 3ccdb12c620..ba3482efbb1 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-pseudoarray-extra.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-pseudoarray-extra.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-pseudoarray.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-pseudoarray.cpp
index cbc67be24af..e19101cf280 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative-pseudoarray.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/negative-pseudoarray.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/negative.cpp
index 0075f5eab69..063ca52adb6 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/negative.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/negative.cpp
@@ -1,7 +1,7 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/negative-header.h > \
 // RUN:       %T/negative-header.h
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs/
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs/
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: FileCheck -input-file=%T/negative-header.h %S/Inputs/negative-header.h
 
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/nesting.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/nesting.cpp
index 33ab5d401b3..3f51c36d509 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/nesting.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/nesting.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/nocompile.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/nocompile.cpp
index ea102877557..afcc8ad6167 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/nocompile.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/nocompile.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: not cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: not clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 void valid() {
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/pseudoarray.cpp
index 5aeaf79fc9f..ba2a3f3018c 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/pseudoarray.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 #include "structures.h"
 
diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/single-iterator.cpp b/clang-tools-extra/test/clang-modernize/LoopConvert/single-iterator.cpp
index a5a74c1a859..baf9bebe091 100644
--- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/single-iterator.cpp
+++ b/clang-tools-extra/test/clang-modernize/LoopConvert/single-iterator.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
+// RUN: clang-modernize -loop-convert %t.cpp -- -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #include "structures.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/PassByValue/basic.cpp b/clang-tools-extra/test/clang-modernize/PassByValue/basic.cpp
index ce23f047edb..118b3663d55 100644
--- a/clang-tools-extra/test/cpp11-migrate/PassByValue/basic.cpp
+++ b/clang-tools-extra/test/clang-modernize/PassByValue/basic.cpp
@@ -3,11 +3,11 @@
 // order to have the same behavior on all systems.
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -pass-by-value %t.cpp -- -std=c++11 -fno-delayed-template-parsing -I %S
+// RUN: clang-modernize -pass-by-value %t.cpp -- -std=c++11 -fno-delayed-template-parsing -I %S
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -pass-by-value %t.cpp -- -std=c++11 -fno-delayed-template-parsing -I %S
+// RUN: clang-modernize -pass-by-value %t.cpp -- -std=c++11 -fno-delayed-template-parsing -I %S
 // RUN: FileCheck -check-prefix=SAFE_RISK -input-file=%t.cpp %s
 
 #include "basic.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/PassByValue/basic.h b/clang-tools-extra/test/clang-modernize/PassByValue/basic.h
index 4b551f7d908..4b551f7d908 100644
--- a/clang-tools-extra/test/cpp11-migrate/PassByValue/basic.h
+++ b/clang-tools-extra/test/clang-modernize/PassByValue/basic.h
diff --git a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/Inputs/basic.h b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/Inputs/basic.h
index 48b0ee4f67c..48b0ee4f67c 100644
--- a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/Inputs/basic.h
+++ b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/Inputs/basic.h
diff --git a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/Inputs/memory_stub.h b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/Inputs/memory_stub.h
index 89e4e0ec533..89e4e0ec533 100644
--- a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/Inputs/memory_stub.h
+++ b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/Inputs/memory_stub.h
diff --git a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/basic.cpp b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/basic.cpp
index 690ede26533..c64ff20f3f0 100644
--- a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/basic.cpp
+++ b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/basic.cpp
@@ -5,7 +5,7 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/basic.h > %T/Inputs/basic.h
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/memory_stub.h > %T/Inputs/memory_stub.h
-// RUN: cpp11-migrate -headers -include=%T -replace-auto_ptr %t.cpp -- \
+// RUN: clang-modernize -headers -include=%T -replace-auto_ptr %t.cpp -- \
 // RUN:               -std=c++11 -I %T
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: FileCheck -input-file=%T/Inputs/basic.h %S/Inputs/basic.h
@@ -15,7 +15,7 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/basic.h > %T/Inputs/basic.h
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/memory_stub.h > %T/Inputs/memory_stub.h
-// RUN: cpp11-migrate -headers -include=%T -replace-auto_ptr %t.cpp -- \
+// RUN: clang-modernize -headers -include=%T -replace-auto_ptr %t.cpp -- \
 // RUN:               -DUSE_INLINE_NAMESPACE=1 -std=c++11 -I %T
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: FileCheck -input-file=%T/Inputs/basic.h %S/Inputs/basic.h
diff --git a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/move.cpp b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/move.cpp
index d0e9ce14098..5d230298a15 100644
--- a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/move.cpp
+++ b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/move.cpp
@@ -1,13 +1,13 @@
 // Without inline namespace:
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11
+// RUN: clang-modernize -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // With inline namespace:
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11 \
+// RUN: clang-modernize -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11 \
 // RUN:                                           -DUSE_INLINE_NAMESPACE=1
 // RUN: FileCheck -input-file=%t.cpp %s
 
diff --git a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/template_fail.cpp b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/template_fail.cpp
index cdbf272c26b..0f23dfc5eeb 100644
--- a/clang-tools-extra/test/cpp11-migrate/ReplaceAutoPtr/template_fail.cpp
+++ b/clang-tools-extra/test/clang-modernize/ReplaceAutoPtr/template_fail.cpp
@@ -3,13 +3,13 @@
 // Without inline namespace:
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11
+// RUN: clang-modernize -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // With inline namespace:
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11 \
+// RUN: clang-modernize -replace-auto_ptr %t.cpp -- -I %S/Inputs std=c++11 \
 // RUN:                                           -DUSE_INLINE_NAMESPACE=1
 // RUN: FileCheck -input-file=%t.cpp %s
 
diff --git a/clang-tools-extra/test/cpp11-migrate/UseAuto/Inputs/test_std_container.h b/clang-tools-extra/test/clang-modernize/UseAuto/Inputs/test_std_container.h
index 5c92f6e194f..c78bcc02a0a 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseAuto/Inputs/test_std_container.h
+++ b/clang-tools-extra/test/clang-modernize/UseAuto/Inputs/test_std_container.h
@@ -2,7 +2,7 @@
 //
 // This file contains a shell implementation of a standard container with
 // iterators. This shell is targeted at supporting the container interfaces
-// recognized by cpp11-migrate's use-auto transformation. It requires the
+// recognized by clang-modernize's use-auto transformation. It requires the
 // preprocessor to parameterize the name of the container, and allows the
 // preprocessor to parameterize various mechanisms used in the implementation
 // of the container / iterator.
diff --git a/clang-tools-extra/test/cpp11-migrate/UseAuto/basic_iterator_tests.cpp b/clang-tools-extra/test/clang-modernize/UseAuto/basic_iterator_tests.cpp
index 30199e93f44..425aa85e03c 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseAuto/basic_iterator_tests.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseAuto/basic_iterator_tests.cpp
@@ -7,24 +7,24 @@
 // // The most basic test.
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=array -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=array -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 //
 // Test variations on how the container and its iterators might be defined.
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=array \
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=array \
 // RUN:   -DUSE_INLINE_NAMESPACE=1 -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=array \
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=array \
 // RUN:   -DUSE_BASE_CLASS_ITERATORS=1 -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=array \
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=array \
 // RUN:   -DUSE_INNER_CLASS_ITERATORS=1 -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
@@ -32,63 +32,63 @@
 // Test all of the other container names in a basic configuration.
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=deque -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=deque -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=forward_list -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=forward_list -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=list -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=list -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=vector -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=vector -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=map -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=map -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=multimap -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=multimap -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=set -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=set -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=multiset -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=multiset -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=unordered_map -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=unordered_map -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=unordered_multimap -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=unordered_multimap -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=unordered_set -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=unordered_set -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=unordered_multiset -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=unordered_multiset -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=queue -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=queue -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=priority_queue -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=priority_queue -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -DCONTAINER=stack -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- -DCONTAINER=stack -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 
 #ifndef CONTAINER
diff --git a/clang-tools-extra/test/cpp11-migrate/UseAuto/iterator.cpp b/clang-tools-extra/test/clang-modernize/UseAuto/iterator.cpp
index 8871bc1eb36..faca8af43d5 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseAuto/iterator.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseAuto/iterator.cpp
@@ -1,9 +1,9 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- --std=c++11 -I %S/Inputs
+// RUN: clang-modernize -use-auto %t.cpp -- --std=c++11 -I %S/Inputs
 // RUN: FileCheck -input-file=%t.cpp %s
 //
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- --std=c++11 -I %S/Inputs \
+// RUN: clang-modernize -use-auto %t.cpp -- --std=c++11 -I %S/Inputs \
 // RUN:   -DUSE_INLINE_NAMESPACE=1
 // RUN: FileCheck -input-file=%t.cpp %s
 
diff --git a/clang-tools-extra/test/cpp11-migrate/UseAuto/new.cpp b/clang-tools-extra/test/clang-modernize/UseAuto/new.cpp
index 3fca05df29b..e41ae14edbd 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseAuto/new.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseAuto/new.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -std=c++11
+// RUN: clang-modernize -use-auto %t.cpp -- -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 
 class MyType {
diff --git a/clang-tools-extra/test/cpp11-migrate/UseAuto/new_cv_failing.cpp b/clang-tools-extra/test/clang-modernize/UseAuto/new_cv_failing.cpp
index 8e21018ef90..6b76c35717f 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseAuto/new_cv_failing.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseAuto/new_cv_failing.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-auto %t.cpp -- -std=c++11
+// RUN: clang-modernize -use-auto %t.cpp -- -std=c++11
 // RUN: FileCheck -input-file=%t.cpp %s
 // XFAIL: *
 
diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/Inputs/basic.h b/clang-tools-extra/test/clang-modernize/UseNullptr/Inputs/basic.h
index 144db769c29..144db769c29 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/Inputs/basic.h
+++ b/clang-tools-extra/test/clang-modernize/UseNullptr/Inputs/basic.h
diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp b/clang-tools-extra/test/clang-modernize/UseNullptr/basic.cpp
index 9057c1a17d7..416047090b8 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseNullptr/basic.cpp
@@ -1,12 +1,12 @@
 // RUN: mkdir -p %T/Inputs
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/basic.h > %T/Inputs/basic.h
-// RUN: cpp11-migrate -use-nullptr %t.cpp -- -std=c++98 -I %T -Wno-non-literal-null-conversion
+// RUN: clang-modernize -use-nullptr %t.cpp -- -std=c++98 -I %T -Wno-non-literal-null-conversion
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: FileCheck -input-file=%T/Inputs/basic.h %S/Inputs/basic.h
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
 // RUN: grep -Ev "// *[A-Z-]+:" %S/Inputs/basic.h > %T/Inputs/basic.h
-// RUN: cpp11-migrate -headers -include=%T -use-nullptr %t.cpp -- -std=c++98 -I %T -Wno-non-literal-null-conversion
+// RUN: clang-modernize -headers -include=%T -use-nullptr %t.cpp -- -std=c++98 -I %T -Wno-non-literal-null-conversion
 // RUN: FileCheck -check-prefix=HEADERS -input-file=%T/Inputs/basic.h %S/Inputs/basic.h
 
 #include "Inputs/basic.h"
diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic_failing.cpp b/clang-tools-extra/test/clang-modernize/UseNullptr/basic_failing.cpp
index 32663ffde12..47292495e99 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic_failing.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseNullptr/basic_failing.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-nullptr %t.cpp -- -I %S
+// RUN: clang-modernize -use-nullptr %t.cpp -- -I %S
 // RUN: FileCheck -input-file=%t.cpp %s
 // XFAIL: *
 
diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/macros.cpp b/clang-tools-extra/test/clang-modernize/UseNullptr/macros.cpp
index 3c1550d0f07..f60305c606e 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/macros.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseNullptr/macros.cpp
@@ -1,8 +1,8 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -use-nullptr %t.cpp -- -I %S
+// RUN: clang-modernize -use-nullptr %t.cpp -- -I %S
 // RUN: FileCheck -input-file=%t.cpp %s
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t2.cpp
-// RUN: cpp11-migrate -use-nullptr -user-null-macros=MY_NULL %t2.cpp -- -I %S
+// RUN: clang-modernize -use-nullptr -user-null-macros=MY_NULL %t2.cpp -- -I %S
 // RUN: FileCheck -check-prefix=USER-SUPPLIED-NULL -input-file=%t2.cpp %s
 
 #define NULL 0
diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/nullptr_t.cpp b/clang-tools-extra/test/clang-modernize/UseNullptr/nullptr_t.cpp
index a973fb39817..659c0dff3fc 100644
--- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/nullptr_t.cpp
+++ b/clang-tools-extra/test/clang-modernize/UseNullptr/nullptr_t.cpp
@@ -1,5 +1,5 @@
 // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: cpp11-migrate -final-syntax-check -use-nullptr %t.cpp -- --std=c++11 -I %S
+// RUN: clang-modernize -final-syntax-check -use-nullptr %t.cpp -- --std=c++11 -I %S
 // RUN: FileCheck -input-file=%t.cpp %s
 
 namespace std {