diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb
index 3c3be27..e014da2 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb
@@ -27,7 +27,7 @@
 INSTFMT_EN= "avsbus-enable@{0}.service"
 INSTFMT_DIS= "avsbus-disable@{0}.service"
 INSTFMT_WA= "avsbus-workaround@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
 FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}"
 FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}"
 FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}"
diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 4d300c5..ca92562 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -3,7 +3,7 @@
 Wants=avsbus-workaround@%i.service
 After=avsbus-workaround@%i.service
 Before=vrm-control@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
@@ -12,4 +12,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 34e68fe..60297d9 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -2,7 +2,7 @@
 Description=Enable the AVS bus on VRMs
 Wants=vrm-control@%i.service
 After=vrm-control@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index 1bae8df..5c2813a 100644
--- a/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-romulus/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -3,7 +3,7 @@
 Wants=op-power-start@.service
 After=op-power-start@.service
 Before=avsbus-disable@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
@@ -12,4 +12,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb b/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb
index 129390d..6236116 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger.bb
@@ -24,8 +24,8 @@
 TMPL_RESET = "cpld_reset@.service"
 INSTFMT = "cpld_trigger@{0}.service"
 INSTFMT_RESET = "cpld_reset@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
-TGTFMT_RESET = "obmc-power-chassis-off@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
+TGTFMT_RESET = "obmc-chassis-poweroff@{0}.target"
 FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
 FMT_RESET = "../${TMPL_RESET}:${TGTFMT_RESET}.requires/${INSTFMT_RESET}"
 
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
index d1b8553..e312a96 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_reset@.service
@@ -2,7 +2,7 @@
 Description=Reset CPLD to wait after VDD is powered up
 Wants=op-wait-power-off@%i.service
 After=op-wait-power-off@%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 ExecStart={bindir}/cpld_reset.sh
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-off@%i.target
+WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
index 68c8ed9..57c5a8f 100644
--- a/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
+++ b/meta-romulus/recipes-phosphor/chassis/cpld-trigger/cpld_trigger@.service
@@ -4,7 +4,7 @@
 Before=vcs_workaround@%i.service
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 ExecStart={bindir}/cpld_trigger.sh
@@ -12,4 +12,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-romulus/recipes-phosphor/chassis/vrm-control.bb
index 73c8282..e23bdd0 100644
--- a/meta-romulus/recipes-phosphor/chassis/vrm-control.bb
+++ b/meta-romulus/recipes-phosphor/chassis/vrm-control.bb
@@ -19,7 +19,7 @@
 
 TMPL = "vrm-control@.service"
 INSTFMT = "vrm-control@{0}.service"
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
 FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
 
 SYSTEMD_SERVICE_${PN} += "${TMPL}"
diff --git a/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
index 0b772f2..d5bdddb 100644
--- a/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
+++ b/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control@.service
@@ -3,7 +3,7 @@
 Wants=avsbus-disable@%i.service
 After=avsbus-disable@%i.service
 Before=avsbus-enable@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 ExecStart={bindir}/vrm.sh
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-power-chassis-on@%i.target
+WantedBy=obmc-chassis-poweron@%i.target