--- a/doc/book/devrepo/entityclasses/data-as-objects.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/book/devrepo/entityclasses/data-as-objects.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -113,7 +113,7 @@
 
 .. sourcecode:: python
 
-    from cubes.OTHER_CUBE import entities
+    from cubicweb_OTHER_CUBE import entities
 
     class EntityExample(entities.EntityExample):
 

--- a/doc/book/devweb/edition/form.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/book/devweb/edition/form.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -35,7 +35,7 @@
  {'base': [<class 'cubicweb.web.views.forms.FieldsForm'>,
            <class 'cubicweb.web.views.forms.EntityFieldsForm'>],
   'changestate': [<class 'cubicweb.web.views.workflow.ChangeStateForm'>,
-                  <class 'cubes.tracker.views.forms.VersionChangeStateForm'>],
+                  <class 'cubicweb_tracker.views.forms.VersionChangeStateForm'>],
   'composite': [<class 'cubicweb.web.views.forms.CompositeForm'>,
                 <class 'cubicweb.web.views.forms.CompositeEntityForm'>],
   'deleteconf': [<class 'cubicweb.web.views.editforms.DeleteConfForm'>],

--- a/doc/tutorials/advanced/part02_security.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/tutorials/advanced/part02_security.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -137,12 +137,12 @@
 	    'delete': ('managers', 'owners'),
 	    }
 
-    from cubes.folder.schema import Folder
-    from cubes.file.schema import File
-    from cubes.comment.schema import Comment
-    from cubes.person.schema import Person
-    from cubes.zone.schema import Zone
-    from cubes.tag.schema import Tag
+    from cubicweb_folder.schema import Folder
+    from cubicweb_file.schema import File
+    from cubicweb_comment.schema import Comment
+    from cubicweb_person.schema import Person
+    from cubicweb_zone.schema import Zone
+    from cubicweb_tag.schema import Tag
 
     Folder.__permissions__ = VISIBILITY_PERMISSIONS
     File.__permissions__ = VISIBILITY_PERMISSIONS

--- a/doc/tutorials/advanced/part04_ui-base.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/tutorials/advanced/part04_ui-base.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -174,7 +174,7 @@
 
 .. sourcecode:: python
 
-    from cubes.folder import entities as folder
+    from cubicweb_folder import entities as folder
 
 
     class FolderITreeAdapter(folder.FolderITreeAdapter):

--- a/doc/tutorials/advanced/part05_ui-advanced.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/tutorials/advanced/part05_ui-advanced.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -196,8 +196,8 @@
 
   from cubicweb.predicates import none_rset
   from cubicweb.web.views import bookmark
-  from cubes.zone import views as zone
-  from cubes.tag import views as tag
+  from cubicweb_zone import views as zone
+  from cubicweb_tag import views as tag
 
 
   # change bookmarks box selector so it's only displayed on startup views

--- a/doc/tutorials/dataimport/diseasome_import.py	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/tutorials/dataimport/diseasome_import.py	Thu Mar 28 11:13:12 2019 +0100
@@ -27,7 +27,7 @@
 
 # CubicWeb imports
 import cubicweb.dataimport as cwdi
-from cubes.dataio import dataimport as mcwdi
+from cubicweb_dataio import dataimport as mcwdi
 
 # Diseasome parser import
 import diseasome_parser as parser

--- a/doc/tutorials/dataimport/index.rst	Thu Mar 28 11:09:29 2019 +0100
+++ b/doc/tutorials/dataimport/index.rst	Thu Mar 28 11:13:12 2019 +0100
@@ -354,7 +354,7 @@
 ``dataimport`` module, then initialize the store by giving it the
 ``session`` parameter::
 
-    from cubes.dataio import dataimport as mcwdi
+    from cubicweb_dataio import dataimport as mcwdi
     ...
 
     store = mcwdi.MassiveObjectStore(session)
@@ -441,7 +441,7 @@
         store = cwdi.SQLGenObjectStore(session)
    
    where ``cwdi`` is the imported ``cubicweb.dataimport`` or 
-   ``cubes.dataio.dataimport``.
+   ``cubicweb_dataio.dataimport``.
 
 #. calls the diseasome parser, that is, the ``entities_from_rdf`` function in the 
    ``diseasome_parser`` module and iterates on its result, in a line such as::