diff --git a/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb b/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
index 59c1a23..36c9009 100644
--- a/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
+++ b/recipes-bsp/u-boot/u-boot-armada-385-nrhw18-v2_git.bb
@@ -21,8 +21,8 @@ do_deploy_append() {
     rm -f ${DEPLOYDIR}/${PN}-spl.bin
     rm -f ${DEPLOYDIR}/${PN}.bin
     rm -f ${DEPLOYDIR}/${PN}-spl.kwb
-    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/${PN}-spl.bin
-    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.bin
-    cp ${S}/u-boot-spl.kwb ${DEPLOYDIR}/${PN}.kwb
+    cp ${S}/spl/u-boot-spl.bin ${DEPLOYDIR}/spl-${PN}.xmodem.bin
+    cp ${S}/u-boot.bin ${DEPLOYDIR}/${PN}.xmodem.bin
+    cp ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${PN}.${UBOOT_SUFFIX}
 }