8 files changed, 30 insertions, 30 deletions

diff --git a/meta/recipes-extended/images/poky-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 76d5dc2c7a..86972c3660 100644
--- a/meta/recipes-extended/images/poky-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -1,8 +1,8 @@
 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    task-poky-boot \
-    task-poky-basic \
+    task-core-boot \
+    task-core-basic \
     "
 
 #    ${POKY_BASE_INSTALL} 
diff --git a/meta/recipes-extended/images/poky-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 578fbd0f06..86baf23de1 100644
--- a/meta/recipes-extended/images/poky-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/core-image-lsb-live.bb b/meta/recipes-extended/images/core-image-lsb-live.bb
new file mode 100644
index 0000000000..72f10f78fe
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-live.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LSB Bootable Live Image"
+
+require recipes-core/images/core-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootimg[depends] += "core-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk-live.bb b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
new file mode 100644
index 0000000000..b01ae060f1
--- /dev/null
+++ b/meta/recipes-extended/images/core-image-lsb-sdk-live.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LSB SDK Bootable Live Image"
+
+require recipes-core/images/core-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-lsb-sdk-${MACHINE}.ext3"
+
+LICENSE = "MIT"
+
+do_bootimg[depends] += "core-image-lsb-sdk:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 967bb023d3..74ad1d2d8c 100644
--- a/meta/recipes-extended/images/poky-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core tools-debug tools-profile tools-sdk dev-pkg
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 33532eac24..63180f5613 100644
--- a/meta/recipes-extended/images/poky-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -2,8 +2,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-basic \
-    task-poky-lsb \
+    task-core-basic \
+    task-core-lsb \
     "
 
 inherit poky-image
diff --git a/meta/recipes-extended/images/poky-image-lsb-live.bb b/meta/recipes-extended/images/poky-image-lsb-live.bb
deleted file mode 100644
index baa9ea0e4f..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB Bootable Live Image"
-
-require recipes-core/images/poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "poky-image-lsb:do_rootfs"
diff --git a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb b/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
deleted file mode 100644
index 370780a062..0000000000
--- a/meta/recipes-extended/images/poky-image-lsb-sdk-live.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "LSB SDK Bootable Live Image"
-
-require recipes-core/images/poky-image-live.inc
-
-LABELS += "boot install"
-
-ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-lsb-sdk-${MACHINE}.ext3"
-
-LICENSE = "MIT"
-
-do_bootimg[depends] += "poky-image-lsb-sdk:do_rootfs"