diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
index 265ea1e..cf8cb02 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
@@ -7,60 +7,44 @@
 inherit obmc-phosphor-license
 inherit allarch
 
-# Overall chassis and host control
-# - start: Services to run to start the host
-# - stop:  Services to run to stop the host
-CHASSIS_TARGETS = "start stop"
-
-# Synchronization targets
+# Chassis power synchronization targets
 # - start-pre:         Services to run before we start power on process
 # - start:             Services to run to do the chassis power on
 # - on:                Services to run once power is on
 # - stop-pre,stop,off: Same as above but applied to powering off
 # - reset-on:          Services to check if chassis power is on after bmc reset
-SYNCH_POWER_TARGETS = "start-pre start on stop-pre stop off reset-on"
+CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on"
 
-# Control chassis power
+# Chassis action power targets
 # - on:  Services to run to power on the chassis
 # - off: Services to run to power off the chassis
-CHASSIS_POWER_TARGETS = "on off"
-
-#TODO - After target renames #1205, combine this with CHASSIS_POWER_TARGETS
 # - reset: Services to check chassis power state and update chassis "on" target
-CHASSIS_POWER_TARGETS_2 = "reset"
+CHASSIS_ACTION_TARGETS = "on off reset"
 
 # Track all host synchronization point targets
-# - start-pre:             Services to run before we start host boot
-# - start:                 Services to run to do the host boot
-# - started:               Services to run once the host is booted
-# - stop-pre,stop,stopped: Same as above but applied to shutting down the host
-# - reset-running:         Services to check if host is running after bmc reset
-HOST_SYNCH_TARGETS = "start-pre start started stop-pre stop stopped reset-running"
+# - start-pre:                 Services to run before we start host boot
+# - starting:                  Services to run to do the host boot
+# - started:                   Services to run once the host is booted
+# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host
+# - reset-running:             Services to check if host is running after bmc reset
+HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running"
 
 # Track all host action targets
+# - start:   Service to run to start the host
 # - stop:    Services to run to shutdown the host
 # - quiesce: Target to enter on host boot failure
-HOST_ACTION_TARGETS = "stop quiesce"
+# - reset:   Services to check if host is running and update host "start" target
+HOST_ACTION_TARGETS = "start stop quiesce reset"
 
-# TODO: openbmc/openbmc#1205 - Move this to standard host action targets
-# - reset:   Check host state and update host "start" target if host running
-HOST_ACTION_TARGETS_2 = "reset"
-
-CHASSIS_FMT = "obmc-chassis-{0}@.target"
-SYNCH_POWER_FMT = "obmc-power-{0}@.target"
-CHASSIS_POWER_FMT = "obmc-chassis-power{0}@.target"
-CHASSIS_POWER_FMT_2 = "obmc-chassis-{0}@.target"
+CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target"
+CHASSIS_ACTION_FMT = "obmc-chassis-power{0}@.target"
 HOST_SYNCH_FMT = "obmc-host-{0}@.target"
-HOST_ACTION_FMT = "obmc-{0}-host@.target"
-HOST_ACTION_FMT_2 = "obmc-host-{0}@.target"
+HOST_ACTION_FMT = "obmc-host-{0}@.target"
 
-CHASSIS_LINK_FMT = "${CHASSIS_FMT}:obmc-chassis-{0}@{1}.target"
-SYNCH_POWER_LINK_FMT = "${SYNCH_POWER_FMT}:obmc-power-{0}@{1}.target"
-CHASSIS_POWER_LINK_FMT = "${CHASSIS_POWER_FMT}:obmc-chassis-power{0}@{1}.target"
-CHASSIS_POWER_LINK_FMT_2 = "${CHASSIS_POWER_FMT_2}:obmc-chassis-{0}@{1}.target"
+CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target"
+CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-power{0}@{1}.target"
 HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
-HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-{0}-host@{1}.target"
-HOST_LINK_ACTION_FMT_2 = "${HOST_ACTION_FMT_2}:obmc-host-{0}@{1}.target"
+HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target"
 
 SYSTEMD_SERVICE_${PN} += " \
         obmc-mapper.target \
@@ -70,18 +54,12 @@
         obmc-standby.target \
         "
 
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_FMT', 'CHASSIS_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'SYNCH_POWER_FMT', 'SYNCH_POWER_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_POWER_FMT', 'CHASSIS_POWER_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_POWER_FMT_2', 'CHASSIS_POWER_TARGETS_2')}"
+SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}"
+SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}"
 SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}"
 SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}"
-SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT_2', 'HOST_ACTION_TARGETS_2')}"
 
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_FMT', 'CHASSIS_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'SYNCH_POWER_LINK_FMT', 'SYNCH_POWER_TARGETS', 'OBMC_POWER_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_POWER_LINK_FMT', 'CHASSIS_POWER_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_POWER_LINK_FMT_2', 'CHASSIS_POWER_TARGETS_2', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT_2', 'HOST_ACTION_TARGETS_2', 'OBMC_HOST_INSTANCES')}"
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target
rename to meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
deleted file mode 100644
index c54fea6..0000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-start@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Chassis%i (Start)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-Conflicts=obmc-chassis-stop@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-quiesce-host@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
deleted file mode 100644
index bc887b3..0000000
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Chassis%i (Stop)
-Wants={SYSTEMD_DEFAULT_TARGET}
-After={SYSTEMD_DEFAULT_TARGET}
-Wants=mapper-wait@-org-openbmc-control-chassis%i.service
-After=mapper-wait@-org-openbmc-control-chassis%i.service
-Conflicts=obmc-chassis-start@%i.target
-RefuseManualStop=yes
-OnFailure=obmc-chassis-poweroff@%i.target
-OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
similarity index 100%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target
rename to meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
index d555d0a..2bc270c 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target
@@ -2,6 +2,6 @@
 Description=Start Host%i (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
index 5d309d2..317c6c1 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target
@@ -1,7 +1,10 @@
 [Unit]
 Description=Start Host%i
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
-RefuseManualStart=yes
+After={SYSTEMD_DEFAULT_TARGET}
+Wants=mapper-wait@-org-openbmc-control-chassis%i.service
+After=mapper-wait@-org-openbmc-control-chassis%i.service
+Conflicts=obmc-host-stop@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-quiesce-host@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
index f5b1f2d..45d898b 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target
@@ -1,8 +1,8 @@
 [Unit]
 Description=Host%i (Started)
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-start@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+After=obmc-host-starting@%i.target
+Conflicts=obmc-host-stop@%i.target
 Conflicts=obmc-stop-host@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
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
new file mode 100644
index 0000000..51bce8d
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target
@@ -0,0 +1,8 @@
+[Unit]
+Description=Host%i (Starting)
+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
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
index a979250..208892f 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target
@@ -2,6 +2,6 @@
 Description=Stop Host%i (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-host-start@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
index c573e9c..96648a4 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target
@@ -1,7 +1,10 @@
 [Unit]
 Description=Stop Host%i
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-stop-pre@%i.target
-Conflicts=obmc-chassis-start@%i.target
-RefuseManualStart=yes
+After={SYSTEMD_DEFAULT_TARGET}
+Wants=mapper-wait@-org-openbmc-control-chassis%i.service
+After=mapper-wait@-org-openbmc-control-chassis%i.service
+Conflicts=obmc-host-start@%i.target
 RefuseManualStop=yes
+OnFailure=obmc-chassis-poweroff@%i.target
+OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
index 92afdf0..1043578 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
@@ -2,6 +2,6 @@
 Description=Host%i (Stopped)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-host-stop@%i.target
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-host-start@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
new file mode 100644
index 0000000..bc81a57
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target
@@ -0,0 +1,8 @@
+[Unit]
+Description=Host%i (Stopping)
+Wants={SYSTEMD_DEFAULT_TARGET}
+After=obmc-host-stop-pre@%i.target
+Conflicts=obmc-host-start@%i.target
+Conflicts=obmc-host-starting@%i.target
+RefuseManualStart=yes
+RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
index 4347fa4..9e7defe 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-stop-host@.target
@@ -2,5 +2,5 @@
 Description=Power%i Host Off
 Wants={SYSTEMD_DEFAULT_TARGET}
 RefuseManualStop=yes
-OnFailure=obmc-chassis-stop@%i.target
+OnFailure=obmc-host-stop@%i.target
 OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index 44421bd..2672335 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index f76695e..befc892 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 86ddf4a..dd3570e 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 32ae694..a5efb41 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index 1c85fc1..cd4f513 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
index 7af067f..b070958 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
index 532d5e9..6cc65f8 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
index 77017e3..d065d63 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
index d28bfe8..77ed037 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-start-watchdog@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
index 2b086cf..d149403 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-watchdog/obmc-stop-watchdog@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb
index a064cf1..201849a 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service
index ac15389..8324fdb 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence/phosphor-fan-presence-tach@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb
index fa5a006..8533c8e 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
index 7f3871e..9a6ffe6 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-reset-host-running@.service
+++ b/meta-phosphor/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/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
index 8c5cfbb..c9d1a7c 100644
--- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service
+++ b/meta-phosphor/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