Index: lib/CodeGen/PeepholeOptimizer.cpp
===================================================================
--- lib/CodeGen/PeepholeOptimizer.cpp
+++ lib/CodeGen/PeepholeOptimizer.cpp
@@ -394,10 +394,10 @@
 
 char PeepholeOptimizer::ID = 0;
 char &llvm::PeepholeOptimizerID = PeepholeOptimizer::ID;
-INITIALIZE_PASS_BEGIN(PeepholeOptimizer, "peephole-opts",
+INITIALIZE_PASS_BEGIN(PeepholeOptimizer, DEBUG_TYPE,
                 "Peephole Optimizations", false, false)
 INITIALIZE_PASS_DEPENDENCY(MachineDominatorTree)
-INITIALIZE_PASS_END(PeepholeOptimizer, "peephole-opts",
+INITIALIZE_PASS_END(PeepholeOptimizer, DEBUG_TYPE,
                 "Peephole Optimizations", false, false)
 
 /// If instruction is a copy-like instruction, i.e. it reads a single register
Index: test/CodeGen/AArch64/arm64-regress-opt-cmp.mir
===================================================================
--- test/CodeGen/AArch64/arm64-regress-opt-cmp.mir
+++ test/CodeGen/AArch64/arm64-regress-opt-cmp.mir
@@ -1,5 +1,5 @@
 # RUN: rm -f %S/arm64-regress-opt-cmp.s
-# RUN: llc -mtriple=aarch64-linux-gnu -run-pass peephole-opts -o - %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=aarch64-linux-gnu -run-pass peephole-opt -o - %s 2>&1 | FileCheck %s
 # CHECK: %1 = ANDWri {{.*}}
 # CHECK-NEXT: %wzr = SUBSWri {{.*}}
 --- |
Index: test/CodeGen/MIR/ARM/imm-peephole-arm.mir
===================================================================
--- test/CodeGen/MIR/ARM/imm-peephole-arm.mir
+++ test/CodeGen/MIR/ARM/imm-peephole-arm.mir
@@ -1,4 +1,4 @@
-# RUN: llc -run-pass=peephole-opts %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llc -run-pass=peephole-opt %s -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: [[IN:%.*]] = COPY %r0
 # CHECK: [[SUM1TMP:%.*]] = ADDri [[IN]], 133
Index: test/CodeGen/MIR/ARM/imm-peephole-thumb.mir
===================================================================
--- test/CodeGen/MIR/ARM/imm-peephole-thumb.mir
+++ test/CodeGen/MIR/ARM/imm-peephole-thumb.mir
@@ -1,4 +1,4 @@
-# RUN: llc -run-pass=peephole-opts %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llc -run-pass=peephole-opt %s -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: [[IN:%.*]] = COPY %r0
 # CHECK: [[SUM1TMP:%.*]] = t2ADDri [[IN]], 25600
Index: test/CodeGen/MIR/Generic/multiRunPass.mir
===================================================================
--- test/CodeGen/MIR/Generic/multiRunPass.mir
+++ test/CodeGen/MIR/Generic/multiRunPass.mir
@@ -1,14 +1,14 @@
-# RUN: llc -run-pass expand-isel-pseudos  -run-pass peephole-opts -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
-# RUN: llc -run-pass expand-isel-pseudos,peephole-opts -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
-# RUN: llc -run-pass peephole-opts -run-pass expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
-# RUN: llc -run-pass peephole-opts,expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
+# RUN: llc -run-pass expand-isel-pseudos  -run-pass peephole-opt -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
+# RUN: llc -run-pass expand-isel-pseudos,peephole-opt -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
+# RUN: llc -run-pass peephole-opt -run-pass expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
+# RUN: llc -run-pass peephole-opt,expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
 # REQUIRES: asserts
 
 # This test ensures that the command line accepts
 # several run passes on the same command line and
 # actually create the proper pipeline for it.
-# PSEUDO_PEEPHOLE: -expand-isel-pseudos -peephole-opts
-# PEEPHOLE_PSEUDO: -peephole-opts -expand-isel-pseudos
+# PSEUDO_PEEPHOLE: -expand-isel-pseudos -peephole-opt
+# PEEPHOLE_PSEUDO: -peephole-opt -expand-isel-pseudos
 
 # Make sure there are no other passes happening after what we asked.
 # CHECK-NEXT: --- |
Index: test/CodeGen/PowerPC/opt-cmp-inst-cr0-live.ll
===================================================================
--- test/CodeGen/PowerPC/opt-cmp-inst-cr0-live.ll
+++ test/CodeGen/PowerPC/opt-cmp-inst-cr0-live.ll
@@ -1,4 +1,4 @@
-; RUN: llc -print-before=peephole-opts -print-after=peephole-opts -mtriple=powerpc64-unknown-linux-gnu -o /dev/null 2>&1 < %s | FileCheck %s
+; RUN: llc -print-before=peephole-opt -print-after=peephole-opt -mtriple=powerpc64-unknown-linux-gnu -o /dev/null 2>&1 < %s | FileCheck %s
 
 define signext i32 @fn1(i32 %baz) {
   %1 = mul nsw i32 %baz, 208
Index: test/CodeGen/PowerPC/opt-sub-inst-cr0-live.mir
===================================================================
--- test/CodeGen/PowerPC/opt-sub-inst-cr0-live.mir
+++ test/CodeGen/PowerPC/opt-sub-inst-cr0-live.mir
@@ -1,4 +1,4 @@
-# RUN: llc -start-after=machine-sink -stop-after=peephole-opts -mtriple=powerpc64-unknown-linux-gnu -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: llc -start-after=machine-sink -stop-after=peephole-opt -mtriple=powerpc64-unknown-linux-gnu -o /dev/null %s 2>&1 | FileCheck %s
 
 --- |
   ; ModuleID = '<stdin>'