diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
similarity index 87%
rename from meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample
rename to meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
index 1e6f3b0..a4fbed4 100644
--- a/meta-quanta/meta-runbmc-nuvoton/conf/bblayers.conf.sample
+++ b/meta-quanta/meta-olympus-nuvoton/conf/bblayers.conf.sample
@@ -13,7 +13,7 @@
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-runbmc-nuvoton \
+  ##OEROOT##/meta-quanta/meta-olympus-nuvoton \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
@@ -23,5 +23,5 @@
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-nuvoton \
   ##OEROOT##/meta-quanta \
-  ##OEROOT##/meta-quanta/meta-runbmc-nuvoton \
+  ##OEROOT##/meta-quanta/meta-olympus-nuvoton \
   "
diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt b/meta-quanta/meta-olympus-nuvoton/conf/conf-notes.txt
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/conf/conf-notes.txt
rename to meta-quanta/meta-olympus-nuvoton/conf/conf-notes.txt
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
new file mode 100644
index 0000000..5d5fdb7
--- /dev/null
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -0,0 +1,10 @@
+# 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 += "olympus-nuvoton-layer"
+BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "warrior zeus"
diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample
similarity index 94%
rename from meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample
rename to meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample
index 37ae2b3..76d1a97 100644
--- a/meta-quanta/meta-runbmc-nuvoton/conf/local.conf.sample
+++ b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample
@@ -1,4 +1,4 @@
-MACHINE ??= "runbmc-nuvoton"
+MACHINE ??= "olympus-nuvoton"
 DISTRO ?= "openbmc-phosphor"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/conf/machine/runbmc-nuvoton.conf
