diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
index 907d6978dc3..af605efb43c 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_bringup"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_bringup"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
index 18974238013..453e0ee7f93 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
@@ -15,8 +15,8 @@ SECTION = "devel"
 LICENSE = "BSD & CC-BY-NC-SA-4.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_description"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_description"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
index 8c84a20afb6..bb823ca660a 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
@@ -15,8 +15,8 @@ SECTION = "devel"
 LICENSE = "BSD & Apache-2.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_ikfast_plugin"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_ikfast_plugin"
 
 ROS_BUILD_DEPENDS = " \
     eigen-conversions \
diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
index f1e771dfc98..876de945e5f 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_melodic
 inherit ros_superflore_generated
 
-DESCRIPTION = "An automatically generated package with all the configuration and launch files for using the pincher:arm with the MoveIt! Motion Planning Framework"
+DESCRIPTION = "An automatically generated package with all the configuration and launch files for using the pincher_arm with the MoveIt! Motion Planning Framework"
 AUTHOR = "Fictionlab <support@fictionlab.pl>"
 ROS_AUTHOR = "Błażej Sowa <blazej@turtlerover.com>"
 HOMEPAGE = "http://moveit.ros.org/"
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_moveit_config"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_moveit_config"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
index 4bb5d386fbe..d9a57797432 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_moveit_demos"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_moveit_demos"
 
 ROS_BUILD_DEPENDS = " \
     moveit-core \
diff --git a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
index ebca42f0ebf..a3442998900 100644
--- a/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
+++ b/meta-ros1-melodic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_melodic
 inherit ros_superflore_generated
 
-DESCRIPTION = "The pincher:arm metapackage."
+DESCRIPTION = "The pincher_arm metapackage."
 AUTHOR = "Fictionlab <support@fictionlab.pl>"
 ROS_AUTHOR = "Błażej Sowa <blazej@fictionlab.pl>"
 HOMEPAGE = "https://wiki.ros.org"
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.11.bb b/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.11.bb
index e265748845d..2f3c96b220d 100644
--- a/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.11.bb
+++ b/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.11.bb
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_common_actions"
-ROS_BPN = "pr2:arm_move_ik"
+ROS_BPN = "pr2_arm_move_ik"
 
 ROS_BUILD_DEPENDS = " \
     actionlib \
diff --git a/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.11.bb b/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.11.bb
index b61021cfb3e..1947d08a306 100644
--- a/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.11.bb
+++ b/meta-ros1-melodic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.11.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_melodic
 inherit ros_superflore_generated
 
-DESCRIPTION = "The pr2_tuck:arms_action package"
+DESCRIPTION = "The pr2_tuck_arms_action package"
 AUTHOR = "ROS Orphaned Package Maintainers <ros-orphaned-packages@googlegroups.com>"
 ROS_AUTHOR = "Wim Meeussen"
 HOMEPAGE = "http://wiki.ros.org/pr2_tuck_arms_action"
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_common_actions"
-ROS_BPN = "pr2_tuck:arms_action"
+ROS_BPN = "pr2_tuck_arms_action"
 
 ROS_BUILD_DEPENDS = " \
     actionlib \
diff --git a/meta-ros1-melodic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.10.bb b/meta-ros1-melodic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.10.bb
index 2bc040e89b0..cb64bcdf77f 100644
--- a/meta-ros1-melodic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.10.bb
+++ b/meta-ros1-melodic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.10.bb
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_kinematics"
-ROS_BPN = "pr2:arm_kinematics"
+ROS_BPN = "pr2_arm_kinematics"
 
 ROS_BUILD_DEPENDS = " \
     angles \
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
index 55475701a97..0956bce9ae0 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-bringup_0.2.0-1.bb
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_bringup"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_bringup"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
index e0496286a04..7c9f2e992cb 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-description_0.2.0-1.bb
@@ -15,8 +15,8 @@ SECTION = "devel"
 LICENSE = "BSD & CC-BY-NC-SA-4.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_description"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_description"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
index 9c762dcd20b..5cb36cf6d14 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-ikfast-plugin_0.2.0-1.bb
@@ -15,8 +15,8 @@ SECTION = "devel"
 LICENSE = "BSD & Apache-2.0"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_ikfast_plugin"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_ikfast_plugin"
 
 ROS_BUILD_DEPENDS = " \
     eigen-conversions \
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
index 1e7cf7dd917..efbfee1bd2e 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-config_0.2.0-1.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_noetic
 inherit ros_superflore_generated
 
-DESCRIPTION = "An automatically generated package with all the configuration and launch files for using the pincher:arm with the MoveIt! Motion Planning Framework"
+DESCRIPTION = "An automatically generated package with all the configuration and launch files for using the pincher_arm with the MoveIt! Motion Planning Framework"
 AUTHOR = "Fictionlab <support@fictionlab.pl>"
 ROS_AUTHOR = "Błażej Sowa <blazej@turtlerover.com>"
 HOMEPAGE = "http://moveit.ros.org/"
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_moveit_config"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_moveit_config"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
index 72beeeb2904..a0b946ecb1a 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm-moveit-demos_0.2.0-1.bb
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm_moveit_demos"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm_moveit_demos"
 
 ROS_BUILD_DEPENDS = " \
     moveit-core \
diff --git a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
index 623895ada5a..e1fb3a05cb7 100644
--- a/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pincher-arm/pincher-arm_0.2.0-1.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_noetic
 inherit ros_superflore_generated
 
-DESCRIPTION = "The pincher:arm metapackage."
+DESCRIPTION = "The pincher_arm metapackage."
 AUTHOR = "Fictionlab <support@fictionlab.pl>"
 ROS_AUTHOR = "Błażej Sowa <blazej@fictionlab.pl>"
 HOMEPAGE = "https://wiki.ros.org"
@@ -13,8 +13,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-ROS_CN = "pincher:arm"
-ROS_BPN = "pincher:arm"
+ROS_CN = "pincher_arm"
+ROS_BPN = "pincher_arm"
 
 ROS_BUILD_DEPENDS = ""
 
diff --git a/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.12-1.bb b/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.12-1.bb
index 874bfe950ca..b2643f6964e 100644
--- a/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.12-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-arm-move-ik_0.0.12-1.bb
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_common_actions"
-ROS_BPN = "pr2:arm_move_ik"
+ROS_BPN = "pr2_arm_move_ik"
 
 ROS_BUILD_DEPENDS = " \
     actionlib \
diff --git a/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.12-1.bb b/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.12-1.bb
index 144bb76e735..f0fa58a9cce 100644
--- a/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.12-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pr2-common-actions/pr2-tuck-arms-action_0.0.12-1.bb
@@ -5,7 +5,7 @@
 inherit ros_distro_noetic
 inherit ros_superflore_generated
 
-DESCRIPTION = "The pr2_tuck:arms_action package"
+DESCRIPTION = "The pr2_tuck_arms_action package"
 AUTHOR = "ROS Orphaned Package Maintainers <ros-orphaned-packages@googlegroups.com>"
 ROS_AUTHOR = "Wim Meeussen"
 HOMEPAGE = "http://wiki.ros.org/pr2_tuck_arms_action"
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_common_actions"
-ROS_BPN = "pr2_tuck:arms_action"
+ROS_BPN = "pr2_tuck_arms_action"
 
 ROS_BUILD_DEPENDS = " \
     actionlib \
diff --git a/meta-ros1-noetic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.11-1.bb b/meta-ros1-noetic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.11-1.bb
index 7133ee3c1fa..6dd26cf6c95 100644
--- a/meta-ros1-noetic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.11-1.bb
+++ b/meta-ros1-noetic/generated-recipes/pr2-kinematics/pr2-arm-kinematics_1.0.11-1.bb
@@ -14,7 +14,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 ROS_CN = "pr2_kinematics"
-ROS_BPN = "pr2:arm_kinematics"
+ROS_BPN = "pr2_arm_kinematics"
 
 ROS_BUILD_DEPENDS = " \
     angles \