diff --git a/robot_capsule_urdf/DESCR b/robot-capsule-urdf/DESCR
similarity index 100%
rename from robot_capsule_urdf/DESCR
rename to robot-capsule-urdf/DESCR
diff --git a/robot_capsule_urdf/Makefile b/robot-capsule-urdf/Makefile
similarity index 76%
rename from robot_capsule_urdf/Makefile
rename to robot-capsule-urdf/Makefile
index 946efde477f1a05d2e0609ddfa8b278d47ae5683..e67369e2d2adb6254422cec0027c043bb0214787 100644
--- a/robot_capsule_urdf/Makefile
+++ b/robot-capsule-urdf/Makefile
@@ -2,9 +2,9 @@
# Created: Olivier Stasse on Fri, 19 Jun 2015
#
VERSION= 1.0.1
-DISTNAME= robot_capsule_urdf-${VERSION}
-PKGNAME= robot_capsule_urdf-${VERSION}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=robot_capsule_urdf/}
+PKGNAME= robot-capsule-urdf-${VERSION}
+DISTNAME= robot-capsule-urdf-${VERSION}
+MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=robot-capsule-urdf/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}laas/robot_capsule_urdf
CATEGORIES= graphics
@@ -13,7 +13,7 @@ COMMENT= Provides capsule description of the robots
LICENSE= 2-clause-bsd
MAINTAINER= hpp@laas.fr
-DYNAMIC_PLIST_DIRS+= share/doc/robot_capsule_urdf
+DYNAMIC_PLIST_DIRS+= share/doc/robot-capsule-urdf
include ../../graphics/urdfdom/depend.mk
include ../../devel/ros-catkin/depend.mk
diff --git a/robot_capsule_urdf/PLIST b/robot-capsule-urdf/PLIST
similarity index 100%
rename from robot_capsule_urdf/PLIST
rename to robot-capsule-urdf/PLIST
diff --git a/robot-capsule-urdf/depend.mk b/robot-capsule-urdf/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..5c47e29b178eb3377a3341e9e0033a459eb04226
--- /dev/null
+++ b/robot-capsule-urdf/depend.mk
@@ -0,0 +1,26 @@
+# robotpkg depend.mk for: graphics/robot_capsule_urdf
+# Created: Olivier Stasse on Wed, 19 Jun 2015
+#
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+ROBOT_CAPSULE_URDF_DEPEND_MK:= ${ROBOT_CAPSULE_URDF_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= robot-capsule-urdf
+endif
+
+ifeq (+,$(ROBOT_CAPSULE_URDF_DEPEND_MK)) # -------------------------------------------
+
+PREFER.robot-capsule-urdf?= robotpkg
+
+SYSTEM_SEARCH.robot-capsule-urdf=\
+ 'lib/pkgconfig/robot-capsule-urdf.pc:/Version/s/[^0-9.]//gp'
+
+DEPEND_USE+= robot-capsule-urdf
+
+DEPEND_ABI.robot-capsule-urdf?= robot-capsule-urdf>=1.0
+DEPEND_DIR.robot-capsule-urdf?= ../../wip/robot-capsule-urdf
+
+endif # ROBOT_CAPSULE_URDF_DEPEND_MK -------------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/robot-capsule-urdf/distinfo b/robot-capsule-urdf/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..0ab39e863acb3739d7b089e9896d521809737d48
--- /dev/null
+++ b/robot-capsule-urdf/distinfo
@@ -0,0 +1,3 @@
+SHA1 (robot-capsule-urdf-1.0.1.tar.gz) = d8fdb9ce8b5ddd17cab624b29ee3d56c3c3c91c9
+RMD160 (robot-capsule-urdf-1.0.1.tar.gz) = a1b8144d06fb687117d621083d0606e3810ff69a
+Size (robot-capsule-urdf-1.0.1.tar.gz) = 75100 bytes
diff --git a/robot_capsule_urdf/depend.mk b/robot_capsule_urdf/depend.mk
deleted file mode 100644
index 27acbee35ecdb276316d8042ed9a660288396a86..0000000000000000000000000000000000000000
--- a/robot_capsule_urdf/depend.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# robotpkg depend.mk for: graphics/robot_capsule_urdf
-# Created: Olivier Stasse on Wed, 19 Jun 2015
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-ROBOT_CAPSULE_URDF_DEPEND_MK:= ${ROBOT_CAPSULE_URDF_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= robot-capsule-robot-urdf
-endif
-
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
-
-PREFER.robot-capsule-robot-urdf?= robotpkg
-
-SYSTEM_SEARCH.robot-capsule-robot-urdf=\
- 'lib/pkgconfig/robot-capsule-robot-urdf.pc:/Version/s/[^0-9.]//gp'
-
-DEPEND_USE+= robot-capsule-robot-urdf
-
-DEPEND_ABI.robot-capsule-robot-urdf?= robot-capsule-robot-urdf>=1.0.0
-DEPEND_DIR.robot-capsule-robot-urdf?= ../robot-capsule-robot-urdf
-
-endif # ROBOT_CAPSULE_URDF_DEPEND_MK -------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/robot_capsule_urdf/distinfo b/robot_capsule_urdf/distinfo
deleted file mode 100644
index 0e7cdcd11c69fca53d7f1afbc555e7fe5477c818..0000000000000000000000000000000000000000
--- a/robot_capsule_urdf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (robot_capsule_urdf-1.0.1.tar.gz) = 5cc8d7a436fc71c2d6c16c280b78eef2fa9e7bc1
-RMD160 (robot_capsule_urdf-1.0.1.tar.gz) = fa01d4fa2e29cbb79cc2055ca10adee95d283e09
-Size (robot_capsule_urdf-1.0.1.tar.gz) = 75380 bytes