diff --git a/Makefile b/Makefile
index e43baffc6a227cb15764e10ded6f31706aa7ca74..e392fbc8e9ee03c123cf4ab2b15064ad0c1c2c3e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ SUBDIR+=	head-action
 SUBDIR+=	hey5-description
 SUBDIR+=	histodet
 SUBDIR+=	hpp-affordance
-SUBDIR+=	hpp-baxter
 SUBDIR+=	hpp-benchmark
 SUBDIR+=	hpp-bezier-com-traj
 SUBDIR+=	hpp-centroidal-dynamics
@@ -93,6 +92,7 @@ SUBDIR+=	py-example-adder
 SUBDIR+=	py-example-robot-data
 SUBDIR+=	py-hqp
 SUBDIR+=	py-hpp-affordance-corba
+SUBDIR+=	py-hpp-baxter
 SUBDIR+=	py-hpp-rbprm-corba
 SUBDIR+=	py-mavlink
 SUBDIR+=	py-morse
diff --git a/hpp-baxter/depend.mk b/hpp-baxter/depend.mk
deleted file mode 100644
index 9693002f1011cb98c9b99291bbe688ba0055eb45..0000000000000000000000000000000000000000
--- a/hpp-baxter/depend.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# robotpkg depend.mk for:	wip/hpp-baxter
-# Created:			Guilhem Saurel on Mon, 28 Jan 2019
-#
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-HPP_BAXTER_DEPEND_MK:=	${HPP_BAXTER_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		hpp-baxter
-endif
-
-ifeq (+,$(HPP_BAXTER_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-baxter?=	robotpkg
-
-DEPEND_USE+=		hpp-baxter
-
-DEPEND_ABI.hpp-baxter?=	${PKGTAG.python-}hpp-baxter>=4.7.0
-DEPEND_DIR.hpp-baxter?=	../../wip/hpp-baxter
-
-SYSTEM_SEARCH.hpp-baxter=\
-	include/hpp/baxter/config.hh	\
-	'lib/pkgconfig/hpp-baxter.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_BAXTER_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-benchmark/Makefile b/hpp-benchmark/Makefile
index d4a3de8b179f305aea432541eb1e16ae3c1b6e38..fd327ac9a9fa1c0d0a563ee1edf9a9eddac52785 100644
--- a/hpp-benchmark/Makefile
+++ b/hpp-benchmark/Makefile
@@ -20,7 +20,7 @@ DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
 include ../../meta-pkgs/hpp/Makefile.common
 
-include ../../wip/hpp-baxter/depend.mk
+include ../../wip/py-hpp-baxter/depend.mk
 include ../../wip/hpp-romeo/depend.mk
 
 include ../../graphics/py-qt-gepetto-viewer/depend.mk
diff --git a/hpp-baxter/DESCR b/py-hpp-baxter/DESCR
similarity index 100%
rename from hpp-baxter/DESCR
rename to py-hpp-baxter/DESCR
diff --git a/hpp-baxter/Makefile b/py-hpp-baxter/Makefile
similarity index 63%
rename from hpp-baxter/Makefile
rename to py-hpp-baxter/Makefile
index 97e11c333e0a332446557d2b7c2ed5de931aa51a..aac69da41aaca99bf27711ce36c305f0ffaa1aab 100644
--- a/hpp-baxter/Makefile
+++ b/py-hpp-baxter/Makefile
@@ -1,17 +1,18 @@
-# robotpkg Makefile for:	wip/hpp-baxter
+# robotpkg Makefile for:	wip/py-hpp-baxter
 # Created:			Guilhem Saurel on Mon, 28 Jan 2019
 #
 
-HPP_PACKAGE=	hpp-baxter
-HPP_COMMENT=	Wrappers for Baxter robot in HPP
+HPP_PACKAGE=		hpp-baxter
+HPP_COMMENT=		Wrappers for Baxter robot in HPP
 
-ROSNAME=	$(subst -,_,${HPP_PACKAGE})
+ROSNAME=		$(subst -,_,${HPP_PACKAGE})
 
-CATEGORIES=	wip
+CATEGORIES=		wip
 
 DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
-USE_PYTHON=	true
+USE_PYTHON=		true
+PYTHON_NOTAG_CONFLICT=	yes
 
 include ../../meta-pkgs/hpp/Makefile.common
 
diff --git a/hpp-baxter/PLIST b/py-hpp-baxter/PLIST
similarity index 100%
rename from hpp-baxter/PLIST
rename to py-hpp-baxter/PLIST
diff --git a/py-hpp-baxter/depend.mk b/py-hpp-baxter/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..ae165f83270bbfbd7c3d1ca8465dbe6cb8a04267
--- /dev/null
+++ b/py-hpp-baxter/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for:	wip/py-hpp-baxter
+# Created:			Guilhem Saurel on Mon, 28 Jan 2019
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+PY_HPP_BAXTER_DEPEND_MK:=	${PY_HPP_BAXTER_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		py-hpp-baxter
+endif
+
+ifeq (+,$(PY_HPP_BAXTER_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-baxter?=	robotpkg
+
+DEPEND_USE+=		py-hpp-baxter
+
+DEPEND_ABI.py-hpp-baxter?=	${PKGTAG.python-}hpp-baxter>=4.7.0
+DEPEND_DIR.py-hpp-baxter?=	../../wip/py-hpp-baxter
+
+SYSTEM_SEARCH.py-hpp-baxter=\
+	include/hpp/baxter/config.hh	\
+	'lib/pkgconfig/hpp-baxter.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_BAXTER_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-baxter/distinfo b/py-hpp-baxter/distinfo
similarity index 100%
rename from hpp-baxter/distinfo
rename to py-hpp-baxter/distinfo