Index: main/waeup.kofa/trunk/src/waeup/kofa/image/README.txt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/README.txt	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/README.txt	(revision 7819)
@@ -2,8 +2,8 @@
 ========================================
 
-The image file widget is built on top of the :class:`KOFAImageFile` object::
-
-  >>> from waeup.kofa.image import KOFAImageFile
-  >>> file = KOFAImageFile('foo.jpg', 'mydata')
+The image file widget is built on top of the :class:`KofaImageFile` object::
+
+  >>> from waeup.kofa.image import KofaImageFile
+  >>> file = KofaImageFile('foo.jpg', 'mydata')
   >>> file.filename
   'foo.jpg'
@@ -16,5 +16,5 @@
   'mydata'
 
-We can also create KOFAImageFile objects from file-like objects::
+We can also create KofaImageFile objects from file-like objects::
 
   >>> from StringIO import StringIO
@@ -36,5 +36,5 @@
 ----------------
 
-The KOFAImageFile object normally stores the file data using ZODB
+The KofaImageFile object normally stores the file data using ZODB
 persistence. Files can however also be stored by tramline.  If
 tramline is installed in Apache, the Tramline takes care of generating
@@ -73,5 +73,5 @@
 just '1') will now be created::
 
-  >>> file = KOFAImageFile('foo.jpg', '1')
+  >>> file = KofaImageFile('foo.jpg', '1')
 
 The data is now '1', referring to the real file::
@@ -102,5 +102,5 @@
 We expect the same behavior as when tramline is not installed::
 
-  >>> file = KOFAImageFile('foo.jpg', 'data')
+  >>> file = KofaImageFile('foo.jpg', 'data')
   >>> f = file.file
   >>> f.read()
@@ -141,12 +141,12 @@
   Traceback (most recent call last):
   ...
-  WrongType: ('asd', <class 'waeup.kofa.image.image.KOFAImageFile'>, 'foo')
+  WrongType: ('asd', <class 'waeup.kofa.image.image.KofaImageFile'>, 'foo')
 
 which means: `ImageFile` fields should better contain
-:class:`KOFAImageFile` instances.
-
-We can store normal :class:`KOFAImageFile` instances:
-
-  >>> field.validate(KOFAImageFile('bar.jpg', 'data')) is None
+:class:`KofaImageFile` instances.
+
+We can store normal :class:`KofaImageFile` instances:
+
+  >>> field.validate(KofaImageFile('bar.jpg', 'data')) is None
   True
 
@@ -173,9 +173,9 @@
 
   >>> field.validate(
-  ...     KOFAImageFile('bar.jpg', '123456789012')) is None
-  True
-
-  >>> field.validate(
-  ...     KOFAImageFile('bar.jpg', '12345')) is None
+  ...     KofaImageFile('bar.jpg', '123456789012')) is None
+  True
+
+  >>> field.validate(
+  ...     KofaImageFile('bar.jpg', '12345')) is None
   True
 
@@ -183,5 +183,5 @@
 
   >>> field.validate(
-  ...     KOFAImageFile('bar.jpg', '1234567890123'))
+  ...     KofaImageFile('bar.jpg', '1234567890123'))
   Traceback (most recent call last):
   ...
@@ -189,5 +189,5 @@
 
   >>> field.validate(
-  ...     KOFAImageFile('bar.jpg', '1234'))
+  ...     KofaImageFile('bar.jpg', '1234'))
   Traceback (most recent call last):
   ...
@@ -198,10 +198,10 @@
 ----------------------------
 
-KOFAImageFile does not reproduce the broken unequal comparison from
+KofaImageFile does not reproduce the broken unequal comparison from
 its base:
 
