diff --git a/data/cubicweb.comment.css b/data/cubes.comment.css
similarity index 100%
rename from data/cubicweb.comment.css
rename to data/cubes.comment.css
diff --git a/data/cubicweb.comment.js b/data/cubes.comment.js
similarity index 100%
rename from data/cubicweb.comment.js
rename to data/cubes.comment.js
diff --git a/views.py b/views.py
index 0e6ac96212d7d221bd6f45d0aa9a31ad3052228f_dmlld3MucHk=..6cab9d22395a31319a86a09e9dd59a4dee70b220_dmlld3MucHk= 100644
--- a/views.py
+++ b/views.py
@@ -29,7 +29,7 @@
     accepts = ('Comment',)
     
     def cell_call(self, row, col):
-        self.req.add_css('cubicweb.comment.css')
+        self.req.add_css('cubes.comment.css')
         entity = self.complete_entity(row, col)
         # display text, author and creation date
         self.w(u'<div class="comment">')
@@ -85,8 +85,8 @@
     
     def cell_call(self, row, col, **kwargs):
         _ = self.req._
-        self.req.add_js('ajax.js') # XXXFIXME cubicweb.ajax.js
-        self.req.add_css('cubicweb.comment.css')
+        self.req.add_js('cubicweb.ajax.js')
+        self.req.add_css('cubes.comment.css')
         entity = self.entity(row, col)
         diem = self.format_date(entity.creation_date)
         action = self.vreg.select_action('reply_comment', self.req, self.rset, row)
@@ -158,7 +158,7 @@
 </div>
 """
     def call(self, commented):
-        self.req.add_js('cubicweb.comment.js')
+        self.req.add_js('cubes.comment.js')
         newcomment = self.vreg.etype_class('Comment')(self.req, None, None)
         newcomment.eid = 'INLINE'
         # hack to avoid tabindex conflicts caused by Ajax requests
@@ -195,7 +195,7 @@
 </div>
 """
     def cell_call(self, row, col):
-        self.req.add_js(['ajax.js', 'cubicweb.comment.js']) # XXXFIXME
+        self.req.add_js( ('cubicweb.ajax.js', 'cubes.comment.js') )
         # hack to avoid tabindex conflicts caused by Ajax request
         self.req.next_tabindex = count(20).next
         comment = self.entity(row, col)
@@ -231,7 +231,7 @@
 
     def call(self, view=None, orderby='diem'):
         req = self.req
-        req.add_js(['ajax.js', 'cubicweb.comment.js'])
+        req.add_js( ('cubicweb.ajax.js', 'cubes.comment.js') )
         eid = self.rset[0][0]
         if orderby == 'author':
             rql = u'Any C,CD,CC,CCF,U,UL,US,UF ORDERBY UL WHERE C is Comment, '\
@@ -250,7 +250,7 @@
             reply = u' (<a href="%s">%s</a>)' % (url, req._(action.title))
             if req.property_value('ui.fckeditor') and \
                    req.property_value('ui.default-text-format') == 'text/html':
-                req.add_js(['fckeditor.js'])
+                req.add_js('fckeditor.js')
                 req.fckeditor_config()
         else:
             reply = u''