diff --git a/Makefile b/Makefile
index 4df578ee973f68f404d23287c05c2859065bbf69..faa49732eee847798d10d307d3a03cc8f9070815 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ SUBDIR+=	hey5-description
 SUBDIR+=	histodet
 SUBDIR+=	hpp-affordance
 SUBDIR+=	hpp-benchmark
-SUBDIR+=	hpp-hrp2
 SUBDIR+=	hpp-rbprm
 SUBDIR+=	hpp-rbprm-robot-data
 SUBDIR+=	hpp-romeo
@@ -93,6 +92,7 @@ SUBDIR+=	py-hpp-baxter
 SUBDIR+=	py-hpp-bezier-com-traj
 SUBDIR+=	py-hpp-centroidal-dynamics
 SUBDIR+=	py-hpp-environments
+SUBDIR+=	py-hpp-hrp2
 SUBDIR+=	py-hpp-rbprm-corba
 SUBDIR+=	py-mavlink
 SUBDIR+=	py-morse
diff --git a/hpp-hrp2/depend.mk b/hpp-hrp2/depend.mk
deleted file mode 100644
index 6e6e8d2ccef4367bfefba2700f6bc0894cb4f579..0000000000000000000000000000000000000000
--- a/hpp-hrp2/depend.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# robotpkg depend.mk for:	wip/py36-hpp-hrp2
-# Created:			Guilhem Saurel on Tue,  8 Oct 2019
-#
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-HPP_HRP2_DEPEND_MK:=	${HPP_HRP2_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		hpp-hrp2
-endif
-
-ifeq (+,$(HPP_HRP2_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-hrp2?=	robotpkg
-
-DEPEND_USE+=		hpp-hrp2
-
-DEPEND_ABI.hpp-hrp2?=	${PKGTAG.python-}hpp-hrp2>=4.7.0
-DEPEND_DIR.hpp-hrp2?=	../../wip/hpp-hrp2
-
-SYSTEM_SEARCH.hpp-hrp2=\
-	include/hpp/hrp2/config.hh	\
-	'lib/pkgconfig/hpp-hrp2.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_HRP2_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-hrp2/DESCR b/py-hpp-hrp2/DESCR
similarity index 100%
rename from hpp-hrp2/DESCR
rename to py-hpp-hrp2/DESCR
diff --git a/hpp-hrp2/Makefile b/py-hpp-hrp2/Makefile
similarity index 69%
rename from hpp-hrp2/Makefile
rename to py-hpp-hrp2/Makefile
index fbf6f116df332acf9bae4f0fae2e60fb6bd3c9b7..337ca32b194e42e05856f1a6a02f4319f4cff0b4 100644
--- a/hpp-hrp2/Makefile
+++ b/py-hpp-hrp2/Makefile
@@ -2,11 +2,12 @@
 # Created:			Guilhem Saurel on Tue,  8 Oct 2019
 #
 
-HPP_PACKAGE=	hpp-hrp2
-HPP_COMMENT=	Data specific to robots hrp2 for hpp-corbaserver
+HPP_PACKAGE=		hpp-hrp2
+HPP_COMMENT=		Data specific to robots hrp2 for hpp-corbaserver
 
-CATEGORIES=	wip
-USE_PYTHON=	true
+CATEGORIES=		wip
+USE_PYTHON=		true
+PYTHON_NOTAG_CONFLICT=	yes
 
 include ../../meta-pkgs/hpp/Makefile.common
 
diff --git a/hpp-hrp2/PLIST b/py-hpp-hrp2/PLIST
similarity index 100%
rename from hpp-hrp2/PLIST
rename to py-hpp-hrp2/PLIST
diff --git a/py-hpp-hrp2/depend.mk b/py-hpp-hrp2/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..7e0e035892c109aa7cb6133f2773b3a4f76c0769
--- /dev/null
+++ b/py-hpp-hrp2/depend.mk
@@ -0,0 +1,29 @@
+# robotpkg depend.mk for:	wip/py36-hpp-hrp2
+# Created:			Guilhem Saurel on Tue,  8 Oct 2019
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+PY_HPP_HRP2_DEPEND_MK:=	${PY_HPP_HRP2_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		py-hpp-hrp2
+endif
+
+ifeq (+,$(PY_HPP_HRP2_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-hrp2?=	robotpkg
+
+DEPEND_USE+=		py-hpp-hrp2
+
+DEPEND_ABI.py-hpp-hrp2?=	${PKGTAG.python-}hpp-hrp2>=4.7.0
+DEPEND_DIR.py-hpp-hrp2?=	../../wip/py-hpp-hrp2
+
+SYSTEM_SEARCH.py-hpp-hrp2=\
+	include/hpp/hrp2/config.hh	\
+	'lib/pkgconfig/hpp-hrp2.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_HRP2_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-hrp2/distinfo b/py-hpp-hrp2/distinfo
similarity index 100%
rename from hpp-hrp2/distinfo
rename to py-hpp-hrp2/distinfo