diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index 44421bd..2672335 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -66,13 +66,13 @@
 
 # Now show that the main control target requires these power targets
 START_TMPL_CTRL = "obmc-chassis-poweron@.target"
-START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target"
+START_TGTFMT_CTRL = "obmc-host-start@{1}.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-chassis-poweroff@.target"
-STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target"
+STOP_TGTFMT_CTRL = "obmc-host-stop@{1}.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 f76695e..befc892 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
@@ -15,4 +15,4 @@
 ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
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 86ddf4a..dd3570e 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
@@ -12,4 +12,4 @@
 ExecStart={sbindir}/mapper call /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-host-stop@%i.target
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 32ae694..a5efb41 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
@@ -14,4 +14,4 @@
 ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-host-stop@%i.target
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 1c85fc1..cd4f513 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
@@ -15,4 +15,4 @@
 TimeoutSec=30
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
index 7af067f..b070958 100644
--- a/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
+++ b/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
@@ -8,7 +8,7 @@
 SKELETON_DIR = "pciedetect"
 
 TMPL = "pcie-slot-detect@.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-host-start@{0}.target"
 INSTFMT = "pcie-slot-detect@{0}.service"
 FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
 
diff --git a/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
index 532d5e9..6cc65f8 100644
--- a/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
+++ b/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
@@ -2,7 +2,7 @@
 Description=PCIE Slot Presence Detection For Chassis%i
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 
 [Service]
 Type=oneshot
@@ -10,4 +10,4 @@
 ExecStart={sbindir}/pcie_slot_present.exe
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-watchdog.bb b/common/recipes-phosphor/chassis/obmc-watchdog.bb
index 77017e3..d065d63 100644
--- a/common/recipes-phosphor/chassis/obmc-watchdog.bb
+++ b/common/recipes-phosphor/chassis/obmc-watchdog.bb
@@ -12,12 +12,12 @@
 SYSTEMD_SERVICE_${PN} += "obmc-start-watchdog@.service obmc-stop-watchdog@.service"
 
 START_TMPL = "obmc-start-watchdog@.service"
-START_TGTFMT = "obmc-chassis-start@{1}.target"
+START_TGTFMT = "obmc-host-start@{1}.target"
 START_INSTFMT = "obmc-start-watchdog@{0}.service"
 START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
 
 STOP_TMPL = "obmc-stop-watchdog@.service"
-STOP_TGTFMT = "obmc-chassis-stop@{1}.target"
+STOP_TGTFMT = "obmc-host-stop@{1}.target"
 STOP_INSTFMT = "obmc-stop-watchdog@{0}.service"
 STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
 
diff --git a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
index d28bfe8..77ed037 100644
--- a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
+++ b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
@@ -4,7 +4,7 @@
 After=obmc-host-started@%i.target
 Wants=mapper-wait@-org-openbmc-watchdog-host%i.service
 After=mapper-wait@-org-openbmc-watchdog-host%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
@@ -14,4 +14,4 @@
 ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog start
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
index 2b086cf..d149403 100644
--- a/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
+++ b/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
@@ -2,7 +2,7 @@
 Description=Stop Watchdog%i
 Wants=mapper-wait@-org-openbmc-watchdog-host%i.service
 After=mapper-wait@-org-openbmc-watchdog-host%i.service
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-host-start@%i.target
 
 [Service]
 Type=oneshot
@@ -10,4 +10,4 @@
 ExecStart={sbindir}/mapper call /org/openbmc/watchdog/host%i org.openbmc.Watchdog stop
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-host-stop@%i.target
diff --git a/common/recipes-phosphor/fans/phosphor-fan-presence.bb b/common/recipes-phosphor/fans/phosphor-fan-presence.bb
index a064cf1..201849a 100644
--- a/common/recipes-phosphor/fans/phosphor-fan-presence.bb
+++ b/common/recipes-phosphor/fans/phosphor-fan-presence.bb
@@ -34,10 +34,10 @@
 
 RDEPENDS_phosphor-chassis-cooling-type += "libevdev"
 
-# Needed to install into the obmc-chassis-start target
+# Needed to install into the obmc-host-start target
 TMPL = "phosphor-fan-presence-tach@.service"
 INSTFMT = "phosphor-fan-presence-tach@{0}.service"
-TGTFMT = "obmc-chassis-start@{0}.target"
+TGTFMT = "obmc-host-start@{0}.target"
 FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}"
 
 FILES_${PN}-tach = "${sbindir}/phosphor-fan-presence-tach"
diff --git a/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service b/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service
index ac15389..8324fdb 100644
--- a/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service
+++ b/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service
@@ -2,11 +2,11 @@
 Description=Phosphor Fan Presence Tach Daemon
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 
 [Service]
 Restart=on-failure
 ExecStart={sbindir}/phosphor-fan-presence-tach
 
 [Install]
-RequiredBy=obmc-chassis-start@%i.target
+RequiredBy=obmc-host-start@%i.target
diff --git a/common/recipes-phosphor/host/obmc-op-control-host.bb b/common/recipes-phosphor/host/obmc-op-control-host.bb
index fa5a006..8533c8e 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host.bb
+++ b/common/recipes-phosphor/host/obmc-op-control-host.bb
@@ -19,7 +19,7 @@
         "
 
 START_TMPL = "op-start-host@.service"
-START_TGTFMT = "obmc-chassis-start@{1}.target"
+START_TGTFMT = "obmc-host-start@{1}.target"
 START_INSTFMT = "obmc-start-host@{0}.service"
 START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
 
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
index 7f3871e..9a6ffe6 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
@@ -7,7 +7,7 @@
 [Service]
 RemainAfterExit=no
 # TODO: openbmc/openbmc#1205 - target name refactor
-ExecStart=/bin/systemctl start obmc-chassis-start@%i.target
+ExecStart=/bin/systemctl start obmc-host-start@%i.target
 
 
 [Install]
diff --git a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index 8c5cfbb..c9d1a7c 100644
--- a/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=Start Host%i
 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
 Wants=mapper-wait@-org-openbmc-control-host%i.service
 After=mapper-wait@-org-openbmc-control-host%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
 
 [Service]
@@ -17,4 +17,4 @@
 ExecStart={sbindir}/mapper call /org/openbmc/control/host%i org.openbmc.control.Host boot
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-host-start@%i.target