143 files changed, 502 insertions, 489 deletions
diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt
index e4b239d1b8b..acdc060e33a 100644
--- a/clang-tools-extra/CMakeLists.txt
+++ b/clang-tools-extra/CMakeLists.txt
@@ -1,9 +1,9 @@
-add_subdirectory(remove-cstr-calls)
-add_subdirectory(tool-template)
 add_subdirectory(clang-apply-replacements)
-add_subdirectory(cpp11-migrate)
-add_subdirectory(modularize)
+add_subdirectory(clang-modernize)
 add_subdirectory(clang-tidy)
+add_subdirectory(modularize)
+add_subdirectory(remove-cstr-calls)
+add_subdirectory(tool-template)
 
 # Add the common testsuite after all the tools.
 add_subdirectory(test)
diff --git a/clang-tools-extra/CODE_OWNERS.TXT b/clang-tools-extra/CODE_OWNERS.TXT
index 0ec5a8e8ff8..c4326376a15 100644
--- a/clang-tools-extra/CODE_OWNERS.TXT
+++ b/clang-tools-extra/CODE_OWNERS.TXT
@@ -10,4 +10,4 @@ beautification by scripts.  The fields are: name (N), email (E), web-address
 
 N: Edwin Vane
 E: edwin.vane@intel.com
-D: cpp11-migrate
+D: clang-modernize
diff --git a/clang-tools-extra/Makefile b/clang-tools-extra/Makefile
index fdcade71fd6..1d06cf52c7b 100644
--- a/clang-tools-extra/Makefile
+++ b/clang-tools-extra/Makefile
@@ -12,7 +12,7 @@ CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
 PARALLEL_DIRS := remove-cstr-calls tool-template modularize
-DIRS := clang-apply-replacements cpp11-migrate clang-tidy unittests
+DIRS := clang-apply-replacements clang-modernize clang-tidy unittests
 
 include $(CLANG_LEVEL)/Makefile
 
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp
index 9a13c044e5d..9a13c044e5d 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.cpp
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h
index 8c39775e48d..8c39775e48d 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.cpp
index 134318ed386..134318ed386 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.cpp
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h
index afcebeffd4b..afcebeffd4b 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.cpp
index e323b5d5726..e323b5d5726 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h
index 0a81e546e85..0a81e546e85 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/CMakeLists.txt b/clang-tools-extra/clang-modernize/CMakeLists.txt
index 5413edc2abc..5413edc2abc 100644
--- a/clang-tools-extra/cpp11-migrate/CMakeLists.txt
+++ b/clang-tools-extra/clang-modernize/CMakeLists.txt
diff --git a/clang-tools-extra/cpp11-migrate/Core/CMakeLists.txt b/clang-tools-extra/clang-modernize/Core/CMakeLists.txt
index 0ac52230e6a..787388b69e2 100644
--- a/clang-tools-extra/cpp11-migrate/Core/CMakeLists.txt
+++ b/clang-tools-extra/clang-modernize/Core/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(LLVM_LINK_COMPONENTS support)
 
