diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index 6217e14..44421bd 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -25,12 +25,12 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control"
 
 START_TMPL = "op-power-start@.service"
-START_TGTFMT = "obmc-power-chassis-on@{1}.target"
+START_TGTFMT = "obmc-chassis-poweron@{1}.target"
 START_INSTFMT = "op-power-start@{0}.service"
 START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
 
 STOP_TMPL = "op-power-stop@.service"
-STOP_TGTFMT = "obmc-power-chassis-off@{1}.target"
+STOP_TGTFMT = "obmc-chassis-poweroff@{1}.target"
 STOP_INSTFMT = "op-power-stop@{0}.service"
 STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
 
@@ -65,15 +65,15 @@
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
 # Now show that the main control target requires these power targets
-START_TMPL_CTRL = "obmc-power-chassis-on@.target"
+START_TMPL_CTRL = "obmc-chassis-poweron@.target"
 START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target"
-START_INSTFMT_CTRL = "obmc-power-chassis-on@{0}.target"
+START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target"
 START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
-STOP_TMPL_CTRL = "obmc-power-chassis-off@.target"
+STOP_TMPL_CTRL = "obmc-chassis-poweroff@.target"
 STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target"
-STOP_INSTFMT_CTRL = "obmc-power-chassis-off@{0}.target"
+STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target"
 STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index 0813123..f76695e 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -6,7 +6,7 @@
 After=obmc-fan-control.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 9120a87..86ddf4a 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -5,7 +5,7 @@
 After=obmc-power-stop-pre@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 RemainAfterExit=yes
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
index e41950d..cb78804 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
@@ -7,7 +7,7 @@
 
 [Service]
 RemainAfterExit=no
-ExecStart=/bin/systemctl start obmc-power-chassis-on@%i.target
+ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target
 
 
 [Install]
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
index b009537..2a46151 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
@@ -4,7 +4,7 @@
 After=mapper-wait@-org-openbmc-control-power%i.service
 Wants=obmc-power-reset-on@%i.target
 Before=obmc-power-reset-on@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 RemainAfterExit=no
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
index 4d58d61..da852ff 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
@@ -4,7 +4,7 @@
 Requires=obmc-power-reset-on@%i.target
 After=op-reset-pgood-check@%i.service
 Requires=op-reset-pgood-check@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 RemainAfterExit=no
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 46e413e..32ae694 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -5,7 +5,7 @@
 Before=obmc-power-stop@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 Type=oneshot
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index d612d61..1c85fc1 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -5,7 +5,7 @@
 Before=obmc-power-start@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]