Index: clang-tools-extra/trunk/clangd/Protocol.h
===================================================================
--- clang-tools-extra/trunk/clangd/Protocol.h
+++ clang-tools-extra/trunk/clangd/Protocol.h
@@ -486,18 +486,18 @@
 };
 
 struct MarkupContent {
-  MarkupKind Kind = MarkupKind::PlainText;
-  std::string Value;
+  MarkupKind kind = MarkupKind::PlainText;
+  std::string value;
 };
 json::Expr toJSON(const MarkupContent &MC);
 
 struct Hover {
   /// The hover's content
-  MarkupContent Contents;
+  MarkupContent contents;
 
   /// An optional range is a range inside a text document
   /// that is used to visualize a hover, e.g. by changing the background color.
-  llvm::Optional<Range> Range;
+  llvm::Optional<Range> range;
 };
 json::Expr toJSON(const Hover &H);
 
Index: clang-tools-extra/trunk/clangd/Protocol.cpp
===================================================================
--- clang-tools-extra/trunk/clangd/Protocol.cpp
+++ clang-tools-extra/trunk/clangd/Protocol.cpp
@@ -397,20 +397,20 @@
 }
 
 json::Expr toJSON(const MarkupContent &MC) {
-  if (MC.Value.empty())
+  if (MC.value.empty())
     return nullptr;
 
   return json::obj{
-      {"kind", toTextKind(MC.Kind)},
-      {"value", MC.Value},
+      {"kind", toTextKind(MC.kind)},
+      {"value", MC.value},
   };
 }
 
 json::Expr toJSON(const Hover &H) {
-  json::obj Result{{"contents", toJSON(H.Contents)}};
+  json::obj Result{{"contents", toJSON(H.contents)}};
 
-  if (H.Range.hasValue())
-    Result["range"] = toJSON(*H.Range);
+  if (H.range.hasValue())
+    Result["range"] = toJSON(*H.range);
 
   return std::move(Result);
 }
Index: clang-tools-extra/trunk/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/trunk/clangd/XRefs.cpp
+++ clang-tools-extra/trunk/clangd/XRefs.cpp
@@ -382,9 +382,9 @@
   if (NamedScope) {
     assert(!NamedScope->empty());
 
-    H.Contents.Value += "Declared in ";
-    H.Contents.Value += *NamedScope;
-    H.Contents.Value += "\n\n";
+    H.contents.value += "Declared in ";
+    H.contents.value += *NamedScope;
+    H.contents.value += "\n\n";
   }
 
   // We want to include the template in the Hover.
@@ -401,7 +401,7 @@
 
   OS.flush();
 
-  H.Contents.Value += DeclText;
+  H.contents.value += DeclText;
   return H;
 }
 
@@ -409,8 +409,8 @@
 static Hover getHoverContents(StringRef MacroName) {
   Hover H;
 
-  H.Contents.Value = "#define ";
-  H.Contents.Value += MacroName;
+  H.contents.value = "#define ";
+  H.contents.value += MacroName;
 
   return H;
 }
Index: clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
===================================================================
--- clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
+++ clang-tools-extra/trunk/unittests/clangd/XRefsTests.cpp
@@ -559,7 +559,7 @@
     auto AST = build(T.code());
     Hover H = getHover(AST, T.point());
 
-    EXPECT_EQ(H.Contents.Value, Test.ExpectedHover) << Test.Input;
+    EXPECT_EQ(H.contents.value, Test.ExpectedHover) << Test.Input;
   }
 }