Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_authentication.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_authentication.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_authentication.py	(revision 7811)
@@ -26,10 +26,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.students.authentication import (
+from waeup.kofa.authentication import get_principal_role_manager
+from waeup.kofa.interfaces import IAuthPluginUtility, IUserAccount
+from waeup.kofa.students.authentication import (
     StudentsAuthenticatorSetup, StudentAccount)
-from waeup.sirp.students.tests.test_browser import StudentsFullSetup
-from waeup.sirp.testing import FunctionalLayer
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.testing import FunctionalLayer
 
 class StudentsAuthenticatorSetupTests(unittest.TestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 7811)
@@ -28,14 +28,14 @@
 from zope.interface.verify import verifyClass, verifyObject
 
-from waeup.sirp.app import University
-from waeup.sirp.university.faculty import Faculty
-from waeup.sirp.university.department import Department
-from waeup.sirp.students.batching import (
+from waeup.kofa.app import University
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+from waeup.kofa.students.batching import (
     StudentProcessor, StudentStudyCourseProcessor,
     StudentStudyLevelProcessor, CourseTicketProcessor,
     StudentOnlinePaymentProcessor)
-from waeup.sirp.students.student import Student
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.interfaces import IBatchProcessor
+from waeup.kofa.students.student import Student
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.interfaces import IBatchProcessor
 
 STUDENT_SAMPLE_DATA = open(
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 7811)
@@ -33,14 +33,14 @@
 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.students.student import Student
-from waeup.sirp.students.studylevel import StudentStudyLevel
-from waeup.sirp.university.faculty import Faculty
-from waeup.sirp.university.department import Department
-from waeup.sirp.interfaces import IUserAccount
-from waeup.sirp.authentication import LocalRoleSetEvent
-from waeup.sirp.hostels.hostel import Hostel, Bed, NOT_OCCUPIED
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.app import University
+from waeup.kofa.configuration import SessionConfiguration
+from waeup.kofa.students.student import Student
+from waeup.kofa.students.studylevel import StudentStudyLevel
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+from waeup.kofa.interfaces import IUserAccount
+from waeup.kofa.authentication import LocalRoleSetEvent
+from waeup.kofa.hostels.hostel import Hostel, Bed, NOT_OCCUPIED
 
 PH_LEN = 2059  # Length of placeholder file
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py	(revision 7811)
@@ -23,10 +23,10 @@
 from zope.component import queryUtility, createObject
 from zope.component.hooks import setSite
-from waeup.sirp.app import University
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.students.student import Student
-from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
-from waeup.sirp.university.faculty import Faculty
-from waeup.sirp.university.department import Department
+from waeup.kofa.app import University
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.students.student import Student
+from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
 
 class CatalogTestSetup(FunctionalTestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_container.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_container.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_container.py	(revision 7811)
@@ -23,13 +23,13 @@
 from zope.interface.verify import verifyClass, verifyObject
 from zope.component.hooks import setSite, clearSite
-from waeup.sirp.app import University
-from waeup.sirp.university.department import Department
-from waeup.sirp.students.interfaces import (
+from waeup.kofa.app import University
+from waeup.kofa.university.department import Department
+from waeup.kofa.students.interfaces import (
     IStudentsContainer,
     )
-from waeup.sirp.students.container import (
+from waeup.kofa.students.container import (
     StudentsContainer, 
     )
-from waeup.sirp.testing import (
+from waeup.kofa.testing import (
     FunctionalLayer, FunctionalTestCase, remove_logger)
 
@@ -39,5 +39,5 @@
 
     def setUp(self):
-        remove_logger('waeup.sirp.app.students')
+        remove_logger('waeup.kofa.app.students')
         super(StudentsContainerTestCase, self).setUp()
         # Setup a sample site for each test
@@ -86,5 +86,5 @@
         logger = self.app['students'].logger
         assert logger is not None
-        assert logger.name == 'waeup.sirp.app.students'
+        assert logger.name == 'waeup.kofa.app.students'
         handlers = logger.handlers
         assert len(handlers) == 1
@@ -100,5 +100,5 @@
         logger = self.app['students'].logger
         assert logger is not None
-        assert logger.name == 'waeup.sirp.app.students'
+        assert logger.name == 'waeup.kofa.app.students'
         handlers = logger.handlers
         assert len(handlers) == 1
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_dynamicroles.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_dynamicroles.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/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.students.tests.test_browser import StudentsFullSetup
-from waeup.sirp.students import Student, StudentPrincipalRoleManager
+from waeup.kofa.testing import FunctionalLayer
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.students import Student, StudentPrincipalRoleManager
 
 class StudentPrincipalRoleManagerTests(APRMTest):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_payment.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_payment.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_payment.py	(revision 7811)
@@ -20,9 +20,9 @@
 """
 
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.students.payments import (
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.students.payments import (
     StudentOnlinePayment, StudentOnlinePaymentFactory)
-from waeup.sirp.payments.interfaces import IOnlinePayment
-from waeup.sirp.students.interfaces import IStudentNavigation
+from waeup.kofa.payments.interfaces import IOnlinePayment
+from waeup.kofa.students.interfaces import IStudentNavigation
 
 class StudentOnlinePaymentFactoryTest(FunctionalTestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 7811)
@@ -20,15 +20,15 @@
 from zope.component.interfaces import IFactory
 from zope.interface import verify
-from waeup.sirp.students.student import Student, StudentFactory
-from waeup.sirp.students.studycourse import StudentStudyCourse
-from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
-from waeup.sirp.students.payments import StudentPaymentsContainer
-from waeup.sirp.students.accommodation import StudentAccommodation, BedTicket
-from waeup.sirp.applicants.interfaces import IApplicantBaseData
-from waeup.sirp.students.interfaces import (
+from waeup.kofa.students.student import Student, StudentFactory
+from waeup.kofa.students.studycourse import StudentStudyCourse
+from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
+from waeup.kofa.students.payments import StudentPaymentsContainer
+from waeup.kofa.students.accommodation import StudentAccommodation, BedTicket
+from waeup.kofa.applicants.interfaces import IApplicantBaseData
+from waeup.kofa.students.interfaces import (
     IStudent, IStudentStudyCourse, IStudentPaymentsContainer, IStudentAccommodation,
     IStudentStudyLevel, ICourseTicket, IBedTicket)
-from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
-from waeup.sirp.university.department import Department
+from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+from waeup.kofa.university.department import Department
 
 class StudentTest(FunctionalTestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_utils.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_utils.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_utils.py	(revision 7811)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 import unittest
-from waeup.sirp.students.utils import formatted_text
+from waeup.kofa.students.utils import formatted_text
 
 class FormatterTests(unittest.TestCase):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_vocabularies.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_vocabularies.py	(revision 7809)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_vocabularies.py	(revision 7811)
@@ -17,6 +17,6 @@
 ##
 import unittest
-from waeup.sirp.students.vocabularies import StudyLevelSource
-from waeup.sirp.university.certificate import Certificate
+from waeup.kofa.students.vocabularies import StudyLevelSource
+from waeup.kofa.university.certificate import Certificate
 
 
