diff --git a/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
index 62ea76f..a40f618 100644
--- a/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
@@ -1,13 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://journald-storage-policy.conf"
-SRC_URI += "file://systemd-journald-override.conf"
-SRC_URI += "file://journald-size-policy.conf"
+SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf"
+SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf"
+SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf"
 
-FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
-FILES_${PN} += "${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
-FILES_${PN} += "${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
+FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
+FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
+FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf"
 
-do_install_append() {
+do_install_append_ibm-ac-server() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
         install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
diff --git a/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
index e41a430..fa249c0 100644
--- a/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://witherspoon.cfg"
+SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg"
 SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Witherspoon-128-Update-BMC-partitioni.patch"
diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control b/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control
rename to meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control
diff --git a/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh b/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-unbind-bind.sh
rename to meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
diff --git a/meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/console/obmc-console/obmc-console.conf
rename to meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf
diff --git a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index b06da50..185db10 100644
--- a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
@@ -1,4 +1,4 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy"
diff --git a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
index e80b499..8e1bf41 100644
--- a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
@@ -1 +1 @@
-SYSTEMD_LINK_phosphor-msl-verify = "../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
+SYSTEMD_LINK_phosphor-msl-verify_append_ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 58c1a5f..88c32ff 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,24 +1,24 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 # Package configuration
-FAN_PACKAGES += " \
+FAN_PACKAGES_append_ibm-ac-server = " \
         phosphor-cooling-type \
 "
 
-PACKAGECONFIG += "cooling-type"
+PACKAGECONFIG_append_ibm-ac-server = " cooling-type"
 
 TMPL_COOLING = "phosphor-cooling-type@.service"
 INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
 COOLING_TGT = "multi-user.target"
 FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
 
-FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}"
-SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
+FILES_phosphor-cooling-type_append_ibm-ac-server = " ${bindir}/phosphor-cooling-type"
+SYSTEMD_SERVICE_phosphor-cooling-type_append_ibm-ac-server = " ${TMPL_COOLING}"
+SYSTEMD_LINK_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
 
 COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
 
 #These services are protected by the watchdog
 SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
diff --git a/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend
index 3dcc25d..197e404 100644
--- a/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_df-openpower-ubi-fs = " verify_pnor_signature"
+PACKAGECONFIG_append_ibm-ac-server = " verify_pnor_signature"
diff --git a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 13c434d..e106fac 100644
--- a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -1,11 +1,9 @@
-BMC_RW_MTD = "bmc"
-BMC_RO_MTD = "alt-bmc+bmc"
-BMC_KERNEL_MTD = "bmc"
+BMC_RW_MTD_ibm-ac-server = "bmc"
+BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc"
+BMC_KERNEL_MTD_ibm-ac-server = "bmc"
 
 # Enable signature verification
-PACKAGECONFIG_append_witherspoon = " verify_signature"
-PACKAGECONFIG_append_swift = " verify_signature"
+PACKAGECONFIG_append_ibm-ac-server = " verify_signature"
 
 # Enable sync of persistent files to the alternate BMC chip
-PACKAGECONFIG_append_witherspoon = " sync_bmc_files"
-PACKAGECONFIG_append_swift = " sync_bmc_files"
+PACKAGECONFIG_append_ibm-ac-server = " sync_bmc_files"
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index f5a3582..032056c 100644
--- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -5,8 +5,8 @@
 POWERSUPPLY_TGT = "multi-user.target"
 FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
 
-SYSTEMD_LINK_${PN}-presence += "${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 
 POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence += "${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
index 0eee561..3ae8bcb 100644
--- a/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend
@@ -1,4 +1,4 @@
 RDEPENDS_${PN}_append_witherspoon = " avsbus-control"
 RDEPENDS_${PN}_append_witherspoon = " vrm-control"
