diff --git a/product/ERP5/tests/testERP5Interfaces.py b/product/ERP5/tests/testERP5Interfaces.py
index 9073b47216a8e4bb7edc12d7a440b1d495a4daef..5d5d7cf507bf22abe1de1bb45ecb400f36c413ce 100644
--- a/product/ERP5/tests/testERP5Interfaces.py
+++ b/product/ERP5/tests/testERP5Interfaces.py
@@ -34,30 +34,30 @@ import unittest
 # this list can be generated automatically using introspection or can be set
 # manually and treated as reference to what implements what
 implements_tuple_list = [
-  (('Products.ERP5Type.Document.RoleDefinition', 'RoleDefinition'), 'ILocalRoleGenerator'),
-  (('Products.ERP5Type.Document.BusinessLink','BusinessLink'), 'IBusinessLink'),
-  (('Products.ERP5Type.Document.BusinessLink','BusinessLink'), 'ICategoryAccessProvider'),
-  (('Products.ERP5Type.Document.TradeCondition','TradeCondition'), 'IAmountGenerator'),
-  (('Products.ERP5Type.Document.TradeModelCell','TradeModelCell'), 'IAmountGenerator'),
-  (('Products.ERP5Type.Document.TradeModelCell','TradeModelCell'), 'IVariated'),
-  (('Products.ERP5Type.Document.TradeModelLine','TradeModelLine'), 'IAmountGenerator'),
-  (('Products.ERP5Type.Document.TradeModelLine','TradeModelLine'), 'IVariated'),
-  (('Products.ERP5Type.Document.TradeModelPath','TradeModelPath'), 'IArrowBase'),
-  (('Products.ERP5Type.Document.TradeModelRule','TradeModelRule'), 'IPredicate'),
-  (('Products.ERP5Type.Document.TradeModelRule','TradeModelRule'), 'IRule'),
-  (('Products.ERP5Type.Document.Transformation','Transformation'), 'IAmountGenerator'),
-  (('Products.ERP5Type.Document.Transformation','Transformation'), 'IVariated'),
-  (('Products.ERP5Type.Document.TransformationRule','TransformationRule'), 'IPredicate'),
-  (('Products.ERP5Type.Document.TransformationRule','TransformationRule'), 'IRule'),
-  (('Products.ERP5Type.Document.TransformedResource','TransformedResource'), 'IVariated'),
+  (('Products.ERP5.Document.RoleDefinition', 'RoleDefinition'), 'ILocalRoleGenerator'),
+  (('Products.ERP5.Document.BusinessLink','BusinessLink'), 'IBusinessLink'),
+  (('Products.ERP5.Document.BusinessLink','BusinessLink'), 'ICategoryAccessProvider'),
+  (('Products.ERP5.Document.TradeCondition','TradeCondition'), 'IAmountGenerator'),
+  (('Products.ERP5.Document.TradeModelCell','TradeModelCell'), 'IAmountGenerator'),
+  (('Products.ERP5.Document.TradeModelCell','TradeModelCell'), 'IVariated'),
+  (('Products.ERP5.Document.TradeModelLine','TradeModelLine'), 'IAmountGenerator'),
+  (('Products.ERP5.Document.TradeModelLine','TradeModelLine'), 'IVariated'),
+  (('Products.ERP5.Document.TradeModelPath','TradeModelPath'), 'IArrowBase'),
+  (('Products.ERP5Legacy.Document.TradeModelRule','TradeModelRule'), 'IPredicate'),
+  (('Products.ERP5Legacy.Document.TradeModelRule','TradeModelRule'), 'IRule'),
+  (('Products.ERP5.Document.Transformation','Transformation'), 'IAmountGenerator'),
+  (('Products.ERP5.Document.Transformation','Transformation'), 'IVariated'),
+  (('Products.ERP5Legacy.Document.TransformationRule','TransformationRule'), 'IPredicate'),
+  (('Products.ERP5Legacy.Document.TransformationRule','TransformationRule'), 'IRule'),
+  (('Products.ERP5.Document.TransformedResource','TransformedResource'), 'IVariated'),
   #IDocument
-  (('Products.ERP5Type.Document.Document', 'Document'), 'IDocument'),
-  (('Products.ERP5Type.Document.Image', 'Image'), 'IDocument'),
-  (('Products.ERP5Type.Document.File', 'File'), 'IDocument'),
-  (('Products.ERP5Type.Document.OOoDocument', 'OOoDocument'), 'IDocument'),
-  (('Products.ERP5Type.Document.TextDocument', 'TextDocument'), 'IDocument'),
-  (('Products.ERP5Type.Document.EmailDocument', 'EmailDocument'), 'IDocument'),
-  (('Products.ERP5Type.Document.Event', 'Event'), 'IDocument'),
+  (('Products.ERP5.Document.Document', 'Document'), 'IDocument'),
+  (('Products.ERP5.Document.Image', 'Image'), 'IDocument'),
+  (('Products.ERP5.Document.File', 'File'), 'IDocument'),
+  (('Products.ERP5OOo.Document.OOoDocument', 'OOoDocument'), 'IDocument'),
+  (('Products.ERP5.Document.TextDocument', 'TextDocument'), 'IDocument'),
+  (('Products.ERP5.Document.EmailDocument', 'EmailDocument'), 'IDocument'),
+  (('Products.ERP5.Document.Event', 'Event'), 'IDocument'),
   # IAmountList
   (('Products.ERP5.AggregatedAmountList', 'AggregatedAmountList'), 'IAmountList'),
 ]
