diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf
deleted file mode 100644
index a0f16b4..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/layer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-BBFILE_COLLECTIONS += "foxconn"
-BBFILE_PATTERN_foxconn = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
new file mode 100644
index 0000000..9bc3e93
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/layer.conf
@@ -0,0 +1,5 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+BBFILE_COLLECTIONS += "rackspace"
+BBFILE_PATTERN_rackspace = ""
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc b/meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/conf/machine/include/foxconn.inc
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/conf/machine/include/rackspace.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
similarity index 70%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index f30ab15..a261b26 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -12,8 +12,8 @@
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -22,6 +22,6 @@
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-aspeed/meta-ast2400 \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-openpower/meta-foxconn \
-  ##OEROOT##/meta-openpower/meta-foxconn/meta-barreleye \
+  ##OEROOT##/meta-openpower/meta-rackspace \
+  ##OEROOT##/meta-openpower/meta-rackspace/meta-barreleye \
   "
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/conf-notes.txt
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/conf-notes.txt
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/layer.conf
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/layer.conf
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
similarity index 100%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/local.conf.sample
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/local.conf.sample
diff --git a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
similarity index 87%
rename from meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf
rename to meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
index 3ab8bb0..6c8f0bf 100644
--- a/meta-openbmc-machines/meta-openpower/meta-foxconn/meta-barreleye/conf/machine/barreleye.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/machine/barreleye.conf
@@ -3,7 +3,7 @@
 
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
-require conf/machine/include/foxconn.inc
+require conf/machine/include/rackspace.inc
 
 UBOOT_MACHINE_barreleye = "palmetto_config"
 UBOOT_ENTRYPOINT = "0x40008000"