diff --git a/clang-tools-extra/change-namespace/ChangeNamespace.cpp b/clang-tools-extra/change-namespace/ChangeNamespace.cpp
index cf875550ebf0..2f6f364b9e36 100644
--- a/clang-tools-extra/change-namespace/ChangeNamespace.cpp
+++ b/clang-tools-extra/change-namespace/ChangeNamespace.cpp
@@ -327,8 +327,8 @@ void ChangeNamespaceTool::moveOldNamespace(
   MoveNs.InsertionOffset = Result.SourceManager->getFileOffset(
       Result.SourceManager->getSpellingLoc(LocAfterNs));
 
-  MoveNs.FileID = Result.SourceManager->getFileID(Start);
-  MoveNs.SourceManager = Result.SourceManager;
+  MoveNs.FID = Result.SourceManager->getFileID(Start);
+  MoveNs.SourceMgr = Result.SourceManager;
   MoveNamespaces[R.getFilePath()].push_back(MoveNs);
 }
 
@@ -447,8 +447,8 @@ void ChangeNamespaceTool::onEndOfTranslationUnit() {
       continue;
     const std::string &FilePath = FileAndNsMoves.first;
     auto &Replaces = FileToReplacements[FilePath];
-    auto &SM = *NsMoves.begin()->SourceManager;
-    llvm::StringRef Code = SM.getBufferData(NsMoves.begin()->FileID);
+    auto &SM = *NsMoves.begin()->SourceMgr;
+    llvm::StringRef Code = SM.getBufferData(NsMoves.begin()->FID);
     auto ChangedCode = tooling::applyAllReplacements(Code, Replaces);
     if (!ChangedCode) {
       llvm::errs() << llvm::toString(ChangedCode.takeError()) << "\n";
diff --git a/clang-tools-extra/change-namespace/ChangeNamespace.h b/clang-tools-extra/change-namespace/ChangeNamespace.h
index 6dc273db9749..3237c656e90d 100644
--- a/clang-tools-extra/change-namespace/ChangeNamespace.h
+++ b/clang-tools-extra/change-namespace/ChangeNamespace.h
@@ -84,8 +84,8 @@ private:
     // original code.
     unsigned InsertionOffset;
     // The file in which the namespace is declared.
-    FileID FileID;
-    SourceManager *SourceManager;
+    FileID FID;
+    SourceManager *SourceMgr;
   };
 
   // Information about inserting a class forward declaration.