--- a/src/pyams_content/component/gallery/zmi/__init__.py	Wed Feb 07 09:22:03 2018 +0100
+++ b/src/pyams_content/component/gallery/zmi/__init__.py	Wed Feb 07 11:21:14 2018 +0100
@@ -21,7 +21,7 @@
 
 # import interfaces
 from pyams_content.component.gallery.interfaces import IGallery, IGalleryRenderer
-from pyams_content.component.gallery.zmi.interfaces import IGalleryImageAddFields, IGalleryImagesView
+from pyams_content.component.gallery.zmi.interfaces import IGalleryMediasAddFields, IGalleryContentsView
 from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
 from pyams_file.interfaces import IFileInfo
 from pyams_form.interfaces.form import IWidgetsPrefixViewletsManager
@@ -88,7 +88,7 @@
 #
 
 @pagelet_config(name='contents.html', context=IGallery, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
-@implementer(IGalleryImagesView)
+@implementer(IGalleryContentsView)
 class GalleryContentForm(AdminDialogDisplayForm):
     """Gallery contents form"""
 
@@ -99,31 +99,31 @@
     show_widget_title = True
 
 
-@viewlet_config(name='gallery-images', context=IGallery, view=IGalleryImagesView, manager=IWidgetsPrefixViewletsManager)
-@template_config(template='templates/gallery-images.pt', layer=IPyAMSLayer)
-@implementer(IGalleryImagesView)
-class GalleryImagesViewlet(Viewlet):
-    """Gallery images viewlet"""
+@viewlet_config(name='gallery-medias', context=IGallery, view=IGalleryContentsView, manager=IWidgetsPrefixViewletsManager)
+@template_config(template='templates/gallery-medias.pt', layer=IPyAMSLayer)
+@implementer(IGalleryContentsView)
+class GalleryMediasViewlet(Viewlet):
+    """Gallery medias viewlet"""
 
-    def get_title(self, image):
-        return II18n(image).query_attribute('title', request=self.request)
+    def get_title(self, media):
+        return II18n(media).query_attribute('title', request=self.request)
 
 
-@view_config(name='get-gallery-images.html', context=IGallery, request_type=IPyAMSLayer,
+@view_config(name='get-gallery-medias.html', context=IGallery, request_type=IPyAMSLayer,
              permission=VIEW_SYSTEM_PERMISSION)
-@implementer(IGalleryImagesView)
-class GalleryImagesView(WfSharedContentPermissionMixin):
-    """Gallery images view"""
+@implementer(IGalleryContentsView)
+class GalleryMediasView(WfSharedContentPermissionMixin):
+    """Gallery medias view"""
 
     def __init__(self, context, request):
         self.context = context
         self.request = request
 
     def __call__(self):
-        return render_to_response('templates/gallery-images.pt', {'view': self}, request=self.request)
+        return render_to_response('templates/gallery-medias.pt', {'view': self}, request=self.request)
 
-    def get_title(self, image):
-        return II18n(image).query_attribute('title', request=self.request)
+    def get_title(self, media):
+        return II18n(media).query_attribute('title', request=self.request)
 
     def get_thumbnail_target(self, media):
         registry = self.request.registry
@@ -132,25 +132,25 @@
             return absolute_url(media, self.request, 'preview.html')
 
 
-@view_config(name='set-images-order.json', context=IGallery, request_type=IPyAMSLayer,
+@view_config(name='set-medias-order.json', context=IGallery, request_type=IPyAMSLayer,
              permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-def set_images_order(request):
-    """Set gallery images order"""
-    images_names = json.loads(request.params.get('images'))
-    request.context.updateOrder(images_names)
+def set_medias_order(request):
+    """Set gallery medias order"""
+    medias_names = json.loads(request.params.get('medias'))
+    request.context.updateOrder(medias_names)
     return {'status': 'success'}
 
 
-@view_config(name='set-image-visibility.json', context=IGallery, request_type=IPyAMSLayer,
+@view_config(name='set-media-visibility.json', context=IGallery, request_type=IPyAMSLayer,
              permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-def set_image_visibility(request):
-    """Set gallery image visibility"""
+def set_media_visibility(request):
+    """Set gallery media visibility"""
     gallery = IGallery(request.context)
-    image = gallery.get(str(request.params.get('object_name')))
-    if image is None:
+    media = gallery.get(str(request.params.get('object_name')))
+    if media is None:
         raise NotFound()
-    image.visible = not image.visible
-    return {'visible': image.visible}
+    media.visible = not media.visible
+    return {'visible': media.visible}
 
 
 #
@@ -176,17 +176,17 @@
 
 
 #
-# Gallery images downloader
+# Gallery medias downloader
 #
 
-@view_config(name='get-images.zip', context=IGallery, request_type=IPyAMSLayer,
+@view_config(name='get-medias.zip', context=IGallery, request_type=IPyAMSLayer,
              permission=VIEW_SYSTEM_PERMISSION)
-def get_images_archive(request):
-    """Get all gallery images as ZIP file"""
+def get_medias_archive(request):
+    """Get all gallery medias as ZIP file"""
     zip_data = BytesIO()
     zip_file = zipfile.ZipFile(zip_data, mode='w')
-    for image in IGallery(request.context).values():
-        zip_file.writestr(IFileInfo(image.data).filename, image.data.data)
+    for media in IGallery(request.context).values():
+        zip_file.writestr(IFileInfo(media.data).filename, media.data.data)
     zip_file.close()
     zip_data.seek(0)
     response = Response(content_type='application/zip',