--- a/cwconfig.py	Tue Feb 22 21:33:10 2011 +0100
+++ b/cwconfig.py	Mon Feb 28 14:12:42 2011 +0100
@@ -771,7 +771,7 @@
         self.debug('%s loaded', sitefile)
         return module
 
-    def eproperty_definitions(self):
+    def cwproperty_definitions(self):
         cfg = self.persistent_options_configuration()
         for section, options in cfg.options_by_section():
             section = section.lower()

--- a/cwvreg.py	Tue Feb 22 21:33:10 2011 +0100
+++ b/cwvreg.py	Mon Feb 28 14:12:42 2011 +0100
@@ -554,7 +554,7 @@
         if not self.initialized:
             self['propertydefs'] = {}
             self['propertyvalues'] = self.eprop_values = {}
-            for key, propdef in self.config.eproperty_definitions():
+            for key, propdef in self.config.cwproperty_definitions():
                 self.register_property(key, **propdef)
         CW_EVENT_MANAGER.emit('after-registry-reset', self)
 

--- a/web/webconfig.py	Tue Feb 22 21:33:10 2011 +0100
+++ b/web/webconfig.py	Mon Feb 28 14:12:42 2011 +0100
@@ -207,8 +207,8 @@
     def fckeditor_installed(self):
         return exists(self.uiprops['FCKEDITOR_PATH'])
 
-    def eproperty_definitions(self):
-        for key, pdef in super(WebConfiguration, self).eproperty_definitions():
+    def cwproperty_definitions(self):
+        for key, pdef in super(WebConfiguration, self).cwproperty_definitions():
             if key == 'ui.fckeditor' and not self.fckeditor_installed():
                 continue
             yield key, pdef