Index: /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 7185)
@@ -214,5 +214,5 @@
 def handle_account_added(account, event):
     """When an account is added, the local owner role and the global
-    PortalUser role must be set.
+    AcademicsOfficer role must be set.
     """
     # We set the local Owner role
@@ -220,9 +220,9 @@
     role_manager_account.assignRoleToPrincipal(
         'waeup.local.Owner', account.name)
-    # We set the global PortalUser role
+    # We set the global AcademicsOfficer role
     site = grok.getSite()
     role_manager_site = IPrincipalRoleManager(site)
     role_manager_site.assignRoleToPrincipal(
-        'waeup.PortalUser', account.name)
+        'waeup.AcademicsOfficer', account.name)
     # Finally we have to notify the user account that the local role
     # of the same object has changed
Index: /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 7185)
@@ -51,8 +51,8 @@
   {'waeup.local.Owner': [<waeup.sirp.authentication.Account object at 0x...>]}
 
-Users have also got the global PortalUser role:
+Users have also got the global AcademicsOfficer role:
 
   >>> alice.getSiteRolesForPrincipal()
-  ['waeup.PortalUser']
+  ['waeup.AcademicsOfficer']
 
 We can tell an account, that Alice got some role for another object:
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7185)
@@ -145,11 +145,11 @@
   >>> print root['myuniversity']['users']['bob'].roles
   []
-  >>> root['myuniversity']['users']['bob'].roles = ['waeup.PortalUser']
+  >>> root['myuniversity']['users']['bob'].roles = ['waeup.ApplicationsOfficer']
   >>> print root['myuniversity']['users']['bob'].roles
-  ['waeup.PortalUser']
+  ['waeup.ApplicationsOfficer']
   >>> browser.open('http://localhost/myuniversity/users')
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<td>Portal User <br /></td>
+  ...<td>Applications Officer <br /></td>
   ...
 
@@ -303,5 +303,5 @@
   >>> browser.open('http://localhost/myuniversity/faculties/TF/manage')
   >>> browser.getControl(name="user").value = ['bob']
-  >>> browser.getControl(name="local_role").value = ['waeup.local.DepartmentOfficer']
+  >>> browser.getControl(name="local_role").value = ['waeup.local.DepartmentManager']
   >>> browser.getControl("Add local role").click()
   >>> print browser.contents
@@ -315,5 +315,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<td>Department Officer:...
+  ...<td>Department Manager:...
   ...
 
@@ -330,5 +330,5 @@
   >>> browser.open('http://localhost/myuniversity/faculties/TF/manage')
   >>> ctrl = browser.getControl(name='role_id')
-  >>> ctrl.getControl(value='bob|waeup.local.DepartmentOfficer').selected = True
+  >>> ctrl.getControl(value='bob|waeup.local.DepartmentManager').selected = True
   >>> browser.getControl("Remove selected local roles").click()
   >>> print browser.contents
@@ -459,5 +459,5 @@
   >>> browser.open('http://localhost/myuniversity/faculties/TF/TD/manage')
   >>> browser.getControl(name="user").value = ['bob']
-  >>> browser.getControl(name="local_role").value = ['waeup.local.DepartmentOfficer']
+  >>> browser.getControl(name="local_role").value = ['waeup.local.DepartmentManager']
   >>> browser.getControl("Add local role").click()
   >>> print browser.contents
@@ -478,5 +478,5 @@
   >>> browser.open('http://localhost/myuniversity/faculties/TF/TD/manage')
   >>> ctrl = browser.getControl(name='role_id')
-  >>> ctrl.getControl(value='bob|waeup.local.DepartmentOfficer').selected = True
+  >>> ctrl.getControl(value='bob|waeup.local.DepartmentManager').selected = True
   >>> browser.getControl("Remove selected local roles").click()
   >>> print browser.contents
Index: /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 7185)
@@ -50,7 +50,7 @@
 
 # Local Roles
-class DepartmentOfficer(grok.Role):
-    grok.name('waeup.local.DepartmentOfficer')
-    grok.title(u'Department Officer')
+class DepartmentManager(grok.Role):
+    grok.name('waeup.local.DepartmentManager')
+    grok.title(u'Department Manager')
     grok.permissions('waeup.manageUniversity')
 
@@ -75,7 +75,7 @@
 
 # Site Roles
-class PortalUser(grok.Role):
-    grok.name('waeup.PortalUser')
-    grok.title(u'Portal User')
+class AcademicsOfficer(grok.Role):
+    grok.name('waeup.AcademicsOfficer')
+    grok.title(u'Academics Offiver (view only)')
     grok.permissions('waeup.viewAcademics')
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt	(revision 7185)
@@ -53,7 +53,8 @@
     >>> from waeup.sirp.permissions import getWAeUPRoleNames
     >>> list(getWAeUPRoleNames())
-    [u'waeup.ACManager', u'waeup.AccommodationOfficer', u'waeup.Applicant',
+    [u'waeup.ACManager', u'waeup.AcademicsOfficer',
+     u'waeup.AccommodationOfficer', u'waeup.Applicant',
      u'waeup.ApplicationsOfficer',
-     u'waeup.PortalManager', u'waeup.PortalUser', u'waeup.Student',
+     u'waeup.PortalManager', u'waeup.Student',
      u'waeup.StudentsClearanceOfficer', u'waeup.StudentsManager',
      u'waeup.StudentsOfficer']
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 7185)
@@ -15,5 +15,5 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return ['waeup.local.DepartmentOfficer',
+        return ['waeup.local.DepartmentManager',
                 'waeup.local.ClearanceOfficer',]
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 7184)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 7185)
@@ -16,5 +16,5 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return ['waeup.local.DepartmentOfficer',
+        return ['waeup.local.DepartmentManager',
                 'waeup.local.ClearanceOfficer',]
 
