diff --git a/meta-intel/COPYING.MIT b/meta-intel-openbmc/COPYING.MIT
similarity index 100%
rename from meta-intel/COPYING.MIT
rename to meta-intel-openbmc/COPYING.MIT
diff --git a/meta-intel/COPYING.apache-2.0 b/meta-intel-openbmc/COPYING.apache-2.0
similarity index 100%
rename from meta-intel/COPYING.apache-2.0
rename to meta-intel-openbmc/COPYING.apache-2.0
diff --git a/meta-intel/LICENSE b/meta-intel-openbmc/LICENSE
similarity index 100%
rename from meta-intel/LICENSE
rename to meta-intel-openbmc/LICENSE
diff --git a/meta-intel/MAINTAINERS b/meta-intel-openbmc/MAINTAINERS
similarity index 100%
rename from meta-intel/MAINTAINERS
rename to meta-intel-openbmc/MAINTAINERS
diff --git a/meta-intel/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
similarity index 100%
rename from meta-intel/conf/layer.conf
rename to meta-intel-openbmc/conf/layer.conf
diff --git a/meta-intel/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc
similarity index 100%
rename from meta-intel/conf/machine/include/intel.inc
rename to meta-intel-openbmc/conf/machine/include/intel.inc
diff --git a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
rename to meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
diff --git a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb
rename to meta-intel-openbmc/meta-common/recipes-core/libpeci/libpeci_git.bb
diff --git a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend
rename to meta-intel-openbmc/meta-common/recipes-core/systemd/obmc-targets.bbappend
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
rename to meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
rename to meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
diff --git a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb
rename to meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
rename to meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
rename to meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
rename to meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
rename to meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
rename to meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
rename to meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
diff --git a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
rename to meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
similarity index 100%
rename from meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
rename to meta-intel-openbmc/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
diff --git a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
similarity index 82%
rename from meta-intel/meta-s2600wf/conf/bblayers.conf.sample
rename to meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
index 900caca..c208e10 100644
--- a/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "8"
+LCONF_VERSION = "9"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -15,6 +15,6 @@
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-intel \
-  ##OEROOT##/meta-intel/meta-s2600wf \
+  ##OEROOT##/meta-intel-openbmc \
+  ##OEROOT##/meta-intel-openbmc/meta-s2600wf \
 "
diff --git a/meta-intel/meta-s2600wf/conf/conf-notes.txt b/meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt
similarity index 100%
rename from meta-intel/meta-s2600wf/conf/conf-notes.txt
rename to meta-intel-openbmc/meta-s2600wf/conf/conf-notes.txt
diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
similarity index 100%
rename from meta-intel/meta-s2600wf/conf/layer.conf
rename to meta-intel-openbmc/meta-s2600wf/conf/layer.conf
diff --git a/meta-intel/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
similarity index 100%
rename from meta-intel/meta-s2600wf/conf/local.conf.sample
rename to meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
diff --git a/meta-intel/meta-s2600wf/conf/machine/s2600wf.conf b/meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
similarity index 100%
rename from meta-intel/meta-s2600wf/conf/machine/s2600wf.conf
rename to meta-intel-openbmc/meta-s2600wf/conf/machine/s2600wf.conf
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
similarity index 100%
rename from meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
rename to meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json
diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
similarity index 100%
rename from meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
rename to meta-intel-openbmc/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend