Index: main/waeup.kofa/trunk/src/waeup/kofa/image/browser/__init__.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/browser/__init__.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/__init__.py	(revision 7811)
@@ -1,5 +1,5 @@
 # The public API part
 # Contains the widgets defined for image files.
-from waeup.sirp.image.browser.widget import (
+from waeup.kofa.image.browser.widget import (
     EncodingImageFileWidget, ThumbnailWidget,
     )
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 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/image.txt	(revision 7811)
@@ -12,8 +12,8 @@
 
   >>> import os
-  >>> from waeup.sirp.image import SIRPImageFile
+  >>> 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 = SIRPImageFile('foo.jpg', open(testimage, 'rb').read())
+  >>> some_file = KOFAImageFile('foo.jpg', open(testimage, 'rb').read())
   >>> some_file.filename
   'foo.jpg'
@@ -26,5 +26,5 @@
   >>> from hurry.file.browser import DownloadWidget
   >>> from hurry.file.schema import File
-  >>> from waeup.sirp.image.schema import ImageFile
+  >>> from waeup.kofa.image.schema import ImageFile
   >>> from zope.publisher.browser import TestRequest
   >>> field = ImageFile(__name__='foo', title=u'Foo')
@@ -51,5 +51,5 @@
 Instead of downloading, we can also use a thumbnail widget:
 
-  >>> from waeup.sirp.image.browser import ThumbnailWidget
+  >>> from waeup.kofa.image.browser import ThumbnailWidget
   >>> request = TestRequest(form={'field.foo': FileUpload(some_file)})
   >>> widget = ThumbnailWidget(field, request)
@@ -61,5 +61,5 @@
 data already available, and no data in request:
 
-  >>> from waeup.sirp.image.browser import EncodingImageFileWidget
+  >>> from waeup.kofa.image.browser import EncodingImageFileWidget
   >>> field = ImageFile(__name__='foo', title=u'Foo', required=False)
   >>> field = field.bind(None)
@@ -166,5 +166,5 @@
 prepare some new file:
 
-  >>> another_file = SIRPImageFile('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.sirp.image.SIRPImageFile` 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 = SIRPImageFile(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 SIRPImageFile object with that
+file retrieval and then create a KOFAImageFile object with that
 file_id stored:
 
-  >>> from waeup.sirp.image import createSIRPImageFile
-  >>> image = createSIRPImageFile(
+  >>> 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 createSIRPImageFile 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/tests/test_views.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/test_views.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/tests/test_views.py	(revision 7811)
@@ -30,5 +30,5 @@
 from hurry.file.file import IdFileRetrieval
 from hurry.file.interfaces import IFileRetrieval
-from waeup.sirp.image.browser.views import HurryFileView
+from waeup.kofa.image.browser.views import HurryFileView
 from zope.component import getMultiAdapter, provideUtility
 from zope.publisher.browser import TestRequest
@@ -41,9 +41,9 @@
 class ImageBrowserViewsLayer(object):
     """A layer that registers all components in
-       `waeup.sirp.image.browser.views` module.
+       `waeup.kofa.image.browser.views` module.
     """
     @classmethod
     def setUp(cls):
-        grok.testing.grok('waeup.sirp.image.browser.views')
+        grok.testing.grok('waeup.kofa.image.browser.views')
 
     @classmethod
Index: main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/image/browser/widget.py	(revision 7811)
@@ -19,5 +19,5 @@
 """
 import os
-from waeup.sirp.image import SIRPImageFile
+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 SIRPImageFile(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 SIRPImageFile(filename, filedata)
+        return KOFAImageFile(filename, filedata)
 
 class ThumbnailWidget(DownloadWidget):
