diff --git a/dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb b/dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb
index b7f0209..2364c75 100644
--- a/dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb
+++ b/dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb
@@ -26,6 +26,6 @@ EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m32", "--enable-mmx", ""
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m64", "--enable-mmx", "", d)}"
 EXTRA_OECONF += "${@bb.utils.contains("AVAILTUNES", "powerpc", "--disable-mmx", "", d)}"
 
-do_unpack_append() {
+do_unpack:append() {
     os.rename("SDL2_gfx-1.0.4/acinclude", "SDL2_gfx-1.0.4/m4")
 }
diff --git a/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb b/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb
index 501c562..8f58c44 100644
--- a/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb
+++ b/recipes-gamelib/allegro4/allegro4_4.4.3.1.bb
@@ -22,5 +22,5 @@ inherit cmake binconfig
 
 S = "${WORKDIR}/allegro-${PV}"
 
-FILES_${PN} += "${libdir}/allegro"
-FILES_${PN}-dbg += "${libdir}/allegro/*/.debug"
+FILES:${PN} += "${libdir}/allegro"
+FILES:${PN}-dbg += "${libdir}/allegro/*/.debug"
diff --git a/recipes-gamelib/sfml/sfml_2.5.1.bb b/recipes-gamelib/sfml/sfml_2.5.1.bb
index 4752141..9fe449a 100644
--- a/recipes-gamelib/sfml/sfml_2.5.1.bb
+++ b/recipes-gamelib/sfml/sfml_2.5.1.bb
@@ -16,4 +16,4 @@ S = "${WORKDIR}/SFML-${PV}"
 
 inherit cmake
 
-FILES_${PN} =+ "${datadir}/SFML"
+FILES:${PN} =+ "${datadir}/SFML"
diff --git a/recipes-games/astromenace/astromenace_1.3.2.bb b/recipes-games/astromenace/astromenace_1.3.2.bb
index 7f7d08d..487fc73 100644
--- a/recipes-games/astromenace/astromenace_1.3.2.bb
+++ b/recipes-games/astromenace/astromenace_1.3.2.bb
@@ -44,7 +44,7 @@ EXTRA_OECMAKE = " \
     -DDATADIR=${datadir}/${BPN} \
 "
 
-do_compile_append() {
+do_compile:append() {
     # building native has dependencies which cannot be fullfilled - so run
     # AstroMenace in qemu to build game data
     ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${B}/AstroMenace')} --pack --rawdata=${S}/RAW_VFS_DATA --dir=${B}
diff --git a/recipes-games/atanks/atanks_6.5.bb b/recipes-games/atanks/atanks_6.5.bb
index e064e06..409913c 100644
--- a/recipes-games/atanks/atanks_6.5.bb
+++ b/recipes-games/atanks/atanks_6.5.bb
@@ -14,4 +14,4 @@ inherit autotools-brokensep
 SRC_URI[md5sum] = "3182d080ea71c3837af57f3651b55025"
 SRC_URI[sha256sum] = "32182b2752a77ff362c378fc04b7c51fc15345caa4c8deaad59cc850dad2322e"
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
diff --git a/recipes-games/chromium-bsu/chromium-bsu_0.9.16.1.bb b/recipes-games/chromium-bsu/chromium-bsu_0.9.16.1.bb
index 5848db8..86704b6 100644
--- a/recipes-games/chromium-bsu/chromium-bsu_0.9.16.1.bb
+++ b/recipes-games/chromium-bsu/chromium-bsu_0.9.16.1.bb
@@ -21,6 +21,6 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl libsdl-image"
 PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,libsdl2 libsdl2-image"
 
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datatdir}/icons \
 "
diff --git a/recipes-games/etr/etr_0.8.0.bb b/recipes-games/etr/etr_0.8.0.bb
index cf29433..4dee069 100644
--- a/recipes-games/etr/etr_0.8.0.bb
+++ b/recipes-games/etr/etr_0.8.0.bb
@@ -19,6 +19,6 @@ B = "${WORKDIR}/build"
 
 inherit autotools
 
-do_install_append() {
+do_install:append() {
         rm -Rf ${D}/${datadir}/appdata
 }
diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index ab5f694..6c891bd 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -40,21 +40,21 @@ acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
 PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common \
 ${PN}-gtk3.22 ${PN}-qt ${PN}-sdl2"
 
-do_install_append() {
+do_install:append() {
         rm -Rf ${D}/${datadir}/appdata
 }
 
-RDEPENDS_${PN} = "freeciv-server freeciv-client"
+RDEPENDS:${PN} = "freeciv-server freeciv-client"
 
-FILES_${PN}-common = "\
+FILES:${PN}-common = "\
 ${libdir}/libfreeciv.so.0.0.0 \
 ${libdir}/libfreeciv.so.0 \
 ${datadir}/po \
 ${datadir}/icons/hicolor/*/*/freeciv-client.png \
 "
 
-RDEPENDS_${PN}-server = "freeciv-common"
-FILES_${PN}-server = "\
+RDEPENDS:${PN}-server = "freeciv-common"
+FILES:${PN}-server = "\
 ${bindir}/freeciv-server \
 ${datadir}/freeciv/default \
 ${datadir}/freeciv/default.serv \
@@ -62,7 +62,7 @@ ${datadir}/freeciv/nation \
 ${datadir}/icons/hicolor/*/*/freeciv-server.png \
 "
 
-FILES_${PN}-client-common = "\
+FILES:${PN}-client-common = "\
 ${datadir}/freeciv/helpdata.txt \
 ${datadir}/freeciv/flags \
 ${datadir}/freeciv/misc \
@@ -73,24 +73,24 @@ ${datadir}/freeciv/stdsounds \
 ${datadir}/icons/hicolor/*/*/freeciv-modpack.png \
 "
 
-RDEPENDS_${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
-FILES_${PN}-gtk3.22 = "\
+RDEPENDS:${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
+RPROVIDES:${PN}-gtk3.22 = "freeciv-client"
+FILES:${PN}-gtk3.22 = "\
 ${bindir}/freeciv-gtk3.22 \
 ${datadir}/freeciv/themes/gui-gtk-3.22 \
 ${datadir}/freeciv/gtk3.22_menus.xml \
 "
 
-RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
-RPROVIDES_${PN}-qt = "freeciv-client"
-FILES_${PN}-qt = "\
+RDEPENDS:${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
+RPROVIDES:${PN}-qt = "freeciv-client"
+FILES:${PN}-qt = "\
 ${bindir}/freeciv-qt \
 ${datadir}/freeciv/themes/gui-qt \
 "
 
-RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-sdl2 = "freeciv-client"
-FILES_${PN}-sdl2 = "\
+RDEPENDS:${PN}-sdl2 = "freeciv-common freeciv-client-common"
+RPROVIDES:${PN}-sdl2 = "freeciv-client"
+FILES:${PN}-sdl2 = "\
 ${bindir}/freeciv-sdl2 \
 ${datadir}/freeciv/themes/gui-sdl2 \
 "
diff --git a/recipes-games/gnome-games/gnome-chess_3.24.1.bb b/recipes-games/gnome-games/gnome-chess_3.24.1.bb
index a10593e..c5ebf0d 100644
--- a/recipes-games/gnome-games/gnome-chess_3.24.1.bb
+++ b/recipes-games/gnome-games/gnome-chess_3.24.1.bb
@@ -12,5 +12,5 @@ inherit gnomebase gettext
 SRC_URI[archive.md5sum] = "56eaa655a7989fd04ce0de3c66c2d8f8"
 SRC_URI[archive.sha256sum] = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3"
 
-FILES_${PN} += "${libdir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES:${PN} += "${libdir} ${datadir}"
+FILES:${PN}-dbg += "${libdir}/*/*/.debug"
diff --git a/recipes-games/gnome-games/gnome-robots_3.22.1.bb b/recipes-games/gnome-games/gnome-robots_3.22.1.bb
index 223c031..5e95c17 100644
--- a/recipes-games/gnome-games/gnome-robots_3.22.1.bb
+++ b/recipes-games/gnome-games/gnome-robots_3.22.1.bb
@@ -12,5 +12,5 @@ inherit gnomebase
 SRC_URI[archive.md5sum] = "adc8b1ddfff21e344eb461db0785eb08"
 SRC_URI[archive.sha256sum] = "5cd4564d7eb876fe4ef332dc568bcf7b1515d8ec9f66e53c2bae5331e0182dd4"
 
-FILES_${PN} += "${libdir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES:${PN} += "${libdir} ${datadir}"
+FILES:${PN}-dbg += "${libdir}/*/*/.debug"
diff --git a/recipes-games/gnome-games/libgames-support_1.0.2.bb b/recipes-games/gnome-games/libgames-support_1.0.2.bb
index eeb5941..38d9a66 100644
--- a/recipes-games/gnome-games/libgames-support_1.0.2.bb
+++ b/recipes-games/gnome-games/libgames-support_1.0.2.bb
@@ -13,4 +13,4 @@ inherit gnomebase
 SRC_URI[archive.md5sum] = "ffba5c102eeb9ae3d96294bccb02446e"
 SRC_URI[archive.sha256sum] = "b096e8d8ddc57ff247edc5eae842d405402b043e289f3a0949499e1df514ba66"
 
-FILES_${PN} += "${libdir} ${datadir}"
+FILES:${PN} += "${libdir} ${datadir}"
diff --git a/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb b/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
index 3d92817..4ab657e 100644
--- a/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
+++ b/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
@@ -13,4 +13,4 @@ inherit gnomebase gettext
 SRC_URI[archive.md5sum] = "a18acdf1a5398507a12fc6f408b5c541"
 SRC_URI[archive.sha256sum] = "704a7a93aa5066f84738b60d696cf393dfbbf1a3e339f9adbb40af0cf70eca3c"
 
-FILES_${PN} += "${libdir} ${datadir}"
+FILES:${PN} += "${libdir} ${datadir}"
diff --git a/recipes-games/maelstrom/maelstrom_3.0.6.bb b/recipes-games/maelstrom/maelstrom_3.0.6.bb
index 5921fff..fbe82f2 100644
--- a/recipes-games/maelstrom/maelstrom_3.0.6.bb
+++ b/recipes-games/maelstrom/maelstrom_3.0.6.bb
@@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982
 
 S = "${WORKDIR}/Maelstrom-${PV}"
 
-do_configure_prepend() {
+do_configure:prepend() {
     touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog
 }
 
@@ -42,4 +42,4 @@ do_install() {
     mv ${D}${datadir}/Maelstrom/*Scores ${D}/${localstatedir}/lib/games
 }
 
-FILES_${PN} += "${datadir}/Maelstrom"
+FILES:${PN} += "${datadir}/Maelstrom"
diff --git a/recipes-games/packagegroups/packagegroup-games-pinball.bb b/recipes-games/packagegroups/packagegroup-games-pinball.bb
index b7caf28..efa6fd7 100644
--- a/recipes-games/packagegroups/packagegroup-games-pinball.bb
+++ b/recipes-games/packagegroups/packagegroup-games-pinball.bb
@@ -6,9 +6,9 @@ inherit packagegroup
 
 PACKAGES = "packagegroup-games-pinball"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += " pinball"
-RDEPENDS_${PN} += " pinball-table-gnu"
-RDEPENDS_${PN} += " pinball-table-hurd"
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " pinball-table-gnu"
+RDEPENDS:${PN} += " pinball-table-hurd"
 
diff --git a/recipes-games/packagegroups/packagegroup-games.bb b/recipes-games/packagegroups/packagegroup-games.bb
index c2f3d4a..809ec3d 100644
--- a/recipes-games/packagegroups/packagegroup-games.bb
+++ b/recipes-games/packagegroups/packagegroup-games.bb
@@ -6,9 +6,9 @@ inherit packagegroup
 
 PACKAGES = "packagegroup-games"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
 astromenace \
 atanks \
 chromium-bsu \
diff --git a/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb b/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
index 3c1d090..1ad0c8e 100644
--- a/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
+++ b/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
@@ -29,32 +29,32 @@ PACKAGES += "${PN}-data"
 
 REMOVE_LIBTOOL_LA = "0"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     ./bootstrap
 }
 
-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
 ${includedir}/${PN}/* \
 "
 
-FILES_${PN}-staticdev = "\
+FILES:${PN}-staticdev = "\
 ${libdir}/pinball/lib*.a \
 "
 
-FILES_${PN}-dbg = "\
+FILES:${PN}-dbg = "\
 ${libdir}/pinball/.debug/libModule*.so* \
 "
 
-FILES_${PN} = "\
+FILES:${PN} = "\
 ${libdir}/pinball/libModule*.so* \
 ${libdir}/pinball/libModule*.la \
 "
 
-FILES_${PN}-data = "\
+FILES:${PN}-data = "\
 ${datadir}/pinball/*/* \
 "
 
-RDEPENDS_${PN} += " pinball"
-RDEPENDS_${PN} += " ${PN}-data"
-INSANE_SKIP_${PN} = "dev-so"
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"
diff --git a/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb b/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
index efef8ad..2c33e4d 100644
--- a/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
+++ b/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
@@ -29,33 +29,33 @@ PACKAGES += "${PN}-data"
 
 REMOVE_LIBTOOL_LA = "0"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     ./bootstrap
 }
 
-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
 ${includedir}/${PN}/* \
 "
 
-FILES_${PN}-staticdev = "\
+FILES:${PN}-staticdev = "\
 ${libdir}/pinball/lib*.a \
 "
 
-FILES_${PN}-dbg = "\
+FILES:${PN}-dbg = "\
 ${libdir}/pinball/.debug/libModule*.so* \
 "
 
-FILES_${PN} = "\
+FILES:${PN} = "\
 ${libdir}/pinball/libModule*.so* \
 ${libdir}/pinball/libModule*.la \
 "
 
-FILES_${PN}-data = "\
+FILES:${PN}-data = "\
 ${datadir}/pinball/*/* \
 ${localstatedir}/games/pinball/*/highscores \
 "
 
-RDEPENDS_${PN} += " pinball"
-RDEPENDS_${PN} += " ${PN}-data"
-INSANE_SKIP_${PN} = "dev-so"
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"
diff --git a/recipes-games/pinball/pinball_0.3.20201218.bb b/recipes-games/pinball/pinball_0.3.20201218.bb
index 7bb5071..88bbe30 100644
--- a/recipes-games/pinball/pinball_0.3.20201218.bb
+++ b/recipes-games/pinball/pinball_0.3.20201218.bb
@@ -38,35 +38,35 @@ PACKAGES += "${PN}-data"
 
 REMOVE_LIBTOOL_LA = "0"
 
-do_configure_prepend() {
+do_configure:prepend() {
     cd ${S}
     sed -e "s|libtool --version|-libtool --version|g"  -i helper.mk
     ./bootstrap
 }
 
-FILES_${PN}-dev = "\
+FILES:${PN}-dev = "\
 ${includedir}/${PN}/* \
 ${bindir}/${PN}-config \
 "
 
-FILES_${PN}-staticdev = "\
+FILES:${PN}-staticdev = "\
 ${libdir}/${PN}/lib*.a \
 "
 
-FILES_${PN}-dbg = "\
+FILES:${PN}-dbg = "\
 ${libdir}/${PN}/.debug/libModule*.so* \
 "
 
-FILES_${PN} = "\
+FILES:${PN} = "\
 ${libdir}/${PN}/libModule*.so* \
 ${libdir}/${PN}/libModule*.la* \
 ${bindir}/${PN} \
 "
 
-FILES_${PN}-data = "\
+FILES:${PN}-data = "\
 ${datadir}/${PN}/* \
 ${localstatedir}/games/${PN}/*/highscores \
 "
 
-RDEPENDS_${PN} += " ${PN}-data"
-INSANE_SKIP_${PN} = "dev-so"
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"
diff --git a/recipes-games/pingus/pingus_0.7.6.bb b/recipes-games/pingus/pingus_0.7.6.bb
index 7acdb85..2631892 100644
--- a/recipes-games/pingus/pingus_0.7.6.bb
+++ b/recipes-games/pingus/pingus_0.7.6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 HOMEPAGE = "http://pingus.seul.org/"
 
-RDEPENDS_${PN} += "libmikmod bash"
+RDEPENDS:${PN} += "libmikmod bash"
 
 inherit scons python3native
 
@@ -38,7 +38,7 @@ do_install() {
 	install -m 0755 ${S}/build/pingus ${D}${bindir}/pingus
 }
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
 
 SRC_URI[md5sum] = "8f366e7ba76c9f3525888efe8b04b1ad"
 SRC_URI[sha256sum] = "c4cd89e1d350d2472f32de5f6266ac9f3658a3620eace3f79efac45db4323b65"
diff --git a/recipes-games/scummvm/scummvm_2.2.0.bb b/recipes-games/scummvm/scummvm_2.2.0.bb
index 834b20c..8ad0fff 100644
--- a/recipes-games/scummvm/scummvm_2.2.0.bb
+++ b/recipes-games/scummvm/scummvm_2.2.0.bb
@@ -62,4 +62,4 @@ do_configure() {
         sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk
 }
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
diff --git a/recipes-games/supertux/supertux2_0.6.2.bb b/recipes-games/supertux/supertux2_0.6.2.bb
index 9117087..089620f 100644
--- a/recipes-games/supertux/supertux2_0.6.2.bb
+++ b/recipes-games/supertux/supertux2_0.6.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "boost libsdl2 libsdl2-image libvorbis curl openal-soft physfs glew freetype"
 
 # somehow boost is not dragged in
-RDEPENDS_${PN} += "boost"
+RDEPENDS:${PN} += "boost"
 
 inherit cmake pkgconfig gtk-icon-cache
 
@@ -32,7 +32,7 @@ EXTRA_OECMAKE = " \
     -DUSE_SYSTEM_PHYSFS=ON \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/games/supertux2 \
 "
diff --git a/recipes-games/supertuxkart/supertuxkart_1.2.bb b/recipes-games/supertuxkart/supertuxkart_1.2.bb
index c867e72..a35c322 100644
--- a/recipes-games/supertuxkart/supertuxkart_1.2.bb
+++ b/recipes-games/supertuxkart/supertuxkart_1.2.bb
@@ -45,7 +45,7 @@ PACKAGECONFIG ??= " \
 "
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_DEVICE=ON,-DENABLE_WAYLAND_DEVICE=OFF,wayland"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
     ${datadir}/metainfo \
 "
diff --git a/recipes-games/wesnoth/wesnoth_1.15.12.bb b/recipes-games/wesnoth/wesnoth_1.15.12.bb
index 0be5bd9..6801f7c 100644
--- a/recipes-games/wesnoth/wesnoth_1.15.12.bb
+++ b/recipes-games/wesnoth/wesnoth_1.15.12.bb
@@ -39,17 +39,17 @@ PACKAGES = "${PN}-doc ${PN}-music ${PN}-sounds \
 	${PN}-server \
 	"
 
-DESCRIPTION_${PN}-all = "The Battle for ${PN} with all campaigns, music and sounds"
-DESCRIPTION_${PN}-all-campaigns = "The Battle for ${PN} with all campaigns."
-DESCRIPTION_${PN}-sounds = "Optional sound package for The Battle for ${PN}"
-DESCRIPTION_${PN}-music = "Optional music package for The Battle for ${PN}"
-DESCRIPTION_${PN}-data = "Mandatory data package for The Battle for ${PN}"
-DESCRIPTION_${PN}-server = "Optional Battle for Wesnoth server"
+DESCRIPTION:${PN}-all = "The Battle for ${PN} with all campaigns, music and sounds"
+DESCRIPTION:${PN}-all-campaigns = "The Battle for ${PN} with all campaigns."
+DESCRIPTION:${PN}-sounds = "Optional sound package for The Battle for ${PN}"
+DESCRIPTION:${PN}-music = "Optional music package for The Battle for ${PN}"
+DESCRIPTION:${PN}-data = "Mandatory data package for The Battle for ${PN}"
+DESCRIPTION:${PN}-server = "Optional Battle for Wesnoth server"
 
-ALLOW_EMPTY_${PN}-all-campaigns = "1"
-ALLOW_EMPTY_${PN}-all = "1"
+ALLOW_EMPTY:${PN}-all-campaigns = "1"
+ALLOW_EMPTY:${PN}-all = "1"
 
-do_configure_prepend() {
+do_configure:prepend() {
 	export HOST_SYS="${HOST_SYS}"
 	export BUILD_SYS="${BUILD_SYS}"
 	export STAGING_LIBDIR="${STAGING_LIBDIR}"
@@ -57,7 +57,7 @@ do_configure_prepend() {
 	rm -f ${S}/cmake/FindBoost.cmake
 }
 
-do_install_append() {
+do_install:append() {
 	#ugly hack but otherwise it would have required to
 	#have MANDIR:STRING=share/man that would require a
 	#second python function
@@ -69,29 +69,29 @@ do_install_append() {
     rm -Rf ${D}/var
 }
 
-RDEPENDS_${PN} = "${PN}-data tremor"
+RDEPENDS:${PN} = "${PN}-data tremor"
 
-RDEPENDS_${PN}-data = "bash python3"
+RDEPENDS:${PN}-data = "bash python3"
 
-RDEPENDS_${PN}-all-campaigns = "${PN} \
+RDEPENDS:${PN}-all-campaigns = "${PN} \
 	${PN}-did ${PN}-dm ${PN}-dw ${PN}-ei ${PN}-httt \
 	${PN}-l ${PN}-low ${PN}-nr ${PN}-sof ${PN}-sota ${PN}-sotbe \
 	${PN}-tb ${PN}-thot ${PN}-trow ${PN}-tsg ${PN}-utbs ${PN}-wc"
 
 # Installing wesnoth-all should pull everything in (like in Debian).
-RDEPENDS_${PN}-all = "${PN} ${PN}-all-campaigns ${PN}-sounds ${PN}-music"
+RDEPENDS:${PN}-all = "${PN} ${PN}-all-campaigns ${PN}-sounds ${PN}-music"
 
-FILES_${PN}-music = "\
+FILES:${PN}-music = "\
 	${datadir}/wesnoth/data/core/music \
 "
 
-FILES_${PN}-sounds = "\
+FILES:${PN}-sounds = "\
 	${datadir}/wesnoth/data/core/sounds \
 "
 
 # Picks up remaining translations and data. Must be packaged after
 # wesnoth-music, wesnoth-sounds and all campaigns.
-FILES_${PN}-data = "\
+FILES:${PN}-data = "\
 	${datadir}/wesnoth/sounds \
 	${datadir}/wesnoth/images \
 	${datadir}/wesnoth/data \
@@ -100,7 +100,7 @@ FILES_${PN}-data = "\
 	${datadir}/wesnoth/l10n-track \
 "
 
-FILES_${PN} = "\
+FILES:${PN} = "\
 	${bindir}/wesnoth \
 	${datadir}/icons \
     ${datadir}/metainfo \
@@ -108,92 +108,92 @@ FILES_${PN} = "\
 	${datadir}/pixmaps/wesnoth-icon.png \
 "
 
-FILES_${PN}-server = "\
+FILES:${PN}-server = "\
 	${bindir}/wesnothd \
 	${localstatedir}/run/wesnothd \
 "
 
-FILES_${PN}-did = "\
+FILES:${PN}-did = "\
 	${datadir}/wesnoth/data/campaigns/Descent_Into_Darkness \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-did.mo \
 "
 
-FILES_${PN}-dm = "\
+FILES:${PN}-dm = "\
 	${datadir}/wesnoth/data/campaigns/Delfadors_Memoirs \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dm.mo \
 "
 
-FILES_${PN}-dw = "\
+FILES:${PN}-dw = "\
 	${datadir}/wesnoth/data/campaigns/Dead_Water \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dw.mo \
 "
 
-FILES_${PN}-ei = "\
+FILES:${PN}-ei = "\
 	${datadir}/wesnoth/data/campaigns/Eastern_Invasion \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-ei.mo \
 "
 
-FILES_${PN}-httt = "\
+FILES:${PN}-httt = "\
 	${datadir}/wesnoth/data/campaigns/Heir_To_The_Throne \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-httt.mo \
 "
 
-FILES_${PN}-l = "\
+FILES:${PN}-l = "\
 	${datadir}/wesnoth/data/campaigns/Liberty \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \
 "
 
-FILES_${PN}-low ="\
+FILES:${PN}-low ="\
 	${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-low.mo \
 "
 
-FILES_${PN}-nr = "\
+FILES:${PN}-nr = "\
 	${datadir}/wesnoth/data/campaigns/Northern_Rebirth \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-nr.mo \
 "
 
-FILES_${PN}-sof = "\
+FILES:${PN}-sof = "\
 	${datadir}/wesnoth/data/campaigns/Sceptre_of_Fire \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sof.mo \
 "
 
-FILES_${PN}-sota = "\
+FILES:${PN}-sota = "\
 	${datadir}/wesnoth/data/campaigns/Secrets_of_the_Ancients \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sota.mo \
 "
 
-FILES_${PN}-sotbe = "\
+FILES:${PN}-sotbe = "\
 	${datadir}/wesnoth/data/campaigns/Son_Of_The_Black_Eye \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sotbe.mo \
 "
 
-FILES_${PN}-tb = "\
+FILES:${PN}-tb = "\
 	${datadir}/wesnoth/data/campaigns/Two_Brothers \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tb.mo \
 "
 
-FILES_${PN}-thot = "\
+FILES:${PN}-thot = "\
 	${datadir}/wesnoth/data/campaigns/The_Hammer_of_Thursagan \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \
 "
 
-FILES_${PN}-trow = "\
+FILES:${PN}-trow = "\
 	${datadir}/wesnoth/data/campaigns/The_Rise_Of_Wesnoth \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-trow.mo \
 "
 
-FILES_${PN}-tsg = "\
+FILES:${PN}-tsg = "\
 	${datadir}/wesnoth/data/campaigns/The_South_Guard \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tsg.mo \
 "
 
-FILES_${PN}-utbs = "\
+FILES:${PN}-utbs = "\
 	${datadir}/wesnoth/data/campaigns/Under_the_Burning_Suns \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-utbs.mo \
 "
 
-FILES_${PN}-wc = "\
+FILES:${PN}-wc = "\
 	${datadir}/wesnoth/data/campaigns/World_Conquest \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-wc.mo \
 "