diff --git a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
index 7533c34a..8b8e4eef 100644
--- a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
+++ b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
@@ -1,4 +1,4 @@
-Source: ${PN}
+Source: ${BPN}
 Section: admin
 Priority: optional
 Standards-Version: ${DEBIAN_STANDARDS_VERSION}
diff --git a/meta/classes-recipe/debianize.bbclass b/meta/classes-recipe/debianize.bbclass
index 6f6141b0..e483a52d 100644
--- a/meta/classes-recipe/debianize.bbclass
+++ b/meta/classes-recipe/debianize.bbclass
@@ -206,10 +206,10 @@ deb_debianize() {
 	for f in ${dh_installdeb_handled} \
 			 ${dh_installsystemd_handled} \
 			 ${dh_installsystemduser_handled} \
-	         ${dh_installtmpfiles_handled}
+			 ${dh_installtmpfiles_handled}
 	do
-		if [ -f ${WORKDIR}/${PN}${f} ]; then
-			install -v -m 644 ${WORKDIR}/${PN}${f} ${S}/debian/
+		if [ -f ${WORKDIR}/${BPN}${f} ]; then
+			install -v -m 644 ${WORKDIR}/${BPN}${f} ${S}/debian/
 		fi
 	done
 }
diff --git a/meta/recipes-bsp/optee-client/files/debian/control.tmpl b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
index e3864407..0887c358 100644
--- a/meta/recipes-bsp/optee-client/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-client/files/debian/control.tmpl
@@ -1,4 +1,4 @@
-Source: ${PN}
+Source: ${BPN}
 Priority: optional
 Maintainer: Unknown maintainer <unknown@example.com>
 Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}),