diff --git a/ros-moveit-msgs/Makefile b/ros-moveit-msgs/Makefile
index 23b00ea883e83c7822d0b0edf48dabee063b462e..2133a9a71994c1e865552aadf3ecbe7988b20795 100644
--- a/ros-moveit-msgs/Makefile
+++ b/ros-moveit-msgs/Makefile
@@ -1,15 +1,15 @@
-# robotpkg Makefile for:	wip/ros-moveit
+# robotpkg Makefile for:	wip/ros-moveit-msgs
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
 ROS_PKG=		moveit_msgs
-ROS_VERSION=	0.10.0
+ROS_VERSION=		0.10.0
 ROS_REPO=		ros-planning
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	ROS messages specific to MoveIt!
+ROS_COMMENT=		ROS messages specific to MoveIt!
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
diff --git a/ros-moveit-resources/Makefile b/ros-moveit-resources/Makefile
index f9e91d717bae3f0d885bdcc26411702f63b12c48..82f96cea1f78b62d3413ce97b69aa7568a0c43ec 100644
--- a/ros-moveit-resources/Makefile
+++ b/ros-moveit-resources/Makefile
@@ -1,15 +1,15 @@
-# robotpkg Makefile for:	wip/ros-moveit
+# robotpkg Makefile for:	wip/ros-moveit-resources
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
 ROS_PKG=		moveit_resources
-ROS_VERSION=	0.6.4
+ROS_VERSION=		0.6.4
 ROS_REPO=		ros-planning
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	various resources needed for MoveIt! testing.
+ROS_COMMENT=		various resources needed for MoveIt! testing.
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
diff --git a/ros-moveit/Makefile b/ros-moveit/Makefile
index 286ddc01d0056b1104ade25af2ef15e52b18cdf3..488c7073fc85ada2786f524e7787ebf58fad9ae0 100644
--- a/ros-moveit/Makefile
+++ b/ros-moveit/Makefile
@@ -2,12 +2,12 @@
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
-ROS_PKG=		ros-moveit
+ROS_PKG=		moveit
 ROS_METAPKG=		yes
 ROS_VERSION=		0.10.5
 ROS_REPO=		ros-planning
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
 ROS_COMMENT=		The MoveIt! Motion Planning Framework
diff --git a/ros-object-recognition-msgs/Makefile b/ros-object-recognition-msgs/Makefile
index 7014e8ce760ec5dec21f5754f8bd0d6ba3ad4cdc..477fd8bf73592d65e5f7ca24f3e271087b5a53e1 100644
--- a/ros-object-recognition-msgs/Makefile
+++ b/ros-object-recognition-msgs/Makefile
@@ -1,15 +1,15 @@
-# robotpkg Makefile for:	wip/moveit
+# robotpkg Makefile for:	wip/ros-object-recognition-msgs
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
 ROS_PKG=		object_recognition_msgs
-ROS_VERSION=	0.4.1
+ROS_VERSION=		0.4.1
 ROS_REPO=		wg-perception
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	ROS messages/actionlib server for object recognition
+ROS_COMMENT=		ROS messages/actionlib server for object recognition
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
diff --git a/ros-octomap-msgs/Makefile b/ros-octomap-msgs/Makefile
index 2c94ee5ac2ba237ea7244b0bbabc66302ea6305c..0e8a49742be51fc67964a76309fad3777f679ded 100644
--- a/ros-octomap-msgs/Makefile
+++ b/ros-octomap-msgs/Makefile
@@ -3,13 +3,13 @@
 #
 
 ROS_PKG=		octomap_msgs
-ROS_VERSION=	0.3.3
+ROS_VERSION=		0.3.3
 ROS_REPO=		octomap
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	ROS package to provide messages and serializations / conversion for the OctoMap library
+ROS_COMMENT=		ROS package to provide messages and serializations / conversion for the OctoMap library
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
diff --git a/ros-srdfdom/Makefile b/ros-srdfdom/Makefile
index 665f12a606facf29833b9dad303d02707c72e398..21bb015fd2418c567b286bebcc0198fb5c32893c 100644
--- a/ros-srdfdom/Makefile
+++ b/ros-srdfdom/Makefile
@@ -3,13 +3,13 @@
 #
 
 ROS_PKG=		srdfdom
-ROS_VERSION=	0.4.2
+ROS_VERSION=		0.4.2
 ROS_REPO=		ros-planning
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	srdf parser
+ROS_COMMENT=		srdf parser
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
diff --git a/ros-warehouse-ros/Makefile b/ros-warehouse-ros/Makefile
index c304602d82483e4a272808e1a25f8904bdea2da5..51460191788fb56e9ffdca568f4bf18109dfb7c4 100644
--- a/ros-warehouse-ros/Makefile
+++ b/ros-warehouse-ros/Makefile
@@ -3,13 +3,13 @@
 #
 
 ROS_PKG=		warehouse_ros
-ROS_VERSION=	0.9.2
+ROS_VERSION=		0.9.2
 ROS_REPO=		ros-planning
 
-PKGNAME=		$(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME=		ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
 
 CATEGORIES=		wip
-ROS_COMMENT=	ROS messages specific to MoveIt!
+ROS_COMMENT=		ROS messages specific to MoveIt!
 
 include ../../meta-pkgs/ros-base/Makefile.common
 include ../../wip/ros-object-recognition-msgs/depend.mk