diff --git a/hrp2-bringup/Makefile b/hrp2-bringup/Makefile
index 898ad2bd91e53646aa2aeb217db580b5ac016e97..571720ca752d6901e192b99fe5d1b79813a90169 100644
--- a/hrp2-bringup/Makefile
+++ b/hrp2-bringup/Makefile
@@ -2,9 +2,9 @@
 # Created:			Olivier Stasse on Wed, 14 Jav 2015
 #
 VERSION=		1.0.4
-ROS_PKG=		hrp2_bringup
+ROS_PKG=		hrp2-bringup
 ROS_VERSION=		${VERSION}
-DISTNAME=		hrp2_bringup-${VERSION}
+DISTNAME=		hrp2-bringup-${VERSION}
 CATEGORIES=		robots
 MASTER_SITES=		${MASTER_SITE_JRL}ros/${ROS_PKG}/
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-bringup
@@ -12,6 +12,7 @@ MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-bringup
 MAINTAINER=		gepetto@laas.fr
 COMMENT=		Hrp2 ros package to start HRP-2
 LICENSE=		openhrp-grx-license
+WRKSRC=			${WRKDIR}/hrp2_bringup-${VERSION}
 
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 NO_PUBLIC_SRC=	${RESTRICTED}
diff --git a/hrp2-bringup/depend.mk b/hrp2-bringup/depend.mk
index cdafa5e59cb15a986ec6b00e54ce43583e2fec97..100931a4447bea9826bbd09bf62434211fcfabe8 100644
--- a/hrp2-bringup/depend.mk
+++ b/hrp2-bringup/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
 DEPEND_PKG+=		hrp2-bringup
 endif
 
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_BRINGUP_DEPEND_MK)) # -------------------------------------------
 
 PREFER.hrp2-bringup?=	robotpkg
 
diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
index c3c861f02754b9eb9c489c6342c45b404a9158d4..0ff7c4c17eef5e7b3ea3d95e29ec3e01e6f3c89d 100644
--- a/hrp2-computer-monitor/Makefile
+++ b/hrp2-computer-monitor/Makefile
@@ -2,9 +2,9 @@
 # Created:			Olivier Stasse on Wed, 17 Jun 2015
 #
 VERSION=		1.0.0
-ROS_PKG=		hrp2_computer_monitor
+ROS_PKG=		hrp2-computer-monitor
 ROS_VERSION=		${VERSION}
-DISTNAME=		hrp2_computer_monitor
+DISTNAME=		hrp2-computer-monitor
 CATEGORIES=		robots
 MASTER_SITES=		${MASTER_SITE_JRL}ros/${ROS_PKG}/
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
@@ -12,6 +12,7 @@ MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
 MAINTAINER=		gepetto@laas.fr
 COMMENT=		Hrp2 ros monitoring package
 LICENSE=		openhrp-grx-license
+WRKSRC=			${WRKDIR}/hrp2_computer_monitor-${VERSION}
 
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 NO_PUBLIC_SRC=	${RESTRICTED}
diff --git a/hrp2-computer-monitor/depend.mk b/hrp2-computer-monitor/depend.mk
index 8e2045f8e055b79a0c4acded98f3e6edc8cfe455..bed92401c298f70ae889931d648b25ee9926002f 100644
--- a/hrp2-computer-monitor/depend.mk
+++ b/hrp2-computer-monitor/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
 DEPEND_PKG+=		hrp2-computer-monitor
 endif
 
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_COMPUTER_MONITOR_DEPEND_MK)) # -------------------------------------------
 
 PREFER.hrp2-computer-monitor?=	robotpkg
 
diff --git a/hrp2-computer-monitor/distinfo b/hrp2-computer-monitor/distinfo
index eac36cd0f21408277b20854c78c843231ca80b43..8850491a357a6c0a11d2aaea83d7ffeee6abc781 100644
--- a/hrp2-computer-monitor/distinfo
+++ b/hrp2-computer-monitor/distinfo
@@ -1,3 +1,3 @@
-SHA1 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88a079f41e64c0ea07984e2846fd1590cf82b9f0
-RMD160 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 7dfb316fabb2b02010e8348a1cc8e1021e694b5b
-Size (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88890 bytes
+SHA1 (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 88a079f41e64c0ea07984e2846fd1590cf82b9f0
+RMD160 (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 7dfb316fabb2b02010e8348a1cc8e1021e694b5b
+Size (ros/hrp2-computer-monitor/1.0.0.tar.gz) = 88890 bytes