diff --git a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
index f805c84ae..05de22937 100644
--- a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
+++ b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
@@ -1,9 +1,7 @@
 # Copyright (C) 2012 Digi International
 PR_append = "+del.r0"
 
-SRCREV_ccardxmx28js = "agonzal/yocto"
-SRCREV_ccxmx53js = "agonzal/yocto"
-SRCREV_ccxmx51js = "agonzal/yocto"
-SRC_URI_ccxmx53js = "${DIGI_LOG_GIT}linux-2.6.git"
-SRC_URI_ccxmx51js = "${DIGI_LOG_GIT}linux-2.6.git"
-SRC_URI_ccardxmx28js = "${DIGI_LOG_GIT}linux-2.6.git"
+# Machine override would be: SRCREV_ccxmx53js_mx5 = "agonzal/yocto"
+SRCREV_mxs = "agonzal/yocto"
+SRCREV_mx5 = "agonzal/yocto"
+SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
index 927562a77..cf4caab8f 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
+++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
@@ -2,13 +2,13 @@
 PR_append = "+del.r0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}_${PV}"
-SRCREV_ccxmx51js = "agonzal/yocto"
-SRCREV_ccxmx53js = "agonzal/yocto"
-SRCREV_ccardxmx28js = "agonzal/yocto"
+
+SRCREV_mxs = "agonzal/yocto"
+LOCALVERSION_mxs = "mxs+agonzal_yocto"
+
+SRCREV_mx5 = "agonzal/yocto"
+LOCALVERSION_mx5 = "mx5+agonzal_yocto"
+
 SRC_URI = "${DIGI_LOG_GIT}linux-2.6.git \
            file://defconfig \
 "
-
-LOCALVERSION_ccxmx51js = "mx5+agonzal_yocto"
-LOCALVERSION_ccxmx53js = "mx5+agonzal_yocto"
-LOCALVERSION_ccardxmx28js = "mxs+agonzal_yocto"