diff --git a/classes/sysmocom-archiver.bbclass b/classes/sysmocom-archiver.bbclass
index b3ac877..c31a9d4 100644
--- a/classes/sysmocom-archiver.bbclass
+++ b/classes/sysmocom-archiver.bbclass
@@ -133,7 +133,7 @@ def not_tarball(d):
     workdir = d.getVar('WORKDIR',True)
     s = d.getVar('S',True)
     if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
-        pn = bb.data.getVar('PN', d , True)
+        pn = d.getVar('PN', True)
         if pn == 'gcc-cross':
               return False
         return True
@@ -362,8 +362,8 @@ def archive_scripts_logs(d):
 
 def dumpdata(d):
     '''dump environment to "${P}-${PR}.showdata.dump" including all kinds of variables and functions when running a task'''
-    workdir = bb.data.getVar('WORKDIR', d, 1)
-    distro = bb.data.getVar('DISTRO', d, 1)
+    workdir = d.getVar('WORKDIR', 1)
+    distro = d.getVar('DISTRO', 1)
     s = d.getVar('S', True)
     pf = d.getVar('PF', True)
     target_sys = d.getVar('TARGET_SYS', True)
@@ -383,8 +383,8 @@ def dumpdata(d):
     bb.data.emit_env(f, d, True)
     # emit the metadata which isnt valid shell
     for e in d.keys():
-        if bb.data.getVarFlag(e, 'python', d):
-            f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+        if d.getVarFlag(e, 'python'):
+            f.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
     f.close()
 
 def create_diff_gz(d):
diff --git a/recipes-bsp/base-files/base-files_sysmocom.inc b/recipes-bsp/base-files/base-files_sysmocom.inc
index 0dea48b..40f4784 100644
--- a/recipes-bsp/base-files/base-files_sysmocom.inc
+++ b/recipes-bsp/base-files/base-files_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="3"
diff --git a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc
index f9c58ed..f7de302 100644
--- a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc
+++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom-master.inc
@@ -1,2 +1,2 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown-master:"
diff --git a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc
index a36a3e8..1daf566 100644
--- a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc
+++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc
@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:"
 PRINC = "13"
 
diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc
index 2bdc67b..ba9c69b 100644
--- a/recipes-bsp/netbase/netbase_sysmocom.inc
+++ b/recipes-bsp/netbase/netbase_sysmocom.inc
@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "21"
 
diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc
index b2e512c..0e68062 100644
--- a/recipes-bsp/watchdog/watchdog_sysmocom.inc
+++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc
@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:"
 PRINC = "9"
 
diff --git a/recipes-core/busybox/busybox_sysmocom.inc b/recipes-core/busybox/busybox_sysmocom.inc
index 90f3e13..6050c3d 100644
--- a/recipes-core/busybox/busybox_sysmocom.inc
+++ b/recipes-core/busybox/busybox_sysmocom.inc
@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
 PRINC = "30"
 
diff --git a/recipes-core/busybox/busybox_sysmocom_systemd.inc b/recipes-core/busybox/busybox_sysmocom_systemd.inc
index 58b2682..a61540d 100644
--- a/recipes-core/busybox/busybox_sysmocom_systemd.inc
+++ b/recipes-core/busybox/busybox_sysmocom_systemd.inc
@@ -1,4 +1,4 @@
 # Make busybox work nicely with systemd
-SYSMOCOM_D := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM_D := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-systemd:${SYSMOCOM_D}/${PN}:"
 PRINC := "${@int(PRINC) + 3}"
diff --git a/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc b/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc
index 2d0b9ee..3cbf83f 100644
--- a/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc
+++ b/recipes-core/initrdscripts/initramfs-framework_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
 PRINC="4"
diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
index d507aa3..7e3d1f6 100644
--- a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
+++ b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
@@ -1,4 +1,4 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+SYSMOCOM := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
 
 PRINC = "2"
diff --git a/recipes-fixes/cronie/cronie_sysmocom.inc b/recipes-fixes/cronie/cronie_sysmocom.inc
index 2fa6e19..aa9d92f 100644
--- a/recipes-fixes/cronie/cronie_sysmocom.inc
+++ b/recipes-fixes/cronie/cronie_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="1"
diff --git a/recipes-fixes/dropbear/dropbear_sysmocom.inc b/recipes-fixes/dropbear/dropbear_sysmocom.inc
index a23e499..6b6fef4 100644
--- a/recipes-fixes/dropbear/dropbear_sysmocom.inc
+++ b/recipes-fixes/dropbear/dropbear_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="4"
diff --git a/recipes-fixes/initscripts/initscripts_dora.inc b/recipes-fixes/initscripts/initscripts_dora.inc
index 5e69ea2..edb32b7 100644
--- a/recipes-fixes/initscripts/initscripts_dora.inc
+++ b/recipes-fixes/initscripts/initscripts_dora.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-dora"], d)}:"
 
 PRINC="4"
diff --git a/recipes-fixes/initscripts/initscripts_master.inc b/recipes-fixes/initscripts/initscripts_master.inc
index 2a4815b..26e3347 100644
--- a/recipes-fixes/initscripts/initscripts_master.inc
+++ b/recipes-fixes/initscripts/initscripts_master.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-master"], d)}:"
 
 PRINC="4"
diff --git a/recipes-fixes/iproute2/iproute2_sysmocom.inc b/recipes-fixes/iproute2/iproute2_sysmocom.inc
index a5b3531..3c0855d 100644
--- a/recipes-fixes/iproute2/iproute2_sysmocom.inc
+++ b/recipes-fixes/iproute2/iproute2_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/files/${PN}-${PV}"], d)}:${@base_set_filespath(["${THISDIR}/files"], d)}:"
 
 PRINC="2"
diff --git a/recipes-fixes/opkg/opkg_sysmocom.inc b/recipes-fixes/opkg/opkg_sysmocom.inc
index 82cd23f..053de17 100644
--- a/recipes-fixes/opkg/opkg_sysmocom.inc
+++ b/recipes-fixes/opkg/opkg_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
 
 PRINC = "2"
diff --git a/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc b/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc
index afb8328..dc8d381 100644
--- a/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc
+++ b/recipes-fixes/pkgconfig/pkgconfig_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
 
 PRINC="2"
diff --git a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
index b8831d5..5b97761 100644
--- a/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd-compat-units_sysmocom.inc
@@ -3,7 +3,7 @@ PRINC="3"
 # We need networking to run as we have no native services yet
 SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking dnsmasq"
 
-S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
 SRC_URI += "file://alignment.service"
diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc
index f1a8a3b..39b0634 100644
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -1,4 +1,4 @@
-S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+S_THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
 PRINC="25"
diff --git a/recipes-fixes/udev/udev_sysmocom.inc b/recipes-fixes/udev/udev_sysmocom.inc
index 57e5285..52c54b3 100644
--- a/recipes-fixes/udev/udev_sysmocom.inc
+++ b/recipes-fixes/udev/udev_sysmocom.inc
@@ -1,4 +1,4 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(d.getVar('FILE', True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
 
 PRINC="9"