--- a/devtools/apptest.py	Mon Nov 10 19:33:55 2008 +0100
+++ b/devtools/apptest.py	Mon Nov 10 19:47:06 2008 +0100
@@ -58,7 +58,7 @@
     vcconf = {'cubicweb': self.config.cubicweb_version()}
     self.config.bootstrap_cubes()
     for pk in self.config.cubes():
-        version = self.config.template_version(pk)
+        version = self.config.cube_version(pk)
         vcconf[pk] = version
     self.config._cubes = None
     return vcconf

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/test/data/bootstrap_cubes	Mon Nov 10 19:47:06 2008 +0100
@@ -0,0 +1,1 @@
+comment,folder,tag,basket,email,file

--- a/server/test/data/bootstrap_packages	Mon Nov 10 19:33:55 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ecomment,eclassfolders,eclasstags,ebasket,eemail,efile

--- a/server/test/unittest_repository.py	Mon Nov 10 19:33:55 2008 +0100
+++ b/server/test/unittest_repository.py	Mon Nov 10 19:47:06 2008 +0100
@@ -402,11 +402,10 @@
     def test_versions_inserted(self):
         inserted = [r[0] for r in self.execute('Any K ORDERBY K WHERE P pkey K, P pkey ~= "system.version.%"')]
         self.assertEquals(inserted,
-                          [u'system.version.ebasket', u'system.version.eclassfolders',
-                           u'system.version.eclasstags', u'system.version.ecomment',
-                           u'system.version.eemail', u'system.version.efile',
-                           u'system.version.cubicweb'])
-
+                          [u'system.version.basket', u'system.version.comment', 
+                           u'system.version.cubicweb', u'system.version.email', 
+                           u'system.version.file', u'system.version.folder', 
+                           u'system.version.tag'])
         
 class InlineRelHooksTC(RepositoryBasedTC):
     """test relation hooks are called for inlined relations