Index: llvm/lib/Passes/StandardInstrumentations.cpp
===================================================================
--- llvm/lib/Passes/StandardInstrumentations.cpp
+++ llvm/lib/Passes/StandardInstrumentations.cpp
@@ -377,12 +377,12 @@
   bool InitialIR;
 };
 
-void HandleInitialIR(Any IR, raw_ostream &Out) {
+void handleInitialIR(Any IR, raw_ostream &Out) {
   StringRef Banner("*** IR Dump At Start: ***");
   unwrapAndPrint(Out, IR, Banner, true);
 }
 
-void GenerateOutput(Any IR, StringRef PassID, std::string &Output) {
+void generateOutput(Any IR, StringRef PassID, std::string &Output) {
   raw_string_ostream OS(Output);
   // use the after banner for all cases so it will match
   SmallString<20> Banner = formatv("*** IR Dump After {0} ***", PassID);
@@ -390,7 +390,7 @@
   OS.str();
 }
 
-void OmitAfter(StringRef PassID, std::string &Name, raw_ostream &Out) {
+void omitAfter(StringRef PassID, std::string &Name, raw_ostream &Out) {
   Out << formatv("*** IR Dump After {0}{1} omitted because no change ***\n",
                  PassID, Name);
 }
@@ -408,21 +408,21 @@
   Out << After.substr(Banner.size());
 }
 
-void HandleInvalidated(StringRef PassID, raw_ostream &Out) {
+void handleInvalidated(StringRef PassID, raw_ostream &Out) {
   Out << formatv("*** IR Pass {0} invalidated ***\n", PassID);
 }
 
-void HandleFiltered(StringRef PassID, std::string &Name, raw_ostream &Out) {
+void handleFiltered(StringRef PassID, std::string &Name, raw_ostream &Out) {
   SmallString<20> Banner =
       formatv("*** IR Dump After {0}{1} filtered out ***\n", PassID, Name);
   Out << Banner;
 }
 
-void HandleIgnored(StringRef PassID, std::string &Name, raw_ostream &Out) {
+void handleIgnored(StringRef PassID, std::string &Name, raw_ostream &Out) {
   Out << formatv("*** IR Pass {0}{1} ignored ***\n", PassID, Name);
 }
 
-bool Same(std::string &S1, std::string &S2) { return S1.compare(S2) == 0; }
+bool sameIR(std::string &S1, std::string &S2) { return S1.compare(S2) == 0; }
 
 // A change printer based on the string representation of the IR as created
 // by unwrapAndPrint.  The string representation is stored in a std::string
@@ -432,24 +432,24 @@
 public:
   IRChangePrinter(raw_ostream &OS)
       : ChangePrinter<std::string>(
-            [this](Any IR) -> void { ::HandleInitialIR(IR, Out); },
-            ::GenerateOutput,
+            [this](Any IR) -> void { ::handleInitialIR(IR, Out); },
+            ::generateOutput,
             [this](StringRef PassID, std::string &Name) -> void {
-              ::OmitAfter(PassID, Name, Out);
+              ::omitAfter(PassID, Name, Out);
             },
             [this](std::string &Name, StringRef PassID, std::string &Before,
                    std::string &After,
                    Any IR) -> void { ::handleAfter(Name, After, Out); },
             [this](StringRef PassID) -> void {
-              ::HandleInvalidated(PassID, Out);
+              ::handleInvalidated(PassID, Out);
             },
             [this](StringRef PassID, std::string &Name) -> void {
-              ::HandleFiltered(PassID, Name, Out);
+              ::handleFiltered(PassID, Name, Out);
             },
             [this](StringRef PassID, std::string &Name) -> void {
-              ::HandleIgnored(PassID, Name, Out);
+              ::handleIgnored(PassID, Name, Out);
             },
-            ::Same),
+            ::sameIR),
         Out(OS) {}
 
 protected: