--- a/test/data/entities.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/test/data/entities.py	Wed Sep 23 11:13:39 2009 +0200
@@ -8,15 +8,15 @@
 from cubicweb.entities import AnyEntity, fetch_config
 
 class Societe(AnyEntity):
-    id = 'Societe'
+    __regid__ = 'Societe'
     fetch_attrs = ('nom',)
 
 class Personne(Societe):
     """customized class forne Person entities"""
-    id = 'Personne'
+    __regid__ = 'Personne'
     fetch_attrs, fetch_order = fetch_config(['nom', 'prenom'])
     rest_attr = 'nom'
 
 
 class Note(AnyEntity):
-    id = 'Note'
+    __regid__ = 'Note'

--- a/web/application.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/application.py	Wed Sep 23 11:13:39 2009 +0200
@@ -29,7 +29,7 @@
 
 class AbstractSessionManager(component.Component):
     """manage session data associated to a session identifier"""
-    id = 'sessionmanager'
+    __regid__ = 'sessionmanager'
 
     def __init__(self, vreg):
         self.session_time = vreg.config['http-session-time'] or None

--- a/web/component.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/component.py	Wed Sep 23 11:13:39 2009 +0200
@@ -58,7 +58,7 @@
 
 class NavigationComponent(Component):
     """abstract base class for navigation components"""
-    id = 'navigation'
+    __regid__ = 'navigation'
     __select__ = paginated_rset()
 
     cw_property_defs = {

--- a/web/test/test_views.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/test/test_views.py	Wed Sep 23 11:13:39 2009 +0200
@@ -27,7 +27,7 @@
 
 
 class SomeView(AnyRsetView):
-    id = 'someview'
+    __regid__ = 'someview'
 
     def call(self):
         self.req.add_js('spam.js')

--- a/web/test/unittest_viewselector.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/test/unittest_viewselector.py	Wed Sep 23 11:13:39 2009 +0200
@@ -427,7 +427,7 @@
 
 
 class CWETypeRQLAction(Action):
-    id = 'testaction'
+    __regid__ = 'testaction'
     __select__ = implements('CWEType') & rql_condition('X name "CWEType"')
     title = 'bla'
 

--- a/web/views/apacherewrite.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/apacherewrite.py	Wed Sep 23 11:13:39 2009 +0200
@@ -85,7 +85,7 @@
         ]
     """
     __abstract__ = True
-    id = 'urlrewriter'
+    __regid__ = 'urlrewriter'
     rules = []
 
     def get_rules(self, req):

--- a/web/views/autoform.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/autoform.py	Wed Sep 23 11:13:39 2009 +0200
@@ -29,7 +29,7 @@
     You can also easily customise it by adding/removing fields in
     AutomaticEntityForm instances.
     """
-    id = 'edition'
+    __regid__ = 'edition'
 
     cwtarget = 'eformframe'
     cssclass = 'entityForm'

--- a/web/views/bookmark.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/bookmark.py	Wed Sep 23 11:13:39 2009 +0200
@@ -20,7 +20,7 @@
 _abaa.tag_object_of(('*', 'bookmarked_by', '*'), False)
 
 class FollowAction(action.Action):
-    id = 'follow'
+    __regid__ = 'follow'
     __select__ = implements('Bookmark')
 
     title = _('follow')
@@ -50,7 +50,7 @@
 
 class BookmarksBox(box.UserRQLBoxTemplate):
     """display a box containing all user's bookmarks"""
-    id = 'bookmarks_box'
+    __regid__ = 'bookmarks_box'
     order = 40
     title = _('bookmarks')
     rql = ('Any B,T,P ORDERBY lower(T) '

--- a/web/views/magicsearch.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/magicsearch.py	Wed Sep 23 11:13:39 2009 +0200
@@ -343,7 +343,7 @@
 
 
 class MagicSearchComponent(Component):
-    id  = 'magicsearch'
+    __regid__  = 'magicsearch'
     def __init__(self, req, rset=None):
         super(MagicSearchComponent, self).__init__(req, rset=rset)
         processors = []

--- a/web/views/plots.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/plots.py	Wed Sep 23 11:13:39 2009 +0200
@@ -121,7 +121,7 @@
 
 
 class PlotView(baseviews.AnyRsetView):
-    id = 'plot'
+    __regid__ = 'plot'
     title = _('generic plot')
     __select__ = at_least_two_columns() & all_columns_are_numbers()
     timemode = False
@@ -170,7 +170,7 @@
             self.w(u'<img src="%s" />' % xml_escape(piechart.url))
 
     class PieChartView(baseviews.AnyRsetView):
-        id = 'piechart'
+        __regid__ = 'piechart'
         pieclass = Pie
 
         __select__ = at_least_two_columns() & second_column_is_number()
@@ -199,5 +199,5 @@
 
 
     class PieChart3DView(PieChartView):
-        id = 'piechart3D'
+        __regid__ = 'piechart3D'
         pieclass = Pie3D

--- a/web/views/tabs.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/tabs.py	Wed Sep 23 11:13:39 2009 +0200
@@ -150,7 +150,7 @@
 
     class ProjectScreenshotsView(EntityRelationView):
         '''display project's screenshots'''
-        id = title = _('projectscreenshots')
+        __regid__ = title = _('projectscreenshots')
         __select__ = EntityRelationView.__select__ & implements('Project')
         rtype = 'screenshot'
         role = 'subject'

--- a/web/views/vcard.py	Wed Sep 23 11:10:38 2009 +0200
+++ b/web/views/vcard.py	Wed Sep 23 11:13:39 2009 +0200
@@ -16,7 +16,7 @@
 
 class VCardCWUserView(EntityView):
     """export a person information as a vcard"""
-    id = 'vcard'
+    __regid__ = 'vcard'
     title = _('vcard')
     templatable = False
     content_type = 'text/x-vcard'