diff --git a/clang/lib/Tooling/Syntax/BuildTree.cpp b/clang/lib/Tooling/Syntax/BuildTree.cpp
--- a/clang/lib/Tooling/Syntax/BuildTree.cpp
+++ b/clang/lib/Tooling/Syntax/BuildTree.cpp
@@ -155,10 +155,10 @@
 } // namespace
 
 static CallExpr::arg_range dropDefaultArgs(CallExpr::arg_range Args) {
-  auto firstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto it) {
-    return isa<CXXDefaultArgExpr>(it);
+  auto FirstDefaultArg = std::find_if(Args.begin(), Args.end(), [](auto It) {
+    return isa<CXXDefaultArgExpr>(It);
   });
-  return llvm::make_range(Args.begin(), firstDefaultArg);
+  return llvm::make_range(Args.begin(), FirstDefaultArg);
 }
 
 static syntax::NodeKind getOperatorNodeKind(const CXXOperatorCallExpr &E) {
@@ -954,12 +954,12 @@
   bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc QualifierLoc) {
     if (!QualifierLoc)
       return true;
-    for (auto it = QualifierLoc; it; it = it.getPrefix()) {
-      auto *NS = buildNameSpecifier(it);
+    for (auto It = QualifierLoc; It; It = It.getPrefix()) {
+      auto *NS = buildNameSpecifier(It);
       if (!NS)
         return false;
       Builder.markChild(NS, syntax::NodeRole::ListElement);
-      Builder.markChildToken(it.getEndLoc(), syntax::NodeRole::ListDelimiter);
+      Builder.markChildToken(It.getEndLoc(), syntax::NodeRole::ListDelimiter);
     }
     Builder.foldNode(Builder.getRange(QualifierLoc.getSourceRange()),
                      new (allocator()) syntax::NestedNameSpecifier,
diff --git a/clang/lib/Tooling/Syntax/Nodes.cpp b/clang/lib/Tooling/Syntax/Nodes.cpp
--- a/clang/lib/Tooling/Syntax/Nodes.cpp
+++ b/clang/lib/Tooling/Syntax/Nodes.cpp
@@ -226,23 +226,23 @@
 // vector
 std::vector<syntax::NameSpecifier *>
 syntax::NestedNameSpecifier::getSpecifiers() {
-  auto specifiersAsNodes = getElementsAsNodes();
+  auto SpecifiersAsNodes = getElementsAsNodes();
   std::vector<syntax::NameSpecifier *> Children;
-  for (const auto &element : specifiersAsNodes) {
-    Children.push_back(llvm::cast<syntax::NameSpecifier>(element));
+  for (const auto &Element : SpecifiersAsNodes) {
+    Children.push_back(llvm::cast<syntax::NameSpecifier>(Element));
   }
   return Children;
 }
 
 std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
 syntax::NestedNameSpecifier::getSpecifiersAndDoubleColons() {
-  auto specifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters();
+  auto SpecifiersAsNodesAndDoubleColons = getElementsAsNodesAndDelimiters();
   std::vector<syntax::List::ElementAndDelimiter<syntax::NameSpecifier>>
       Children;
-  for (const auto &specifierAndDoubleColon : specifiersAsNodesAndDoubleColons) {
+  for (const auto &SpecifierAndDoubleColon : SpecifiersAsNodesAndDoubleColons) {
     Children.push_back(
-        {llvm::cast<syntax::NameSpecifier>(specifierAndDoubleColon.element),
-         specifierAndDoubleColon.delimiter});
+        {llvm::cast<syntax::NameSpecifier>(SpecifierAndDoubleColon.element),
+         SpecifierAndDoubleColon.delimiter});
   }
   return Children;
 }
diff --git a/clang/lib/Tooling/Syntax/Tree.cpp b/clang/lib/Tooling/Syntax/Tree.cpp
--- a/clang/lib/Tooling/Syntax/Tree.cpp
+++ b/clang/lib/Tooling/Syntax/Tree.cpp
@@ -153,7 +153,7 @@
 
 static void dumpNode(raw_ostream &OS, const syntax::Node *N,
                      const SourceManager &SM, std::vector<bool> IndentMask) {
-  auto dumpExtraInfo = [&OS](const syntax::Node *N) {
+  auto DumpExtraInfo = [&OS](const syntax::Node *N) {
     if (N->getRole() != syntax::NodeRole::Unknown)
       OS << " " << N->getRole();
     if (!N->isOriginal())
@@ -167,14 +167,14 @@
     OS << "'";
     dumpLeaf(OS, L, SM);
     OS << "'";
-    dumpExtraInfo(N);
+    DumpExtraInfo(N);
     OS << "\n";
     return;
   }
 
   const auto *T = cast<syntax::Tree>(N);
   OS << T->getKind();
-  dumpExtraInfo(N);
+  DumpExtraInfo(N);
   OS << "\n";
 
   for (const auto *It = T->getFirstChild(); It; It = It->getNextSibling()) {
@@ -302,20 +302,20 @@
   if (!getFirstChild())
     return {};
 
-  auto children = std::vector<syntax::List::ElementAndDelimiter<Node>>();
-  syntax::Node *elementWithoutDelimiter = nullptr;
+  std::vector<syntax::List::ElementAndDelimiter<Node>> Children;
+  syntax::Node *ElementWithoutDelimiter = nullptr;
   for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
     switch (C->getRole()) {
     case syntax::NodeRole::ListElement: {
-      if (elementWithoutDelimiter) {
-        children.push_back({elementWithoutDelimiter, nullptr});
+      if (ElementWithoutDelimiter) {
+        Children.push_back({ElementWithoutDelimiter, nullptr});
       }
-      elementWithoutDelimiter = C;
+      ElementWithoutDelimiter = C;
       break;
     }
     case syntax::NodeRole::ListDelimiter: {
-      children.push_back({elementWithoutDelimiter, cast<syntax::Leaf>(C)});
-      elementWithoutDelimiter = nullptr;
+      Children.push_back({ElementWithoutDelimiter, cast<syntax::Leaf>(C)});
+      ElementWithoutDelimiter = nullptr;
       break;
     }
     default:
@@ -326,19 +326,19 @@
 
   switch (getTerminationKind()) {
   case syntax::List::TerminationKind::Separated: {
-    children.push_back({elementWithoutDelimiter, nullptr});
+    Children.push_back({ElementWithoutDelimiter, nullptr});
     break;
   }
   case syntax::List::TerminationKind::Terminated:
   case syntax::List::TerminationKind::MaybeTerminated: {
-    if (elementWithoutDelimiter) {
-      children.push_back({elementWithoutDelimiter, nullptr});
+    if (ElementWithoutDelimiter) {
+      Children.push_back({ElementWithoutDelimiter, nullptr});
     }
     break;
   }
   }
 
-  return children;
+  return Children;
 }
 
 // Almost the same implementation of `getElementsAsNodesAndDelimiters` but
@@ -347,20 +347,20 @@
   if (!getFirstChild())
     return {};
 
-  auto children = std::vector<syntax::Node *>();
-  syntax::Node *elementWithoutDelimiter = nullptr;
+  std::vector<syntax::Node *> Children;
+  syntax::Node *ElementWithoutDelimiter = nullptr;
   for (auto *C = getFirstChild(); C; C = C->getNextSibling()) {
     switch (C->getRole()) {
     case syntax::NodeRole::ListElement: {
-      if (elementWithoutDelimiter) {
-        children.push_back(elementWithoutDelimiter);
+      if (ElementWithoutDelimiter) {
+        Children.push_back(ElementWithoutDelimiter);
       }
-      elementWithoutDelimiter = C;
+      ElementWithoutDelimiter = C;
       break;
     }
     case syntax::NodeRole::ListDelimiter: {
-      children.push_back(elementWithoutDelimiter);
-      elementWithoutDelimiter = nullptr;
+      Children.push_back(ElementWithoutDelimiter);
+      ElementWithoutDelimiter = nullptr;
       break;
     }
     default:
@@ -370,19 +370,19 @@
 
   switch (getTerminationKind()) {
   case syntax::List::TerminationKind::Separated: {
-    children.push_back(elementWithoutDelimiter);
+    Children.push_back(ElementWithoutDelimiter);
     break;
   }
   case syntax::List::TerminationKind::Terminated:
   case syntax::List::TerminationKind::MaybeTerminated: {
-    if (elementWithoutDelimiter) {
-      children.push_back(elementWithoutDelimiter);
+    if (ElementWithoutDelimiter) {
+      Children.push_back(ElementWithoutDelimiter);
     }
     break;
   }
   }
 
-  return children;
+  return Children;
 }
 
 clang::tok::TokenKind syntax::List::getDelimiterTokenKind() const {