rename to meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_olympus.xml
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_RunBMC.xml
rename to meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/files/BootBlockAndHeader_olympus.xml
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/files/UbootHeader_olympus.xml
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/files/UbootHeader_RunBMC.xml
rename to meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/files/UbootHeader_olympus.xml
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend
new file mode 100644
index 0000000..4de20b2
--- /dev/null
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_remove = "file://BootBlockAndHeader_EB.xml"
+SRC_URI_remove = "file://UbootHeader_EB.xml"
+SRC_URI_append += " file://BootBlockAndHeader_olympus.xml"
+SRC_URI_append += " file://UbootHeader_olympus.xml"
+
+
+do_install_append() {
+	install ${WORKDIR}/BootBlockAndHeader_olympus.xml ${D}${bindir}/BootBlockAndHeader_EB.xml
+	install ${WORKDIR}/UbootHeader_olympus.xml ${D}${bindir}/UbootHeader_EB.xml
+}
+
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config
rename to meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton/fw_env.config
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
rename to meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg b/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton/olympus-nuvoton.cfg
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton/runbmc-nuvoton.cfg
rename to meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton/olympus-nuvoton.cfg
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend
new file mode 100644
index 0000000..0ebbb1a
--- /dev/null
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:"
+
+SRC_URI += "file://olympus-nuvoton.cfg"
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/files/obmc-console.conf
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/files/obmc-console.conf
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-runbmc-nuvoton.json
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/config-olympus-nuvoton.json
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-reboot-control.service
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
new file mode 100644
index 0000000..a61181d
--- /dev/null
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -0,0 +1,29 @@
+FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+
+SRC_URI_append_olympus-nuvoton = " file://config-olympus-nuvoton.json"
+SRC_URI_append_olympus-nuvoton = " file://fan-full-speed.sh"
+SRC_URI_append_olympus-nuvoton = " file://phosphor-pid-control.service"
+SRC_URI_append_olympus-nuvoton = " file://fan-reboot-control.service"
+
+FILES_${PN}_append_olympus-nuvoton = " ${bindir}/fan-full-speed.sh"
+FILES_${PN}_append_olympus-nuvoton = " ${datadir}/swampd/config.json"
+
+RDEPENDS_${PN} += "bash"
+
+SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " phosphor-pid-control.service"
+SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " fan-reboot-control.service"
+
+do_install_append_olympus-nuvoton() {
+    install -d ${D}/${bindir}
+    install -m 0755 ${WORKDIR}/fan-full-speed.sh ${D}/${bindir}
+
+    install -d ${D}${datadir}/swampd
+    install -m 0644 -D ${WORKDIR}/config-olympus-nuvoton.json \
+        ${D}${datadir}/swampd/config.json
+
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/phosphor-pid-control.service \
+        ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/fan-reboot-control.service \
+        ${D}${systemd_unitdir}/system
+}
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-olympus-channels.json
similarity index 100%
rename from meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-runbmc-channels.json
rename to meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-olympus-channels.json
diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
new file mode 100644
index 0000000..6feb2be
--- /dev/null
+++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:"
+
+SRC_URI_append_olympus-nuvoton = " file://ipmb-olympus-channels.json"
+FILES_${PN}_append_olympus-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json"
+
+do_install_append_olympus-nuvoton() {
+    install -d ${D}${datadir}/ipmbbridge
+    install -m 0644 -D ${WORKDIR}/ipmb-olympus-channels.json \
+        ${D}${datadir}/ipmbbridge/ipmb-channels.json
+}
+
diff --git a/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf b/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf
deleted file mode 100644
index ccb683f..0000000
--- a/meta-quanta/meta-runbmc-nuvoton/conf/layer.conf
+++ /dev/null
@@ -1,10 +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 += "runbmc-nuvoton-layer"
-BBFILE_PATTERN_runbmc-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_runbmc-nuvoton-layer = "warrior zeus"
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend
deleted file mode 100644
index 664fcb0..0000000
--- a/meta-quanta/meta-runbmc-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_remove = "file://BootBlockAndHeader_EB.xml"
-SRC_URI_remove = "file://UbootHeader_EB.xml"
-SRC_URI += " file://BootBlockAndHeader_RunBMC.xml"
-SRC_URI += " file://UbootHeader_RunBMC.xml"
-
-
-do_install_append() {
-	install ${WORKDIR}/BootBlockAndHeader_RunBMC.xml ${D}${bindir}/BootBlockAndHeader_EB.xml
-	install ${WORKDIR}/UbootHeader_RunBMC.xml ${D}${bindir}/UbootHeader_EB.xml
-}
-
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend
deleted file mode 100644
index de375ce..0000000
--- a/meta-quanta/meta-runbmc-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:"
-
-SRC_URI += "file://runbmc-nuvoton.cfg"
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
deleted file mode 100644
index 5d7e0f9..0000000
--- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ /dev/null
@@ -1,29 +0,0 @@
-FILESEXTRAPATHS_prepend_runbmc-nuvoton := "${THISDIR}/${PN}:"
-
-SRC_URI_append_runbmc-nuvoton = " file://config-runbmc-nuvoton.json"
-SRC_URI_append_runbmc-nuvoton = " file://fan-full-speed.sh"
-SRC_URI_append_runbmc-nuvoton = " file://phosphor-pid-control.service"
-SRC_URI_append_runbmc-nuvoton = " file://fan-reboot-control.service"
-
-FILES_${PN}_append_runbmc-nuvoton = " ${bindir}/fan-full-speed.sh"
-FILES_${PN}_append_runbmc-nuvoton = " ${datadir}/swampd/config.json"
-
-RDEPENDS_${PN} += "bash"
-
-SYSTEMD_SERVICE_${PN}_append_runbmc-nuvoton = " phosphor-pid-control.service"
-SYSTEMD_SERVICE_${PN}_append_runbmc-nuvoton = " fan-reboot-control.service"
-
-do_install_append_runbmc-nuvoton() {
-    install -d ${D}/${bindir}
-    install -m 0755 ${WORKDIR}/fan-full-speed.sh ${D}/${bindir}
-
-    install -d ${D}${datadir}/swampd
-    install -m 0644 -D ${WORKDIR}/config-runbmc-nuvoton.json \
-        ${D}${datadir}/swampd/config.json
-
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/phosphor-pid-control.service \
-        ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/fan-reboot-control.service \
-        ${D}${systemd_unitdir}/system
-}
diff --git a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
deleted file mode 100644
index ef0838e..0000000
--- a/meta-quanta/meta-runbmc-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend_runbmc-nuvoton := "${THISDIR}/${PN}:"
-
-SRC_URI_append_runbmc-nuvoton = " file://ipmb-runbmc-channels.json"
-FILES_${PN}_append_runbmc-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json"
-
-do_install_append_runbmc-nuvoton() {
-    install -d ${D}${datadir}/ipmbbridge
-    install -m 0644 -D ${WORKDIR}/ipmb-runbmc-channels.json \
-        ${D}${datadir}/ipmbbridge/ipmb-channels.json
-}
-