--- a/src/pyams_content/component/association/zmi/__init__.py	Wed Jun 13 08:55:06 2018 +0200
+++ b/src/pyams_content/component/association/zmi/__init__.py	Wed Jun 13 08:56:05 2018 +0200
@@ -17,7 +17,8 @@
 import json
 
 # import interfaces
-from pyams_content.component.association.interfaces import IAssociationTarget, IAssociationContainer, IAssociationInfo
+from pyams_content.component.association.interfaces import IAssociationContainerTarget, IAssociationContainer, \
+    IAssociationInfo
 from pyams_content.component.association.zmi.interfaces import IAssociationsParentForm, IAssociationsView
 from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
 from pyams_form.interfaces.form import IInnerSubForm
@@ -73,7 +74,7 @@
     """Association item properties edit form, JSON renderer"""
 
     def get_associations_table(self):
-        target = get_parent(self.context, IAssociationTarget)
+        target = get_parent(self.context, IAssociationContainerTarget)
         return {
             'status': 'success',
             'message': self.request.localizer.translate(self.successMessage),
@@ -87,7 +88,7 @@
 # Content associations view
 #
 
-@viewlet_config(name='associations.menu', context=IAssociationTarget, layer=IPyAMSLayer,
+@viewlet_config(name='associations.menu', context=IAssociationContainerTarget, layer=IPyAMSLayer,
                 manager=IPropertiesMenu, permission=VIEW_SYSTEM_PERMISSION, weight=60)
 class AssociationsMenu(MenuItem):
     """Associations menu"""
@@ -117,7 +118,7 @@
     @property
     def data_attributes(self):
         registry = get_current_registry()
-        target = get_parent(self.context, IAssociationTarget)
+        target = get_parent(self.context, IAssociationContainerTarget)
         container = registry.getAdapter(target, IAssociationContainer, name=self.associations_name)
         attributes = super(AssociationsTable, self).data_attributes
         attributes['table'] = {
@@ -134,7 +135,7 @@
         return list(super(AssociationsTable, self).values)
 
 
-@adapter_config(context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IValues)
+@adapter_config(context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IValues)
 class AssociationsTableValuesAdapter(ContextRequestViewAdapter):
     """Associations table values adapter"""
 
@@ -144,7 +145,7 @@
         return registry.getAdapter(self.context, IAssociationContainer, name=self.view.associations_name).values()
 
 
-@adapter_config(name='sorter', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='sorter', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='sorter', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTableSorterColumn(ProtectedFormObjectMixin, SorterColumn):
     """Associations table sorter column"""
@@ -159,7 +160,7 @@
     return {'status': 'success'}
 
 
-@adapter_config(name='show-hide', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable),
+@adapter_config(name='show-hide', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable),
                 provides=IColumn)
 @adapter_config(name='show-hide', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable),
                 provides=IColumn)
@@ -174,7 +175,7 @@
     return switch_element_visibility(request, IAssociationContainer)
 
 
-@adapter_config(name='pictogram', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='pictogram', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='pictogram', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTablePictogramColumn(ImageColumn):
     """Associations table pictogram column"""
@@ -190,7 +191,7 @@
         return self.request.localizer.translate(item.icon_hint)
 
 
-@adapter_config(name='name', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='name', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='name', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTablePublicNameColumn(NameColumn):
     """Associations table name column"""
@@ -208,7 +209,7 @@
         return title
 
 
-@adapter_config(name='inner_name', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='inner_name', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='inner_name', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTableInnerNameColumn(I18nColumn, GetAttrColumn):
     """Associations table inner name column"""
@@ -224,7 +225,7 @@
             return '--'
 
 
-@adapter_config(name='size', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='size', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='size', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTableSizeColumn(I18nColumn, GetAttrColumn):
     """Associations table size column"""
@@ -240,7 +241,7 @@
             return '--'
 
 
-@adapter_config(name='trash', context=(IAssociationTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
+@adapter_config(name='trash', context=(IAssociationContainerTarget, IPyAMSLayer, AssociationsTable), provides=IColumn)
 @adapter_config(name='trash', context=(IAssociationContainer, IPyAMSLayer, AssociationsTable), provides=IColumn)
 class AssociationsTableTrashColumn(ProtectedFormObjectMixin, TrashColumn):
     """Associations table trash column"""
@@ -253,7 +254,7 @@
     output = delete_container_element(request)
     if output.get('status') == 'success':
         from pyams_content.component.paragraph.zmi import get_json_paragraph_toolbar_refresh_event
-        parent = get_parent(request.context, IAssociationTarget)
+        parent = get_parent(request.context, IAssociationContainerTarget)
         output.update({
             'handle_json': True,
             'events': [
@@ -264,7 +265,7 @@
     return output
 
 
-@pagelet_config(name='associations.html', context=IAssociationTarget, layer=IPyAMSLayer,
+@pagelet_config(name='associations.html', context=IAssociationContainerTarget, layer=IPyAMSLayer,
                 permission=VIEW_SYSTEM_PERMISSION)
 @implementer(IAssociationsView)
 class AssociationsContainerView(ContainerAdminView, Pagelet):
@@ -274,7 +275,7 @@
     table_class = AssociationsTable
 
 
-@pagelet_config(name='associations-dialog.html', context=IAssociationTarget, layer=IPyAMSLayer,
+@pagelet_config(name='associations-dialog.html', context=IAssociationContainerTarget, layer=IPyAMSLayer,
                 permission=VIEW_SYSTEM_PERMISSION)
 @implementer(IAssociationsParentForm)
 class AssociationsContainerDialogView(AdminDialogDisplayForm):
@@ -287,7 +288,7 @@
     fields = field.Fields(Interface)
 
 
-@adapter_config(name='associations', context=(IAssociationTarget, IPyAMSLayer, IAssociationsParentForm),
+@adapter_config(name='associations', context=(IAssociationContainerTarget, IPyAMSLayer, IAssociationsParentForm),
                 provides=IInnerSubForm)
 @implementer(IAssociationsView)
 class AssociationsView(InnerTableView):