Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6003)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 6004)
@@ -859,5 +859,5 @@
     #            self.flash('Could not delete %s.' % code)
 
-class AddFacultyFormPage(WAeUPAddFormPage):
+class FacultyAddFormPage(WAeUPAddFormPage):
     """ Page form to add a new faculty to a faculty container.
     """
@@ -865,6 +865,6 @@
     grok.require('waeup.manageUniversity')
     grok.name('add')
-    label = ''
-    title = 'Add faculty'
+    label = 'Add faculty'
+    title = 'Academics'
     form_fields = grok.AutoFields(IFacultyAdd)
     pnav = 1
@@ -925,5 +925,5 @@
     #            self.flash('Could not delete %s.' % code)
 
-class AddDepartmentFormPage(WAeUPAddFormPage):
+class DepartmentAddFormPage(WAeUPAddFormPage):
     """Add a department to a faculty.
     """
@@ -959,5 +959,5 @@
         self.redirect(self.url(self.context))
 
-class ManageFacultyFormPage(WAeUPEditFormPage):
+class FacultyManageFormPage(WAeUPEditFormPage):
     """Manage the basic properties of a `Faculty` instance.
     """
@@ -984,5 +984,5 @@
         tabs.need()
         #warning.need()
-        return super(ManageFacultyFormPage, self).update()
+        return super(FacultyManageFormPage, self).update()
 
     @grok.action('Save')
@@ -1021,5 +1021,5 @@
         return
 
-class ManageFacultyContainerFormPage(WAeUPEditFormPage):
+class FacultyContainerManageFormPage(WAeUPEditFormPage):
     """Manage the basic properties of a `Faculty` instance.
     """
@@ -1040,5 +1040,5 @@
         tabs.need()
         #warning.need()
-        return super(ManageFacultyContainerFormPage, self).update()
+        return super(FacultyContainerManageFormPage, self).update()
 
     # ToDo: Show warning message before deletion
@@ -1198,5 +1198,5 @@
         return
 
-class DepartmentAddCourseFormPage(WAeUPAddFormPage):
+class CourseAddFormPage(WAeUPAddFormPage):
     """Add-form to add course to a department.
     """
@@ -1230,5 +1230,5 @@
         return
 
-class DepartmentAddCertificateFormPage(WAeUPAddFormPage):
+class CertificateAddFormPage(WAeUPAddFormPage):
     """Add-form to add certificate to a department.
     """
@@ -1384,5 +1384,5 @@
         return levels
 
-class CertificateManageForm(WAeUPEditFormPage):
+class CertificateManageFormPage(WAeUPEditFormPage):
     """Manage the basic properties of a `Certificate` instance.
     """
