diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
index 3aa28c5..b176fa9 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v1_git.bb
@@ -1,8 +1,8 @@
+require u-boot-nm.inc
+
 # Force machine configuration for this recipe
 UBOOT_MACHINE = "am335x_nbhw16_defconfig"
 
-require u-boot-nm.inc
-
 # Be aware github/netmodule git
 SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;branch=2016.05-am335x-netmodule"
 
@@ -14,13 +14,11 @@ SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
 
 do_deploy_append() {
-    rm -f ${DEPLOYDIR}/${PN}-spl.bin
-    rm -f ${DEPLOYDIR}/${PN}.bin
-    rm -f ${DEPLOYDIR}/${PN}.img
-    rm -f ${DEPLOYDIR}/MLO-${PN}
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin
-    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.img
-    cp ${S}/MLO ${DEPLOYDIR}/MLO-${PN}
+    rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
+    rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
+    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
+    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
 }
 
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
index 2501d6d..4e5d91e 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw16-v2_git.bb
@@ -3,5 +3,5 @@ require u-boot-am335x-nrhw16-v1_git.bb
 # Force machine configuration for this recipe
 UBOOT_MACHINE = "am335x_nbhw16_v2_defconfig"
 
-SRCREV = "0b985705d558caceeb968b234af27cfc536ef019"
+SRCREV ?= "${AUTOREV}"
 
diff --git a/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb b/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
index a665e53..ba469a7 100644
--- a/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
+++ b/recipes-bsp/u-boot/u-boot-am335x-nrhw20-v1_git.bb
@@ -8,20 +8,17 @@ SRC_URI = "git://git.netmodule.intranet/nmrouter/u-boot;protocol=ssh;user=gitea;
 
 # Should be updated when a new U-Boot Version is available
 SRCREV ?= "297c60c69942e7d377925181b29a1f8e9515284d"
-
-PV = "v2016.04+git${SRCPV}"
+PV = "v2016.05+git${SRCPV}"
 
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
 
 do_deploy_append() {
-    rm -f ${DEPLOYDIR}/${PN}-spl.bin
-    rm -f ${DEPLOYDIR}/${PN}.bin
-    rm -f ${DEPLOYDIR}/${PN}.img
-    rm -f ${DEPLOYDIR}/MLO-${PN}
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin
-    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.img
-    cp ${S}/MLO ${DEPLOYDIR}/MLO-${PN}
+    rm -f ${DEPLOYDIR}/*${PN}.xmodem.bin
+    rm -f ${DEPLOYDIR}/*${PN}.${UBOOT_SUFFIX}
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
+    cp ${S}/u-boot.img ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
+    cp ${S}/MLO ${DEPLOYDIR}/spl-${PN}.${UBOOT_SUFFIX}
 }