Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/customer.py	(revision 12087)
@@ -124,5 +124,6 @@
     def translated_state(self):
         try:
-            TRANSLATED_STATES = getUtility(ICustomersUtils).TRANSLATED_STATES
+            TRANSLATED_STATES = getUtility(
+                ICustomersUtils).TRANSLATED_CUSTOMER_STATES
             ts = TRANSLATED_STATES[self.state]
             return ts
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py	(revision 12087)
@@ -281,5 +281,5 @@
     SKIP_UPLOAD_VIEWLETS = ()
 
-    TRANSLATED_STATES = {
+    TRANSLATED_CUSTOMER_STATES = {
         CREATED: _('created'),
         STARTED: _('started'),
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py	(revision 12087)
@@ -64,5 +64,6 @@
     def translated_state(self):
         try:
-            TRANSLATED_STATES = getUtility(IDocumentsUtils).TRANSLATED_STATES
+            TRANSLATED_STATES = getUtility(
+                IDocumentsUtils).TRANSLATED_DOCUMENT_STATES
             return TRANSLATED_STATES[self.state]
         except KeyError:
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/utils.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/utils.py	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/documents/utils.py	(revision 12087)
@@ -39,5 +39,5 @@
     DOCMANAGE_STATES = (CREATED,)
 
-    TRANSLATED_STATES = {
+    TRANSLATED_DOCUMENT_STATES = {
         CREATED: _('created'),
         SUBMITTED: _('submitted for verification'),
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.py	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.py	(revision 12087)
@@ -66,5 +66,5 @@
 
 
-class UsersExporter(grok.GlobalUtility, ExporterBase):
+class UserExporter(grok.GlobalUtility, ExporterBase):
     """Exporter for user accounts.
     """
@@ -98,5 +98,5 @@
                 value[role] = object_list
         return super(
-            UsersExporter, self).mangle_value(
+            UserExporter, self).mangle_value(
             value, name, context=context)
 
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.txt
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.txt	(revision 12086)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/userscontainer.txt	(revision 12087)
@@ -50,10 +50,10 @@
 We can export user accounts:
 
-    >>> from waeup.ikoba.userscontainer import UsersExporter
+    >>> from waeup.ikoba.userscontainer import UserExporter
     >>> import os
     >>> import tempfile
     >>> workdir = tempfile.mkdtemp()
     >>> outfile = os.path.join(workdir, 'myoutput.csv')
-    >>> exporter = UsersExporter()
+    >>> exporter = UserExporter()
     >>> site = {'users':myusers}
     >>> exporter.export_all(site, outfile)
