diff --git a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb
index 3f9babb..54c14d4 100644
--- a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl.bb
@@ -42,10 +42,10 @@
 SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}"
 SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}"
 
-# append on op-wait-power-on
+# append on phosphor-wait-power-on
 AMPERE_POWER_ON_TGT = "obmc-power-already-on@.target"
 AMPERE_POWER_ON_INSTMPL = "obmc-power-already-on@{0}.target"
-OP_WAIT_POWER_ON = "op-wait-power-on@{0}.service"
+OP_WAIT_POWER_ON = "phosphor-wait-power-on@{0}.service"
 AMPERE_POWER_ON_TARGET_FMT = "../${AMPERE_POWER_ON_TGT}:${OP_WAIT_POWER_ON}.wants/${AMPERE_POWER_ON_INSTMPL}"
 SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'AMPERE_POWER_ON_TARGET_FMT', 'OBMC_HOST_INSTANCES')}"
 
diff --git a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target
index 63699cf..868348e 100644
--- a/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target
+++ b/meta-ampere/meta-common/recipes-ampere/host/ampere-hostctrl/obmc-power-already-on@.target
@@ -1,5 +1,5 @@
 [Unit]
 Description=Ampere power %i already on target
-After=op-wait-power-on@%i.service
+After=phosphor-wait-power-on@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 Conflicts=ampere-host-shutdown-ack@%i.service
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
index ce59894..543b852 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Ampere set GPIOs before power off
-Before=op-wait-power-off@%i.service
+Before=phosphor-wait-power-off@%i.service
 Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
index e7131a1..ec2cd68 100644
--- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
+++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Ampere set GPIOs before power on
-Before=op-wait-power-on@%i.service
+Before=phosphor-wait-power-on@%i.service
 After=obmc-power-start-pre@%i.target
 Conflicts=obmc-chassis-poweroff@%i.target