diff --git a/conf/machine/smarcimx8m2g.conf b/conf/machine/smarcimx8m2g.conf
index d851ee7..5c436ab 100644
--- a/conf/machine/smarcimx8m2g.conf
+++ b/conf/machine/smarcimx8m2g.conf
@@ -18,7 +18,7 @@ MACHINE_SOCARCH_FILTER_append_mx8mq = "virtual/libopenvg virtual/libgles1 virtua
 
 # Embedian  BSP default providers
 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m2g ?= "linux-smarcimx8m"
-PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51_imx8m"
+PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51"
 
 KERNEL_DEVICETREE = " \
 	embedian/fsl-smarcimx8mq.dtb \
diff --git a/conf/machine/smarcimx8m2gind.conf b/conf/machine/smarcimx8m2gind.conf
index 01f6153..a2669b0 100644
--- a/conf/machine/smarcimx8m2gind.conf
+++ b/conf/machine/smarcimx8m2gind.conf
@@ -18,7 +18,7 @@ MACHINE_SOCARCH_FILTER_append_mx8mq = "virtual/libopenvg virtual/libgles1 virtua
 
 # Embedian  BSP default providers
 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m2g ?= "linux-smarcimx8m"
-PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51_imx8m"
+PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51"
 
 KERNEL_DEVICETREE = " \
 	embedian/fsl-smarcimx8mq.dtb \
diff --git a/conf/machine/smarcimx8m4g.conf b/conf/machine/smarcimx8m4g.conf
index 0b4a30f..031b0b4 100644
--- a/conf/machine/smarcimx8m4g.conf
+++ b/conf/machine/smarcimx8m4g.conf
@@ -18,7 +18,7 @@ MACHINE_SOCARCH_FILTER_append_mx8mq = "virtual/libopenvg virtual/libgles1 virtua
 
 # Embedian  BSP default providers
 PREFERRED_PROVIDER_virtual/kernel_smarcimx8m2g ?= "linux-smarcimx8m"
-PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51_imx8m"
+PREFERRED_VERSION_linux-smarcimx8m_smarcimx8m2g = "4.9.51"
 
 KERNEL_DEVICETREE = " \
 	embedian/fsl-smarcimx8mq.dtb \
diff --git a/recipes-kernel/linux/linux-smarcimx8m_4.9.51.bb b/recipes-kernel/linux/linux-smarcimx8m_4.9.51.bb
new file mode 100644
index 0000000..1e97d65
--- /dev/null
+++ b/recipes-kernel/linux/linux-smarcimx8m_4.9.51.bb
@@ -0,0 +1,52 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017 NXP
+# Copyright 2018 Embedian, Inc..
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "Linux Kernel provided and supported by NXP"
+DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
+i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
+
+require recipes-kernel/linux/linux-imx.inc
+require recipes-kernel/linux/linux-imx-src.inc
+
+DEPENDS += "lzop-native bc-native"
+
+DEFAULT_PREFERENCE = "1"
+
+DO_CONFIG_V7_COPY = "no"
+DO_CONFIG_V7_COPY_mx6 = "yes"
+DO_CONFIG_V7_COPY_mx7 = "yes"
+DO_CONFIG_V7_COPY_mx8 = "no"
+
+SRCBRANCH = "smarc-imx_4.9.51_imx8m_ga"
+
+LOCALVERSION = "-${SRCBRANCH}"
+DEFCONFIG_mx8 = "smarcimx8m_defconfig"
+
+KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
+SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
+SRCREV = "044022d8da98d6636945dc33ef969f5e096fce1f"
+
+S = "${WORKDIR}/git"
+
+addtask copy_defconfig after do_unpack before do_preconfigure
+do_copy_defconfig () {
+    install -d ${B}
+    if [ ${DO_CONFIG_V7_COPY} = "yes" ]; then
+        # copy latest imx_v7_defconfig to use for mx6, mx6ul and mx7
+        mkdir -p ${B}
+        cp ${S}/arch/arm/configs/imx_v7_defconfig ${B}/.config
+        cp ${S}/arch/arm/configs/imx_v7_defconfig ${B}/../defconfig
+    else
+        # copy latest defconfig to use for mx8
+        mkdir -p ${B}
+        cp ${S}/arch/arm64/configs/${DEFCONFIG_mx8} ${B}/.config
+        cp ${S}/arch/arm64/configs/${DEFCONFIG_mx8} ${B}/../defconfig
+    fi
+}
+
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+EXTRA_OEMAKE_append_mx6 = " ARCH=arm"
+EXTRA_OEMAKE_append_mx7 = " ARCH=arm"
+EXTRA_OEMAKE_append_mx8 = " ARCH=arm64"
diff --git a/recipes-kernel/linux/linux-smarcimx8m_4.9.51_imx8m.bb b/recipes-kernel/linux/linux-smarcimx8m_4.9.51_imx8m.bb
deleted file mode 100644
index 1e97d65..0000000
--- a/recipes-kernel/linux/linux-smarcimx8m_4.9.51_imx8m.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017 NXP
-# Copyright 2018 Embedian, Inc..
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY = "Linux Kernel provided and supported by NXP"
-DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \
-i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU."
-
-require recipes-kernel/linux/linux-imx.inc
-require recipes-kernel/linux/linux-imx-src.inc
-
-DEPENDS += "lzop-native bc-native"
-
-DEFAULT_PREFERENCE = "1"
-
-DO_CONFIG_V7_COPY = "no"
-DO_CONFIG_V7_COPY_mx6 = "yes"
-DO_CONFIG_V7_COPY_mx7 = "yes"
-DO_CONFIG_V7_COPY_mx8 = "no"
-
-SRCBRANCH = "smarc-imx_4.9.51_imx8m_ga"
-
-LOCALVERSION = "-${SRCBRANCH}"
-DEFCONFIG_mx8 = "smarcimx8m_defconfig"
-
-KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
-SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
-SRCREV = "044022d8da98d6636945dc33ef969f5e096fce1f"
-
-S = "${WORKDIR}/git"
-
-addtask copy_defconfig after do_unpack before do_preconfigure
-do_copy_defconfig () {
-    install -d ${B}
-    if [ ${DO_CONFIG_V7_COPY} = "yes" ]; then
-        # copy latest imx_v7_defconfig to use for mx6, mx6ul and mx7
-        mkdir -p ${B}
-        cp ${S}/arch/arm/configs/imx_v7_defconfig ${B}/.config
-        cp ${S}/arch/arm/configs/imx_v7_defconfig ${B}/../defconfig
-    else
-        # copy latest defconfig to use for mx8
-        mkdir -p ${B}
-        cp ${S}/arch/arm64/configs/${DEFCONFIG_mx8} ${B}/.config
-        cp ${S}/arch/arm64/configs/${DEFCONFIG_mx8} ${B}/../defconfig
-    fi
-}
-
-COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
-EXTRA_OEMAKE_append_mx6 = " ARCH=arm"
-EXTRA_OEMAKE_append_mx7 = " ARCH=arm"
-EXTRA_OEMAKE_append_mx8 = " ARCH=arm64"