DRAFT packagegroup-ros2-*.bb: Replace ros2- packages with original names

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 \
 "

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 \
 "