diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
index bd4f8c9..0ca4aa9 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
@@ -2,6 +2,6 @@
 Description=Power%i (Off)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-power-stop@%i.target
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
index c891173..6eefba0 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
@@ -2,6 +2,6 @@
 Description=Power%i (On)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-power-start@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
index 2891e79..2900d16 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
@@ -2,6 +2,6 @@
 Description=Power%i On (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
index d23c5e9..355ab1c 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
@@ -2,6 +2,6 @@
 Description=Power%i On
 After=obmc-power-start-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
index db625b3..d28871b 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
@@ -2,6 +2,6 @@
 Description=Power%i Off (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index d7dd125..7b909d1 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
@@ -2,6 +2,6 @@
 Description=Power%i Off
 After=obmc-power-stop-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index d4a594e..95eaea1 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -39,21 +39,21 @@
 OFF_INSTFMT = "op-wait-power-off@{0}.service"
 OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.wants/${OFF_INSTFMT}"
 
+# Build up wants relationship for START_TGTFMT and STOP_TGTFMT
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
-# TODO - Will delete this next block of code in later commit once everything
-#        moved over to new targets
-START_TGTFMT_TBDEL = "obmc-chassis-start@{1}.target"
-STOP_TGTFMT_TBDEL = "obmc-chassis-stop@{1}.target"
-START_FMT_TBDEL = "../${START_TMPL}:${START_TGTFMT_TBDEL}.wants/${START_INSTFMT}"
-STOP_FMT_TBDEL = "../${STOP_TMPL}:${STOP_TGTFMT_TBDEL}.wants/${STOP_INSTFMT}"
-ON_FMT_TBDEL = "../${ON_TMPL}:${START_TGTFMT_TBDEL}.wants/${ON_INSTFMT}"
-OFF_FMT_TBDEL = "../${OFF_TMPL}:${STOP_TGTFMT_TBDEL}.wants/${OFF_INSTFMT}"
+# Now show that the main control target wants these power targets
+START_TMPL_CTRL = "obmc-power-chassis-on@.target"
+START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target"
+START_INSTFMT_CTRL = "obmc-power-chassis-on@{0}.target"
+START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.wants/${START_INSTFMT_CTRL}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_TBDEL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_TBDEL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT_TBDEL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT_TBDEL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
\ No newline at end of file
+STOP_TMPL_CTRL = "obmc-power-chassis-off@.target"
+STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target"
+STOP_INSTFMT_CTRL = "obmc-power-chassis-off@{0}.target"
+STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.wants/${STOP_INSTFMT_CTRL}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
\ No newline at end of file
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 cae414f..e98d08f 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-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 RemainAfterExit=yes
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 f370a3c..9120a87 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-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%i.target
 
 [Service]
 RemainAfterExit=yes
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 4315140..8c4d3d3 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-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%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 16b83c0..d5eb9dc 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-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 Type=oneshot