diff --git a/include/clang/Frontend/CompilerInstance.h b/include/clang/Frontend/CompilerInstance.h
index 1be4118e55..828e9b5bf6 100644
--- a/include/clang/Frontend/CompilerInstance.h
+++ b/include/clang/Frontend/CompilerInstance.h
@@ -439,11 +439,11 @@ public:
   /// \param OS - The output stream, which should be non-null.
   void addOutputFile(llvm::StringRef Path, llvm::raw_ostream *OS);
 
-  /// ClearOutputFiles - Clear the output file list, destroying the contained
+  /// clearOutputFiles - Clear the output file list, destroying the contained
   /// output streams.
   ///
   /// \param EraseFiles - If true, attempt to erase the files from disk.
-  void ClearOutputFiles(bool EraseFiles);
+  void clearOutputFiles(bool EraseFiles);
 
   /// }
   /// @name Construction Utility Methods
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 1831ca532b..25b804aba7 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -94,7 +94,7 @@ namespace {
   public:
     explicit BinaryDiagnosticSerializer(llvm::raw_ostream &OS)
       : OS(OS), SourceMgr(0) { }
-    
+
     virtual void HandleDiagnostic(Diagnostic::Level DiagLevel,
                                   const DiagnosticInfo &Info);
   };
@@ -341,7 +341,7 @@ void CompilerInstance::addOutputFile(llvm::StringRef Path,
   OutputFiles.push_back(std::make_pair(Path, OS));
 }
 
-void CompilerInstance::ClearOutputFiles(bool EraseFiles) {
+void CompilerInstance::clearOutputFiles(bool EraseFiles) {
   for (std::list< std::pair<std::string, llvm::raw_ostream*> >::iterator
          it = OutputFiles.begin(), ie = OutputFiles.end(); it != ie; ++it) {
     delete it->second;
diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp
index 96a68c931e..66df7a6191 100644
--- a/lib/Frontend/FrontendAction.cpp
+++ b/lib/Frontend/FrontendAction.cpp
@@ -180,7 +180,7 @@ void FrontendAction::EndSourceFile() {
 
   // Cleanup the output streams, and erase the output files if we encountered
   // an error.
-  CI.ClearOutputFiles(/*EraseFiles=*/CI.getDiagnostics().getNumErrors());
+  CI.clearOutputFiles(/*EraseFiles=*/CI.getDiagnostics().getNumErrors());
 
   // Inform the diagnostic client we are done with this source file.
   CI.getDiagnosticClient().EndSourceFile();