diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 3f26613..6c283f4 100644
--- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_rainier = "hwmontempsensor"
+PACKAGECONFIG_p10bmc = "hwmontempsensor"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/max31785@52.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/rainier/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 8e4d5f6..8841019 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -74,7 +74,7 @@
                bus@1e78a000/i2c-bus@500/tmp275@4a \
                "
 
-CHIPS_rainier = " \
+CHIPS_p10bmc = " \
                bus@1e78a000/i2c-bus@400/max31785@52 \
                bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \
                "
@@ -110,7 +110,7 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 
 # Enable and install the max31785-msl package
 PACKAGECONFIG_append_ibm-ac-server = " max31785-msl"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/rainier/virtual_sensor_config.json
rename to meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 53f8905..878a58a 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://virtual_sensor_config.json"
 
-do_install_append_rainier() {
+do_install_append_p10bmc() {
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
 }