diff --git a/README.md b/README.md
index 6ae7bfe..8678e09 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@
 hr630                   palmetto                   witherspoon
 hr855xg2                qemuarm                    witherspoon-128
 lanyang                 quanta-q71l                witherspoon-tacoma
-mihawk                  rainier                    yosemitev2
+mihawk                  p10bmc                     yosemitev2
 msn                     romulus                    zaius
 neptune                 s2600wf
 ```
diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt
index f56b88b..d4578dc 100644
--- a/meta-ibm/conf/conf-notes.txt
+++ b/meta-ibm/conf/conf-notes.txt
@@ -2,11 +2,11 @@
 
 mihawk:
 DISTRO=openbmc-witherspoon MACHINE=mihawk bitbake obmc-phosphor-image
+p10bmc:
+DISTRO=openbmc-openpower MACHINE=p10bmc bitbake obmc-phosphor-image
 swift:
 DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image
 witherspoon:
 DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image
 witherspoon-tacoma:
 DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image
-rainier:
-DISTRO=openbmc-openpower MACHINE=rainier bitbake obmc-phosphor-image
diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample
index 4b70cad..9f2228b 100644
--- a/meta-ibm/conf/local.conf.sample
+++ b/meta-ibm/conf/local.conf.sample
@@ -1,6 +1,6 @@
 #MACHINE ?= "mihawk"
+#MACHINE ?= "p10bmc"
 #MACHINE ?= "swift"
-#MACHINE ?= "rainier"
 MACHINE ??= "witherspoon"
 DISTRO ?= "openbmc-witherspoon"
 PACKAGE_CLASSES ?= "package_rpm"
diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/p10bmc.conf
similarity index 94%
rename from meta-ibm/conf/machine/rainier.conf
rename to meta-ibm/conf/machine/p10bmc.conf
index f7f08dd..22b59b4 100644
--- a/meta-ibm/conf/machine/rainier.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -5,6 +5,7 @@
 
 OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"
 
+# TODO remove the MACHINEOVERRIDES when the rainier.conf file is removed.
 MACHINEOVERRIDES =. "p10bmc:"
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf
new file mode 120000
index 0000000..ddfb6ec
--- /dev/null
+++ b/meta-ibm/conf/machine/rainier.conf
@@ -0,0 +1 @@
+p10bmc.conf
\ No newline at end of file