-RDEPENDS_${PN}_append = " power-workarounds"
-RDEPENDS_${PN}_remove += "p9-vcs-workaround"
+RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds"
+RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround"
diff --git a/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 7702d99..ab45d55 100644
--- a/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname"
+OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname"
diff --git a/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 39f8734..bdc3912 100644
--- a/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,11 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append = " associations"
-SRC_URI += "file://associations.json"
+PACKAGECONFIG_append_ibm-ac-server = " associations"
+SRC_URI_append_ibm-ac-server = " file://associations.json"
 
 
-DEPENDS_append = " inventory-cleanup"
+DEPENDS_append_ibm-ac-server = " inventory-cleanup"
 
-do_install_append() {
+do_install_append_ibm-ac-server() {
     install -d ${D}${base_datadir}
     install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json
 }
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
index 588f23e..ae379af 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,5 +1,5 @@
-DEPENDS_append = " acx22-yaml-config"
+DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF_ibm-ac-server = " \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 3256e83..e3e5002 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -16,7 +16,7 @@
 unset do_patch[noexec]
 do_patch[depends] = "os-release:do_populate_sysroot"
 
-python do_patch() {
+python do_patch_ibm-ac-server() {
     import json
     import re
     from shutil import copyfile
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 408364c..2da9493 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append = " acx22-yaml-config"
+DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF_ibm-ac-server = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 16b1379..3fdcada 100644
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append = " acx22-yaml-config"
+DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
 
-EXTRA_OECONF = " \
+EXTRA_OECONF_ibm-ac-server = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/logging/ibm-logging/policyTable.json
rename to meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
diff --git a/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend b/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend
index 913a0e8..9b78069 100644
--- a/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend
@@ -1,2 +1,2 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG += "policy-interface"
+PACKAGECONFIG_append_ibm-ac-server = " policy-interface"
diff --git a/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
index ac35ae9..69c9d1d 100644
--- a/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend
@@ -1,12 +1,12 @@
-MBOXD_FLASH_SIZE = "64M"
+MBOXD_FLASH_SIZE_ibm-ac-server = "64M"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN} += "check-pnor-format.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " check-pnor-format.service"
 
-SRC_URI += "file://check_pnor_format.sh"
+SRC_URI_append_ibm-ac-server = " file://check_pnor_format.sh"
 
-do_install_append() {
+do_install_append_ibm-ac-server() {
 	install -d ${D}${bindir}
 	install -m 0755 ${WORKDIR}/check_pnor_format.sh ${D}${bindir}/check_pnor_format.sh
 }
diff --git a/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
index 29d23c8..cb167ee 100644
--- a/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend
@@ -1 +1 @@
-SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " first-boot-set-mac@eth0.service"
diff --git a/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
index 5137f4e..ba6e393 100644
--- a/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
-SRC_URI += "file://ncsi-netlink.service"
-SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service"
+SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service"
 
-do_install_append() {
+do_install_append_ibm-ac-server() {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 92b48f9..386c1e6 100644
--- a/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,6 +1,5 @@
-RDEPENDS_${PN}-inventory += "openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
-RDEPENDS_${PN}-fan-control += "witherspoon-fan-watchdog"
-RDEPENDS_${PN}-extras += "witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui"
+RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
+RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog"
+RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui"
 
-${PN}-software-extras_append_witherspoon = " phosphor-software-manager-sync"
-${PN}-software-extras_append_swift = " phosphor-software-manager-sync"
+${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync"
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 993ca28..d9d606b 100644
--- a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += " \
+SRC_URI_append_ibm-ac-server = " \
            file://70-hwmon.rules \
            file://70-max31785-hwmon.rules \
            file://start_max31785_hwmon.sh \
@@ -46,15 +46,15 @@
 OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
 
-SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/max31785.conf"
-SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
+SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
+SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
 
-SYSTEMD_SERVICE_${PN} += "max31785-hwmon-helper@.service"
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service"
 
-do_install_append() {
+do_install_append_ibm-ac-server() {
     install -d ${D}/${base_libdir}/udev/rules.d/
     install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
 
diff --git a/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 02c0e94..99f7ffd 100644
--- a/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,2 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://TPMEnable-default-true.override.yml"
+SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml"