diff --git a/common/recipes-phosphor/host/op-host-control/start_host@.service b/common/recipes-phosphor/host/op-host-control/start_host@.service
index 14f816e..af26186 100644
--- a/common/recipes-phosphor/host/op-host-control/start_host@.service
+++ b/common/recipes-phosphor/host/op-host-control/start_host@.service
@@ -1,12 +1,12 @@
 [Unit]
 Description=Start host%i SBE
 After=obmc-host-start-pre@%i.target
-Wants=obmc-host-start@%i.target
-Before=obmc-host-start@%i.target
+Wants=obmc-host-starting@%i.target
+Before=obmc-host-starting@%i.target
 Before=obmc-host-started@%i.target
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
@@ -15,4 +15,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/host/p9-host-start.bb b/common/recipes-phosphor/host/p9-host-start.bb
index 0caa074..0d7d534 100644
--- a/common/recipes-phosphor/host/p9-host-start.bb
+++ b/common/recipes-phosphor/host/p9-host-start.bb
@@ -16,7 +16,7 @@
 
 TMPL = "start_host@.service"
 INSTFMT = "start_host@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-host-start@{0}.target"
 FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
 
 SYSTEMD_SERVICE_${PN} += "${TMPL}"
diff --git a/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/common/recipes-phosphor/inventory-upload/inventory-upload.bb
index 03a63e5..bab0b63 100644
--- a/common/recipes-phosphor/inventory-upload/inventory-upload.bb
+++ b/common/recipes-phosphor/inventory-upload/inventory-upload.bb
@@ -24,7 +24,7 @@
 
 TMPL = "op-inventory-upload@.service"
 INSTFMT = "op-inventory-upload@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-host-start@{0}.target"
 FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
 
 SYSTEMD_SERVICE_${PN} += "${TMPL}"
diff --git a/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service b/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
index 39c1cfc..2da73e3 100644
--- a/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
+++ b/common/recipes-phosphor/inventory-upload/inventory-upload/op-inventory-upload@.service
@@ -2,7 +2,7 @@
 Description=Inventory Upload
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 
 [Service]
 Restart=no
@@ -12,4 +12,4 @@
 Environment="PYTHONUNBUFFERED=1"
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target