-  >>> f1 = KOFAImageFile('bar.jpg', '123456789')
-  >>> f2 = KOFAImageFile('bar.jpg', '123456789')
-  >>> f3 = KOFAImageFile('baz.jpg', '1234')
+  >>> f1 = KofaImageFile('bar.jpg', '123456789')
+  >>> f2 = KofaImageFile('bar.jpg', '123456789')
+  >>> f3 = KofaImageFile('baz.jpg', '1234')
   >>> f1 == f2
   True
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/__init__.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/__init__.py	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/__init__.py	(revision 7819)
@@ -3,8 +3,8 @@
 Includings schemas, widgets and the content components.
 """
-from waeup.kofa.image.image import KOFAImageFile, createKOFAImageFile
+from waeup.kofa.image.image import KofaImageFile, createKofaImageFile
 
 __all__ = [
-    "KOFAImageFile",
-    "createKOFAImageFile",
+    "KofaImageFile",
+    "createKofaImageFile",
     ]
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/image.txt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/image.txt	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/image.txt	(revision 7819)
@@ -12,8 +12,8 @@
 
   >>> import os
-  >>> from waeup.kofa.image import KOFAImageFile
+  >>> from waeup.kofa.image import KofaImageFile
   >>> testimage = os.path.join(os.path.dirname(__file__), 'sample.jpg')
   >>> testimage2 = os.path.join(os.path.dirname(__file__), 'sample2.jpg')
-  >>> some_file = KOFAImageFile('foo.jpg', open(testimage, 'rb').read())
+  >>> some_file = KofaImageFile('foo.jpg', open(testimage, 'rb').read())
   >>> some_file.filename
   'foo.jpg'
@@ -166,5 +166,5 @@
 prepare some new file:
 
-  >>> another_file = KOFAImageFile('bar.txt', 'bar contents')
+  >>> another_file = KofaImageFile('bar.txt', 'bar contents')
 
 We happen to know, due to the implementation of
@@ -200,5 +200,5 @@
 ---------------------------
 
-As :class:`waeup.kofa.image.KOFAImageFile` objects support storing
+As :class:`waeup.kofa.image.KofaImageFile` objects support storing
 image data by using external 'storages', also our widgets should do
 so.
@@ -220,5 +220,5 @@
   ...         contents = f.read()
   ...         id_string = hashlib.md5(contents).hexdigest()
-  ...         result = KOFAImageFile(filename, id_string)
+  ...         result = KofaImageFile(filename, id_string)
   ...         self.storage[id_string] = contents
   ...         return result
@@ -260,9 +260,9 @@
 We now want to simulate, that the field contains already data,
 identified by some `file_id`. To do so, we first store the data in our
-file retrieval and then create a KOFAImageFile object with that
+file retrieval and then create a KofaImageFile object with that
 file_id stored:
 
-  >>> from waeup.kofa.image import createKOFAImageFile
-  >>> image = createKOFAImageFile(
+  >>> from waeup.kofa.image import createKofaImageFile
+  >>> image = createKofaImageFile(
   ...     'sample.jpg', open(testimage, 'rb'))
   >>> file_id = image.data
@@ -274,5 +274,5 @@
   '9feac4265077922000aa8b88748e25be'
 
-The new file was stored by our utility, as createKOFAImageFile looks
+The new file was stored by our utility, as createKofaImageFile looks
 up IFileRetrieval utilities and uses them:
 
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py	(revision 7819)
@@ -19,5 +19,5 @@
 """
 import os
-from waeup.kofa.image import KOFAImageFile
+from waeup.kofa.image import KofaImageFile
 from hurry.file.browser.widget import (
     EncodingFileWidget, DownloadWidget, FakeFieldStorage)
@@ -62,5 +62,5 @@
                 seek(0)
                 return retrieval.createFile(input.filename, input)
-            return KOFAImageFile(input.filename, data)
+            return KofaImageFile(input.filename, data)
         else:
             return self.context.missing_value
@@ -143,5 +143,5 @@
         data = file_id.decode('base64')
         filename, filedata = data.split('\n', 1)
-        return KOFAImageFile(filename, filedata)
+        return KofaImageFile(filename, filedata)
 
 class ThumbnailWidget(DownloadWidget):
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/image.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/image.py	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/image.py	(revision 7819)
@@ -23,7 +23,7 @@
 from zope.component import getUtility
 from zope.interface import implements
-from waeup.kofa.image.interfaces import IKOFAImageFile
+from waeup.kofa.image.interfaces import IKofaImageFile
 
-class KOFAImageFile(HurryFile):
+class KofaImageFile(HurryFile):
     """A file prepared for storing image files.
 
@@ -32,8 +32,8 @@
     regular hurry files.
 
-    To create a :class:`KOFAImageFile` you should use
-    :func:`createKOFAImageFile`.
+    To create a :class:`KofaImageFile` you should use
+    :func:`createKofaImageFile`.
     """
-    implements(IKOFAImageFile)
+    implements(IKofaImageFile)
 
     def __ne__(self, other):
@@ -45,5 +45,5 @@
             return True
 
-def createKOFAImageFile(filename, f):
+def createKofaImageFile(filename, f):
     retrieval = getUtility(IFileRetrieval)
     return retrieval.createFile(filename, f)
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/interfaces.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/interfaces.py	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/interfaces.py	(revision 7819)
@@ -24,5 +24,5 @@
     """
 
-class IKOFAImageFile(IHurryFile):
+class IKofaImageFile(IHurryFile):
     """Image file.
     """
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/schema.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/schema.py	(revision 7811)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/schema.py	(revision 7819)
@@ -23,5 +23,5 @@
 from hurry.file.schema import File
 from waeup.kofa.image.interfaces import IImageFile
-from waeup.kofa.image.image import KOFAImageFile
+from waeup.kofa.image.image import KofaImageFile
 
 class MinMaxSize(object):
@@ -82,3 +82,3 @@
     implements(IImageFile)
 
-    _type = KOFAImageFile
+    _type = KofaImageFile
