Index: main/waeup.sirp/trunk/src/waeup/sirp/university/department.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 5986)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 5988)
@@ -6,4 +6,5 @@
 from zope.interface import implementedBy
 from waeup.sirp.university.interfaces import IDepartment, IDepartmentAdd
+from waeup.sirp.university.vocabularies import inst_types
 
 class Department(grok.Container):
@@ -40,4 +41,9 @@
         return None
         
+    def longtitle(self):
+        return "%s %s (%s)" % (inst_types.getTerm(self.title_prefix).title, 
+                                                  self.title,
+                                                  self.code)
+        
 
 class DepartmentFactory(grok.GlobalUtility):
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 5986)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 5988)
@@ -7,4 +7,5 @@
 from waeup.sirp.university.interfaces import (
     IFaculty, IFacultyAdd, IDepartment)
+from waeup.sirp.university.vocabularies import inst_types    
 
 class Faculty(grok.Container):
@@ -36,13 +37,8 @@
             del self[key]
 
-    #def getName(self, key):
-    #    """Get complete department name.
-    #    """
-    #    if key in self.keys():
-    #        dept = self[key]
-    #        prefix = dept.title_prefix
-    #        prefix = prefix[0].upper() + prefix[1:]
-    #        return '%s of %s' % (prefix, dept.title)
-
+    def longtitle(self):
+        return "%s %s (%s)" % (inst_types.getTerm(self.title_prefix).title, 
+                                                  self.title,
+                                                  self.code)
         
 class FacultyFactory(grok.GlobalUtility):
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py	(revision 5986)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py	(revision 5988)
@@ -22,11 +22,4 @@
             del self[key]
 
-    #def getName(self, key):
-    #    if key in self.keys():
-    #        fac = self[key]
-    #        prefix = fac.title_prefix
-    #        prefix = prefix[0].upper() + prefix[1:]
-    #        return '%s of %s' % (prefix, fac.title)
-            
 class FacultyContainerFactory(grok.GlobalUtility):
     """A factory for faculty containers.
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 5986)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 5988)
@@ -9,4 +9,5 @@
                                                 application_category, 
                                                 study_mode,
+                                                inst_types,
                                                 CourseSource)                                   
 
@@ -28,9 +29,15 @@
         )
 
-    title_prefix = schema.TextLine(
+    title_prefix = schema.Choice(
         title = u'Title prefix',
         default = u'faculty',
-        required = True,
-        )
+        vocabulary = inst_types,
+        required = True,
+        )
+        
+    def longtitle():
+        """
+        Returns the long title of a faculty.
+        """        
         
 class IFacultyAdd(IFaculty):
@@ -72,6 +79,7 @@
         )
 
-    title_prefix = schema.TextLine(
+    title_prefix = schema.Choice(
         title = u'Title prefix',
+        vocabulary = inst_types,
         default = u'department',
         required = True,
@@ -80,5 +88,10 @@
     courses = Attribute("A container for courses.")
     certificates = Attribute("A container for certificates.")
-
+    
+    def longtitle():
+        """
+        Returns the long title of a department.
+        """
+        
 class IDepartmentAdd(IDepartment):
     """Representation of a university department.
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 5986)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 5988)
@@ -10,4 +10,15 @@
     from zope.app.catalog.interfaces import ICatalog
 from zope.component import getUtility
+
+inst_types = SimpleWAeUPVocabulary(
+             ('Faculty of','faculty'),
+             ('Department of','department'),
+             ('School of','school_of'),
+             ('School for','school_for'),
+             ('Institute of','institute'),
+             ('Office for','office'),
+             ('Centre for','centre'),
+             ('College','college'),
+             )
                                    
 course_levels = SimpleWAeUPVocabulary(
