diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
index 6d72d87..48fc441 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target
@@ -5,7 +5,7 @@
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-reset@%i.target
+Conflicts=obmc-chassis-powerreset@%i.target
 Conflicts=obmc-host-shutdown@%i.target
 Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
index 1a042a0..84c1dda 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target
@@ -5,5 +5,5 @@
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-reset@%i.target
+Conflicts=obmc-chassis-powerreset@%i.target
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
index bf775fd..080d724 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
@@ -5,5 +5,5 @@
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 Conflicts=obmc-chassis-poweron@%i.target
-Conflicts=obmc-chassis-reset@%i.target
+Conflicts=obmc-chassis-powerreset@%i.target
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
index 2ef6c70..8d7c47e 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Chassis%i (Reset Check)
-Conflicts=obmc-chassis-poweroff%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStop=yes
 
 [Install]
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
index 6ff6809..ca95d84 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Host%i (Reset Check)
-Conflicts=obmc-host-stop%i.target
+Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
 
 [Install]
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
index 51bce8d..408139d 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
@@ -3,6 +3,5 @@
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-host-start-pre@%i.target
 Conflicts=obmc-host-stop@%i.target
-Conflicts=obmc-stop-host@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes