Index: main/waeup.custom/trunk/src/waeup/custom/students/batching.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/batching.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/batching.py	(revision 7822)
@@ -27,5 +27,5 @@
     IStudent, 
     )
-from waeup.sirp.students.batching import StudentProcessor
+from waeup.kofa.students.batching import StudentProcessor
 
 class StudentProcessor(StudentProcessor):
Index: main/waeup.custom/trunk/src/waeup/custom/students/browser.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/browser.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/browser.py	(revision 7822)
@@ -18,5 +18,5 @@
 import grok
 from zope.formlib.textwidgets import BytesDisplayWidget
-from waeup.sirp.widgets.datewidget import (
+from waeup.kofa.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget
     )
@@ -24,5 +24,5 @@
     IStudent, IStudentPersonal, IStudentClearance, IStudentClearanceEdit
     )
-from waeup.sirp.students.browser import (
+from waeup.kofa.students.browser import (
     StudentPersonalDisplayFormPage, StudentPersonalManageFormPage,
     StudentClearanceManageFormPage, StudentClearanceEditFormPage,
Index: main/waeup.custom/trunk/src/waeup/custom/students/interfaces.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/interfaces.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/interfaces.py	(revision 7822)
@@ -17,10 +17,10 @@
 ##
 from zope import schema
-from waeup.sirp.schema import TextLineChoice
-from waeup.sirp.interfaces import SimpleSIRPVocabulary
-from waeup.sirp.students.interfaces import (
+from waeup.kofa.schema import TextLineChoice
+from waeup.kofa.interfaces import SimpleKofaVocabulary
+from waeup.kofa.students.interfaces import (
     IStudentBase,IStudentClearance,IStudentPersonal,IStudentNavigation,
     )
-from waeup.sirp.students.vocabularies import (
+from waeup.kofa.students.vocabularies import (
     lgas_vocab, nats_vocab, contextual_reg_num_source)
 
@@ -46,5 +46,5 @@
         default = 'unmarried',
         required = False,
-        vocabulary = SimpleSIRPVocabulary(
+        vocabulary = SimpleKofaVocabulary(
             ('Unmarried', 'unmarried'),
             ('Married', 'married'),)
Index: main/waeup.custom/trunk/src/waeup/custom/students/student.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/student.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/student.py	(revision 7822)
@@ -21,6 +21,6 @@
 import grok
 from zope.interface import implementedBy
-from waeup.sirp.utils.helpers import attrs_to_fields
-from waeup.sirp.students.student import Student, StudentFactory
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.students.student import Student, StudentFactory
 from waeup.custom.students.interfaces import (
     IStudent, IStudentNavigation,
Index: main/waeup.custom/trunk/src/waeup/custom/students/tests.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/tests.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/tests.py	(revision 7822)
@@ -20,8 +20,8 @@
 import tempfile
 from zope.component.hooks import setSite, clearSite
-from waeup.sirp.app import University
-from waeup.sirp.students.tests.test_browser import StudentsFullSetup
-from waeup.sirp.testing import FunctionalTestCase
-from waeup.sirp.students.batching import StudentProcessor as StudentProcessorBase
+from waeup.kofa.app import University
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kofa.students.batching import StudentProcessor as StudentProcessorBase
 from waeup.custom.students.batching import StudentProcessor
 from waeup.custom.testing import FunctionalLayer
Index: main/waeup.custom/trunk/src/waeup/custom/students/utils.py
===================================================================
--- main/waeup.custom/trunk/src/waeup/custom/students/utils.py	(revision 7621)
+++ main/waeup.custom/trunk/src/waeup/custom/students/utils.py	(revision 7822)
@@ -17,7 +17,7 @@
 ##
 import grok
-from waeup.sirp.students.workflow import CLEARED, RETURNING
-from waeup.sirp.students.utils import StudentsUtils
-from waeup.sirp.students.interfaces import IStudentsUtils
+from waeup.kofa.students.workflow import CLEARED, RETURNING
+from waeup.kofa.students.utils import StudentsUtils
+from waeup.kofa.students.interfaces import IStudentsUtils
 
 def get_school_fee(student, surcharge):
