diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 1970f00..55957f3 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -3,7 +3,7 @@
 Wants=avsbus-workaround@%i.service
 After=avsbus-workaround@%i.service
 Before=vrm-control@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/avsbus-disable.sh
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
index 9032f68..e7d3fe1 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service
@@ -3,7 +3,7 @@
 Wants=vrm-control@%i.service
 After=vrm-control@%i.service
 Before=vcs_off@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/avsbus-enable.sh
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
index 5662371..ac1c6c0 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
@@ -3,7 +3,7 @@
 Wants=ucd_disable_vcs@%i.service
 After=ucd_disable_vcs@%i.service
 Before=avsbus-disable@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/avsbus-workaround.sh
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target