diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 3aedd16..2a8ea37 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Disable the AVS bus on the VRMs
-Wants=op-power-start@.service
-After=op-power-start@.service
+Wants=obmc-power-start@.service
+After=obmc-power-start@.service
 Before=vrm-control@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
index 45776aa..dfe333e 100644
--- a/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
+++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Enable the AVS bus on VRMs
-Wants=op-power-start@%i.service
-Before=op-power-start@%i.service
+Wants=obmc-power-start@%i.service
+Before=obmc-power-start@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service
index 69d9bb0..ee5ec16 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service
@@ -2,7 +2,7 @@
 Description=Set the Asserted property of all the LED groups to %i
 Wants=xyz.openbmc_project.LED.GroupManager.service
 After=xyz.openbmc_project.LED.GroupManager.service
-After=op-reset-chassis-running@0.service
+After=phosphor-reset-chassis-running@0.service
 ConditionPathExists=!/run/openbmc/chassis@0-on
 
 [Service]
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
index 412b8b2..63832fc 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Power Sequencer Power-on Monitor
-Wants=op-power-start@0.service
-After=op-power-start@0.service
+Wants=obmc-power-start@0.service
+After=obmc-power-start@0.service
 Wants=power-workarounds@0.service
 After=power-workarounds@0.service
 Conflicts=obmc-chassis-poweroff@0.target