@@ -84,14 +84,14 @@ addTestMethodDynamically(TestERP5Interfaces, implements_tuple_list)
 
 for failing_method in [
     'test_Products.ERP5.AggregatedAmountList_AggregatedAmountList_implements_IAmountList',
-    'test_Products.ERP5Type.Document.BusinessLink_BusinessLink_implements_IBusinessLink',
-    'test_Products.ERP5Type.Document.BusinessLink_BusinessLink_implements_ICategoryAccessProvider',
-    'test_Products.ERP5Type.Document.TradeModelCell_TradeModelCell_implements_IVariated',
-    'test_Products.ERP5Type.Document.TradeModelLine_TradeModelLine_implements_IVariated',
-    'test_Products.ERP5Type.Document.TradeModelRule_TradeModelRule_implements_IRule',
-    'test_Products.ERP5Type.Document.TransformationRule_TransformationRule_implements_IRule',
-    'test_Products.ERP5Type.Document.Transformation_Transformation_implements_IVariated',
-    'test_Products.ERP5Type.Document.TransformedResource_TransformedResource_implements_IVariated',
+    'test_Products.ERP5.Document.BusinessLink_BusinessLink_implements_IBusinessLink',
+    'test_Products.ERP5.Document.BusinessLink_BusinessLink_implements_ICategoryAccessProvider',
+    'test_Products.ERP5.Document.TradeModelCell_TradeModelCell_implements_IVariated',
+    'test_Products.ERP5.Document.TradeModelLine_TradeModelLine_implements_IVariated',
+    'test_Products.ERP5Legacy.Document.TradeModelRule_TradeModelRule_implements_IRule',
+    'test_Products.ERP5Legacy.Document.TransformationRule_TransformationRule_implements_IRule',
+    'test_Products.ERP5.Document.Transformation_Transformation_implements_IVariated',
+    'test_Products.ERP5.Document.TransformedResource_TransformedResource_implements_IVariated',
   ]:
   setattr(TestERP5Interfaces, failing_method,
       expectedFailure(getattr(TestERP5Interfaces,failing_method)))
diff --git a/product/ERP5Type/tests/testERP5TypeInterfaces.py b/product/ERP5Type/tests/testERP5TypeInterfaces.py
index f6bdba699d27be5a39f5c7d3499c75c70fa02455..bb0d3d1c89b70ea4655c95638b986f8e7c881c8b 100644
--- a/product/ERP5Type/tests/testERP5TypeInterfaces.py
+++ b/product/ERP5Type/tests/testERP5TypeInterfaces.py
@@ -45,9 +45,9 @@ implements_tuple_list = [
     'IActionContainer'),
   (('Products.ERP5Type.ERP5Type', 'ERP5TypeInformation'),
     'ILocalRoleAssignor'),
-  (('Products.ERP5Type.Document.ActionInformation', 'CacheableAction'),
+  (('Products.ERP5Type.Core.ActionInformation', 'CacheableAction'),
     'IAction'),
-  (('Products.ERP5Type.Document.RoleInformation', 'RoleInformation'),
+  (('Products.ERP5Type.Core.RoleInformation', 'RoleInformation'),
     'ILocalRoleGenerator'),
 ]