diff --git a/meta-facebook/meta-fby35/conf/layer.conf b/meta-facebook/meta-fby35/conf/layer.conf
deleted file mode 100644
index 9440620..0000000
--- a/meta-facebook/meta-fby35/conf/layer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "fby35-layer"
-BBFILE_PATTERN_fby35-layer := "^${LAYERDIR}/"
-
-LAYERSERIES_COMPAT_fby35-layer := "honister kirkstone"
diff --git a/meta-facebook/meta-fby35/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-fby35/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
deleted file mode 100644
index bc61285..0000000
--- a/meta-facebook/meta-fby35/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI +="file://fby35.cfg"
diff --git a/meta-facebook/meta-fby35/OWNERS b/meta-facebook/meta-greatlakes/OWNERS
similarity index 100%
rename from meta-facebook/meta-fby35/OWNERS
rename to meta-facebook/meta-greatlakes/OWNERS
diff --git a/meta-facebook/meta-fby35/conf/bblayers.conf.sample b/meta-facebook/meta-greatlakes/conf/bblayers.conf.sample
similarity index 91%
rename from meta-facebook/meta-fby35/conf/bblayers.conf.sample
rename to meta-facebook/meta-greatlakes/conf/bblayers.conf.sample
index 752f1b5..ce12406 100644
--- a/meta-facebook/meta-fby35/conf/bblayers.conf.sample
+++ b/meta-facebook/meta-greatlakes/conf/bblayers.conf.sample
@@ -15,5 +15,5 @@
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-facebook \
-  ##OEROOT##/meta-facebook/meta-fby35 \
+  ##OEROOT##/meta-facebook/meta-greatlakes \
   "
diff --git a/meta-facebook/meta-fby35/conf/conf-notes.txt b/meta-facebook/meta-greatlakes/conf/conf-notes.txt
similarity index 100%
rename from meta-facebook/meta-fby35/conf/conf-notes.txt
rename to meta-facebook/meta-greatlakes/conf/conf-notes.txt
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
new file mode 100644
index 0000000..abee71c
--- /dev/null
+++ b/meta-facebook/meta-greatlakes/conf/layer.conf
@@ -0,0 +1,11 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "greatlakes-layer"
+BBFILE_PATTERN_greatlakes-layer := "^${LAYERDIR}/"
+
+LAYERSERIES_COMPAT_greatlakes-layer := "honister kirkstone"
diff --git a/meta-facebook/meta-fby35/conf/local.conf.sample b/meta-facebook/meta-greatlakes/conf/local.conf.sample
similarity index 99%
rename from meta-facebook/meta-fby35/conf/local.conf.sample
rename to meta-facebook/meta-greatlakes/conf/local.conf.sample
index 532d95a..6f86dcf 100644
--- a/meta-facebook/meta-fby35/conf/local.conf.sample
+++ b/meta-facebook/meta-greatlakes/conf/local.conf.sample
@@ -14,7 +14,7 @@
 #
 # Machine Selection
 #
-MACHINE ??= "fby35"
+MACHINE ??= "greatlakes"
 
 #
 # Where to place downloads
diff --git a/meta-facebook/meta-fby35/conf/machine/fby35.conf b/meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
similarity index 100%
rename from meta-facebook/meta-fby35/conf/machine/fby35.conf
rename to meta-facebook/meta-greatlakes/conf/machine/greatlakes.conf
diff --git a/meta-facebook/meta-fby35/recipes-bsp/u-boot/u-boot-aspeed-sdk/fby35.cfg b/meta-facebook/meta-greatlakes/recipes-bsp/u-boot/u-boot-aspeed-sdk/greatlakes.cfg
similarity index 100%
rename from meta-facebook/meta-fby35/recipes-bsp/u-boot/u-boot-aspeed-sdk/fby35.cfg
rename to meta-facebook/meta-greatlakes/recipes-bsp/u-boot/u-boot-aspeed-sdk/greatlakes.cfg
diff --git a/meta-facebook/meta-greatlakes/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-greatlakes/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
new file mode 100644
index 0000000..09cd47f
--- /dev/null
+++ b/meta-facebook/meta-greatlakes/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI +="file://greatlakes.cfg"
diff --git a/meta-facebook/meta-fby35/recipes-kernel/linux/linux-aspeed/fby35.cfg b/meta-facebook/meta-greatlakes/recipes-kernel/linux/linux-aspeed/greatlakes.cfg
similarity index 100%
rename from meta-facebook/meta-fby35/recipes-kernel/linux/linux-aspeed/fby35.cfg
rename to meta-facebook/meta-greatlakes/recipes-kernel/linux/linux-aspeed/greatlakes.cfg
diff --git a/meta-facebook/meta-fby35/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-greatlakes/recipes-kernel/linux/linux-aspeed_%.bbappend
similarity index 60%
rename from meta-facebook/meta-fby35/recipes-kernel/linux/linux-aspeed_%.bbappend
rename to meta-facebook/meta-greatlakes/recipes-kernel/linux/linux-aspeed_%.bbappend
index 76ba5fc..2018d23 100644
--- a/meta-facebook/meta-fby35/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-facebook/meta-greatlakes/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,2 +1,2 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:"
-SRC_URI += "file://fby35.cfg"
+SRC_URI += "file://greatlakes.cfg"
diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan/fby35/host-poweroff b/meta-facebook/recipes-phosphor/fans/phosphor-fan/greatlakes/host-poweroff
similarity index 100%
rename from meta-facebook/recipes-phosphor/fans/phosphor-fan/fby35/host-poweroff
rename to meta-facebook/recipes-phosphor/fans/phosphor-fan/greatlakes/host-poweroff
diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/fby35/ipmb-channels.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/greatlakes/ipmb-channels.json
similarity index 100%
rename from meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/fby35/ipmb-channels.json
rename to meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/greatlakes/ipmb-channels.json
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/fby35/nvme_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/greatlakes/nvme_config.json
similarity index 100%
rename from meta-facebook/recipes-phosphor/sensors/phosphor-nvme/fby35/nvme_config.json
rename to meta-facebook/recipes-phosphor/sensors/phosphor-nvme/greatlakes/nvme_config.json
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/fby35/fby35_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json
similarity index 100%
rename from meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/fby35/fby35_sensor_config.json
rename to meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json