diff -r 6cbc7bc8ea6d -r 5fe84a5f7035 schema.py
--- a/schema.py	Fri Apr 17 13:21:05 2009 +0200
+++ b/schema.py	Fri Apr 17 16:55:37 2009 +0200
@@ -458,11 +458,11 @@
         
     def schema_entity_types(self):
         """return the list of entity types used to build the schema"""
-        return frozenset(('EEType', 'ERType', 'EFRDef', 'ENFRDef',
-                          'EConstraint', 'EConstraintType', 'RQLExpression',
+        return frozenset(('CWEType', 'CWRType', 'CWAttribute', 'CWRelation',
+                          'CWConstraint', 'CWConstraintType', 'RQLExpression',
                           # XXX those are not really "schema" entity types
                           #     but we usually don't want them as @* targets
-                          'EProperty', 'EPermission', 'State', 'Transition'))
+                          'CWProperty', 'CWPermission', 'State', 'Transition'))
         
     def add_entity_type(self, edef):
         edef.name = edef.name.encode()