--- a/entities/authobjs.py	Fri Feb 12 15:18:00 2010 +0100
+++ b/entities/authobjs.py	Wed Mar 24 10:23:31 2010 +0100
@@ -13,7 +13,7 @@
 from cubicweb.entities import AnyEntity, fetch_config
 
 class CWGroup(AnyEntity):
-    id = 'CWGroup'
+    __regid__ = 'CWGroup'
     fetch_attrs, fetch_order = fetch_config(['name'])
     fetch_unrelated_order = fetch_order
 
@@ -23,7 +23,7 @@
 
 
 class CWUser(AnyEntity):
-    id = 'CWUser'
+    __regid__ = 'CWUser'
     fetch_attrs, fetch_order = fetch_config(['login', 'firstname', 'surname'])
     fetch_unrelated_order = fetch_order
 
@@ -60,12 +60,13 @@
         try:
             # properties stored on the user aren't correctly typed
             # (e.g. all values are unicode string)
-            return self.vreg.typed_value(key, self.properties[key])
+            return self._cw.vreg.typed_value(key, self.properties[key])
         except KeyError:
             pass
         except ValueError:
-            self.warning('incorrect value for eproperty %s of user %s', key, self.login)
-        return self.vreg.property_value(key)
+            self.warning('incorrect value for eproperty %s of user %s',
+                         key, self.login)
+        return self._cw.vreg.property_value(key)
 
     def matching_groups(self, groups):
         """return the number of the given group(s) in which the user is
@@ -92,12 +93,12 @@
         return self.groups == frozenset(('guests', ))
 
     def owns(self, eid):
-        if hasattr(self.req, 'unsafe_execute'):
+        if hasattr(self._cw, 'unsafe_execute'):
             # use unsafe_execute on the repository side, in case
             # session's user doesn't have access to CWUser
-            execute = self.req.unsafe_execute
+            execute = self._cw.unsafe_execute
         else:
-            execute = self.req.execute
+            execute = self._cw.execute
         try:
             return execute('Any X WHERE X eid %(x)s, X owned_by U, U eid %(u)s',
                            {'x': eid, 'u': self.eid}, 'x')
@@ -115,7 +116,7 @@
             kwargs['x'] = contexteid
             cachekey = 'x'
         try:
-            return self.req.execute(rql, kwargs, cachekey)
+            return self._cw.execute(rql, kwargs, cachekey)
         except Unauthorized:
             return False
 
@@ -125,7 +126,7 @@
         """construct a name using firstname / surname or login if not defined"""
 
         if self.firstname and self.surname:
-            return self.req._('%(firstname)s %(surname)s') % {
+            return self._cw._('%(firstname)s %(surname)s') % {
                 'firstname': self.firstname, 'surname' : self.surname}
         if self.firstname:
             return self.firstname