diff --git a/classes/image_types_tegra.bbclass b/classes/image_types_tegra.bbclass
index 0f321915..a057280f 100644
--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -766,7 +766,7 @@ create_bup_payload_image() {
         [ -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
+        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 0e08efa4..70dd5a81 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"