Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/sample_container_data.csv
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/sample_container_data.csv	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/sample_container_data.csv	(revision 7811)
@@ -1,3 +1,3 @@
 code,ac_prefix,application_category,provider,prefix,year
-CODE1,APP,basic,waeup.sirp.applicants.ApplicantsContainer,app,2013
-CODE2,DPP,cest,waeup.sirp.applicants.ApplicantsContainer,app,2013
+CODE1,APP,basic,waeup.kofa.applicants.ApplicantsContainer,app,2013
+CODE2,DPP,cest,waeup.kofa.applicants.ApplicantsContainer,app,2013
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicant.py	(revision 7811)
@@ -26,17 +26,17 @@
 from zope.interface import verify, implements
 from zope.location.interfaces import ILocation
-from waeup.sirp.image.interfaces import ISIRPImageFile
-from waeup.sirp.imagestorage import DefaultStorage
-from waeup.sirp.interfaces import IFileStoreHandler, IFileStoreNameChooser
-from waeup.sirp.applicants import (
+from waeup.kofa.image.interfaces import IKOFAImageFile
+from waeup.kofa.imagestorage import DefaultStorage
+from waeup.kofa.interfaces import IFileStoreHandler, IFileStoreNameChooser
+from waeup.kofa.applicants import (
     Applicant, ApplicantFactory,
     ApplicantImageStoreHandler, ApplicantImageNameChooser,
     )
-from waeup.sirp.applicants.interfaces import IApplicant
-from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
+from waeup.kofa.applicants.interfaces import IApplicant
+from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer
 
 class FakeImageLocation(object):
     implements(ILocation)
-    adapts(ISIRPImageFile)
+    adapts(IKOFAImageFile)
     def __init__(self, context):
         pass
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_applicantcopier.py	(revision 7811)
@@ -22,7 +22,7 @@
 from hurry.workflow.interfaces import IWorkflowInfo
 from zope.component import getUtility
-from waeup.sirp.testing import FunctionalLayer
-from waeup.sirp.interfaces import IExtFileStore, IFileStoreNameChooser
-from waeup.sirp.applicants.tests.test_browser import ApplicantsFullSetup
+from waeup.kofa.testing import FunctionalLayer
+from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
+from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
 
 class ApplicantCopierFunctionalTests(ApplicantsFullSetup):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_authentication.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_authentication.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_authentication.py	(revision 7811)
@@ -25,10 +25,10 @@
 from zope.securitypolicy.role import Role
 from zope.securitypolicy.interfaces import IRole, Allow
-from waeup.sirp.authentication import get_principal_role_manager
-from waeup.sirp.interfaces import IAuthPluginUtility, IUserAccount
-from waeup.sirp.applicants.authentication import (
+from waeup.kofa.authentication import get_principal_role_manager
+from waeup.kofa.interfaces import IAuthPluginUtility, IUserAccount
+from waeup.kofa.applicants.authentication import (
     ApplicantsAuthenticatorSetup, ApplicantAccount)
-from waeup.sirp.applicants.tests.test_browser import ApplicantsFullSetup
-from waeup.sirp.testing import FunctionalLayer
+from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
+from waeup.kofa.testing import FunctionalLayer
 
 class ApplicantsAuthenticatorSetupTests(unittest.TestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py	(revision 7811)
@@ -27,13 +27,13 @@
 from zope.interface.verify import verifyClass, verifyObject
 
-from waeup.sirp.app import University
-from waeup.sirp.applicants.batching import (
+from waeup.kofa.app import University
+from waeup.kofa.applicants.batching import (
     ApplicantsContainerImporter, ApplicantImporter)
-from waeup.sirp.applicants.container import ApplicantsContainer
-from waeup.sirp.applicants.applicant import Applicant
-from waeup.sirp.university.faculty import Faculty
-from waeup.sirp.university.department import Department
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.interfaces import IBatchProcessor
+from waeup.kofa.applicants.container import ApplicantsContainer
+from waeup.kofa.applicants.applicant import Applicant
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.interfaces import IBatchProcessor
 
 
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 7811)
@@ -29,13 +29,13 @@
 from zope.testbrowser.testing import Browser
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.app import University
-from waeup.sirp.configuration import SessionConfiguration
-from waeup.sirp.applicants.container import ApplicantsContainer
-from waeup.sirp.applicants.applicant import Applicant
-from waeup.sirp.interfaces import (
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.app import University
+from waeup.kofa.configuration import SessionConfiguration
+from waeup.kofa.applicants.container import ApplicantsContainer
+from waeup.kofa.applicants.applicant import Applicant
+from waeup.kofa.interfaces import (
     IExtFileStore, IFileStoreNameChooser, IUserAccount)
-from waeup.sirp.university.faculty import Faculty
-from waeup.sirp.university.department import Department
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
 
 PH_LEN = 2059  # Length of placeholder file
@@ -247,5 +247,5 @@
         self.browser.getControl(name="form.year").value = ['2010']
         self.browser.getControl(name="form.provider").value = [
-            'waeup.sirp.applicants.ApplicantsContainer']
+            'waeup.kofa.applicants.ApplicantsContainer']
         self.browser.getControl(
             name="form.application_category").value = ['basic']
@@ -262,5 +262,5 @@
         self.browser.getControl(name="form.year").value = ['2010']
         self.browser.getControl(name="form.provider").value = [
-            'waeup.sirp.applicants.ApplicantsContainer']
+            'waeup.kofa.applicants.ApplicantsContainer']
         self.browser.getControl(
             name="form.application_category").value = ['basic']
@@ -277,5 +277,5 @@
         self.browser.getControl(name="form.year").value = ['2010']
         self.browser.getControl(name="form.provider").value = [
-            'waeup.sirp.applicants.ApplicantsContainer']
+            'waeup.kofa.applicants.ApplicantsContainer']
         #self.browser.getControl(name="form.ac_prefix").value = ['APP']
         self.browser.getControl(
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_catalog.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_catalog.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_catalog.py	(revision 7811)
@@ -28,8 +28,8 @@
 from zope.component.interfaces import ComponentLookupError
 from zope.testbrowser.testing import Browser
-from waeup.sirp.app import University
-from waeup.sirp.applicants.container import ApplicantsContainer
-from waeup.sirp.applicants.applicant import Applicant
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.app import University
+from waeup.kofa.applicants.container import ApplicantsContainer
+from waeup.kofa.applicants.applicant import Applicant
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
 
 class CatalogTests(FunctionalTestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_container.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_container.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_container.py	(revision 7811)
@@ -21,6 +21,6 @@
 import unittest
 from zope.interface.verify import verifyClass, verifyObject
-from waeup.sirp.applicants import interfaces
-from waeup.sirp.applicants.container import (
+from waeup.kofa.applicants import interfaces
+from waeup.kofa.applicants.container import (
     ApplicantsContainer,
     )
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_dynamicroles.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_dynamicroles.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_dynamicroles.py	(revision 7811)
@@ -24,7 +24,7 @@
 from zope.securitypolicy.tests.test_annotationprincipalrolemanager import (
     Test as APRMTest, Manageable)
-from waeup.sirp.testing import FunctionalLayer
-from waeup.sirp.applicants.tests.test_browser import ApplicantsFullSetup
-from waeup.sirp.applicants import ApplicantPrincipalRoleManager
+from waeup.kofa.testing import FunctionalLayer
+from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
+from waeup.kofa.applicants import ApplicantPrincipalRoleManager
 
 class ApplicantPrincipalRoleManagerTests(APRMTest):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_interfaces.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_interfaces.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_interfaces.py	(revision 7811)
@@ -22,6 +22,6 @@
 from zc.sourcefactory.browser.source import FactoredTerms
 from zope.publisher.browser import TestRequest
-from waeup.sirp.applicants.interfaces import ApplicationTypeSource
-from waeup.sirp.students.vocabularies import GenderSource
+from waeup.kofa.applicants.interfaces import ApplicationTypeSource
+from waeup.kofa.students.vocabularies import GenderSource
 
 class InterfacesTest(unittest.TestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_payment.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_payment.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_payment.py	(revision 7811)
@@ -20,8 +20,8 @@
 """
 
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.applicants.payment import (
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.applicants.payment import (
     ApplicantOnlinePayment, ApplicantOnlinePaymentFactory)
-from waeup.sirp.payments.interfaces import IOnlinePayment
+from waeup.kofa.payments.interfaces import IOnlinePayment
 
 class ApplicantOnlinePaymentFactoryTest(FunctionalTestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_pdf.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_pdf.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_pdf.py	(revision 7811)
@@ -22,8 +22,8 @@
 from zope.component import getAdapter
 from zope.interface import verify
-from waeup.sirp.applicants.pdf import IPDF, PDFApplicationSlip
-from waeup.sirp.applicants.tests.test_browser import ApplicantsFullSetup
-from waeup.sirp.interfaces import IPDF
-from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
+from waeup.kofa.applicants.pdf import IPDF, PDFApplicationSlip
+from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
+from waeup.kofa.interfaces import IPDF
+from waeup.kofa.testing import FunctionalTestCase, FunctionalLayer
 
 class PDFApplicationSlipTests(ApplicantsFullSetup):
Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_root.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_root.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_root.py	(revision 7811)
@@ -26,12 +26,12 @@
 from zope.component.hooks import setSite, clearSite
 from zope.interface.verify import verifyClass, verifyObject
-from waeup.sirp.app import University
-from waeup.sirp.applicants import (
+from waeup.kofa.app import University
+from waeup.kofa.applicants import (
     interfaces, Applicant, ApplicantsContainer,
     )
-from waeup.sirp.applicants.root import (
+from waeup.kofa.applicants.root import (
     ApplicantsRoot, ApplicantsPlugin,
     )
-from waeup.sirp.testing import (
+from waeup.kofa.testing import (
     FunctionalLayer, FunctionalTestCase, remove_logger)
 
@@ -45,5 +45,5 @@
 
     def setUp(self):
-        remove_logger('waeup.sirp.app.applicants')
+        remove_logger('waeup.kofa.app.applicants')
         super(ApplicantsRootTestCase, self).setUp()
         # Setup a sample site for each test
@@ -79,5 +79,5 @@
         logger = self.app['applicants'].logger
         assert logger is not None
-        assert logger.name == 'waeup.sirp.app.applicants'
+        assert logger.name == 'waeup.kofa.app.applicants'
         handlers = logger.handlers
         assert len(handlers) == 1
@@ -93,5 +93,5 @@
         logger = self.app['applicants'].logger
         assert logger is not None
-        assert logger.name == 'waeup.sirp.app.applicants'
+        assert logger.name == 'waeup.kofa.app.applicants'
         handlers = logger.handlers
         assert len(handlers) == 1
@@ -103,5 +103,5 @@
     def create_logger(self):
         # create a logger suitable for local tests.
-        test_logger = logging.getLogger('waeup.sirp.applicants.testlogger')
+        test_logger = logging.getLogger('waeup.kofa.applicants.testlogger')
         log = StringIO()
         handler = logging.StreamHandler(log)
