From a0df79a76d4ebb798835a8ecf81a7c273804083a Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Thu, 28 Mar 2019 17:44:01 -0700
Subject: [PATCH] DRAFT packagegroup-ros2-*.bb: Replace ros2- packages with
 original names

---
 .../packagegroups/packagegroup-ros2-demos.bb     |  2 +-
 .../packagegroups/packagegroup-ros2-world.bb     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/recipes-core/packagegroups/packagegroup-ros2-demos.bb b/recipes-core/packagegroups/packagegroup-ros2-demos.bb
index dc6894e..b26b933 100644
--- a/recipes-core/packagegroups/packagegroup-ros2-demos.bb
+++ b/recipes-core/packagegroups/packagegroup-ros2-demos.bb
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
-        ros2-demo-nodes-cpp \
+        demo-nodes-cpp \
         ros2run \
         ros2topic \
 "
diff --git a/recipes-core/packagegroups/packagegroup-ros2-world.bb b/recipes-core/packagegroups/packagegroup-ros2-world.bb
index d76ada4..3ee3c1c 100644
--- a/recipes-core/packagegroups/packagegroup-ros2-world.bb
+++ b/recipes-core/packagegroups/packagegroup-ros2-world.bb
@@ -15,13 +15,13 @@ RDEPENDS_${PN} = "\
     ros2node \
     ros2srv \
     ros2service \
-    ros2-launch \
-    ros2-actionlib-msgs \
-    ros2-diagnostic-msgs \
-    ros2-nav-msgs \
-    ros2-std-srvs \
-    ros2-stereo-msgs \
-    ros2-trajectory-msgs \
-    ros2-visualization-msgs \
+    launch \
+    actionlib-msgs \
+    diagnostic-msgs \
+    nav-msgs \
+    std-srvs \
+    stereo-msgs \
+    trajectory-msgs \
+    visualization-msgs \
     rosidl-generator-py \
 "