diff --git a/classes/image_types_tegra.bbclass b/classes/image_types_tegra.bbclass
index a057280f..43111252 100644
--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -765,8 +765,8 @@ create_bup_payload_image() {
     for f in ${WORKDIR}/bup-payload/*_only_payload; do
         [ -e $f ] || continue
         sfx=$(basename $f _payload)
-        install -m 0644 $f ${IMGDEPLOYDIR}/${IMAGE_NAME}.$sfx.bup_payload
-        ln -sf ${IMAGE_NAME}.$sfx.bup_payload ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$sfx.bup_payload
+        install -m 0644 $f ${IMGDEPLOYDIR}/${IMAGE_NAME}.$sfx.bup-payload
+        ln -sf ${IMAGE_NAME}.$sfx.bup-payload ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$sfx.bup-payload
     done
 }
 create_bup_payload_image[vardepsexclude] += "DATETIME"
diff --git a/conf/machine/include/tegra-common.inc b/conf/machine/include/tegra-common.inc
index 70dd5a81..0e08efa4 100644
--- a/conf/machine/include/tegra-common.inc
+++ b/conf/machine/include/tegra-common.inc
@@ -64,7 +64,7 @@ IMAGE_FSTYPES += "tegraflash"
 
 INITRAMFS_IMAGE ?= "tegra-minimal-initramfs"
 INITRAMFS_IMAGE_BUNDLE ?= "0"
-TEGRA_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup_payload'}"
+TEGRA_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}"
 INITRAMFS_FSTYPES:append = "${TEGRA_INITRAMFS_FSTYPES}"
 TEGRA_INITRD_FLASH_INITRAMFS_FSTYPES ?= "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot'}"
 TEGRAFLASH_INITRD_FLASH_IMAGE ?= "tegra-initrd-flash-initramfs"
diff --git a/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb b/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb
index a1b438b7..54475469 100644
--- a/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb
+++ b/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb
@@ -20,11 +20,11 @@ BUPFILENAME = "${@bupfile_basename(d)}"
 
 do_install() {
     install -d ${D}/opt/ota_package/
-    if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ]; then
-        install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup_payload ${D}/opt/ota_package/bl_only_payload
+    if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup-payload ]; then
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.bl_only.bup-payload ${D}/opt/ota_package/bl_only_payload
     fi
-    if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ]; then
-        install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup_payload ${D}/opt/ota_package/kernel_only_payload
+    if [ -e ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup-payload ]; then
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILENAME}.kernel_only.bup-payload ${D}/opt/ota_package/kernel_only_payload
     fi
 }
 
diff --git a/recipes-kernel/kernel-bup-payload/kernel-bup-payload.bb b/recipes-kernel/kernel-bup-payload/kernel-bup-payload.bb
index 6b0d53b2..5b7bdd45 100644
--- a/recipes-kernel/kernel-bup-payload/kernel-bup-payload.bb
+++ b/recipes-kernel/kernel-bup-payload/kernel-bup-payload.bb
@@ -27,7 +27,7 @@ do_deploy() {
 	    for f in ${WORKDIR}/bup-payload/*_only_payload; do
 		[ -e $f ] || continue
 		sfx=$(basename $f _payload)
-		install -m 0644 $f ${DEPLOYDIR}/${initramfs_symlink_name}.$sfx.bup_payload
+		install -m 0644 $f ${DEPLOYDIR}/${initramfs_symlink_name}.$sfx.bup-payload
 	    done
 	done
     fi