--- a/devtools/devctl.py	Thu Feb 02 14:33:30 2012 +0100
+++ b/devtools/devctl.py	Mon Jan 23 13:25:02 2012 +0100
@@ -107,7 +107,7 @@
     notice that relation definitions description and static vocabulary
     should be marked using '_' and extracted using xgettext
     """
-    from cubicweb.cwvreg import CubicWebVRegistry
+    from cubicweb.cwvreg import CWRegistryStore
     if cubedir:
         cube = osp.split(cubedir)[-1]
         config = DevConfiguration(cube)
@@ -119,7 +119,7 @@
         cube = libconfig = None
     cleanup_sys_modules(config)
     schema = config.load_schema(remove_unused_rtypes=False)
-    vreg = CubicWebVRegistry(config)
+    vreg = CWRegistryStore(config)
     # set_schema triggers objects registrations
     vreg.set_schema(schema)
     w(DEFAULT_POT_HEAD)
@@ -138,13 +138,13 @@
     w('\n')
     vregdone = set()
     if libconfig is not None:
-        from cubicweb.cwvreg import CubicWebVRegistry, clear_rtag_objects
+        from cubicweb.cwvreg import CWRegistryStore, clear_rtag_objects
         libschema = libconfig.load_schema(remove_unused_rtypes=False)
         afs = deepcopy(uicfg.autoform_section)
         appearsin_addmenu = deepcopy(uicfg.actionbox_appearsin_addmenu)
         clear_rtag_objects()
         cleanup_sys_modules(libconfig)
-        libvreg = CubicWebVRegistry(libconfig)
+        libvreg = CWRegistryStore(libconfig)
         libvreg.set_schema(libschema) # trigger objects registration
         libafs = uicfg.autoform_section
         libappearsin_addmenu = uicfg.actionbox_appearsin_addmenu