meta-ieisystem: Rename layer name

Since the company name is ieisystems and the domain name is ieisystem
in order to be consistent with the domain name, the layer name is
replaced with ieisystem.

Link: https://en.ieisystem.com/

Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: Ie8e02d5b9f20a92ce4bf8c53ec291e2b51dc43f5

65 files changed, 12 insertions, 12 deletions

diff --git a/meta-ieisystems/COPYING.MIT b/meta-ieisystem/COPYING.MIT
index 89de354795..89de354795 100644
--- a/meta-ieisystems/COPYING.MIT
+++ b/meta-ieisystem/COPYING.MIT
diff --git a/meta-ieisystems/COPYING.apache-2.0 b/meta-ieisystem/COPYING.apache-2.0
index 67db858821..67db858821 100644
--- a/meta-ieisystems/COPYING.apache-2.0
+++ b/meta-ieisystem/COPYING.apache-2.0
diff --git a/meta-ieisystems/LICENSE b/meta-ieisystem/LICENSE
index 1dab391387..b9d4f1e640 100644
--- a/meta-ieisystems/LICENSE
+++ b/meta-ieisystem/LICENSE
@@ -1,4 +1,4 @@
-Different components of meta-ieisystems are under different licenses
+Different components of meta-ieisystem are under different licenses
 (a mix of MIT and Apache-2.0). Please see:
 
 COPYING.Apache-2.0
diff --git a/meta-ieisystems/OWNERS b/meta-ieisystem/OWNERS
index 2df0440475..2df0440475 100644
--- a/meta-ieisystems/OWNERS
+++ b/meta-ieisystem/OWNERS
diff --git a/meta-ieisystems/conf/layer.conf b/meta-ieisystem/conf/layer.conf
index 60f56a95e0..1771003e5e 100644
--- a/meta-ieisystems/conf/layer.conf
+++ b/meta-ieisystem/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "ieisystems-layer"
-BBFILE_PATTERN_ieisystems-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ieisystems-layer = "nanbield scarthgap"
+BBFILE_COLLECTIONS += "ieisystem-layer"
+BBFILE_PATTERN_ieisystem-layer = "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_ieisystem-layer = "nanbield scarthgap"
diff --git a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
index 2570a9a199..2570a9a199 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/layer.conf b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
index 057258b0c0..057258b0c0 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/layer.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
index 0e81ea0553..4c99703f78 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
@@ -1,11 +1,11 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-#UBOOT_DEVICETREE = "ast2600-ieisystems-fp5280g3"
+#UBOOT_DEVICETREE = "ast2600-ieisystem-fp5280g3"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/distro/include/phosphor-mmc.inc
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
index 8b2699e383..d8485a5c17 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
@@ -14,6 +14,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-fp5280g3 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-fp5280g3 \
   "
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
index 9b3c01a556..9b3c01a556 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
index 279569a9be..279569a9be 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
index 0bcd774c58..0bcd774c58 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
index 6c3da1a91b..6c3da1a91b 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
+++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
index 41a58934ce..41a58934ce 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
index cc872bd2de..cc872bd2de 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
index 8da9acad79..8da9acad79 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
index 745095e197..745095e197 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
index 4878d52977..4878d52977 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
index cfc14d02d7..cfc14d02d7 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
index 9dd7181d83..9dd7181d83 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
index 88b781911b..88b781911b 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index bf8e2bf5a0..bf8e2bf5a0 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 6689276c69..6689276c69 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
index cdeb23680e..cdeb23680e 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 1b6c91265f..1b6c91265f 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
index e77a553638..e77a553638 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
index 36d9babdb3..36d9babdb3 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
index eb5bc2a2ec..eb5bc2a2ec 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index f5a790801d..f5a790801d 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index d06de11c26..d06de11c26 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index f60fb6e161..f60fb6e161 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index a4a9551732..a4a9551732 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
index 6bf4409c78..6bf4409c78 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
index 04c1245801..04c1245801 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
index 92b8546806..92b8546806 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
index 6fc8a98fe7..6fc8a98fe7 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
index 8b6248a461..8b6248a461 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
index 136847d442..136847d442 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index e0bd907a4d..e0bd907a4d 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
index 0eb993d305..0eb993d305 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
index e790c639ad..e790c639ad 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 9bfbdcb934..9bfbdcb934 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
index c1dd14ba85..c1dd14ba85 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index e603990c2f..e603990c2f 100644
--- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/conf/layer.conf b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
index f0f36da335..f0f36da335 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/layer.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
diff --git a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
index 2f020adde1..5a47f0e419 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -1,12 +1,12 @@
 # Add a device tree for nf5280m7
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-# UBOOT_DEVICETREE = "${UMACHINE}-ieisystems-${MACHINE}"
+# UBOOT_DEVICETREE = "${UMACHINE}-ieisystem-${MACHINE}"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/machine/include/ast2600.inc
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
index 6297743d11..46100128ed 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
@@ -14,7 +14,7 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-nf5280m7 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-nf5280m7 \
   "
 
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
index 9b3c01a556..9b3c01a556 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
index 033b6bbde2..033b6bbde2 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
index e1299422a2..e1299422a2 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
+++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
index 6a0c70228b..6a0c70228b 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
index bde5908e62..bde5908e62 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
index d9edbf3996..d9edbf3996 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
index 95088ed99c..95088ed99c 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
index 388f9c50d3..388f9c50d3 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
index d40de52b1b..d40de52b1b 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 1b6c91265f..1b6c91265f 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
index c4fba64f67..c4fba64f67 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
index a9aedf15fc..a9aedf15fc 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 8bc2c548a9..8bc2c548a9 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index e16e2bb079..e16e2bb079 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
index eef9cf4a46..eef9cf4a46 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 6b12a398f7..6b12a398f7 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 3586206559..3586206559 100644
--- a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb
index 4e0f8af8f3..4e0f8af8f3 100644
--- a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb
+++ b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb