Index: main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_browser.py
===================================================================
--- main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_browser.py	(revision 8862)
+++ main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_browser.py	(revision 8863)
@@ -31,9 +31,9 @@
 from waeup.kofa.students.batching import StudentProcessor
 from waeup.kofa.students.interfaces import IStudentsUtils
-from kofacustom.nigeria.students.batching import CustomStudentProcessor
+from kofacustom.nigeria.students.batching import NigeriaStudentProcessor
 from kofacustom.nigeria.testing import FunctionalLayer
 from kofacustom.nigeria.students.interfaces import (
-    ICustomStudentStudyCourse, ICustomStudent,
-    ICustomStudentStudyLevel, ICustomCourseTicket)
+    INigeriaStudentStudyCourse, INigeriaStudent,
+    INigeriaStudentStudyLevel, INigeriaCourseTicket)
 
 
@@ -69,5 +69,5 @@
 
         self.processor_base = StudentProcessor()
-        self.processor = CustomStudentProcessor()
+        self.processor = NigeriaStudentProcessor()
         self.workdir = tempfile.mkdtemp()
         self.csv_file = os.path.join(self.workdir, 'sample_student_data.csv')
@@ -108,11 +108,11 @@
         # Let's see if objects created in the customized
         # portal really implement the customized interfaces
-        verify.verifyObject(ICustomStudent, self.student)
+        verify.verifyObject(INigeriaStudent, self.student)
         verify.verifyObject(
-            ICustomStudentStudyCourse, self.student['studycourse'])
+            INigeriaStudentStudyCourse, self.student['studycourse'])
         studylevel = createObject(u'waeup.StudentStudyLevel')
-        verify.verifyObject(ICustomStudentStudyLevel, studylevel)
+        verify.verifyObject(INigeriaStudentStudyLevel, studylevel)
         ticket = createObject(u'waeup.CourseTicket')
-        verify.verifyObject(ICustomCourseTicket, ticket)
+        verify.verifyObject(INigeriaCourseTicket, ticket)
         IWorkflowState(self.student).setState('returning')
         # Let's see if next_session_allowed works as expected
Index: main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_student.py
===================================================================
--- main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_student.py	(revision 8862)
+++ main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_student.py	(revision 8863)
@@ -22,106 +22,106 @@
 from zope.interface import verify
 from waeup.kofa.testing import FunctionalTestCase
-from kofacustom.nigeria.students.student import CustomStudent, CustomStudentFactory
+from kofacustom.nigeria.students.student import NigeriaStudent, NigeriaStudentFactory
 from kofacustom.nigeria.students.studycourse import (
-    CustomStudentStudyCourse, CustomStudentStudyCourseFactory)
+    NigeriaStudentStudyCourse, NigeriaStudentStudyCourseFactory)
 from kofacustom.nigeria.students.studylevel import (
-    CustomStudentStudyLevel, CustomCourseTicket,
-    CustomStudentStudyLevelFactory,
-    CustomCourseTicketFactory)
+    NigeriaStudentStudyLevel, NigeriaCourseTicket,
+    NigeriaStudentStudyLevelFactory,
+    NigeriaCourseTicketFactory)
 from kofacustom.nigeria.students.interfaces import (
-    ICustomStudent, ICustomStudentStudyCourse,
-    ICustomStudentStudyLevel, ICustomCourseTicket)
+    INigeriaStudent, INigeriaStudentStudyCourse,
+    INigeriaStudentStudyLevel, INigeriaCourseTicket)
 from kofacustom.nigeria.testing import FunctionalLayer
 
 
-class CustomStudentFactoryTest(FunctionalTestCase):
+class NigeriaStudentFactoryTest(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomStudentFactoryTest, self).setUp()
-        self.factory = CustomStudentFactory()
+        super(NigeriaStudentFactoryTest, self).setUp()
+        self.factory = NigeriaStudentFactory()
 
     def tearDown(self):
-        super(CustomStudentFactoryTest, self).tearDown()
+        super(NigeriaStudentFactoryTest, self).tearDown()
 
     def test_interfaces(self):
-        verify.verifyClass(IFactory, CustomStudentFactory)
+        verify.verifyClass(IFactory, NigeriaStudentFactory)
         verify.verifyObject(IFactory, self.factory)
 
     def test_factory(self):
         obj = self.factory()
-        assert isinstance(obj, CustomStudent)
+        assert isinstance(obj, NigeriaStudent)
 
     def test_getInterfaces(self):
         implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(ICustomStudent)
+        assert implemented_by.isOrExtends(INigeriaStudent)
 
-class CustomStudentStudyCourseFactoryTest(FunctionalTestCase):
+class NigeriaStudentStudyCourseFactoryTest(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomStudentStudyCourseFactoryTest, self).setUp()
-        self.factory = CustomStudentStudyCourseFactory()
+        super(NigeriaStudentStudyCourseFactoryTest, self).setUp()
+        self.factory = NigeriaStudentStudyCourseFactory()
 
     def tearDown(self):
-        super(CustomStudentStudyCourseFactoryTest, self).tearDown()
+        super(NigeriaStudentStudyCourseFactoryTest, self).tearDown()
 
     def test_interfaces(self):
-        verify.verifyClass(IFactory, CustomStudentStudyCourseFactory)
+        verify.verifyClass(IFactory, NigeriaStudentStudyCourseFactory)
         verify.verifyObject(IFactory, self.factory)
 
     def test_factory(self):
         obj = self.factory()
-        assert isinstance(obj, CustomStudentStudyCourse)
+        assert isinstance(obj, NigeriaStudentStudyCourse)
 
     def test_getInterfaces(self):
         implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(ICustomStudentStudyCourse)
+        assert implemented_by.isOrExtends(INigeriaStudentStudyCourse)
 
-class CustomStudentStudyLevelFactoryTest(FunctionalTestCase):
+class NigeriaStudentStudyLevelFactoryTest(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomStudentStudyLevelFactoryTest, self).setUp()
-        self.factory = CustomStudentStudyLevelFactory()
+        super(NigeriaStudentStudyLevelFactoryTest, self).setUp()
+        self.factory = NigeriaStudentStudyLevelFactory()
 
     def tearDown(self):
-        super(CustomStudentStudyLevelFactoryTest, self).tearDown()
+        super(NigeriaStudentStudyLevelFactoryTest, self).tearDown()
 
     def test_interfaces(self):
-        verify.verifyClass(IFactory, CustomStudentStudyLevelFactory)
+        verify.verifyClass(IFactory, NigeriaStudentStudyLevelFactory)
         verify.verifyObject(IFactory, self.factory)
 
     def test_factory(self):
         obj = self.factory()
-        assert isinstance(obj, CustomStudentStudyLevel)
+        assert isinstance(obj, NigeriaStudentStudyLevel)
 
     def test_getInterfaces(self):
         implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(ICustomStudentStudyLevel)
+        assert implemented_by.isOrExtends(INigeriaStudentStudyLevel)
 
-class CustomCourseTicketFactoryTest(FunctionalTestCase):
+class NigeriaCourseTicketFactoryTest(FunctionalTestCase):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomCourseTicketFactoryTest, self).setUp()
-        self.factory = CustomCourseTicketFactory()
+        super(NigeriaCourseTicketFactoryTest, self).setUp()
+        self.factory = NigeriaCourseTicketFactory()
 
     def tearDown(self):
-        super(CustomCourseTicketFactoryTest, self).tearDown()
+        super(NigeriaCourseTicketFactoryTest, self).tearDown()
 
     def test_interfaces(self):
-        verify.verifyClass(IFactory, CustomCourseTicketFactory)
+        verify.verifyClass(IFactory, NigeriaCourseTicketFactory)
         verify.verifyObject(IFactory, self.factory)
 
     def test_factory(self):
         obj = self.factory()
-        assert isinstance(obj, CustomCourseTicket)
+        assert isinstance(obj, NigeriaCourseTicket)
 
     def test_getInterfaces(self):
         implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(ICustomCourseTicket)
+        assert implemented_by.isOrExtends(INigeriaCourseTicket)
