diff --git a/Makefile b/Makefile
index 9f18c401667ee6c755e02297c0a469027bc49698..e43baffc6a227cb15764e10ded6f31706aa7ca74 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ SUBDIR+=	head-action
 SUBDIR+=	hey5-description
 SUBDIR+=	histodet
 SUBDIR+=	hpp-affordance
-SUBDIR+=	hpp-affordance-corba
 SUBDIR+=	hpp-baxter
 SUBDIR+=	hpp-benchmark
 SUBDIR+=	hpp-bezier-com-traj
@@ -93,6 +92,7 @@ SUBDIR+=	py-dynamic-graph-v3
 SUBDIR+=	py-example-adder
 SUBDIR+=	py-example-robot-data
 SUBDIR+=	py-hqp
+SUBDIR+=	py-hpp-affordance-corba
 SUBDIR+=	py-hpp-rbprm-corba
 SUBDIR+=	py-mavlink
 SUBDIR+=	py-morse
diff --git a/hpp-affordance-corba/depend.mk b/hpp-affordance-corba/depend.mk
deleted file mode 100644
index 5e36f086c24a620b31cc6e4b549170e2206292b8..0000000000000000000000000000000000000000
--- a/hpp-affordance-corba/depend.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg depend.mk for:	wip/hpp-affordance-corba-corba
-# Created:			Guilhem Saurel on Fri, 4 Jan 2019
-#
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-HPP_AFFORDANCE_CORBA_DEPEND_MK:=	${HPP_AFFORDANCE_CORBA_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		hpp-affordance-corba
-endif
-
-ifeq (+,$(HPP_AFFORDANCE_CORBA_DEPEND_MK)) # --------------------------------------
-
-include ../../mk/sysdep/python.mk
-
-PREFER.hpp-affordance-corba?=	robotpkg
-
-DEPEND_USE+=		hpp-affordance-corba
-
-DEPEND_ABI.hpp-affordance-corba?=	${PKGTAG.python-}hpp-affordance-corba>=4.7.0
-DEPEND_DIR.hpp-affordance-corba?=	../../wip/hpp-affordance-corba
-
-SYSTEM_SEARCH.hpp-affordance-corba=\
-	include/hpp/corbaserver/affordance/config.hh			\
-	lib/hppPlugins/affordance-corba.so				\
-	'lib/pkgconfig/hpp-affordance-corba.pc:/Version/s/[^0-9.]//gp'
-
-endif # HPP_AFFORDANCE_CORBA_DEPEND_MK --------------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-affordance-corba/DESCR b/py-hpp-affordance-corba/DESCR
similarity index 100%
rename from hpp-affordance-corba/DESCR
rename to py-hpp-affordance-corba/DESCR
diff --git a/hpp-affordance-corba/Makefile b/py-hpp-affordance-corba/Makefile
similarity index 75%
rename from hpp-affordance-corba/Makefile
rename to py-hpp-affordance-corba/Makefile
index 363340eb1aa58517d198278af1ad20a0eb612491..d629702ee195aa24d7d8bc0e3d71d5b2796ea955 100644
--- a/hpp-affordance-corba/Makefile
+++ b/py-hpp-affordance-corba/Makefile
@@ -1,13 +1,14 @@
-# robotpkg Makefile for:	wip/hpp-affordance-corba
+# robotpkg Makefile for:	wip/py-hpp-affordance-corba
 # Created:			Guilhem Saurel on fri, 4 Jan 2019
 #
 
-HPP_PACKAGE=	hpp-affordance-corba
-HPP_COMMENT=	Extract Whole-Body Affordances for Mutli-Contact Planning (CORBA bindings)
+HPP_PACKAGE=		hpp-affordance-corba
+HPP_COMMENT=		Extract Whole-Body Affordances for Mutli-Contact Planning (CORBA bindings)
 
-CATEGORIES=	wip
+CATEGORIES=		wip
 
-USE_PYTHON=	true
+USE_PYTHON=		true
+PYTHON_NOTAG_CONFLICT=	yes
 
 include ../../meta-pkgs/hpp/Makefile.common
 
diff --git a/hpp-affordance-corba/PLIST b/py-hpp-affordance-corba/PLIST
similarity index 100%
rename from hpp-affordance-corba/PLIST
rename to py-hpp-affordance-corba/PLIST
diff --git a/py-hpp-affordance-corba/depend.mk b/py-hpp-affordance-corba/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..8f5a37f66682f5695023941a3257b5168434e339
--- /dev/null
+++ b/py-hpp-affordance-corba/depend.mk
@@ -0,0 +1,30 @@
+# robotpkg depend.mk for:	wip/py-hpp-affordance-corba-corba
+# Created:			Guilhem Saurel on Fri, 4 Jan 2019
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+PY_HPP_AFFORDANCE_CORBA_DEPEND_MK:=	${PY_HPP_AFFORDANCE_CORBA_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		py-hpp-affordance-corba
+endif
+
+ifeq (+,$(PY_HPP_AFFORDANCE_CORBA_DEPEND_MK)) # --------------------------------------
+
+include ../../mk/sysdep/python.mk
+
+PREFER.py-hpp-affordance-corba?=	robotpkg
+
+DEPEND_USE+=		py-hpp-affordance-corba
+
+DEPEND_ABI.py-hpp-affordance-corba?=	${PKGTAG.python-}hpp-affordance-corba>=4.7.0
+DEPEND_DIR.py-hpp-affordance-corba?=	../../wip/py-hpp-affordance-corba
+
+SYSTEM_SEARCH.py-hpp-affordance-corba=\
+	include/hpp/corbaserver/affordance/config.hh			\
+	lib/hppPlugins/affordance-corba.so				\
+	'lib/pkgconfig/hpp-affordance-corba.pc:/Version/s/[^0-9.]//gp'
+
+endif # PY_HPP_AFFORDANCE_CORBA_DEPEND_MK --------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/hpp-affordance-corba/distinfo b/py-hpp-affordance-corba/distinfo
similarity index 100%
rename from hpp-affordance-corba/distinfo
rename to py-hpp-affordance-corba/distinfo
diff --git a/py-hpp-rbprm-corba/Makefile b/py-hpp-rbprm-corba/Makefile
index 0dd529dbfed315d24350a066d2918a5017b76b0f..b6b1d39583a6bace69c6e6c187774d9123bba232 100644
--- a/py-hpp-rbprm-corba/Makefile
+++ b/py-hpp-rbprm-corba/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=		true
 include ../../meta-pkgs/hpp/Makefile.common
 
 include ../../wip/hpp-rbprm/depend.mk
-include ../../wip/hpp-affordance-corba/depend.mk
+include ../../wip/py-hpp-affordance-corba/depend.mk
 
 include ../../math/eigen3/depend.mk
 include ../../path/hpp-core/depend.mk