diff --git a/appends/meta-browser/chromium-ozone-wayland_%.bbappend b/appends/meta-browser/chromium-ozone-wayland_%.bbappend
index aced0b9..af510c0 100644
--- a/appends/meta-browser/chromium-ozone-wayland_%.bbappend
+++ b/appends/meta-browser/chromium-ozone-wayland_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " use-egl impl-side-painting proprietary-codecs"
+PACKAGECONFIG:append = " use-egl impl-side-painting proprietary-codecs"
diff --git a/appends/meta-gnome/devilspie2_%.bbappend b/appends/meta-gnome/devilspie2_%.bbappend
index 72d991c..4fc41d0 100644
--- a/appends/meta-gnome/devilspie2_%.bbappend
+++ b/appends/meta-gnome/devilspie2_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/appends/meta-gnome/gvfs_%.bbappend b/appends/meta-gnome/gvfs_%.bbappend
index 5f0b546..ea8904f 100644
--- a/appends/meta-gnome/gvfs_%.bbappend
+++ b/appends/meta-gnome/gvfs_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " archive gcr libmtp libgphoto2 samba systemd"
+PACKAGECONFIG:append = " archive gcr libmtp libgphoto2 samba systemd"
diff --git a/appends/meta-networking/dnsmasq_%.bbappend b/appends/meta-networking/dnsmasq_%.bbappend
index 428d57f..990cb47 100644
--- a/appends/meta-networking/dnsmasq_%.bbappend
+++ b/appends/meta-networking/dnsmasq_%.bbappend
@@ -2,4 +2,4 @@
 # of all the configuration parameters necessary. Unfortunately this is broken
 # by dnsmasq running as service: It is set-up by configuration files and that
 # are not matching networkmanagers's needs.
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
diff --git a/appends/meta-networking/networkmanager-openvpn_%.bbappend b/appends/meta-networking/networkmanager-openvpn_%.bbappend
index 5b6b1d6..ac790ed 100644
--- a/appends/meta-networking/networkmanager-openvpn_%.bbappend
+++ b/appends/meta-networking/networkmanager-openvpn_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " gnome"
+PACKAGECONFIG:append = " gnome"
diff --git a/appends/meta-oe/lxdm_%.bbappend b/appends/meta-oe/lxdm_%.bbappend
index f902aac..d0724d3 100644
--- a/appends/meta-oe/lxdm_%.bbappend
+++ b/appends/meta-oe/lxdm_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
     # Since we
     # * do not have angstroms's DISTRO_TYPE
     # * do not want to set all debug-tweaks
diff --git a/appends/meta-oe/nodejs_%.bbappend b/appends/meta-oe/nodejs_%.bbappend
index 7e2b214..4210930 100644
--- a/appends/meta-oe/nodejs_%.bbappend
+++ b/appends/meta-oe/nodejs_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " shared"
+PACKAGECONFIG:append = " shared"
diff --git a/appends/meta-oe/udisks2_%.bbappend b/appends/meta-oe/udisks2_%.bbappend
index c81099e..b67e41d 100644
--- a/appends/meta-oe/udisks2_%.bbappend
+++ b/appends/meta-oe/udisks2_%.bbappend
@@ -1 +1 @@
-RRECOMMENDS_${PN} += "udev-rules-udisks-hide-bootpart"
+RRECOMMENDS:${PN} += "udev-rules-udisks-hide-bootpart"
diff --git a/appends/meta-qt5/qtbase_%.bbappend b/appends/meta-qt5/qtbase_%.bbappend
index 1614a99..1530553 100644
--- a/appends/meta-qt5/qtbase_%.bbappend
+++ b/appends/meta-qt5/qtbase_%.bbappend
@@ -7,12 +7,12 @@ PACKAGECONFIG_DISTRO += " \
 
 inherit instant-paths
 
