13 files changed, 20 insertions, 20 deletions
diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
index 875d8f8445..b7b7fca895 100644
--- a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
+++ b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
@@ -1,4 +1,4 @@
-TOOLCHAIN_TARGET_EFLTASK ?= "task-efl-standalone-sdk-target task-efl-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_EFLTASK ?= "packagegroup-efl-standalone-sdk-target packagegroup-efl-standalone-sdk-target-dbg"
 TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_EFLTASK}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-efl-${DISTRO_VERSION}"
 require recipes-core/meta/meta-toolchain.bb
diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index 5c1a13a66a..bfaf5d4fd5 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
-    task-core-sdk \
+    packagegroup-core-sdk \
     ${SDK-EFL} \
     ${SDK-EXTRAS}"
diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
index 8f012677ed..8f012677ed 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
index 95a66b99f3..21d1540732 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 ALLOW_EMPTY = "1"
 
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
 
 PACKAGES = "${PN} ${PN}-dbg"
 
 RDEPENDS_${PN} = "\
-    task-core-standalone-sdk-target \
+    packagegroup-core-standalone-sdk-target \
     ${SDK-EFL} \
     ${SDK-EXTRAS}"
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 47b09de0e3..e46afc2788 100644
--- a/meta-oe/recipes-core/tasks/task-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -1,4 +1,4 @@
-# This recipe is intended as a 'simpler' replacement for task-base.
+# This recipe is intended as a 'simpler' replacement for packagegroup-base.
 # Please communicate your use cases and suggestions to the mailinglist(s)
 
 DESCRIPTION = "Basic task to get a device online"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r9"
 
-inherit task
+inherit packagegroup
 
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
@@ -24,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
 TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
 
 #
-# The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom 
+# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom 
 # when writing image recipes.
 # It also avoids the choice between connman/networkmanager/ifupdown since that is an image feature, not a
 # distro feature.
diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index 6c27ffe445..ac31118346 100644
--- a/meta-oe/recipes-core/tasks/task-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r57"
 
-inherit task
+inherit packagegroup
 
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index a849978b44..0ab3703bd9 100644
--- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 PV = "1.0"
 PR = "r19"
 
-inherit task allarch
+inherit packagegroup allarch
 
 PACKAGES += "${PN}-debug"
 
diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 03141f2d1f..3ad9b55577 100644
--- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-inherit task allarch
+inherit packagegroup allarch
 
-RPROVIDES_${PN} = "task-native-sdk"
+RPROVIDES_${PN} = "packagegroup-native-sdk"
 RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
                   binutils-symlinks \
                   perl-modules \
diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 112e8cbc12..816a67f593 100644
--- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 PV = "1.0"
 PR = "r1"
 
-inherit task allarch
+inherit packagegroup allarch
 
 PACKAGES += "\
   ${PN}-core \
@@ -13,13 +13,13 @@ PACKAGES += "\
   ${PN}-japanese \
 "
 
-RRECOMMENDS_task-fonts-truetype = "\
+RRECOMMENDS_packagegroup-fonts-truetype = "\
   ${PN}-core \
   ${PN}-chinese \
   ${PN}-japanese \
 "
 
-RDEPENDS_task-fonts-truetype-core = "\
+RDEPENDS_packagegroup-fonts-truetype-core = "\
   fontconfig-utils \
   \
   ttf-dejavu-common \
@@ -28,12 +28,12 @@ RDEPENDS_task-fonts-truetype-core = "\
 "
 #  ttf-dejavu-serif \
 
-RDEPENDS_task-fonts-truetype-chinese = "\
+RDEPENDS_packagegroup-fonts-truetype-chinese = "\
   ${PN}-core \
   ttf-arphic-uming \
 "
 
-RDEPENDS_task-fonts-truetype-japanese = "\
+RDEPENDS_packagegroup-fonts-truetype-japanese = "\
   ${PN}-core \
   ttf-sazanami-gothic \
   ttf-sazanami-mincho \
diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
index 7ca6c592b6..7ca6c592b6 100644
--- a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
+++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
index 358c9cbe4a..358c9cbe4a 100644
--- a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index d9fcc30e0f..7627576599 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 PR = "r2"
 
-inherit task
+inherit packagegroup
 
 RDEPENDS_${PN} = " \
     xfwm4 \
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 0c13a64e88..469a2b7a5a 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r3"
 
-inherit task
+inherit packagegroup
 
 # mandatory
 RDEPENDS_${PN} = " \
-    task-xfce-base \
+    packagegroup-xfce-base \
 "
 
 # nice to have