diff --git a/recipes-bsp/bootfiles/bootfiles.bb b/recipes-bsp/bootfiles/bootfiles.bb
index d081806..f1248ee 100644
--- a/recipes-bsp/bootfiles/bootfiles.bb
+++ b/recipes-bsp/bootfiles/bootfiles.bb
@@ -18,26 +18,26 @@ S = "${RPIFW_S}/boot"
 PR = "r3"
 
 do_deploy() {
-    install -d ${DEPLOYDIR}/${PN}
+    install -d ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
 
     for i in ${S}/*.elf ; do
-        cp $i ${DEPLOYDIR}/${PN}
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
     done
     for i in ${S}/*.dat ; do
-        cp $i ${DEPLOYDIR}/${PN}
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
     done
     for i in ${S}/*.bin ; do
-        cp $i ${DEPLOYDIR}/${PN}
+        cp $i ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}
     done
 
     # Add stamp in deploy directory
-    touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp
+    touch ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/${PN}-${PV}.stamp
 }
 
 do_deploy[depends] += "rpi-config:do_deploy rpi-cmdline:do_deploy"
 
 addtask deploy before do_build after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
+do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"