diff --git a/conf/machine/imx8mpguf.conf b/conf/machine/seco-mx8mp.conf
similarity index 100%
rename from conf/machine/imx8mpguf.conf
rename to conf/machine/seco-mx8mp.conf
diff --git a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
index 12a05d5fd58afdfc49921f55a22a75a8a2842e2d..2030405ac108dabd6832c469937001b648bfb75c 100644
--- a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
+++ b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
@@ -3,15 +3,15 @@ require imx-mkimage_kuk.inc
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SOC_TARGET:seco-mx8mm = "iMX8MM"
-SOC_TARGET:imx8mpguf = "iMX8MP"
+SOC_TARGET:seco-mx8mp = "iMX8MP"
 SOC_FAMILY:seco-mx8mm = "mx8m"
-SOC_FAMILY:imx8mpguf = "mx8m"
+SOC_FAMILY:seco-mx8mp = "mx8m"
 ATF_MACHINE_NAME:seco-mx8mm = "bl31-imx8mm.bin"
-ATF_MACHINE_NAME:imx8mpguf = "bl31-imx8mp.bin"
+ATF_MACHINE_NAME:seco-mx8mp = "bl31-imx8mp.bin"
 BOOT_STAGING:seco-mx8mm = "${S}/iMX8M"
-BOOT_STAGING:imx8mpguf = "${S}/iMX8M"
+BOOT_STAGING:seco-mx8mp = "${S}/iMX8M"
 MACHINE_SOCARCH_SUFFIX:seco-mx8mm = "-mx8mm"
-MACHINE_SOCARCH_SUFFIX:imx8mpguf = "-mx8mp"
+MACHINE_SOCARCH_SUFFIX:seco-mx8mp = "-mx8mp"
 
 # Using prepuilt bl31 for now
 DEPENDS:remove = "imx-atf"
diff --git a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_kuk.inc b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_kuk.inc
index 8dfd76c93209803f9c6199404356e21fd44bf822..e96a18f10145611cadb2fd2d4b3278f33921c9b9 100644
--- a/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_kuk.inc
+++ b/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_kuk.inc
@@ -3,5 +3,5 @@ SRC_URI = "git://git.seco.com/seco-ne/3rd-party/kuk/imx-mkimage-kuk.git;protocol
 SRCBRANCH:seco-mx8mm = "kuk_lf-5.10.52_2.1.0"
 SRCREV:seco-mx8mm = "3748257787e25fea042c8e05cfe83cb6938a3f34"
 
-SRCBRANCH:imx8mpguf = "kuk_lf-5.10.52_2.1.0"
-SRCREV:imx8mpguf = "3748257787e25fea042c8e05cfe83cb6938a3f34"
+SRCBRANCH:seco-mx8mp = "kuk_lf-5.10.52_2.1.0"
+SRCREV:seco-mx8mp = "3748257787e25fea042c8e05cfe83cb6938a3f34"
diff --git a/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend b/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend
index 69742cc408bb6cc265df6ee054012ee8942b2f70..2519a109e16f2506738ee3f4fcbb40dbb01cc609 100644
--- a/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend
+++ b/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-imx_%.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 # Get include file from poky layer
 FILESEXTRAPATHS:append := "${BSPDIR}/sources/poky/meta/recipes-bsp/u-boot/files:"
 
-COMPATIBLE_MACHINE = "(seco-mx8mm|imx8mpguf)"
+COMPATIBLE_MACHINE = "(seco-mx8mm|seco-mx8mp)"
 
 SRCBRANCH = "guf_imx_v2020.04-trizeps8plus_2021_12_07"
 PV = "2020.04"
diff --git a/recipes-kernel/linux/linux-imx-kuk_5.10.bb b/recipes-kernel/linux/linux-imx-kuk_5.10.bb
index 277d155950defe1ba36b4247c9141fb848c7947c..e13ff87cb507e252e366b83914c0e0ab8fde8b5d 100644
--- a/recipes-kernel/linux/linux-imx-kuk_5.10.bb
+++ b/recipes-kernel/linux/linux-imx-kuk_5.10.bb
@@ -2,7 +2,7 @@ require linux-seconorth.inc
 
 KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig"
 
-COMPATIBLE_MACHINE = "(seco-mx8mm|imx8mpguf)"
+COMPATIBLE_MACHINE = "(seco-mx8mm|seco-mx8mp)"
 
 LINUX_VERSION = "5.10"
 LINUX_VERSION_EXTENSION = "-seconorth"
diff --git a/recipes-kernel/linux/linux-imx_5.15.bb b/recipes-kernel/linux/linux-imx_5.15.bb
index ae6f0e191e2ec51d5ad4bbbed48d01c55ded7f06..dd802e1fbdabde361d469c7684e07705845eed0f 100644
--- a/recipes-kernel/linux/linux-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-imx_5.15.bb
@@ -2,7 +2,7 @@ require linux-seconorth.inc
 
 KERNEL_CONFIG_COMMAND = "oe_runmake_call -C ${S} CC="${KERNEL_CC}" O=${B} olddefconfig"
 
-COMPATIBLE_MACHINE = "(seco-mx8mm|imx8mpguf)"
+COMPATIBLE_MACHINE = "(seco-mx8mm|seco-mx8mp)"
 
 LINUX_VERSION = "5.15"
 LINUX_VERSION_EXTENSION = "-seco"