--- a/goa/test/unittest_db.py	Fri Apr 17 13:21:05 2009 +0200
+++ b/goa/test/unittest_db.py	Fri Apr 17 16:55:37 2009 +0200
@@ -18,20 +18,20 @@
     MODEL_CLASSES = (Blog,)
 
     def test_set_none_relation(self):
-        eprop = self.add_entity('EProperty', pkey=u'ui.language', value=u'en')
+        eprop = self.add_entity('CWProperty', pkey=u'ui.language', value=u'en')
         self.failUnless('s_for_user' in eprop._dbmodel)
         self.assertEquals(eprop._dbmodel['s_for_user'], None)
 
     def test_euser_key(self):
-        euser = self.add_entity('EUser', login=u'toto', upassword='toto')
+        euser = self.add_entity('CWUser', login=u'toto', upassword='toto')
         self.assertEquals(euser.key().name(), 'key_toto')
         
     def test_egroup_key(self):
-        egroup = self.add_entity('EGroup', name=u'toto')
+        egroup = self.add_entity('CWGroup', name=u'toto')
         self.assertEquals(egroup.key().name(), 'key_toto')
 
     def test_password_encryption(self):
-        euser = self.add_entity('EUser', login=u'toto', upassword='toto')
+        euser = self.add_entity('CWUser', login=u'toto', upassword='toto')
         self.failUnless(euser.upassword != 'toto', euser.upassword)
         self.assertEquals(crypt_password('toto', euser.upassword[:2]), euser.upassword)