diff --git a/jido-pickObject/DESCR b/jido-pick-object/DESCR
similarity index 67%
rename from jido-pickObject/DESCR
rename to jido-pick-object/DESCR
index 0f1e359f6bcfcea992ac1ee5b652ed0546225644..4147c7af388113df26edfa0ebbe7d19852f15522 100644
--- a/jido-pickObject/DESCR
+++ b/jido-pick-object/DESCR
@@ -1,4 +1,4 @@
-Script needed to be installed for the jido-pickObject demo
+Script needed to be installed for the jido-pick-object demo
 
 Supervision scripts will be added in the future.
 
diff --git a/jido-pickObject/Makefile b/jido-pick-object/Makefile
similarity index 83%
rename from jido-pickObject/Makefile
rename to jido-pick-object/Makefile
index 634aafba2dad16dac5579b366f679ae1b15a3b1f..ff29ee1a8549685b62eac403cda19075092480d7 100644
--- a/jido-pickObject/Makefile
+++ b/jido-pick-object/Makefile
@@ -16,21 +16,19 @@
 
 
 
-# robotpkg Makefile for:	meta-pkgs/jido-pickObject
+# robotpkg Makefile for:	meta-pkgs/jido-pick-object
 # Created:			Xavier BROQUERE on Mon, 25 Oct 2010
 #
 JIDO_DATE=      	20101026
 
-# can't it be named jido-pick-object to be more consistent with other pkgs?
-# the directory name should reflect the pkg name as much as possible
-DISTNAME=		laas-jido-pickObject-${JIDO_DATE}
+DISTNAME=		laas-jido-pick-object-${JIDO_DATE}
 
 CATEGORIES=		meta-pkg
 
 META_PACKAGE=	yes
 
 MAINTAINER=	xavier.broquere@laas.fr
-COMMENT=	Meta-package for package needed for the jido-pickObject demo
+COMMENT=	Meta-package for package needed for the jido-pick-object demo
 
 REQD_BUILD_OPTIONS.pilo-genom=	jido
 
@@ -39,13 +37,16 @@ REQD_BUILD_OPTIONS.pilo-genom=	jido
 # PKG_OPTIONS.viam-libs=	opencv
 # PKG_DEFAULT_OPTIONS=	openprs
 
+# only on the jido robot:
+#PKG_OPTIONS.lwr-genom = kukaFri-libs
+
 # PREFER.festival=	robotpkg
 # PREFER.OGIlexicon=      robotpkg
 # PREFER.festlex-poslex=		robotpkg
 # PREFER.boost=	robotpkg
 
 include ../../hardware/sahand-libs/depend.mk
-include ../../wip/kukaFri-libs/depend.mk
+include ../../wip/lwr-genom/depend.mk
 include ../../graphics/pqp/depend.mk
 include ../../motion/pilo-genom/depend.mk
 include ../../localization/segloc-genom/depend.mk