Index: clang-tools-extra/clang-move/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-move/CMakeLists.txt
+++ clang-tools-extra/clang-move/CMakeLists.txt
@@ -3,7 +3,7 @@
   )
 
 add_clang_library(clangMove
-  ClangMove.cpp
+  Move.cpp
   HelperDeclRefGraph.cpp
 
   LINK_LIBS
Index: clang-tools-extra/clang-move/HelperDeclRefGraph.cpp
===================================================================
--- clang-tools-extra/clang-move/HelperDeclRefGraph.cpp
+++ clang-tools-extra/clang-move/HelperDeclRefGraph.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "HelperDeclRefGraph.h"
-#include "ClangMove.h"
+#include "Move.h"
 #include "clang/AST/Decl.h"
 #include "llvm/Support/Debug.h"
 #include <vector>
Index: clang-tools-extra/clang-move/Move.cpp
===================================================================
--- clang-tools-extra/clang-move/Move.cpp
+++ clang-tools-extra/clang-move/Move.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ClangMove.h"
+#include "Move.h"
 #include "HelperDeclRefGraph.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/SourceManager.h"
Index: clang-tools-extra/clang-move/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-move/tool/CMakeLists.txt
+++ clang-tools-extra/clang-move/tool/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_executable(clang-move
-  ClangMoveMain.cpp
+  ClangMove.cpp
   )
 
 target_link_libraries(clang-move
Index: clang-tools-extra/clang-move/tool/ClangMove.cpp
===================================================================
--- clang-tools-extra/clang-move/tool/ClangMove.cpp
+++ clang-tools-extra/clang-move/tool/ClangMove.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ClangMove.h"
+#include "Move.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Rewrite/Core/Rewriter.h"
 #include "clang/Tooling/ArgumentsAdjusters.h"
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-move/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/clang-move/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-move/BUILD.gn
@@ -15,7 +15,7 @@
     "//llvm/lib/Support",
   ]
   sources = [
-    "ClangMove.cpp",
+    "Move.cpp",
     "HelperDeclRefGraph.cpp",
   ]
 }
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
@@ -14,6 +14,6 @@
   ]
   include_dirs = [ ".." ]
   sources = [
-    "ClangMoveMain.cpp",
+    "ClangMove.cpp",
   ]
 }