Index: include/clang/Tooling/Refactoring/EditList.h
===================================================================
--- include/clang/Tooling/Refactoring/EditList.h
+++ include/clang/Tooling/Refactoring/EditList.h
@@ -49,7 +49,7 @@
   std::string toYAMLString();
 
   /// \brief Converts a YAML-encoded edit to EditList.
-  static EditList ConvertFromYAML(llvm::StringRef YAMLContent);
+  static EditList convertFromYAML(llvm::StringRef YAMLContent);
 
   /// \brief Returns the key of this edit, which is a concatenation of the file
   /// name and position information of the key position.
Index: lib/Tooling/Refactoring/EditList.cpp
===================================================================
--- lib/Tooling/Refactoring/EditList.cpp
+++ lib/Tooling/Refactoring/EditList.cpp
@@ -1,4 +1,4 @@
-//===--- EditList.h - EditList implementation -------------------*- C++ -*-===//
+//===--- EditList.cpp - EditList implementation -----------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -100,7 +100,7 @@
   return YamlContent;
 }
 
-EditList EditList::ConvertFromYAML(llvm::StringRef YAMLContent) {
+EditList EditList::convertFromYAML(llvm::StringRef YAMLContent) {
   EditList Edit;
   llvm::yaml::Input YAML(YAMLContent);
   YAML >> Edit;
Index: unittests/Tooling/RefactoringTest.cpp
===================================================================
--- unittests/Tooling/RefactoringTest.cpp
+++ unittests/Tooling/RefactoringTest.cpp
@@ -1168,7 +1168,7 @@
   ExpectedEdit.removeHeader("b.h");
   ExpectedEdit.setError("ok");
 
-  EditList ActualEdit = EditList::ConvertFromYAML(YamlContent);
+  EditList ActualEdit = EditList::convertFromYAML(YamlContent);
   EXPECT_EQ(ExpectedEdit.getKey(), ActualEdit.getKey());
   EXPECT_EQ(ExpectedEdit.getFilePath(), ActualEdit.getFilePath());
   EXPECT_EQ(ExpectedEdit.getError(), ActualEdit.getError());