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 ca92562..90e8b03 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Disable the AVS bus on the VRMs
-Wants=avsbus-workaround@%i.service
-After=avsbus-workaround@%i.service
+Wants=power-workarounds@%i.service
+After=power-workarounds@%i.service
 Before=vrm-control@%i.service
 Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround.sh
rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
similarity index 76%
rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
index a8bebc5..ec3017c 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-workaround@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/power-workarounds@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Perform AVS bus workaround on VRMs
+Description=Perform power workarounds on VRMs
 Wants=ucd_disable_vcs@%i.service
 After=ucd_disable_vcs@%i.service
 Before=avsbus-disable@%i.service
@@ -7,7 +7,7 @@
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
-ExecStart={bindir}/avsbus-workaround.sh
+ExecStart={bindir}/power-workarounds.sh
 Type=oneshot
 RemainAfterExit=yes