diff --git a/service_files/pcie-poweroff@.service.in b/service_files/pcie-poweroff@.service.in
index 5f0403a..5b59f96 100644
--- a/service_files/pcie-poweroff@.service.in
+++ b/service_files/pcie-poweroff@.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=POWER9 PCIe Power-off Workaround
-Before=op-power-stop@%i.service
+Before=obmc-power-stop@%i.service
 After=obmc-power-stop-pre@%i.target
 
 [Service]
diff --git a/service_files/set-spi-mux.service.in b/service_files/set-spi-mux.service.in
index b8042b5..291aef7 100644
--- a/service_files/set-spi-mux.service.in
+++ b/service_files/set-spi-mux.service.in
@@ -1,8 +1,8 @@
 [Unit]
 Description=Set the SPI mux
 ConditionPathExists=!/run/openbmc/chassis@0-on
-After=op-reset-chassis-running@0.service
-After=op-wait-power-off@0.service
+After=phosphor-reset-chassis-running@0.service
+After=phosphor-wait-power-off@0.service
 
 [Service]
 ExecStartPre=@bindir@/openpower-proc-control cfamReset