-do_install_append() {
+do_install:append() {
     # at least KDE's extra-cmake-modules expect qmake-qt5
     ln -s qmake ${D}/${bindir}/qmake-qt5
 }
 
-do_copy_to_target_sysroot_append() {
+do_copy_to_target_sysroot:append() {
     # ---------- qt.conf ----------
     # create
     generate_qt_config_file_paths
diff --git a/appends/meta-qt5/qtquickcontrols2_%.bbappend b/appends/meta-qt5/qtquickcontrols2_%.bbappend
index 7d348b9..2091cb3 100644
--- a/appends/meta-qt5/qtquickcontrols2_%.bbappend
+++ b/appends/meta-qt5/qtquickcontrols2_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"
diff --git a/appends/meta-qt5/qtwayland_%.bbappend b/appends/meta-qt5/qtwayland_%.bbappend
index 7d348b9..2091cb3 100644
--- a/appends/meta-qt5/qtwayland_%.bbappend
+++ b/appends/meta-qt5/qtwayland_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " examples"
+PACKAGECONFIG:append = " examples"
diff --git a/appends/meta-qt5/vlc_%.bbappend b/appends/meta-qt5/vlc_%.bbappend
index de10379..4e04cee 100644
--- a/appends/meta-qt5/vlc_%.bbappend
+++ b/appends/meta-qt5/vlc_%.bbappend
@@ -1,3 +1,3 @@
 # VLC is not part of meta-qt5. We add append here so the append will work only
 # in case meta-qt5 is in layers
-PACKAGECONFIG_append = " qt5"
+PACKAGECONFIG:append = " qt5"
diff --git a/appends/meta-xfce/libxfce4ui_%.bbappend b/appends/meta-xfce/libxfce4ui_%.bbappend
index 44d33e9..ee98165 100644
--- a/appends/meta-xfce/libxfce4ui_%.bbappend
+++ b/appends/meta-xfce/libxfce4ui_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " startup-notification gladeui2"
+PACKAGECONFIG:append = " startup-notification gladeui2"
diff --git a/appends/meta-xfce/packagegroup-xfce-extended.bbappend b/appends/meta-xfce/packagegroup-xfce-extended.bbappend
index ae676f9..ac431ec 100644
--- a/appends/meta-xfce/packagegroup-xfce-extended.bbappend
+++ b/appends/meta-xfce/packagegroup-xfce-extended.bbappend
@@ -1,3 +1,3 @@
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
     imsettings \
 "
diff --git a/appends/meta-xfce/thunar-volman_%.bbappend b/appends/meta-xfce/thunar-volman_%.bbappend
index 33e750a..1c24304 100644
--- a/appends/meta-xfce/thunar-volman_%.bbappend
+++ b/appends/meta-xfce/thunar-volman_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " notify"
+PACKAGECONFIG:append = " notify"
diff --git a/appends/meta-xfce/xfce4-settings_%.bbappend b/appends/meta-xfce/xfce4-settings_%.bbappend
index 3ea1345..faf2004 100644
--- a/appends/meta-xfce/xfce4-settings_%.bbappend
+++ b/appends/meta-xfce/xfce4-settings_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " sound-setter notify"
+PACKAGECONFIG:append = " sound-setter notify"
diff --git a/appends/oe-core/base-files_%.bbappend b/appends/oe-core/base-files_%.bbappend
index 99db0a2..1602d3d 100644
--- a/appends/oe-core/base-files_%.bbappend
+++ b/appends/oe-core/base-files_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 BASEFILESISSUEINSTALL = "do_install_mortsgnaissue"
 
diff --git a/appends/oe-core/base-passwd_%.bbappend b/appends/oe-core/base-passwd_%.bbappend
index 5c1a1af..8717ec9 100644
--- a/appends/oe-core/base-passwd_%.bbappend
+++ b/appends/oe-core/base-passwd_%.bbappend
@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
     sed -i 's|root::0:0:root:/home/root:/bin/sh|root::0:0:root:/home/root:/bin/bash|' ${D}${datadir}/${BPN}/passwd.master
 }
diff --git a/appends/oe-core/cairo_%.bbappend b/appends/oe-core/cairo_%.bbappend
index 9e6bf61..93e4b93 100644
--- a/appends/oe-core/cairo_%.bbappend
+++ b/appends/oe-core/cairo_%.bbappend
@@ -1,5 +1,5 @@
 # It is time I do suggest common / global PREFERRED_OPENGL variable
 
-PACKAGECONFIG_remove_class-target = "opengl"
+PACKAGECONFIG:remove:class-target = "opengl"
 
-PACKAGECONFIG_append_class-target = " egl glesv2"
+PACKAGECONFIG:append:class-target = " egl glesv2"
diff --git a/appends/oe-core/enchant2_%.bbappend b/appends/oe-core/enchant2_%.bbappend
index b81dfc3..7bcfd40 100644
--- a/appends/oe-core/enchant2_%.bbappend
+++ b/appends/oe-core/enchant2_%.bbappend
@@ -1,3 +1,3 @@
 PACKAGECONFIG = "hunspell"
 
-RRECOMMENDS_${PN} += "hunspell-dictionaries"
+RRECOMMENDS:${PN} += "hunspell-dictionaries"
diff --git a/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend b/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend
index ae188d9..c67ad10 100644
--- a/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend
+++ b/appends/oe-core/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
     hls \
     libmms \
     faad \
diff --git a/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend b/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend
index cfd3a81..2f52d0b 100644
--- a/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend
+++ b/appends/oe-core/gstreamer1.0-plugins-ugly_%.bbappend
@@ -1,3 +1,3 @@
-PACKAGECONFIG_append = " \
+PACKAGECONFIG:append = " \
     x264 \
 "
diff --git a/appends/oe-core/libsdl2_%.bbappend b/appends/oe-core/libsdl2_%.bbappend
index 598eb7b..6546837 100644
--- a/appends/oe-core/libsdl2_%.bbappend
+++ b/appends/oe-core/libsdl2_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_class-target = " jack"
+PACKAGECONFIG:append:class-target = " jack"
diff --git a/appends/oe-core/linux%.bbappend b/appends/oe-core/linux%.bbappend
index 51b0bcc..533dab5 100644
--- a/appends/oe-core/linux%.bbappend
+++ b/appends/oe-core/linux%.bbappend
@@ -1,4 +1,4 @@
-kernel_do_deploy_append() {
+kernel_do_deploy:append() {
     # deploy an extra link containing abiversion - used by our
     # card-kernel-write scripts
     for imageType in ${KERNEL_IMAGETYPES} ; do
diff --git a/appends/oe-core/packagegroup-core-x11-xserver%.bbappend b/appends/oe-core/packagegroup-core-x11-xserver%.bbappend
index bf9d469..101c5c1 100644
--- a/appends/oe-core/packagegroup-core-x11-xserver%.bbappend
+++ b/appends/oe-core/packagegroup-core-x11-xserver%.bbappend
@@ -1,5 +1,5 @@
 # we want xf86-input-libinput and some BSP layers exceed their allowed limits :(
-XSERVER_remove = " xf86-input-evdev "
+XSERVER:remove = " xf86-input-evdev "
 
 # at least for test add xserver's standard xf86-video-modesetting
-XSERVER_append = " xf86-video-modesetting"
+XSERVER:append = " xf86-video-modesetting"
diff --git a/appends/oe-core/pulseaudio_%.bbappend b/appends/oe-core/pulseaudio_%.bbappend
index 192df69..ae820e5 100644
--- a/appends/oe-core/pulseaudio_%.bbappend
+++ b/appends/oe-core/pulseaudio_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " jack"
+PACKAGECONFIG:append = " jack"
diff --git a/appends/oe-core/readline_%.bbappend b/appends/oe-core/readline_%.bbappend
index 16b0511..77bb3f9 100644
--- a/appends/oe-core/readline_%.bbappend
+++ b/appends/oe-core/readline_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://inputrc"
 
 # Get more out of our console
-do_install_append() {
+do_install:append() {
 	cp ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
 }
diff --git a/appends/oe-core/sudo_%.bbappend b/appends/oe-core/sudo_%.bbappend
index fa49245..a555df7 100644
--- a/appends/oe-core/sudo_%.bbappend
+++ b/appends/oe-core/sudo_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append = " pam-wheel"
+PACKAGECONFIG:append = " pam-wheel"
diff --git a/appends/oe-core/weston%.bbappend b/appends/oe-core/weston%.bbappend
index 0a1f466..20f0ef4 100644
--- a/appends/oe-core/weston%.bbappend
+++ b/appends/oe-core/weston%.bbappend
@@ -1,2 +1,2 @@
 # A root session without password activated by just two keys - honestly..
-RRECOMMENDS_${PN}_remove = "weston-init"
+RRECOMMENDS:${PN}:remove = "weston-init"
diff --git a/classes/instant-sysroot-native.bbclass b/classes/instant-sysroot-native.bbclass
index daa9e72..83aa383 100644
--- a/classes/instant-sysroot-native.bbclass
+++ b/classes/instant-sysroot-native.bbclass
@@ -8,8 +8,8 @@ inherit utils instant-paths
 
 do_prepare_recipe_sysroot[postfuncs] += "${INSTANTSYSROOTFUNC}"
 INSTANTSYSROOTFUNC = ""
-INSTANTSYSROOTFUNC_class-native = "instant_sysroot_copy"
-INSTANTSYSROOTFUNC_class-cross = "instant_sysroot_copy"
+INSTANTSYSROOTFUNC:class-native = "instant_sysroot_copy"
+INSTANTSYSROOTFUNC:class-cross = "instant_sysroot_copy"
 
 instant_sysroot_copy () {
     mkdir -p ${INSTANT_NATIVE_PATH}
@@ -18,8 +18,8 @@ instant_sysroot_copy () {
 
 do_populate_sysroot[postfuncs] += "${INSTANTPOPULATE} "
 INSTANTPOPULATE = ""
-INSTANTPOPULATE_class-native = "instant_populate_sysroot"
-INSTANTPOPULATE_class-cross = "instant_populate_sysroot"
+INSTANTPOPULATE:class-native = "instant_populate_sysroot"
+INSTANTPOPULATE:class-cross = "instant_populate_sysroot"
 
 instant_populate_sysroot () {
     find "${SYSROOT_DESTDIR}${STAGING_DIR_NATIVE}" -type f -o -type l | while read file; do
diff --git a/classes/instant-sysroot-target.bbclass b/classes/instant-sysroot-target.bbclass
index b55dc6d..61d5bdd 100644
--- a/classes/instant-sysroot-target.bbclass
+++ b/classes/instant-sysroot-target.bbclass
@@ -173,10 +173,7 @@ do_copy_to_target_sysroot() {
     fi
 }
 
-addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm before do_build
-
-# same as do package
-do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
+addtask copy_to_target_sysroot after do_packagedata do_package
 
 do_copy_to_target_sysroot[stamp-extra-info] = "${MACHINE_ARCH}"
 
diff --git a/classes/instant-toolchain-target.bbclass b/classes/instant-toolchain-target.bbclass
index de30396..5f02f79 100644
--- a/classes/instant-toolchain-target.bbclass
+++ b/classes/instant-toolchain-target.bbclass
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_compile[postfuncs] += "${COMPILE_POST_TARGET}"
 COMPILE_POST_TARGET = ""
-COMPILE_POST_TARGET_class-target = "instant_compile_target"
+COMPILE_POST_TARGET:class-target = "instant_compile_target"
 
 INSTANTPOPULATE_TOOLCHAIN_VARS = " \
     CC \
diff --git a/classes/user-with-full-skel.bbclass b/classes/user-with-full-skel.bbclass
index 76cd155..9274de6 100644
--- a/classes/user-with-full-skel.bbclass
+++ b/classes/user-with-full-skel.bbclass
@@ -15,7 +15,7 @@
 SKEL_INIT_MARKER = "force-skel-full-init"
 
 # user recipe part
-pkg_postinst_${PN}_prepend() {
+pkg_postinst:${PN}:prepend() {
     if [ -n "$D" -a -n "${USERNAME}" ]; then
         touch $D/home/${USERNAME}/${SKEL_INIT_MARKER}
     fi
diff --git a/conf/distro/include/mortsgna-distro-features.inc b/conf/distro/include/mortsgna-distro-features.inc
index 39986f9..c73c023 100644
--- a/conf/distro/include/mortsgna-distro-features.inc
+++ b/conf/distro/include/mortsgna-distro-features.inc
@@ -29,7 +29,7 @@ DISTRO_FEATURES = " \
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 # Uncomment to completely disable support for sysv scripts:
-#PACKAGECONFIG_pn-systemd = "xz"
+#PACKAGECONFIG:pn-systemd = "xz"
 
 # USE-flag like features
 DISTRO_FEATURES += "tk"
diff --git a/conf/distro/include/mortsgna-libc-musl.inc b/conf/distro/include/mortsgna-libc-musl.inc
index 73d5682..449871f 100644
--- a/conf/distro/include/mortsgna-libc-musl.inc
+++ b/conf/distro/include/mortsgna-libc-musl.inc
@@ -4,7 +4,7 @@
 # libc settings
 DISTRO_FEATURES += "${@['', ' nls'][d.getVar('ENABLE_BINARY_LOCALE_GENERATION') == '1']}"
 
-DISTRO_FEATURES_remove = "ldconfig"
+DISTRO_FEATURES:remove = "ldconfig"
 
 USE_NLS_glib-2.0 = "yes"
 USE_NLS_glib-2.0-native = "yes"
diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index 34d63e6..af323ef 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -88,13 +88,13 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
 # thumb2 only
 ARM_INSTRUCTION_SET ??= "thumb"
-ARM_INSTRUCTION_SET_armv4 ?= "arm"
-ARM_INSTRUCTION_SET_armv5 ?= "arm"
-ARM_INSTRUCTION_SET_armv6 ?= "arm"
+ARM_INSTRUCTION_SET:armv4 ?= "arm"
+ARM_INSTRUCTION_SET:armv5 ?= "arm"
+ARM_INSTRUCTION_SET:armv6 ?= "arm"
 
 # set MORTSGNA_ARMV7_TUNE="1" in your local.conf to build armv7athf
 require conf/distro/include/mortsgna-armv7-tune.inc
-DEFAULTTUNE_mortsgna := "${@armv7_tune_handler(d)}"
+DEFAULTTUNE:mortsgna := "${@armv7_tune_handler(d)}"
 
 
 ###############################################################################
@@ -111,7 +111,7 @@ MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 
 # qemu has taken a dislike to armeb as well
-ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+ENABLE_BINARY_LOCALE_GENERATION:armeb = "0"
 
 # blacklist policy
 PNBLACKLIST[pn-fso-apm]             = "regular apmd is good enough"
@@ -142,8 +142,8 @@ WARN_TO_ERROR_QA = " \
     unknown-configure-option useless-rpaths host-user-contaminated \
     invalid-packageconfig patch-fuzz src-uri-bad \
 "
-WARN_QA_remove = "${WARN_TO_ERROR_QA}"
-ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
+WARN_QA:remove = "${WARN_TO_ERROR_QA}"
+ERROR_QA:append = " ${WARN_TO_ERROR_QA}"
 
 ###############################################################################
 # Image defaults
@@ -160,7 +160,7 @@ DISTRO_GUI_USER ?= "unpriv-user"
 # If you don't want parts of this in your packagegroup-base using images you can put this in the image recipe:
 # BAD_RECOMMENDATIONS = "<packages-to-remove>"
 # or
-# IMAGE_INSTALL_remove = "<packages-to-remove>"
+# IMAGE_INSTALL:remove = "<packages-to-remove>"
 #
 # os-release: Distro release info on target
 # kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
@@ -225,7 +225,7 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
 IMAGE_INSTALL += "${IMAGE_BOOT}"
 
 # some default locales
-IMAGE_LINGUAS_libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
+IMAGE_LINGUAS:libc-glibc ?= "de-de fr-fr en-us en-gb es-es it-it"
 
 # there are important missing I bet
 IMAGE_LINGUAS_FULL ?= " \
diff --git a/qt5-sdk-recipes/qtcreator-sdk-prepare.bb b/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
index b7e06cc..33d75c3 100644
--- a/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
+++ b/qt5-sdk-recipes/qtcreator-sdk-prepare.bb
@@ -21,11 +21,11 @@ do_install() {
     cp $sourcepath/$qtconf $targetpath/
 }
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 # An image installing this requires the following packages at least for working
 # instant sdk support
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     qtbase \
     gdbserver \
     ${TASK_BASIC_SSHDAEMON} \
diff --git a/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb b/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb
index e192db3..f23f692 100644
--- a/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb
+++ b/recipes-defaultconfig/guiconfig/xfce4-default-config_1.0.bb
@@ -24,9 +24,9 @@ do_install() {
     install -m 0644 ${WORKDIR}/sunrise-sky-blue-sunlight-67832.jpeg ${D}${datadir}/backgrounds/ 
 }
 
-FILES_${PN} += "${datadir}/backgrounds"
+FILES:${PN} += "${datadir}/backgrounds"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     adwaita-icon-theme-cursors \
     adwaita-icon-theme-symbolic \
     adwaita-icon-theme-symbolic-hires \
diff --git a/recipes-defaultconfig/users/group-wheel.bb b/recipes-defaultconfig/users/group-wheel.bb
index 3ff3a77..30b8c0f 100644
--- a/recipes-defaultconfig/users/group-wheel.bb
+++ b/recipes-defaultconfig/users/group-wheel.bb
@@ -6,6 +6,6 @@ inherit useradd
 
 USERADD_PACKAGES = "${PN}"
 #USERADD_PARAM = ""
-GROUPADD_PARAM_${PN} = "--system wheel"
+GROUPADD_PARAM:${PN} = "--system wheel"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-defaultconfig/users/unpriv-user_1.2.bb b/recipes-defaultconfig/users/unpriv-user_1.2.bb
index 7f9646f..eeaf9b3 100644
--- a/recipes-defaultconfig/users/unpriv-user_1.2.bb
+++ b/recipes-defaultconfig/users/unpriv-user_1.2.bb
@@ -17,17 +17,17 @@ USER_DEPS ?= " \
 "
 
 DEPENDS += "${USER_DEPS}"
-RDEPENDS_${PN} = "${USER_DEPS} bash"
+RDEPENDS:${PN} = "${USER_DEPS} bash"
 
 USERADD_PACKAGES = "${PN}"
 
-USERADD_PARAM_${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"
+USERADD_PARAM:${PN} = "-m -c Morona -d /home/${USERNAME} -s /bin/bash -k /etc/skel -g ${USERNAME} --groups ${USERGROUPS} ${USERNAME}"
 
-GROUPADD_PARAM_${PN} = "${USERNAME}"
+GROUPADD_PARAM:${PN} = "${USERNAME}"
 
-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
 # empty password
 passwd -d ${USERNAME}
 }
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/recipes-image/allgui/allgui-full-image.bb b/recipes-image/allgui/allgui-full-image.bb
index 335a5fa..3fac730 100644
--- a/recipes-image/allgui/allgui-full-image.bb
+++ b/recipes-image/allgui/allgui-full-image.bb
@@ -24,4 +24,4 @@ IMAGE_INSTALL += " \
     nodejs nodejs-npm nodejs-systemtap \
 "
 
-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
diff --git a/recipes-image/console/console-base-image.bb b/recipes-image/console/console-base-image.bb
index 21cfd2a..d5c5c51 100644
--- a/recipes-image/console/console-base-image.bb
+++ b/recipes-image/console/console-base-image.bb
@@ -24,7 +24,7 @@ IMAGE_INSTALL += " \
 "
 
 LIBC_SPECIFIC_PACKS = ""
-LIBC_SPECIFIC_PACKS_libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
+LIBC_SPECIFIC_PACKS:libc-glibc = "glibc-gconv glibc-gconvs glibc-utils"
 
 IMAGE_DEV_MANAGER   = "udev"
 IMAGE_INIT_MANAGER  = "systemd"
diff --git a/recipes-image/kde/kde-full-image.bb b/recipes-image/kde/kde-full-image.bb
index a0991a2..695528b 100644
--- a/recipes-image/kde/kde-full-image.bb
+++ b/recipes-image/kde/kde-full-image.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
     packagegroup-gui-full \
 " 
 
-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
diff --git a/recipes-image/lxqt/lxqt-full-image.bb b/recipes-image/lxqt/lxqt-full-image.bb
index 4ea37a0..f0a777a 100644
--- a/recipes-image/lxqt/lxqt-full-image.bb
+++ b/recipes-image/lxqt/lxqt-full-image.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL += " \
     packagegroup-gui-full \
 "
 
-IMAGE_LINGUAS_libc-glibc = "${IMAGE_LINGUAS_FULL}"
+IMAGE_LINGUAS:libc-glibc = "${IMAGE_LINGUAS_FULL}"
diff --git a/recipes-image/lxqt/lxqt-tiny-image.bb b/recipes-image/lxqt/lxqt-tiny-image.bb
index ee8419a..cf6b957 100644
--- a/recipes-image/lxqt/lxqt-tiny-image.bb
+++ b/recipes-image/lxqt/lxqt-tiny-image.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL += " \
     qpdfview \
 "
 
-IMAGE_INSTALL_remove = "evince"
+IMAGE_INSTALL:remove = "evince"
diff --git a/recipes-image/packagegroups/packagegroup-gui-base.bb b/recipes-image/packagegroups/packagegroup-gui-base.bb
index 9ce9cfd..3b73493 100644
--- a/recipes-image/packagegroups/packagegroup-gui-base.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-base.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-common \
     ttf-liberation-sans ttf-liberation-mono ttf-liberation-serif \
     \
diff --git a/recipes-image/packagegroups/packagegroup-gui-dev.bb b/recipes-image/packagegroups/packagegroup-gui-dev.bb
index 908efc0..b2c9280 100644
--- a/recipes-image/packagegroups/packagegroup-gui-dev.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-dev.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     qt5-creator qtwebengine-dev \
     qtquickcontrols2-examples qtwayland-examples \
     hexedit \
@@ -50,7 +50,7 @@ RDEPENDS_${PN} = " \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rubygems', 'rubygems-jekyll', '', d)} \
 "
 
-RDEPENDS_${PN}_append_rpi = "rpi-gpio"
+RDEPENDS:${PN}:append:rpi = "rpi-gpio"
 
 #    qemu
 #    
diff --git a/recipes-image/packagegroups/packagegroup-gui-full.bb b/recipes-image/packagegroups/packagegroup-gui-full.bb
index fc2a531..35dca1b 100644
--- a/recipes-image/packagegroups/packagegroup-gui-full.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-full.bb
@@ -7,7 +7,7 @@ inherit packagegroup
 MACHINE_SPECIFICS_FULL = ""
 MACHINE_SPECIFICS_FULL_mx6 = "gstreamer1.0-plugins-imx"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     source-han-sans-cn-fonts \
     source-han-sans-kr-fonts \
     source-han-sans-jp-fonts \
diff --git a/recipes-image/packagegroups/packagegroup-gui-games.bb b/recipes-image/packagegroups/packagegroup-gui-games.bb
index b62a4e6..24a88c0 100644
--- a/recipes-image/packagegroups/packagegroup-gui-games.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-games.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit packagegroup
 
 # Those listed here are either ugly or nonworking
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     atanks \
     etr \
     gnome-chess \
diff --git a/recipes-image/packagegroups/packagegroup-gui-musicians.bb b/recipes-image/packagegroups/packagegroup-gui-musicians.bb
index 0c66481..53f248e 100644
--- a/recipes-image/packagegroups/packagegroup-gui-musicians.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-musicians.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     musicians-world \
     mixxx \
     qmmp \
diff --git a/recipes-image/packagegroups/packagegroup-gui-tiny.bb b/recipes-image/packagegroups/packagegroup-gui-tiny.bb
index cc9f6a1..5a18222 100644
--- a/recipes-image/packagegroups/packagegroup-gui-tiny.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-tiny.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'plymouth plymouth-set-default-theme plymouth-initrd', '', d)} \
     xdg-user-dirs \
     \
diff --git a/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb b/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb
index acadaa2..8ed7d55 100644
--- a/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb
+++ b/recipes-image/packagegroups/packagegroup-kde-apps-tiny.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     kate \
     dolphin \
     konsole \
diff --git a/recipes-utils/fixmac/fixmac.bb b/recipes-utils/fixmac/fixmac.bb
index a8d656f..ba598c0 100644
--- a/recipes-utils/fixmac/fixmac.bb
+++ b/recipes-utils/fixmac/fixmac.bb
@@ -18,4 +18,4 @@ do_install() {
 
 }
 
-RDEPENDS_${PN} = "ranpwd"
+RDEPENDS:${PN} = "ranpwd"
diff --git a/recipes-utils/ranpwd/ranpwd_git.bb b/recipes-utils/ranpwd/ranpwd_git.bb
index ff0c72d..ea36174 100644
--- a/recipes-utils/ranpwd/ranpwd_git.bb
+++ b/recipes-utils/ranpwd/ranpwd_git.bb
@@ -15,7 +15,7 @@ SRCREV = "b62aab579e288715b82d5575befaa2b8ff210c2b"
 
 S="${WORKDIR}/git"
 
-do_configure_prepend () {
+do_configure:prepend () {
 	( cd ${S} 
 	touch NEWS README AUTHORS ChangeLog
 	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
diff --git a/recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb b/recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb
index 659a062..7c71214 100644
--- a/recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb
+++ b/recipes-utils/udev-udisks/udev-rules-udisks-hide-bootpart_1.0.bb
@@ -60,4 +60,4 @@ do_install () {
     done
 }
 
-FILES_${PN} = "${nonarch_base_libdir}/udev/rules.d"
+FILES:${PN} = "${nonarch_base_libdir}/udev/rules.d"