diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
index d584392..29f36a4 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb
@@ -9,7 +9,7 @@
 TMPL_ON = "avsbus-enable@.service"
 INSTFMT_OFF = "avsbus-disable@{0}.service"
 INSTFMT_ON = "avsbus-enable@{0}.service"
-TGTFMT_OFF = "obmc-chassis-stop@{0}.target"
+TGTFMT_OFF = "obmc-host-stop@{0}.target"
 TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
 FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
 FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 8561bf2..51eec7f 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -2,7 +2,7 @@
 Description=Disable AVSBus on VRMs
 Wants=obmc-power-stop-pre@%i.target
 Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-host-start@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-host-stop@%i.target
diff --git a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 0f786a6..b945529 100644
--- a/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -2,7 +2,7 @@
 Description=Enable AVSBus on VRMs
 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
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
diff --git a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
index 4b43834..3c70afd 100644
--- a/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
+++ b/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service
@@ -5,7 +5,7 @@
 Wants=obmc-power-on@%i.target
 After=obmc-power-on@%i.target
 Before=vcs_workaround@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-host-stop@%i.target
 
 [Service]
 Restart=no
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
index 33b646f..98fb89b 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control.bb
@@ -12,7 +12,7 @@
 TMPL_ON = "vcs-on@.service"
 INSTFMT_OFF = "vcs-off@{0}.service"
 INSTFMT_ON = "vcs-on@{0}.service"
-TGTFMT_OFF = "obmc-chassis-stop@{0}.target"
+TGTFMT_OFF = "obmc-host-stop@{0}.target"
 TGTFMT_ON = "obmc-chassis-poweron@{0}.target"
 FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}"
 FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}"
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
index 3acbcf8..1ca6215 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service
@@ -2,7 +2,7 @@
 Description=Turn VCS rails off
 Wants=obmc-power-stop-pre@%i.target
 Before=obmc-power-stop-pre@%i.target
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-host-start@%i.target
 
 [Service]
 ExecStart={bindir}/zaius_vcs.sh off
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-host-stop@%i.target
diff --git a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
index 9194060..74b8df3 100644
--- a/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
+++ b/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service
@@ -4,7 +4,7 @@
 After=vcs_workaround@%i.service
 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]
 ExecStart={bindir}/zaius_vcs.sh on