diff --git a/recipes-graphics/drm/tegra-drm-headers_35.1.0.bb b/recipes-graphics/drm/tegra-drm-headers_35.1.0.bb
index bea25a78..0e72abf3 100644
--- a/recipes-graphics/drm/tegra-drm-headers_35.1.0.bb
+++ b/recipes-graphics/drm/tegra-drm-headers_35.1.0.bb
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://usr/include/libdrm/nvidia/tegra_drm.h;endline=21;md5=
 
 COMPATIBLE_MACHINE = "(tegra)"
 
-SRC_SOC_DEBS = "nvidia-l4t-weston_${PV}_arm64.deb;subdir=${BPN}"
-PV .= "${@l4t_bsp_debian_version_suffix(d)}"
+SRC_SOC_DEBS = "${@l4t_deb_pkgname(d, 'weston')};subdir=${BPN}"
+PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-weston')}"
 
 inherit l4t_deb_pkgfeed
 
-SRC_URI[sha256sum] = "50f7d81de6a6b02b4c686e14fb1c7828f6a792f30697c2eeeab6a2fc378796ac"
+SRC_URI[sha256sum] = "6de41727198b848e1c404473e3ca30be183bc9667059c96e9f14774fa14689a2"
 
 S = "${WORKDIR}/${BPN}"
 B = "${S}"
diff --git a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc
index aae0a4fa..56822b90 100644
--- a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc
+++ b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc
@@ -3,12 +3,12 @@ HOMEPAGE = "https://developer.nvidia.com/embedded"
 COMPATIBLE_MACHINE = "(tegra)"
 
 L4T_DEB_SOCNAME = "t194"
-SRC_SOC_DEBS = "nvidia-l4t-graphics-demos_${PV}_arm64.deb;subdir=l4t-graphics-demos"
-PV .= "${@l4t_bsp_debian_version_suffix(d)}"
+SRC_SOC_DEBS = "${@l4t_deb_pkgname(d, 'graphics-demos')};subdir=l4t-graphics-demos"
+PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-graphics-demos')}"
 
 inherit l4t_deb_pkgfeed
 
-SRC_URI[sha256sum] = "a1e7953eb27f8ab522ee874e3d44484cf05a573a648417049e0adaba82af7f4c"
+SRC_URI[sha256sum] = "3be39c27213234703e9f63a78dd09954d12146218275fc0ad51b36018ff84dac"
 
 S = "${WORKDIR}/l4t-graphics-demos/usr/src/nvidia/graphics_demos"
 B = "${S}"