-add_clang_library(migrateCore
+add_clang_library(modernizeCore
   FileOverrides.cpp
   SyntaxCheck.cpp
   Transforms.cpp
@@ -10,7 +10,7 @@ add_clang_library(migrateCore
   Reformatting.cpp
   IncludeDirectives.cpp
   )
-target_link_libraries(migrateCore
+target_link_libraries(modernizeCore
   clangFormat
   clangTooling
   clangBasic
diff --git a/clang-tools-extra/cpp11-migrate/Core/CustomMatchers.h b/clang-tools-extra/clang-modernize/Core/CustomMatchers.h
index 9af04977996..9af04977996 100644
--- a/clang-tools-extra/cpp11-migrate/Core/CustomMatchers.h
+++ b/clang-tools-extra/clang-modernize/Core/CustomMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/FileOverrides.cpp b/clang-tools-extra/clang-modernize/Core/FileOverrides.cpp
index 7ab7e91c30c..7ab7e91c30c 100644
--- a/clang-tools-extra/cpp11-migrate/Core/FileOverrides.cpp
+++ b/clang-tools-extra/clang-modernize/Core/FileOverrides.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/FileOverrides.h b/clang-tools-extra/clang-modernize/Core/FileOverrides.h
index 8ed2914f0d2..8ed2914f0d2 100644
--- a/clang-tools-extra/cpp11-migrate/Core/FileOverrides.h
+++ b/clang-tools-extra/clang-modernize/Core/FileOverrides.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/IncludeDirectives.cpp b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
index f240950790b..f240950790b 100644
--- a/clang-tools-extra/cpp11-migrate/Core/IncludeDirectives.cpp
+++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/IncludeDirectives.h b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
index c1c5a7acf77..c1c5a7acf77 100644
--- a/clang-tools-extra/cpp11-migrate/Core/IncludeDirectives.h
+++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/IncludeExcludeInfo.cpp b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp
index e3f07c5f0d3..e3f07c5f0d3 100644
--- a/clang-tools-extra/cpp11-migrate/Core/IncludeExcludeInfo.cpp
+++ b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/IncludeExcludeInfo.h b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
index a5e73efae0f..a5e73efae0f 100644
--- a/clang-tools-extra/cpp11-migrate/Core/IncludeExcludeInfo.h
+++ b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/Makefile b/clang-tools-extra/clang-modernize/Core/Makefile
index e60e11364f6..9ccffae2fa3 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Makefile
+++ b/clang-tools-extra/clang-modernize/Core/Makefile
@@ -1,4 +1,4 @@
-##===- cpp11-migrate/Core/Makefile -------------------------*- Makefile -*-===##
+##===- clang-modernize/Core/Makefile -----------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
diff --git a/clang-tools-extra/cpp11-migrate/Core/PerfSupport.cpp b/clang-tools-extra/clang-modernize/Core/PerfSupport.cpp
index e074bd123ef..e074bd123ef 100644
--- a/clang-tools-extra/cpp11-migrate/Core/PerfSupport.cpp
+++ b/clang-tools-extra/clang-modernize/Core/PerfSupport.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/PerfSupport.h b/clang-tools-extra/clang-modernize/Core/PerfSupport.h
index 58ddded2207..58ddded2207 100644
--- a/clang-tools-extra/cpp11-migrate/Core/PerfSupport.h
+++ b/clang-tools-extra/clang-modernize/Core/PerfSupport.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/Refactoring.h b/clang-tools-extra/clang-modernize/Core/Refactoring.h
index a15634a3704..a15634a3704 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Refactoring.h
+++ b/clang-tools-extra/clang-modernize/Core/Refactoring.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp b/clang-tools-extra/clang-modernize/Core/Reformatting.cpp
index 50ba1f19f7a..50ba1f19f7a 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp
+++ b/clang-tools-extra/clang-modernize/Core/Reformatting.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/Reformatting.h b/clang-tools-extra/clang-modernize/Core/Reformatting.h
index 9a10171a742..9a10171a742 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Reformatting.h
+++ b/clang-tools-extra/clang-modernize/Core/Reformatting.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.cpp
index bd2eb63044f..42900e7d540 100644
--- a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.cpp
+++ b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.cpp
@@ -65,7 +65,7 @@ bool doSyntaxCheck(const CompilationDatabase &Database,
   ClangTool SyntaxTool(Database, SourcePaths);
 
   // Ensure C++11 support is enabled.
-  // FIXME: This isn't necessary anymore since the Migrator requires C++11
+  // FIXME: This isn't necessary anymore since the Modernizer requires C++11
   // to be enabled in the CompilationDatabase. Remove later.
   SyntaxTool.setArgumentsAdjuster(new SyntaxArgumentsAdjuster);
 
diff --git a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.h b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h
index 1651a7e7acc..1651a7e7acc 100644
--- a/clang-tools-extra/cpp11-migrate/Core/SyntaxCheck.h
+++ b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h
diff --git a/clang-tools-extra/cpp11-migrate/Core/Transform.cpp b/clang-tools-extra/clang-modernize/Core/Transform.cpp
index cd76723d316..cd76723d316 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Transform.cpp
+++ b/clang-tools-extra/clang-modernize/Core/Transform.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/Transform.h b/clang-tools-extra/clang-modernize/Core/Transform.h
index 45e470d64e4..846bb8a76b2 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Transform.h
+++ b/clang-tools-extra/clang-modernize/Core/Transform.h
@@ -141,7 +141,7 @@ public:
   }
 
   /// \brief Tests if the file containing \a Loc is allowed to be modified by
-  /// the Migrator.
+  /// the Modernizer.
   bool isFileModifiable(const clang::SourceManager &SM,
                         const clang::SourceLocation &Loc) const;
 
diff --git a/clang-tools-extra/cpp11-migrate/Core/Transforms.cpp b/clang-tools-extra/clang-modernize/Core/Transforms.cpp
index 93701796e24..93701796e24 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Transforms.cpp
+++ b/clang-tools-extra/clang-modernize/Core/Transforms.cpp
diff --git a/clang-tools-extra/cpp11-migrate/Core/Transforms.h b/clang-tools-extra/clang-modernize/Core/Transforms.h
index 18369407dda..18369407dda 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Transforms.h
+++ b/clang-tools-extra/clang-modernize/Core/Transforms.h
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.cpp
index 0ba49d8ad4f..4dab6aba75f 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.cpp
@@ -37,7 +37,7 @@ struct Usage {
 
 /// \brief A class to encapsulate lowering of the tool's confidence level.
 ///
-/// Confidence is a quantity opposite in meaning to Risk. Since cpp11-migrate
+/// Confidence is a quantity opposite in meaning to Risk. Since clang-modernize
 /// uses risk, this class reverses the meaning for the legacy loop convert
 /// code.
 class Confidence {
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
index b72576bde82..b72576bde82 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopConvert.cpp b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp
index 2dfa4562929..2dfa4562929 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopConvert.cpp
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.cpp
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopConvert.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h
index b45d9555b3d..b45d9555b3d 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopConvert.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopMatchers.cpp b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.cpp
index 719c2069fbe..719c2069fbe 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopMatchers.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h
index b0cd8a5a7cc..b0cd8a5a7cc 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopMatchers.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/StmtAncestor.cpp b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.cpp
index 33f576bd814..33f576bd814 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/StmtAncestor.cpp
+++ b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.cpp
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/StmtAncestor.h b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h
index 24079097652..24079097652 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/StmtAncestor.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/VariableNaming.cpp b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.cpp
index 853e4830ca6..853e4830ca6 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/VariableNaming.cpp
+++ b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.cpp
diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/VariableNaming.h b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h
index 066ed1e5af4..066ed1e5af4 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/VariableNaming.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h
diff --git a/clang-tools-extra/cpp11-migrate/Makefile b/clang-tools-extra/clang-modernize/Makefile
index f19a25b83af..f19a25b83af 100644
--- a/clang-tools-extra/cpp11-migrate/Makefile
+++ b/clang-tools-extra/clang-modernize/Makefile
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValue.cpp b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp
index fbd641233af..fbd641233af 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValue.cpp
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.cpp
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValue.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
index 6dad5497c99..6dad5497c99 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValue.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueActions.cpp b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.cpp
index 63189219294..63189219294 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueActions.cpp
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.cpp
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueActions.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h
index 5aeaae4f9fb..5aeaae4f9fb 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueActions.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueMatchers.cpp b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.cpp
index 32095e167b7..32095e167b7 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueMatchers.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h
index 8c2bade4385..8c2bade4385 100644
--- a/clang-tools-extra/cpp11-migrate/PassByValue/PassByValueMatchers.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtr.cpp b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp
index fae7970b416..fae7970b416 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtr.cpp
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.cpp
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtr.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
index c236c99b6c8..c236c99b6c8 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtr.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp
index 2074e3764bb..2074e3764bb 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.cpp
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrActions.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
index fb805965b01..fb805965b01 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrActions.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrMatchers.cpp b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.cpp
index e03a2c342f5..e03a2c342f5 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
index 2a87d5b40ed..2a87d5b40ed 100644
--- a/clang-tools-extra/cpp11-migrate/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAuto.cpp b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp
index 72f5ae077f2..72f5ae077f2 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAuto.cpp
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAuto.h b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h
index 26b5e4496f6..26b5e4496f6 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAuto.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoActions.cpp b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.cpp
index 2a8d5c5935d..2a8d5c5935d 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoActions.cpp
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoActions.h b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h
index 0ddb0e0c5af..0ddb0e0c5af 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoActions.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoMatchers.cpp b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.cpp
index 4f314adb2e3..4f314adb2e3 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoMatchers.h b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h
index 37baceee047..37baceee047 100644
--- a/clang-tools-extra/cpp11-migrate/UseAuto/UseAutoMatchers.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
index 23a8fd3a476..23a8fd3a476 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.cpp
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.h b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h
index 02da6b76db0..02da6b76db0 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrActions.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrMatchers.cpp b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.cpp
index 0995c168b50..0995c168b50 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrMatchers.cpp
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrMatchers.h b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h
index b6b686859a6..b6b686859a6 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/NullptrMatchers.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp
index e07ee6682ee..e07ee6682ee 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.cpp
+++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.cpp
diff --git a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.h b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h
index ed90f9a5bbc..ed90f9a5bbc 100644
--- a/clang-tools-extra/cpp11-migrate/UseNullptr/UseNullptr.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h
diff --git a/clang-tools-extra/cpp11-migrate/tool/CMakeLists.txt b/clang-tools-extra/clang-modernize/tool/CMakeLists.txt
index 06e61c37e6d..b28de70966a 100644
--- a/clang-tools-extra/cpp11-migrate/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-modernize/tool/CMakeLists.txt
@@ -1,42 +1,42 @@
 set(LLVM_LINK_COMPONENTS support)
 
-set (Cpp11MigrateSources
-  Cpp11Migrate.cpp
+set (ClangModernizeSources
+  ClangModernize.cpp
   )
 
 # FIXME: Lib-ify the transforms to simplify the build rules.
 
 # For each transform subdirectory.
 file(GLOB_RECURSE LoopConvertSources "../LoopConvert/*.cpp")
-list(APPEND Cpp11MigrateSources ${LoopConvertSources})
+list(APPEND ClangModernizeSources ${LoopConvertSources})
 
 file(GLOB_RECURSE UseNullptrSources "../UseNullptr/*.cpp")
-list(APPEND Cpp11MigrateSources ${UseNullptrSources})
+list(APPEND ClangModernizeSources ${UseNullptrSources})
 
 file(GLOB_RECURSE UseAutoSources "../UseAuto/*.cpp")
-list(APPEND Cpp11MigrateSources ${UseAutoSources})
+list(APPEND ClangModernizeSources ${UseAutoSources})
 
 file(GLOB_RECURSE AddOverrideSources "../AddOverride/*.cpp")
-list(APPEND Cpp11MigrateSources ${AddOverrideSources})
+list(APPEND ClangModernizeSources ${AddOverrideSources})
 
 file(GLOB_RECURSE PassByValueSources "../PassByValue/*.cpp")
-list(APPEND Cpp11MigrateSources ${PassByValueSources})
+list(APPEND ClangModernizeSources ${PassByValueSources})
 
 file(GLOB_RECURSE ReplaceAutoPtrSources "../ReplaceAutoPtr/*.cpp")
-list(APPEND Cpp11MigrateSources ${ReplaceAutoPtrSources})
+list(APPEND ClangModernizeSources ${ReplaceAutoPtrSources})
 
-add_clang_executable(cpp11-migrate
-  ${Cpp11MigrateSources}
+add_clang_executable(clang-modernize
+  ${ClangModernizeSources}
   )
 
-add_dependencies(cpp11-migrate
+add_dependencies(clang-modernize
   clang-headers
   )
 
-target_link_libraries(cpp11-migrate
+target_link_libraries(clang-modernize
   clangApplyReplacements
-  migrateCore
+  modernizeCore
   )
 
-install(TARGETS cpp11-migrate
+install(TARGETS clang-modernize
   RUNTIME DESTINATION bin)
diff --git a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp
index 14d55609b22..1af1cf7c0f8 100644
--- a/clang-tools-extra/cpp11-migrate/tool/Cpp11Migrate.cpp
+++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp
@@ -1,4 +1,4 @@
-//===-- cpp11-migrate/Cpp11Migrate.cpp - Main file C++11 migration tool ---===//
+//===-- ClangModernize.cpp - Main file for Clang modernization tool -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -48,20 +48,20 @@ static cl::list<std::string> SourcePaths(
 static cl::extrahelp MoreHelp(
     "EXAMPLES:\n\n"
     "Apply all transforms on a given file, no compilation database:\n\n"
-    "  cpp11-migrate path/to/file.cpp -- -Ipath/to/include/\n"
+    "  clang-modernize path/to/file.cpp -- -Ipath/to/include/\n"
     "\n"
     "Convert for loops to the new ranged-based for loops on all files in a "
     "subtree\nand reformat the code automatically using the LLVM style:\n\n"
     "  find path/in/subtree -name '*.cpp' -exec \\\n"
-    "    cpp11-migrate -p build/path -format-style=LLVM -loop-convert {} ';'\n"
+    "    clang-modernize -p build/path -format-style=LLVM -loop-convert {} ';'\n"
     "\n"
     "Make use of both nullptr and the override specifier, using git ls-files:\n"
     "\n"
-    "  git ls-files '*.cpp' | xargs -I{} cpp11-migrate -p build/path \\\n"
+    "  git ls-files '*.cpp' | xargs -I{} clang-modernize -p build/path \\\n"
     "    -use-nullptr -add-override -override-macros {}\n"
     "\n"
     "Apply all transforms supported by both clang >= 3.0 and gcc >= 4.7:\n\n"
-    "  cpp11-migrate -for-compilers=clang-3.0,gcc-4.7 foo.cpp -- -Ibar\n");
+    "  clang-modernize -for-compilers=clang-3.0,gcc-4.7 foo.cpp -- -Ibar\n");
 
 static cl::opt<RiskLevel, /*ExternalStorage=*/true> MaxRiskLevel(
     "risk", cl::desc("Select a maximum risk level:"),
diff --git a/clang-tools-extra/cpp11-migrate/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile
index 8c4d0105386..0e055674861 100644
--- a/clang-tools-extra/cpp11-migrate/tool/Makefile
+++ b/clang-tools-extra/clang-modernize/tool/Makefile
@@ -10,7 +10,7 @@
 CLANG_LEVEL := ../../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
-TOOLNAME = cpp11-migrate
+TOOLNAME = clang-modernize
 
 # No plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1
diff --git a/clang-tools-extra/docs/AddOverrideTransform.rst b/clang-tools-extra/docs/AddOverrideTransform.rst
index 2b2142b339e..ea7e3140783 100644
--- a/clang-tools-extra/docs/AddOverrideTransform.rst
+++ b/clang-tools-extra/docs/AddOverrideTransform.rst
@@ -7,7 +7,7 @@ Add-Override Transform
 The Add-Override Transform adds the ``override`` specifier to member
 functions that override a virtual function in a base class and that
 don't already have the specifier. The transform is enabled with the 
-:option:`-add-override` option of :program:`cpp11-migrate`.
+:option:`-add-override` option of :program:`clang-modernize`.
 For example:
 
 .. code-block:: c++
@@ -33,7 +33,7 @@ expand to the ``override`` keyword when compiling with C++11 features enabled.
 To maintain compatibility with non-C++11 builds, the Add-Override Transform
 supports detection and use of these macros instead of using the ``override``
 keyword directly. Specify ``-override-macros`` on the command line to the
-Migrator to enable this behavior.
+Modernizer to enable this behavior.
 
 
 Known Limitations
diff --git a/clang-tools-extra/docs/Doxyfile b/clang-tools-extra/docs/Doxyfile
index 3403bae6458..2ecd372ae30 100644
--- a/clang-tools-extra/docs/Doxyfile
+++ b/clang-tools-extra/docs/Doxyfile
@@ -648,7 +648,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../cpp11-migrate ../clang-apply-replacements
+INPUT                  = ../clang-modernize ../clang-apply-replacements
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/clang-tools-extra/docs/LoopConvertTransform.rst b/clang-tools-extra/docs/LoopConvertTransform.rst
index 1579d6b77b3..21d96a6c01d 100644
--- a/clang-tools-extra/docs/LoopConvertTransform.rst
+++ b/clang-tools-extra/docs/LoopConvertTransform.rst
@@ -6,7 +6,7 @@ Loop Convert Transform
 
 The Loop Convert Transform is a transformation to convert ``for(...; ...;
 ...)`` loops to use the new range-based loops in C++11. The transform is enabled
-with the :option:`-loop-convert` option of :program:`cpp11-migrate`.
+with the :option:`-loop-convert` option of :program:`clang-modernize`.
 
 Three kinds of loops can be converted:
 
diff --git a/clang-tools-extra/docs/MigratorUsage.rst b/clang-tools-extra/docs/MigratorUsage.rst
index 4063bc0554e..b5b5ef5ed9d 100644
--- a/clang-tools-extra/docs/MigratorUsage.rst
+++ b/clang-tools-extra/docs/MigratorUsage.rst
@@ -2,240 +2,5 @@
 cpp11-migrate Usage
 ===================
 
-``cpp11-migrate [options] <source0> [... <sourceN>] [-- [args]]``
-
-``<source#>`` specifies the path to the source to migrate. This path may be
-relative to the current directory.
-
-By default all transformations are applied. There are two ways to enable a
-subset of the transformations:
-
-1. Explicitly, by referring to the transform options directly, see
-   :ref:`transform-specific-command-line-options`.
-2. Implicitly, based on the compilers to support, see
-   :ref:`-for-compilers=\<string\> <for-compilers-option>`.
-
-If both ways of specifying transforms are used only explicitly specified
-transformations that are supported by the given compilers will be applied.
-
-General Command Line Options
-============================
-
-.. option:: -help
-
-  Displays tool usage instructions and command line options.
-
-.. option:: -version
-
-  Displays the version information of this tool.
-
-.. option:: -p=<build-path>
-
-  ``<build-path>`` is the directory containing a *compilation databasefile*, a
-  file named ``compile_commands.json``, which provides compiler arguments for
-  building each source file. CMake can generate this file by specifying
-  ``-DCMAKE_EXPORT_COMPILE_COMMANDS`` when running CMake. Ninja_, since v1.2 can
-  also generate this file with ``ninja -t compdb``. If the compilation database
-  cannot be used for any reason, an error is reported.
-
-  This option is ignored if ``--`` is present.
-
-.. option:: -- [args]
-
-  Another way to provide compiler arguments is to specify all arguments on the
-  command line following ``--``. Arguments provided this way are used for
-  *every* source file.
-
-  If neither ``--`` nor ``-p`` are specified a compilation database is
-  searched for starting with the path of the first-provided source file and
-  proceeding through parent directories. If no compilation database is found or
-  one is found and cannot be used for any reason then ``-std=c++11`` is used as
-  the only compiler argument.
-
-.. _Ninja: http://martine.github.io/ninja/
-
-.. option:: -risk=<risk-level>
-
-  Some transformations may cause a change in semantics. In such cases the
-  maximum acceptable risk level specified through the ``-risk`` command
-  line option decides whether or not a transformation is applied.
-
-  Three different risk level options are available:
-
-    ``-risk=safe``
-      Perform only safe transformations.
-    ``-risk=reasonable`` (default)
-      Enable transformations that may change semantics.
-    ``-risk=risky``
-      Enable transformations that are likely to change semantics.
-
-  The meaning of risk is handled differently for each transform. See
-  :ref:`transform documentation <transforms>` for details.
-
-.. option:: -final-syntax-check
-
-  After applying the final transform to a file, parse the file to ensure the
-  last transform did not introduce syntax errors. Syntax errors introduced by
-  earlier transforms are already caught when subsequent transforms parse the
-  file.
-
-.. option:: -format-style=<string>
-
-  After all transformations have been applied, reformat the changes using the
-  style ``string`` given as argument to the option. The style can be a builtin
-  style, one of LLVM, Google, Chromium, Mozilla; or a YAML configuration file.
-
-  If you want a place to start for using your own custom configuration file,
-  ClangFormat_ can generate a file with ``clang-format -dump-config``.
-
-  Example:
-
-  .. code-block:: c++
-    :emphasize-lines: 10-12,18
-
-      // file.cpp
-      for (std::vector<int>::const_iterator I = my_container.begin(),
-                                            E = my_container.end();
-           I != E; ++I) {
-        std::cout << *I << std::endl;
-      }
-
-      // No reformatting:
-      //     cpp11-migrate -use-auto file.cpp --
-      for (auto I = my_container.begin(),
-                                            E = my_container.end();
-           I != E; ++I) {
-        std::cout << *I << std::endl;
-      }
-
-      // With reformatting enabled:
-      //     cpp11-migrate -format-style=LLVM -use-auto file.cpp --
-      for (auto I = my_container.begin(), E = my_container.end(); I != E; ++I) {
-        std::cout << *I << std::endl;
-      }
-
-.. _ClangFormat: http://clang.llvm.org/docs/ClangFormat.html
-
-.. option:: -summary
-
-  Displays a summary of the number of changes each transform made or could have
-  made to each source file immediately after each transform is applied.
-  **Accepted** changes are those actually made. **Rejected** changes are those
-  that could have been made if the acceptable risk level were higher.
-  **Deferred** changes are those that might be possible but they might conflict
-  with other accepted changes. Re-applying the transform will resolve deferred
-  changes.
-
-.. _for-compilers-option:
-
-.. option:: -for-compilers=<string>
-
-  Select transforms targeting the intersection of language features supported by
-  the given compilers.
-
-  Four compilers are supported. The transforms are enabled according to this
-  table:
-
-  ===============  =====  ===  ====  ====
-  Transforms       clang  gcc  icc   mscv
-  ===============  =====  ===  ====  ====
-  AddOverride (1)  3.0    4.7  14    8
-  LoopConvert      3.0    4.6  13    11
-  PassByValue      3.0    4.6  13    11
-  ReplaceAutoPtr   3.0    4.6  13    11
-  UseAuto          2.9    4.4  12    10
-  UseNullptr       3.0    4.6  12.1  10
-  ===============  =====  ===  ====  ====
-
-  (1): if *-override-macros* is provided it's assumed that the macros are C++11
-  aware and the transform is enabled without regard to the supported compilers.
-
-  The structure of the argument to the `-for-compilers` option is
-  **<compiler>-<major ver>[.<minor ver>]** where **<compiler>** is one of the
-  compilers from the above table.
-
-  Some examples:
-
-  1. To support `Clang >= 3.0`, `gcc >= 4.6` and `MSVC >= 11`:
-
-     ``cpp11-migrate -for-compilers=clang-3.0,gcc-4.6,msvc-11 <args..>``
-
-     Enables LoopConvert, ReplaceAutoPtr, UseAuto, UseNullptr.
-
-  2. To support `icc >= 12` while using a C++11-aware macro for the `override`
-     virtual specifier:
-
-     ``cpp11-migrate -for-compilers=icc-12 -override-macros <args..>``
-
-     Enables AddOverride and UseAuto.
-
-  .. warning::
-
-    If your version of Clang depends on the GCC headers (e.g: when `libc++` is
-    not used), then you probably want to add the GCC version to the targeted
-    platforms as well.
-
-.. option:: -perf[=<directory>]
-
-  Turns on performance measurement and output functionality. The time it takes to
-  apply each transform is recorded by the migrator and written in JSON format
-  to a uniquely named file in the given ``<directory>``. All sources processed
-  by a single Migrator process are written to the same output file. If ``<directory>`` is
-  not provided the default is ``./migrate_perf/``.
-
-  The time recorded for a transform includes parsing and creating source code
-  replacements.
-
-.. _transform-specific-command-line-options:
-
-Transform-Specific Command Line Options
-=======================================
-
-.. option:: -loop-convert
-
-  Makes use of C++11 range-based for loops where possible. See
-  :doc:`LoopConvertTransform`.
-
-.. option:: -use-nullptr
-
-  Makes use of the new C++11 keyword ``nullptr`` where possible.
-  See :doc:`UseNullptrTransform`.
-
-.. option:: -user-null-macros=<string>
-
-  ``<string>`` is a comma-separated list of user-defined macros that behave like
-  the ``NULL`` macro. The :option:`-use-nullptr` transform will replace these
-  macros along with ``NULL``. See :doc:`UseNullptrTransform`.
-
-.. option:: -use-auto
-
-  Replace the type specifier of variable declarations with the ``auto`` type
-  specifier. See :doc:`UseAutoTransform`.
-
-.. option:: -add-override
-
-  Adds the override specifier to member functions where it is appropriate. That
-  is, the override specifier is added to member functions that override a
-  virtual function in a base class and that don't already have the specifier.
-  See :doc:`AddOverrideTransform`.
-
-.. option:: -override-macros
-
-  Tells the Add Override Transform to locate a macro that expands to
-  ``override`` and use that macro instead of the ``override`` keyword directly.
-  If no such macro is found, ``override`` is still used. This option enables
-  projects that use such macros to maintain build compatibility with non-C++11
-  code.
-
-.. option:: -pass-by-value
-
-  Replace const-reference parameters by values in situations where it can be
-  beneficial.
-  See :doc:`PassByValueTransform`.
-
-.. option:: -replace-auto_ptr
-
-  Replace ``std::auto_ptr`` (deprecated in C++11) by ``std::unique_ptr`` and
-  wrap calls to the copy constructor and assignment operator with
-  ``std::move()``.
-  See :doc:`ReplaceAutoPtrTransform`.
+This program has been renamed :program:`clang-modernize`, and its usage is now
+found in :doc:`ModernizerUsage`.
diff --git a/clang-tools-extra/docs/ModernizerUsage.rst b/clang-tools-extra/docs/ModernizerUsage.rst
new file mode 100644
index 00000000000..c1c77460160
--- /dev/null
+++ b/clang-tools-extra/docs/ModernizerUsage.rst
@@ -0,0 +1,241 @@
+=====================
+clang-modernize Usage
+=====================
+
+``clang-modernize [options] <source0> [... <sourceN>] [-- [args]]``
+
+``<source#>`` specifies the path to the source to migrate. This path may be
+relative to the current directory.
+
+By default all transformations are applied. There are two ways to enable a
+subset of the transformations:
+
+1. Explicitly, by referring to the transform options directly, see
+   :ref:`transform-specific-command-line-options`.
+2. Implicitly, based on the compilers to support, see
+   :ref:`-for-compilers=\<string\> <for-compilers-option>`.
+
+If both ways of specifying transforms are used only explicitly specified
+transformations that are supported by the given compilers will be applied.
+
+General Command Line Options
+============================
+
+.. option:: -help
+
+  Displays tool usage instructions and command line options.
+
+.. option:: -version
+
+  Displays the version information of this tool.
+
+.. option:: -p=<build-path>
+
+  ``<build-path>`` is the directory containing a *compilation databasefile*, a
+  file named ``compile_commands.json``, which provides compiler arguments for
+  building each source file. CMake can generate this file by specifying
+  ``-DCMAKE_EXPORT_COMPILE_COMMANDS`` when running CMake. Ninja_, since v1.2 can
+  also generate this file with ``ninja -t compdb``. If the compilation database
+  cannot be used for any reason, an error is reported.
+
+  This option is ignored if ``--`` is present.
+
+.. option:: -- [args]
+
+  Another way to provide compiler arguments is to specify all arguments on the
+  command line following ``--``. Arguments provided this way are used for
+  *every* source file.
+
+  If neither ``--`` nor ``-p`` are specified a compilation database is
+  searched for starting with the path of the first-provided source file and
+  proceeding through parent directories. If no compilation database is found or
+  one is found and cannot be used for any reason then ``-std=c++11`` is used as
+  the only compiler argument.
+
+.. _Ninja: http://martine.github.io/ninja/
+
+.. option:: -risk=<risk-level>
+
+  Some transformations may cause a change in semantics. In such cases the
+  maximum acceptable risk level specified through the ``-risk`` command
+  line option decides whether or not a transformation is applied.
+
+  Three different risk level options are available:
+
+    ``-risk=safe``
+      Perform only safe transformations.
+    ``-risk=reasonable`` (default)
+      Enable transformations that may change semantics.
+    ``-risk=risky``
+      Enable transformations that are likely to change semantics.
+
+  The meaning of risk is handled differently for each transform. See
+  :ref:`transform documentation <transforms>` for details.
+
+.. option:: -final-syntax-check
+
+  After applying the final transform to a file, parse the file to ensure the
+  last transform did not introduce syntax errors. Syntax errors introduced by
+  earlier transforms are already caught when subsequent transforms parse the
+  file.
+
+.. option:: -format-style=<string>
+
+  After all transformations have been applied, reformat the changes using the
+  style ``string`` given as argument to the option. The style can be a builtin
+  style, one of LLVM, Google, Chromium, Mozilla; or a YAML configuration file.
+
+  If you want a place to start for using your own custom configuration file,
+  ClangFormat_ can generate a file with ``clang-format -dump-config``.
+
+  Example:
+
+  .. code-block:: c++
+    :emphasize-lines: 10-12,18
+
+      // file.cpp
+      for (std::vector<int>::const_iterator I = my_container.begin(),
+                                            E = my_container.end();
+           I != E; ++I) {
+        std::cout << *I << std::endl;
+      }
+
+      // No reformatting:
+      //     clang-modernize -use-auto file.cpp --
+      for (auto I = my_container.begin(),
+                                            E = my_container.end();
+           I != E; ++I) {
+        std::cout << *I << std::endl;
+      }
+
+      // With reformatting enabled:
+      //     clang-modernize -format-style=LLVM -use-auto file.cpp --
+      for (auto I = my_container.begin(), E = my_container.end(); I != E; ++I) {
+        std::cout << *I << std::endl;
+      }
+
+.. _ClangFormat: http://clang.llvm.org/docs/ClangFormat.html
+
+.. option:: -summary
+
+  Displays a summary of the number of changes each transform made or could have
+  made to each source file immediately after each transform is applied.
+  **Accepted** changes are those actually made. **Rejected** changes are those
+  that could have been made if the acceptable risk level were higher.
+  **Deferred** changes are those that might be possible but they might conflict
+  with other accepted changes. Re-applying the transform will resolve deferred
+  changes.
+
+.. _for-compilers-option:
+
+.. option:: -for-compilers=<string>
+
+  Select transforms targeting the intersection of language features supported by
+  the given compilers.
+
+  Four compilers are supported. The transforms are enabled according to this
+  table:
+
+  ===============  =====  ===  ====  ====
+  Transforms       clang  gcc  icc   mscv
+  ===============  =====  ===  ====  ====
+  AddOverride (1)  3.0    4.7  14    8
+  LoopConvert      3.0    4.6  13    11
+  PassByValue      3.0    4.6  13    11
+  ReplaceAutoPtr   3.0    4.6  13    11
+  UseAuto          2.9    4.4  12    10
+  UseNullptr       3.0    4.6  12.1  10
+  ===============  =====  ===  ====  ====
+
+  (1): if *-override-macros* is provided it's assumed that the macros are C++11
+  aware and the transform is enabled without regard to the supported compilers.
+
+  The structure of the argument to the `-for-compilers` option is
+  **<compiler>-<major ver>[.<minor ver>]** where **<compiler>** is one of the
+  compilers from the above table.
+
+  Some examples:
+
+  1. To support `Clang >= 3.0`, `gcc >= 4.6` and `MSVC >= 11`:
+
+     ``clang-modernize -for-compilers=clang-3.0,gcc-4.6,msvc-11 <args..>``
+
+     Enables LoopConvert, ReplaceAutoPtr, UseAuto, UseNullptr.
+
+  2. To support `icc >= 12` while using a C++11-aware macro for the `override`
+     virtual specifier:
+
+     ``clang-modernize -for-compilers=icc-12 -override-macros <args..>``
+
+     Enables AddOverride and UseAuto.
+
+  .. warning::
+
+    If your version of Clang depends on the GCC headers (e.g: when `libc++` is
+    not used), then you probably want to add the GCC version to the targeted
+    platforms as well.
+
+.. option:: -perf[=<directory>]
+
+  Turns on performance measurement and output functionality. The time it takes to
+  apply each transform is recorded by the migrator and written in JSON format
+  to a uniquely named file in the given ``<directory>``. All sources processed
+  by a single Modernizer process are written to the same output file. If
+  ``<directory>`` is not provided the default is ``./migrate_perf/``.
+
+  The time recorded for a transform includes parsing and creating source code
+  replacements.
+
+.. _transform-specific-command-line-options:
+
+Transform-Specific Command Line Options
+=======================================
+
+.. option:: -loop-convert
+
+  Makes use of C++11 range-based for loops where possible. See
+  :doc:`LoopConvertTransform`.
+
+.. option:: -use-nullptr
+
+  Makes use of the new C++11 keyword ``nullptr`` where possible.
+  See :doc:`UseNullptrTransform`.
+
+.. option:: -user-null-macros=<string>
+
+  ``<string>`` is a comma-separated list of user-defined macros that behave like
+  the ``NULL`` macro. The :option:`-use-nullptr` transform will replace these
+  macros along with ``NULL``. See :doc:`UseNullptrTransform`.
+
+.. option:: -use-auto
+
+  Replace the type specifier of variable declarations with the ``auto`` type
+  specifier. See :doc:`UseAutoTransform`.
+
+.. option:: -add-override
+
+  Adds the override specifier to member functions where it is appropriate. That
+  is, the override specifier is added to member functions that override a
+  virtual function in a base class and that don't already have the specifier.
+  See :doc:`AddOverrideTransform`.
+
+.. option:: -override-macros
+
+  Tells the Add Override Transform to locate a macro that expands to
+  ``override`` and use that macro instead of the ``override`` keyword directly.
+  If no such macro is found, ``override`` is still used. This option enables
+  projects that use such macros to maintain build compatibility with non-C++11
+  code.
+
+.. option:: -pass-by-value
+
+  Replace const-reference parameters by values in situations where it can be
+  beneficial.
+  See :doc:`PassByValueTransform`.
+
+.. option:: -replace-auto_ptr
+
+  Replace ``std::auto_ptr`` (deprecated in C++11) by ``std::unique_ptr`` and
+  wrap calls to the copy constructor and assignment operator with
+  ``std::move()``.
+  See :doc:`ReplaceAutoPtrTransform`.
diff --git a/clang-tools-extra/docs/PassByValueTransform.rst b/clang-tools-extra/docs/PassByValueTransform.rst
index 05c254ce8a0..438d87c9fd6 100644
--- a/clang-tools-extra/docs/PassByValueTransform.rst
+++ b/clang-tools-extra/docs/PassByValueTransform.rst
@@ -44,7 +44,7 @@ necessary.
 
 Example::
 
-  $ cpp11-migrate -pass-by-value ctor.cpp
+  $ clang-modernize -pass-by-value ctor.cpp
 
 **ctor.cpp**
 
diff --git a/clang-tools-extra/docs/ReplaceAutoPtrTransform.rst b/clang-tools-extra/docs/ReplaceAutoPtrTransform.rst
index ec4cfdb997c..0d26b55c8f4 100644
--- a/clang-tools-extra/docs/ReplaceAutoPtrTransform.rst
+++ b/clang-tools-extra/docs/ReplaceAutoPtrTransform.rst
@@ -9,7 +9,7 @@ The Replace-AutoPtr Transform replaces the uses of the deprecated class
 ownership, done by the copy-constructor and the assignment operator, is changed
 to match ``std::unique_ptr`` usage by using explicit calls to ``std::move()``.
 The transform is enabled with the :option:`-replace-auto_ptr` option of
-:program:`cpp11-migrate`.
+:program:`clang-modernize`.
 
 Migration example:
 
diff --git a/clang-tools-extra/docs/UseAutoTransform.rst b/clang-tools-extra/docs/UseAutoTransform.rst
index 44d50018dee..59b919e890a 100644
--- a/clang-tools-extra/docs/UseAutoTransform.rst
+++ b/clang-tools-extra/docs/UseAutoTransform.rst
@@ -7,7 +7,7 @@ Use-Auto Transform
 The Use-Auto Transform is responsible for using the ``auto`` type specifier for
 variable declarations to *improve code readability and maintainability*. The
 transform is enabled with the :option:`-use-auto` option of
-:program:`cpp11-migrate`. For example:
+:program:`clang-modernize`. For example:
 
 .. code-block:: c++
 
diff --git a/clang-tools-extra/docs/UseNullptrTransform.rst b/clang-tools-extra/docs/UseNullptrTransform.rst
index bc6289c5185..27ccb8c7415 100644
--- a/clang-tools-extra/docs/UseNullptrTransform.rst
+++ b/clang-tools-extra/docs/UseNullptrTransform.rst
@@ -7,7 +7,7 @@ Use-Nullptr Transform
 The Use-Nullptr Transform is a transformation to convert the usage of null
 pointer constants (eg. ``NULL``, ``0``) to use the new C++11 ``nullptr``
 keyword. The transform is enabled with the :option:`-use-nullptr` option of
-:program:`cpp11-migrate`.
+:program:`clang-modernize`.
 
 Example
 =======
@@ -63,7 +63,7 @@ using the command-line
 
 .. code-block:: bash
 
-  cpp11-migrate -use-nullptr -user-null-macros=MY_NULL foo.cpp
+  clang-modernize -use-nullptr -user-null-macros=MY_NULL foo.cpp
 
 
 transforms to:
diff --git a/clang-tools-extra/docs/clang-modernize.rst b/clang-tools-extra/docs/clang-modernize.rst
new file mode 100644
index 00000000000..6567dcd2cce
--- /dev/null
+++ b/clang-tools-extra/docs/clang-modernize.rst
@@ -0,0 +1,122 @@
+.. index:: clang-modernize
+
+==================================
+Clang C++ Modernizer User's Manual
+==================================
+
+.. toctree::
+   :hidden:
+
+   UseAutoTransform
+   UseNullptrTransform
+   LoopConvertTransform
+   AddOverrideTransform
+   PassByValueTransform
+   ReplaceAutoPtrTransform
+   ModernizerUsage
+
+:program:`clang-modernize` is a standalone tool used to automatically convert
+C++ code written against old standards to use features of the newest C++
+standard where appropriate.
+
+Getting Started
+===============
+
+To build from source:
+
+1. Read `Getting Started with the LLVM System`_ and `Clang Tools
+   Documentation`_ for information on getting sources for LLVM, Clang, and
+   Clang Extra Tools.
+
+2. `Getting Started with the LLVM System`_ and `Building LLVM with CMake`_ give
+   directions for how to build. With sources all checked out into the
+   right place the LLVM build will build Clang Extra Tools and their
+   dependencies automatically.
+
+   * If using CMake, you can also use the ``clang-modernize`` target to build
+     just the Modernizer and its dependencies.
+
+Before continuing, take a look at :doc:`ModernizerUsage` to see how to invoke
+the Modernizer.
+
+Before running the Modernizer on code you'll need the arguments you'd normally
+pass to the compiler. If you're migrating a single file with few compiler
+arguments, it might be easier to pass the compiler args on the command line
+after ``--``. If you don't have any compiler arguments then ``--`` is not needed.
+If you're working with multiple files or even a single file with many compiler
+args, it's probably best to use a *compilation database*.
+
+A `compilation database`_ contains the command-line arguments for multiple
+files. If the code you want to transform can be built with CMake, you can
+generate this database easily by running CMake with the
+``-DCMAKE_EXPORT_COMPILE_COMMANDS`` option. The Ninja_ build system, since
+v1.2, can create this file too using the *compdb* tool: ``ninja -t compdb``. If
+you're not already using either of these tools or cannot easily make use of
+them you might consider looking into Bear_.
+
+In addition to the compiler arguments you usually build your code with, you must
+provide the option for enabling C++11 features. For clang and versions of gcc
+≥ v4.8 this is ``-std=c++11``.
+
+Now with compiler arguments, the Modernizer can be applied to source. Sources
+are transformed in place and changes are only written to disk if compilation
+errors aren't caused by the transforms. Each transform will re-parse the output
+from the previous transform. The output from the last transform is not checked
+unless ``-final-syntax-check`` is enabled.
+
+
+.. _Ninja: http://martine.github.io/ninja/
+.. _Bear: https://github.com/rizsotto/Bear
+.. _compilation database: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+.. _Getting Started with the LLVM System: http://llvm.org/docs/GettingStarted.html
+.. _Building LLVM with CMake: http://llvm.org/docs/CMake.html
+.. _Clang Tools Documentation: http://clang.llvm.org/docs/ClangTools.html
+
+Getting Involved
+================
+
+If you find a bug
+
+.. raw:: html
+
+  <input type="button" id="logbug" value="Log a Bug!" />
+  <script type="text/javascript" src="https://cpp11-migrate.atlassian.net/s/en_USpfg3b3-1988229788/6095/34/1.4.0-m2/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=50813874"></script>
+  <script type="text/javascript">window.ATL_JQ_PAGE_PROPS =  {
+    "triggerFunction": function(showCollectorDialog) {
+      //Requries that jQuery is available! 
+      jQuery("#logbug").click(function(e) {
+        e.preventDefault();
+        showCollectorDialog();
+      });
+    }};
+  </script>
+
+Bugs and feature development of the Modernizer are tracked at
+http://cpp11-migrate.atlassian.net. If you want to get involved the front page
+shows a list of outstanding issues or you can browse around the project to get
+familiar. To take on issues or contribute feature requests and/or bug reports
+you need to sign up for an account from the `log in page`_. An account also
+lets you sign up for notifications on issues or vote for unassigned issues to
+be completed.
+
+.. _log in page: https://cpp11-migrate.atlassian.net/login
+
+.. _transforms:
+
+Transformations
+===============
+
+The Modernizer is a collection of independent transforms which can be
+independently enabled. The transforms currently implemented are:
+
+* :doc:`LoopConvertTransform`
+
+* :doc:`UseNullptrTransform`
+
+* :doc:`UseAutoTransform`
+
+* :doc:`AddOverrideTransform`
+
+* :doc:`PassByValueTransform`
+
+* :doc:`ReplaceAutoPtrTransform`
diff --git a/clang-tools-extra/docs/cpp11-migrate.rst b/clang-tools-extra/docs/cpp11-migrate.rst
index 3febf7ff933..09ee2fde774 100644
--- a/clang-tools-extra/docs/cpp11-migrate.rst
+++ b/clang-tools-extra/docs/cpp11-migrate.rst
@@ -1,122 +1,7 @@
-.. index:: cpp11-migrate
+.. index:: clang-modernize
 
 ============================
 C++11 Migrator User's Manual
 ============================
 
-.. toctree::
-   :hidden:
-
-   UseAutoTransform
-   UseNullptrTransform
-   LoopConvertTransform
-   AddOverrideTransform
-   PassByValueTransform
-   ReplaceAutoPtrTransform
-   MigratorUsage
-
-:program:`cpp11-migrate` is a standalone tool used to automatically convert
-C++98 and C++03 code to use features of the new C++11 standard where
-appropriate.
-
-Getting Started
-===============
-
-To build from source:
-
-1. Read `Getting Started with the LLVM System`_ and `Clang Tools
-   Documentation`_ for information on getting sources for LLVM, Clang, and
-   Clang Extra Tools.
-
-2. `Getting Started with the LLVM System`_ and `Building LLVM with CMake`_ give
-   directions for how to build. With sources all checked out into the
-   right place the LLVM build will build Clang Extra Tools and their
-   dependencies automatically.
-
-   * If using CMake, you can also use the ``cpp11-migrate`` target to build
-     just the Migrator and its dependencies.
-
-Before continuing, take a look at :doc:`MigratorUsage` to see how to invoke the
-Migrator.
-
-Before running the Migrator on code you'll need the arguments you'd normally
-pass to the compiler. If you're migrating a single file with few compiler
-arguments, it might be easier to pass the compiler args on the command line
-after ``--``. If you don't have any compiler arguments then ``--`` is not needed.
-If you're working with multiple files or even a single file with many compiler
-args, it's probably best to use a *compilation database*.
-
-A `compilation database`_ contains the command-line arguments for multiple
-files. If the code you want to transform can be built with CMake, you can
-generate this database easily by running CMake with the
-``-DCMAKE_EXPORT_COMPILE_COMMANDS`` option. The Ninja_ build system, since
-v1.2, can create this file too using the *compdb* tool: ``ninja -t compdb``. If
-you're not already using either of these tools or cannot easily make use of
-them you might consider looking into Bear_.
-
-In addition to the compiler arguments you usually build your code with, you must
-provide the option for enabling C++11 features. For clang and versions of gcc
-≥ v4.8 this is ``-std=c++11``.
-
-Now with compiler arguments, the Migrator can be applied to source. Sources are
-transformed in place and changes are only written to disk if compilation errors
-aren't caused by the transforms. Each transform will re-parse the output from
-the previous transform. The output from the last transform is not checked
-unless ``-final-syntax-check`` is enabled.
-
-
-.. _Ninja: http://martine.github.io/ninja/
-.. _Bear: https://github.com/rizsotto/Bear
-.. _compilation database: http://clang.llvm.org/docs/JSONCompilationDatabase.html
-.. _Getting Started with the LLVM System: http://llvm.org/docs/GettingStarted.html
-.. _Building LLVM with CMake: http://llvm.org/docs/CMake.html
-.. _Clang Tools Documentation: http://clang.llvm.org/docs/ClangTools.html
-
-Getting Involved
-================
-
-If you find a bug
-
-.. raw:: html
-
-  <input type="button" id="logbug" value="Log a Bug!" />
-  <script type="text/javascript" src="https://cpp11-migrate.atlassian.net/s/en_USpfg3b3-1988229788/6095/34/1.4.0-m2/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=50813874"></script>
-  <script type="text/javascript">window.ATL_JQ_PAGE_PROPS =  {
-    "triggerFunction": function(showCollectorDialog) {
-      //Requries that jQuery is available! 
-      jQuery("#logbug").click(function(e) {
-        e.preventDefault();
-        showCollectorDialog();
-      });
-    }};
-  </script>
-
-Bugs and feature development of the Migrator are tracked at
-http://cpp11-migrate.atlassian.net. If you want to get involved the front page
-shows a list of outstanding issues or you can browse around the project to get
-familiar. To take on issues or contribute feature requests and/or bug reports
-you need to sign up for an account from the `log in page`_. An account also
-lets you sign up for notifications on issues or vote for unassigned issues to
-be completed.
-
-.. _log in page: https://cpp11-migrate.atlassian.net/login
-
-.. _transforms:
-
-Transformations
-===============
-
-The Migrator is a collection of independent transforms which can be
-independently enabled. The transforms currently implemented are:
-
-* :doc:`LoopConvertTransform`
-
-* :doc:`UseNullptrTransform`
-
-* :doc:`UseAutoTransform`
-
-* :doc:`AddOverrideTransform`
-
-* :doc:`PassByValueTransform`
-
-* :doc:`ReplaceAutoPtrTransform`
+This tool has been renamed :program:`clang-modernize`.
diff --git a/clang-tools-extra/docs/index.rst b/clang-tools-extra/docs/index.rst
index 8eadbf3c71c..0dcff786933 100644
--- a/clang-tools-extra/docs/index.rst
+++ b/clang-tools-extra/docs/index.rst
@@ -15,7 +15,7 @@ Contents
 .. toctree::
    :maxdepth: 1
 
-   cpp11-migrate
+   clang-modernize
 
 
 Doxygen Documentation
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 {
diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt
index 8ab39b85288..44d61d68fd1 100644
--- a/clang-tools-extra/unittests/CMakeLists.txt
+++ b/clang-tools-extra/unittests/CMakeLists.txt
@@ -5,5 +5,5 @@ function(add_extra_unittest test_dirname)
   add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN})
 endfunction()
 
-add_subdirectory(cpp11-migrate)
+add_subdirectory(clang-modernize)
 add_subdirectory(clang-tidy)
diff --git a/clang-tools-extra/unittests/Makefile b/clang-tools-extra/unittests/Makefile
index 5b17ea1e0a3..6a9ae081bee 100644
--- a/clang-tools-extra/unittests/Makefile
+++ b/clang-tools-extra/unittests/Makefile
@@ -10,6 +10,6 @@
 CLANG_LEVEL := ../../..
 include $(CLANG_LEVEL)/../../Makefile.config
 
-PARALLEL_DIRS := cpp11-migrate clang-tidy
+PARALLEL_DIRS := clang-modernize clang-tidy
 
 include $(CLANG_LEVEL)/Makefile
diff --git a/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt b/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt
index 8bcdf717f5c..8acfc97fcf7 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/CMakeLists.txt
+++ b/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS
   )
 
 get_filename_component(CPP11_MIGRATE_SOURCE_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../cpp11-migrate REALPATH)
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../clang-modernize REALPATH)
 get_filename_component(ClangReplaceLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../../clang-apply-replacements/include" REALPATH)
 include_directories(
diff --git a/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp b/clang-tools-extra/unittests/clang-modernize/FileOverridesTest.cpp
index 5404aeb579d..55f7f5dfced 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/FileOverridesTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/FileOverridesTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/FileOverridesTest.cpp - File overrides unit tests ----===//
+//===- clang-modernize/FileOverridesTest.cpp - File overrides unit tests --===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/IncludeDirectivesTest.cpp b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp
index f56ee7fd3f1..9e2add09734 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/IncludeDirectivesTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/IncludeDirectivesTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/IncludeDirectivesTest.cpp ----------------------------===//
+//===- clang-modernize/IncludeDirectivesTest.cpp --------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp b/clang-tools-extra/unittests/clang-modernize/IncludeExcludeTest.cpp
index 52a9d32d1f6..a7df1da634e 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/IncludeExcludeTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/IncludeExcludeTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/IncludeExcludeTest.cpp - IncludeExclude unit tests ---===//
+//===- clang-modernize/IncludeExcludeTest.cpp - IncludeExclude unit tests -===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/Makefile b/clang-tools-extra/unittests/clang-modernize/Makefile
index 464bcd73033..3c7b48234a9 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/Makefile
+++ b/clang-tools-extra/unittests/clang-modernize/Makefile
@@ -1,4 +1,4 @@
-##===- unittests/cpp11-migrate/Makefile --------------------*- Makefile -*-===##
+##===- unittests/clang-modernize/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -21,5 +21,5 @@ USEDLIBS = migrateCore.a clangFormat.a clangApplyReplacements.a clangTooling.a c
 
 include $(CLANG_LEVEL)/Makefile
 MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1
-CPP.Flags += -I$(PROJ_SRC_DIR)/../../cpp11-migrate -I$(PROJ_SRC_DIR)/../../clang-apply-replacements/include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../clang-modernize -I$(PROJ_SRC_DIR)/../../clang-apply-replacements/include
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp b/clang-tools-extra/unittests/clang-modernize/PerfSupportTest.cpp
index 81235481bff..9789a9571f1 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/PerfSupportTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/PerfSupportTest.cpp - PerfSupport unit tests --------===//
+//===- clang-modernize/PerfSupportTest.cpp - PerfSupport unit tests -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp b/clang-tools-extra/unittests/clang-modernize/ReformattingTest.cpp
index b4b9a365478..d81e20bac5a 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/ReformattingTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/ReformattingTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/ReformattingTest.cpp - Reformatting unit tests -------===//
+//===- clang-modernize/ReformattingTest.cpp - Reformatting unit tests -----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp b/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp
index 75397bf7760..9bfa37cd5cc 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/TransformTest.cpp
@@ -1,4 +1,4 @@
-//===- cpp11-migrate/TransformTest.cpp - Transform unit tests -------------===//
+//===- clang-modernize/TransformTest.cpp - Transform unit tests -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp b/clang-tools-extra/unittests/clang-modernize/UniqueHeaderNameTest.cpp
index a2d70e03baa..9383ded4d98 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/UniqueHeaderNameTest.cpp
+++ b/clang-tools-extra/unittests/clang-modernize/UniqueHeaderNameTest.cpp
@@ -1,4 +1,4 @@
-//===- unittests/cpp11-migrate/UniqueHeaderNameTest.cpp -------------------===//
+//===- unittests/clang-modernize/UniqueHeaderNameTest.cpp -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/Utility.h b/clang-tools-extra/unittests/clang-modernize/Utility.h
index 54291d941a3..1b25c822972 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/Utility.h
+++ b/clang-tools-extra/unittests/clang-modernize/Utility.h
@@ -1,4 +1,4 @@
-//=-- cpp11-migrate/Utility.h - Utility functions and macros-----*- C++ -*-===//
+//=-- clang-modernize/Utility.h - Utility functions and macros---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/clang-tools-extra/unittests/cpp11-migrate/VirtualFileHelper.h b/clang-tools-extra/unittests/clang-modernize/VirtualFileHelper.h
index 093ace1d0dc..093ace1d0dc 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/VirtualFileHelper.h
+++ b/clang-tools-extra/unittests/clang-modernize/VirtualFileHelper.h