Index: main/waeup.sirp/trunk/src/waeup/sirp/__init__.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/__init__.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/__init__.py	(revision 7321)
@@ -1,13 +1,13 @@
 import grok
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 from zope.annotation.attribute import AttributeAnnotations
 from zope.annotation.interfaces import IAnnotations
 
-class WAeUPAttributeAnnotations(AttributeAnnotations, grok.Adapter):
-    """An adapter to IAnnotations for any WAeUPObject.
+class SIRPAttributeAnnotations(AttributeAnnotations, grok.Adapter):
+    """An adapter to IAnnotations for any SIRPObject.
 
-    Providing this adapter, each WAeUP object becomes (attribute)
+    Providing this adapter, each SIRP object becomes (attribute)
     annotatable.
     """
     grok.provides(IAnnotations)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py	(revision 7321)
@@ -31,5 +31,5 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from random import SystemRandom as random
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable, IObjectHistory
+from waeup.sirp.interfaces import ISIRPPluggable, IObjectHistory
 from waeup.sirp.accesscodes.interfaces import (
     IAccessCode, IAccessCodeBatch, IAccessCodeBatchContainer
@@ -398,5 +398,5 @@
 class AccessCodePlugin(grok.GlobalUtility):
     grok.name('accesscodes')
-    grok.implements(IWAeUPSIRPPluggable)
+    grok.implements(ISIRPPluggable)
 
     def setup(self, site, name, logger):
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :NOdoctest:
-.. :NOlayer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :NOlayer: waeup.sirp.testing.SIRPUnitTestLayer
 
 About access-codes
@@ -591,8 +591,8 @@
 .. class:: AccessCodePlugin
 
-  A `waeup.sirp` plugin that updates existing WAeUP SIRP university
+  A `waeup.sirp` plugin that updates existing SIRP university
   instances so that they provide support for access-codes.
 
-  .. attribute:: grok.implements(IWAeUPSIRPPluggable)
+  .. attribute:: grok.implements(ISIRPPluggable)
   .. attribute:: grok.name('accesscodes')
 
@@ -608,5 +608,5 @@
 
   The AccessCodePlugin is available as a global named utility for the
-  IWAeUPSIRPPluggable interface named ``accesscodes``.
+  ISIRPPluggable interface named ``accesscodes``.
 
   It is looked up by a university instance when created, so that this
@@ -615,6 +615,6 @@
 
     >>> from zope.component import getUtility
-    >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
-    >>> plugin = getUtility(IWAeUPSIRPPluggable, name='accesscodes')
+    >>> from waeup.sirp.interfaces import ISIRPPluggable
+    >>> plugin = getUtility(ISIRPPluggable, name='accesscodes')
     >>> plugin
     <waeup.sirp.accesscodes.accesscodes.AccessCodePlugin object at 0x...>
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py	(revision 7321)
@@ -22,9 +22,9 @@
 from hurry.workflow.interfaces import InvalidTransitionError
 from waeup.sirp.browser.resources import datatable
-from waeup.sirp.browser import WAeUPPage, WAeUPAddFormPage
+from waeup.sirp.browser import SIRPPage, SIRPAddFormPage
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
 from waeup.sirp.browser.viewlets import (
     AdminTask, AddActionButton, SearchActionButton, BatchOpButton, ManageLink)
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 
 from waeup.sirp.accesscodes.interfaces import (
@@ -33,7 +33,7 @@
 from waeup.sirp.accesscodes.catalog import search
 
-grok.context(IWAeUPObject)
-
-class BatchContainerPage(WAeUPPage):
+grok.context(ISIRPObject)
+
+class BatchContainerPage(SIRPPage):
     grok.name('index')
     grok.context(IAccessCodeBatchContainer)
@@ -61,5 +61,5 @@
             self.flash('Deleted batch %s' % name)
 
-class AddBatchPage(WAeUPAddFormPage):
+class AddBatchPage(SIRPAddFormPage):
     grok.name('add')
     grok.context(IAccessCodeBatchContainer)
@@ -89,5 +89,5 @@
         self.redirect(self.url(self.context))
 
-class ReimportBatchPage(WAeUPPage):
+class ReimportBatchPage(SIRPPage):
     """Screen for reimporting AC batches.
     """
@@ -123,5 +123,5 @@
         self.redirect(self.url(self.context))
 
-class BatchContainerSearchPage(WAeUPPage):
+class BatchContainerSearchPage(SIRPPage):
     grok.name('search')
     grok.context(IAccessCodeBatchContainer)
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt	(revision 7321)
@@ -4,5 +4,5 @@
 .. module:: waeup.sirp.accesscodes.browser
 
-Here we visit the access-code related parts of a WAeUP SIRP site using
+Here we visit the access-code related parts of a SIRP site using
 a virtual browser.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/interfaces.py	(revision 7321)
@@ -20,7 +20,7 @@
 from zope import schema
 from zope.interface import Interface
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 
-class IAccessCode(IWAeUPObject):
+class IAccessCode(ISIRPObject):
     """An access code.
     """
@@ -91,5 +91,5 @@
         )
 
-class IAccessCodeBatchContainer(IWAeUPObject):
+class IAccessCodeBatchContainer(ISIRPObject):
     """A container for access code batches.
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscode.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscode.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscode.py	(revision 7321)
@@ -29,5 +29,5 @@
 from zope.testing import renormalizing
 from waeup.sirp.app import University
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPSIRPPluggable
+from waeup.sirp.interfaces import IObjectHistory, ISIRPPluggable
 from waeup.sirp.testing import (
     FunctionalLayer, FunctionalTestCase, setUp, tearDown, getRootFolder)
@@ -412,6 +412,6 @@
     def test_iface(self):
         plugin = AccessCodePlugin()
-        assert verifyObject(IWAeUPSIRPPluggable, plugin)
-        assert verifyClass(IWAeUPSIRPPluggable, AccessCodePlugin)
+        assert verifyObject(ISIRPPluggable, plugin)
+        assert verifyClass(ISIRPPluggable, AccessCodePlugin)
 
     def test_update_w_ac_container(self):
Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/workflow.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/workflow.py	(revision 7321)
@@ -24,6 +24,6 @@
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.sirp.accesscodes.interfaces import IAccessCode
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
-from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo
+from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
 
 INITIALIZED = 'initialized'
@@ -104,5 +104,5 @@
     )
 
-accesscode_workflow = WAeUPWorkflow(ACCESSCODE_TRANSITIONS)
+accesscode_workflow = SIRPWorkflow(ACCESSCODE_TRANSITIONS)
 
 class AccessCodeWorkflowState(WorkflowState, grok.Adapter):
@@ -113,7 +113,7 @@
     state_id = 'wf.accesscode.id'
 
-class AccessCodeWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
+class AccessCodeWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
     grok.context(IAccessCode)
-    grok.provides(IWAeUPWorkflowInfo)
+    grok.provides(ISIRPWorkflowInfo)
 
     def __init__(self, context):
Index: main/waeup.sirp/trunk/src/waeup/sirp/app.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/app.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/app.py	(revision 7321)
@@ -26,5 +26,5 @@
 from waeup.sirp.hostels.container import HostelsContainer
 from waeup.sirp.interfaces import (
-    IUniversity, IWAeUPSIRPPluggable, IObjectUpgradeEvent, )
+    IUniversity, ISIRPPluggable, IObjectUpgradeEvent, )
 from waeup.sirp.userscontainer import UsersContainer
 from waeup.sirp.utils.logger import Logger
@@ -64,5 +64,5 @@
         """Create instances of all plugins defined somewhere.
         """
-        for name, plugin in getUtilitiesFor(IWAeUPSIRPPluggable):
+        for name, plugin in getUtilitiesFor(ISIRPPluggable):
             plugin.setup(self, name, self.logger)
         return
@@ -76,5 +76,5 @@
         self.logger.info('Done.')
         self.logger.info('Now upgrading any plugins.')
-        for name, plugin in getUtilitiesFor(IWAeUPSIRPPluggable):
+        for name, plugin in getUtilitiesFor(ISIRPPluggable):
             plugin.update(self, name, self.logger)
         self.logger.info('Plugin update finished.')
Index: main/waeup.sirp/trunk/src/waeup/sirp/app.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/app.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/app.txt	(revision 7321)
@@ -1,7 +1,7 @@
-:mod:`waeup.sirp.app` -- central components for a WAeUP portal
-**************************************************************
+:mod:`waeup.sirp.app` -- central components for SIRP
+****************************************************
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 .. module:: waeup.sirp.app
@@ -9,5 +9,5 @@
 .. class:: University
 
-  The main WAeUP application object is given with
+  The main SIRP application object is given with
   :class:`University`. It provides the main containers as faculties,
   hostels, etc.
@@ -76,6 +76,6 @@
 first::
 
-  >>> from waeup.sirp.interfaces import IWAeUPExporter
-  >>> exporter = IWAeUPExporter(myuniversity)
+  >>> from waeup.sirp.interfaces import ISIRPExporter
+  >>> exporter = ISIRPExporter(myuniversity)
   >>> exporter
   <waeup.sirp.utils.importexport.Exporter object at 0x...>
@@ -90,6 +90,6 @@
 memory file::
 
-  >>> from waeup.sirp.interfaces import IWAeUPXMLExporter
-  >>> exporter = IWAeUPXMLExporter(myuniversity)
+  >>> from waeup.sirp.interfaces import ISIRPXMLExporter
+  >>> exporter = ISIRPXMLExporter(myuniversity)
   >>> f = exporter.export()
   >>> f
@@ -103,17 +103,17 @@
   </pickle>
 
-WAeUP SIRP plugins
-==================
+SIRP plugins
+============
 
 waeup.sirp provides an API to 'plugin' components. Things that should
-be setup at creation time of a WAeUP SIRP application can indicate
-that by providing a utility providing IWAeUPSIRPPlugin.
+be setup at creation time of a SIRP application can indicate
+that by providing a utility providing ISIRPPlugin.
 
 The plugins are looked up by an created app, which then will call the
 ``setup()`` method of each plugin.
 
-   >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
+   >>> from waeup.sirp.interfaces import ISIRPPluggable
    >>> from zope.component import getAdapters, getUtilitiesFor
-   >>> sorted(list(getUtilitiesFor(IWAeUPSIRPPluggable)))
+   >>> sorted(list(getUtilitiesFor(ISIRPPluggable)))
    [(u'accesscodes', <waeup.sirp.accesscodes...AccessCodePlugin ...)]
 
@@ -122,7 +122,7 @@
 
    >>> import grok
-   >>> from waeup.sirp.interfaces import IWAeUPSIRPPluggable
+   >>> from waeup.sirp.interfaces import ISIRPPluggable
    >>> class MyPlugin(grok.GlobalUtility):
-   ...   grok.implements(IWAeUPSIRPPluggable)
+   ...   grok.implements(ISIRPPluggable)
    ...   def setup(self, site, name, logger):
    ...     print "Setup was called for"
@@ -136,5 +136,5 @@
    True
 
-and setup a new WAeUP SIRP instance, we will get a message:
+and setup a new SIRP instance, we will get a message:
 
    >>> from waeup.sirp.app import University
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicant.py	(revision 7321)
@@ -24,5 +24,5 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.sirp.app import University
-from waeup.sirp.image import WAeUPImageFile
+from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
 from waeup.sirp.interfaces import (
@@ -220,5 +220,5 @@
             ApplicantImageStoreHandler, self).createFile(
             store, root,  filename, file_id, file)
-        return file, path, WAeUPImageFile(
+        return file, path, SIRPImageFile(
             file_obj.filename, file_obj.data)
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7321)
@@ -34,5 +34,5 @@
 from reportlab.platypus.tables import TableStyle
 from waeup.sirp.browser import (
-    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage)
+    SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
 from waeup.sirp.browser.layout import NullValidator
@@ -41,5 +41,5 @@
 from waeup.sirp.browser.viewlets import ManageActionButton, PrimaryNavTab
 from waeup.sirp.interfaces import (
-    IWAeUPObject, ILocalRolesAssignable, IExtFileStore,
+    ISIRPObject, ILocalRolesAssignable, IExtFileStore,
     IFileStoreNameChooser, IPasswordValidator, IUserAccount)
 from waeup.sirp.permissions import get_users_with_local_roles
@@ -60,7 +60,7 @@
 from waeup.sirp.students.interfaces import IStudentsUtils
 
-grok.context(IWAeUPObject) # Make IWAeUPObject the default context
-
-class ApplicantsRootPage(WAeUPPage):
+grok.context(ISIRPObject) # Make ISIRPObject the default context
+
+class ApplicantsRootPage(SIRPPage):
     grok.context(IApplicantsRoot)
     grok.name('index')
@@ -81,5 +81,5 @@
     text = 'Manage application section'
 
-class ApplicantsRootManageFormPage(WAeUPEditFormPage):
+class ApplicantsRootManageFormPage(SIRPEditFormPage):
     grok.context(IApplicantsRoot)
     grok.name('manage')
@@ -151,5 +151,5 @@
         return del_local_roles(self,2,**data)
 
-class ApplicantsContainerAddFormPage(WAeUPAddFormPage):
+class ApplicantsContainerAddFormPage(SIRPAddFormPage):
     grok.context(IApplicantsRoot)
     grok.require('waeup.manageApplication')
@@ -229,5 +229,5 @@
     """Applicants tab in primary navigation.
     """
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.order(3)
     grok.require('waeup.viewApplicantsTab')
@@ -273,5 +273,5 @@
         return self.view.application_url() + rel_link
 
-class ApplicantsContainerPage(WAeUPDisplayFormPage):
+class ApplicantsContainerPage(SIRPDisplayFormPage):
     """The standard view for regular applicant containers.
     """
@@ -311,5 +311,5 @@
 #    target = 'login'
 
-class ApplicantsContainerManageFormPage(WAeUPEditFormPage):
+class ApplicantsContainerManageFormPage(SIRPEditFormPage):
     grok.context(IApplicantsContainer)
     grok.name('manage')
@@ -404,5 +404,5 @@
         return del_local_roles(self,3,**data)
 
-class ApplicantAddFormPage(WAeUPAddFormPage):
+class ApplicantAddFormPage(SIRPAddFormPage):
     """Add-form to add an applicant.
     """
@@ -431,5 +431,5 @@
         return
 
-class ApplicantDisplayFormPage(WAeUPDisplayFormPage):
+class ApplicantDisplayFormPage(SIRPDisplayFormPage):
     grok.context(IApplicant)
     grok.name('index')
@@ -532,5 +532,5 @@
 
 
-class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
+class OnlinePaymentDisplayFormPage(SIRPDisplayFormPage):
     """ Page to view an online payment ticket
     """
@@ -700,5 +700,5 @@
         pdf.setAuthor('%s (%s)' % (self.request.principal.title,
             self.request.principal.id))
-        pdf.setCreator('WAeUP SIRP')
+        pdf.setCreator('SIRP SIRP')
         width, height = A4
         style = getSampleStyleSheet()
@@ -802,5 +802,5 @@
     return True
 
-class ApplicantManageFormPage(WAeUPEditFormPage):
+class ApplicantManageFormPage(SIRPEditFormPage):
     """A full edit view for applicant data.
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py	(revision 7321)
@@ -30,5 +30,5 @@
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.interfaces import (
-    IWAeUPObject, year_range, validate_email, academic_sessions_vocab)
+    ISIRPObject, year_range, validate_email, academic_sessions_vocab)
 from waeup.sirp.university.vocabularies import application_categories
 from waeup.sirp.students.vocabularies import (
@@ -118,10 +118,10 @@
             factory.container_title, factory.container_description)
 
-class IApplicantsRoot(IWAeUPObject, IContainer):
+class IApplicantsRoot(ISIRPObject, IContainer):
     """A container for university applicants containers.
     """
     pass
 
-class IApplicantsContainer(IWAeUPObject):
+class IApplicantsContainer(ISIRPObject):
     """An applicants container contains university applicants.
 
@@ -275,5 +275,5 @@
     'provider'].order =  IApplicantsContainer['provider'].order
 
-class IApplicantBaseData(IWAeUPObject):
+class IApplicantBaseData(ISIRPObject):
     """The data for an applicant.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py	(revision 7321)
@@ -23,5 +23,5 @@
 from hurry.query.interfaces import IQuery
 from zope.component import getUtility
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable
+from waeup.sirp.interfaces import ISIRPPluggable
 from waeup.sirp.applicants.interfaces import IApplicantsRoot
 from waeup.sirp.utils.helpers import get_current_principal
@@ -49,5 +49,5 @@
 
 class ApplicantsPlugin(grok.GlobalUtility):
-    """A WAeUPSIRPPlugin that creates an applicants root in portal.
+    """A SIRPPlugin that creates an applicants root in portal.
 
     This plugin should be called by a typical
@@ -56,8 +56,8 @@
     the main site configuration.
 
-    Implements :class:`waeup.sirp.interfaces.IWAeUPSIRPPluggable`
+    Implements :class:`waeup.sirp.interfaces.ISIRPPluggable`
     """
     grok.name('applicants')
-    grok.implements(IWAeUPSIRPPluggable)
+    grok.implements(ISIRPPluggable)
     log_prefix = 'ApplicantsPlugin'
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicant.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicant.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_applicant.py	(revision 7321)
@@ -26,5 +26,5 @@
 from zope.interface import verify, implements
 from zope.location.interfaces import ILocation
-from waeup.sirp.image.interfaces import IWAeUPImageFile
+from waeup.sirp.image.interfaces import ISIRPImageFile
 from waeup.sirp.imagestorage import DefaultStorage
 from waeup.sirp.interfaces import IFileStoreHandler, IFileStoreNameChooser
@@ -38,5 +38,5 @@
 class FakeImageLocation(object):
     implements(ILocation)
-    adapts(IWAeUPImageFile)
+    adapts(ISIRPImageFile)
     def __init__(self, context):
         pass
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py	(revision 7321)
@@ -20,5 +20,5 @@
 from zope.component import getUtility
 from zope.catalog.interfaces import ICatalog
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 from waeup.sirp.students.vocabularies import CertificateSource
 
@@ -37,9 +37,9 @@
     )
 
-#: A :class:`waeup.sirp.interfaces.SimpleWAeUPVocabulary` of supported
+#: A :class:`waeup.sirp.interfaces.SimpleSIRPVocabulary` of supported
 #: application or screening types.
-application_types_vocab = SimpleWAeUPVocabulary(
+application_types_vocab = SimpleSIRPVocabulary(
     *[(x[0],x[1]) for x in APPLICATION_TYPES])
-application_pins_vocab = SimpleWAeUPVocabulary(
+application_pins_vocab = SimpleSIRPVocabulary(
     *[(u"%s (%s)" % (x[2],x[0]),x[2]) for x in APPLICATION_TYPES])
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 7321)
@@ -22,6 +22,6 @@
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.sirp.applicants.interfaces import IApplicantBaseData
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
-from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo
+from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
 from waeup.sirp.utils.helpers import get_current_principal
 
@@ -127,5 +127,5 @@
     )
 
-application_workflow = WAeUPWorkflow(APPLICATION_TRANSITIONS)
+application_workflow = SIRPWorkflow(APPLICATION_TRANSITIONS)
 
 class ApplicationWorkflowState(WorkflowState, grok.Adapter):
@@ -138,9 +138,9 @@
     state_id = 'wf.application.id'
 
-class ApplicationWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
+class ApplicationWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
     """Adapter to adapt Applicant objects to workflow info objects.
     """
     grok.context(IApplicantBaseData)
-    grok.provides(IWAeUPWorkflowInfo)
+    grok.provides(ISIRPWorkflowInfo)
 
     def __init__(self, context):
Index: main/waeup.sirp/trunk/src/waeup/sirp/authentication.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/authentication.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""Authentication for WAeUP portals.
+"""Authentication for SIRP.
 """
 import grok
@@ -63,5 +63,5 @@
     return principalRoleManager
 
-class WAeUPSessionCredentialsPlugin(grok.GlobalUtility,
+class SIRPSessionCredentialsPlugin(grok.GlobalUtility,
                                     SessionCredentialsPlugin):
     grok.provides(ICredentialsPlugin)
Index: main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/authentication.txt	(revision 7321)
@@ -1,4 +1,4 @@
-WAeUP portal authentication
-***************************
+SIRP authentication
+*******************
 
 We need to protect most pieces of our portals from unauthenticated
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/__init__.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/__init__.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/__init__.py	(revision 7321)
@@ -2,6 +2,6 @@
 
 from waeup.sirp.browser.layout import (
-    WAeUPPage, WAeUPForm, WAeUPLayout, WAeUPDisplayFormPage, WAeUPEditFormPage,
-    WAeUPAddFormPage, NullValidator)
+    SIRPPage, SIRPForm, SIRPLayout, SIRPDisplayFormPage, SIRPEditFormPage,
+    SIRPAddFormPage, NullValidator)
 from waeup.sirp.browser.pages import ContactAdminForm
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py	(revision 7321)
@@ -33,5 +33,5 @@
     """
     grok.provides(IBreadcrumb)
-    grok.context(interfaces.IWAeUPObject)
+    grok.context(interfaces.ISIRPObject)
     grok.name('index')
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7321)
@@ -1,6 +1,6 @@
-Browsing the WAeUP portal
-*************************
-
-Here we visit all parts of a WAeUP portal using a browser.
+Browsing SIRP
+*************
+
+Here we visit all parts of a SIRP portal using a browser.
 
 University
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/exceptions.py	(revision 7321)
@@ -22,5 +22,5 @@
 from zope.publisher.interfaces import INotFound
 from zope.security.interfaces import IUnauthorized
-from waeup.sirp.browser.layout import WAeUPPage
+from waeup.sirp.browser.layout import SIRPPage
 
 grok.templatedir('templates')
@@ -61,5 +61,5 @@
 
 
-class NotFoundPage(WAeUPPage):
+class NotFoundPage(SIRPPage):
     """A page rendered when an object cannot be found.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py	(revision 7321)
@@ -21,5 +21,5 @@
 from zope.interface import Interface, Attribute
 from waeup.sirp.interfaces import (
-    IWAeUPObject, IUniversity, IUsersContainer, IDataCenter)
+    ISIRPObject, IUniversity, IUsersContainer, IDataCenter)
 from waeup.sirp.university.interfaces import (
     IFacultyContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd,
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7321)
@@ -29,7 +29,7 @@
 from zope.interface import Interface
 from zope.site.hooks import getSite
-from waeup.sirp.interfaces import IWAeUPObject, IUserAccount
+from waeup.sirp.interfaces import ISIRPObject, IUserAccount
 from waeup.sirp.browser.interfaces import ITheme
-from waeup.sirp.browser.theming import get_all_themes, WAeUPThemeGray1
+from waeup.sirp.browser.theming import get_all_themes, SIRPThemeGray1
 from waeup.sirp.students.interfaces import IStudentNavigation
 from waeup.sirp.applicants.interfaces import IApplicant
@@ -101,10 +101,10 @@
         return True
 
-class WAeUPLayout(Layout, UtilityView):
+class SIRPLayout(Layout, UtilityView):
     """A megrok.layout.Layout with additional methods.
     """
     grok.baseclass()
 
-class WAeUPForm(Form, UtilityView):
+class SIRPForm(Form, UtilityView):
     """A megrok.layout.Form with additional methods.
     """
@@ -112,5 +112,5 @@
 
     def setUpWidgets(self,ignore_request=False):
-        super(WAeUPForm,self).setUpWidgets(ignore_request)
+        super(SIRPForm,self).setUpWidgets(ignore_request)
         if self.widgets.get('subject'):
             self.widgets['subject'].displayWidth = 45
@@ -120,10 +120,10 @@
             self.widgets['body'].width = 35
 
-class WAeUPPage(Page):
+class SIRPPage(Page):
     """A megrok.layout page with additional methods.
     """
     grok.baseclass()
 
-class WAeUPDisplayFormPage(DisplayForm, UtilityView):
+class SIRPDisplayFormPage(DisplayForm, UtilityView):
     """A megrok.layout.DisplayForm with additional methods.
     """
@@ -131,5 +131,5 @@
     template = default_waeup_display_template
 
-class WAeUPEditFormPage(EditForm, UtilityView):
+class SIRPEditFormPage(EditForm, UtilityView):
     """A megrok.layout.EditForm with additional methods.
     """
@@ -138,5 +138,5 @@
 
     def setUpWidgets(self,ignore_request=False):
-        super(WAeUPEditFormPage,self).setUpWidgets(ignore_request)
+        super(SIRPEditFormPage,self).setUpWidgets(ignore_request)
         if self.widgets.get('title'):
             self.widgets['title'].displayWidth = 80
@@ -148,5 +148,5 @@
             self.widgets['notice'].height = 3
 
-class WAeUPAddFormPage(AddForm,  UtilityView):
+class SIRPAddFormPage(AddForm,  UtilityView):
     """A megrok.layout.AddForm with additional methods.
     """
@@ -154,11 +154,11 @@
     template = default_waeup_edit_template
 
-class SiteLayout(WAeUPLayout):
+class SiteLayout(SIRPLayout):
     """ The general site layout.
     """
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
 
     #: An instance of the default theme to use for the site layout
-    default_theme = WAeUPThemeGray1()
+    default_theme = SIRPThemeGray1()
     stafftemp = grok.PageTemplateFile('templates/staffsitelayout.pt')
     studenttemp = grok.PageTemplateFile('templates/studentsitelayout.pt')
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-""" Viewing components for WAeUP objects.
+""" Viewing components for SIRP objects.
 """
 import copy
@@ -38,6 +38,6 @@
 from zope.session.interfaces import ISession
 from waeup.sirp.browser import (
-    WAeUPPage, WAeUPForm, WAeUPEditFormPage, WAeUPAddFormPage,
-    WAeUPDisplayFormPage, NullValidator)
+    SIRPPage, SIRPForm, SIRPEditFormPage, SIRPAddFormPage,
+    SIRPDisplayFormPage, NullValidator)
 from waeup.sirp.browser.interfaces import (
     IUniversity, IFacultyContainer, IFaculty, IFacultyAdd,
@@ -46,6 +46,6 @@
 from waeup.sirp.browser.resources import warning, datepicker, tabs, datatable
 from waeup.sirp.interfaces import(
-    IWAeUPObject, IUsersContainer, IUserAccount, IDataCenter,
-    IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
+    ISIRPObject, IUsersContainer, IUserAccount, IDataCenter,
+    ISIRPXMLImporter, ISIRPXMLExporter, IBatchProcessor,
     ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
     ISessionConfiguration, ISessionConfigurationAdd,
@@ -60,5 +60,5 @@
 from waeup.sirp.utils.helpers import get_user_account, send_mail
 
-grok.context(IWAeUPObject)
+grok.context(ISIRPObject)
 grok.templatedir('templates')
 
@@ -139,9 +139,9 @@
 #
 
-class LoginPage(WAeUPPage):
+class LoginPage(SIRPPage):
     """A login page, available for all objects.
     """
     grok.name('login')
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.require('waeup.Public')
     title = u'Login'
@@ -174,8 +174,8 @@
 
 
-class LogoutPage(WAeUPPage):
+class LogoutPage(SIRPPage):
     """A logout page. Calling this page will log the current user out.
     """
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.require('waeup.Public')
     grok.name('logout')
@@ -185,5 +185,5 @@
             auth = getUtility(IAuthentication)
             ILogout(auth).logout(self.request)
-            self.flash("You have been logged out. Thanks for using WAeUP SIRP!")
+            self.flash("You have been logged out. Thanks for using SIRP SIRP!")
         self.redirect(self.application_url())
 
@@ -192,5 +192,5 @@
 #
 
-class ContactAdminForm(WAeUPForm):
+class ContactAdminForm(SIRPForm):
     grok.name('contactadmin')
     #grok.context(IUniversity)
@@ -263,5 +263,5 @@
 #
 
-class UniversityPage(WAeUPDisplayFormPage):
+class UniversityPage(SIRPDisplayFormPage):
     """ The main university page.
     """
@@ -286,5 +286,5 @@
         return view.widgets['frontpage']()
 
-class AdministrationPage(WAeUPPage):
+class AdministrationPage(SIRPPage):
     """ The administration overview page.
     """
@@ -333,5 +333,5 @@
 #
 
-class UsersContainerPage(WAeUPPage):
+class UsersContainerPage(SIRPPage):
     """Overview page for all local users.
     """
@@ -370,5 +370,5 @@
         return site_roles_string
 
-class AddUserFormPage(WAeUPAddFormPage):
+class AddUserFormPage(SIRPAddFormPage):
     grok.require('waeup.manageUsers')
     grok.context(IUsersContainer)
@@ -407,5 +407,5 @@
         self.redirect(self.url(self.context))
 
-class UserManageFormPage(WAeUPEditFormPage):
+class UserManageFormPage(SIRPEditFormPage):
     """Manage a user account.
     """
@@ -499,5 +499,5 @@
         return "%s (%s)" % (self.context.title, self.context.__name__)
 
-class MyRolesPage(WAeUPPage):
+class MyRolesPage(SIRPPage):
     """Display site roles and local roles assigned to officers.
     """
@@ -535,5 +535,5 @@
 #
 
-class SearchPage(WAeUPPage):
+class SearchPage(SIRPPage):
     """General search page for the academics section.
     """
@@ -562,5 +562,5 @@
 #
 
-class ConfigurationContainerDisplayFormPage(WAeUPDisplayFormPage):
+class ConfigurationContainerDisplayFormPage(SIRPDisplayFormPage):
     """View page of the configuration container.
     """
@@ -574,5 +574,5 @@
     form_fields['frontpage'].custom_widget = ReSTDisplayWidget
 
-class ConfigurationContainerManageFormPage(WAeUPEditFormPage):
+class ConfigurationContainerManageFormPage(SIRPEditFormPage):
     """Manage page of the configuration container. We always use the
     manage page in the UI not the view page, thus we use the index name here.
@@ -629,5 +629,5 @@
         return
 
-class SessionConfigurationAddFormPage(WAeUPAddFormPage):
+class SessionConfigurationAddFormPage(SIRPAddFormPage):
     """Add a session configuration object to configuration container.
     """
@@ -657,5 +657,5 @@
         return
 
-class SessionConfigurationManageFormPage(WAeUPEditFormPage):
+class SessionConfigurationManageFormPage(SIRPEditFormPage):
     """Manage session configuration object.
     """
@@ -692,5 +692,5 @@
 #
 
-class DatacenterPage(WAeUPPage):
+class DatacenterPage(SIRPPage):
     grok.context(IDataCenter)
     grok.name('index')
@@ -699,5 +699,5 @@
     pnav = 0
 
-class DatacenterUploadPage(WAeUPPage):
+class DatacenterUploadPage(SIRPPage):
     grok.context(IDataCenter)
     grok.name('upload')
@@ -743,5 +743,5 @@
         return '%s_%s%s' % (base, filtered_username, ext.lower())
 
-class DatacenterImportStep1(WAeUPPage):
+class DatacenterImportStep1(SIRPPage):
     """Manual import step 1: choose file
     """
@@ -773,5 +773,5 @@
             self.redirect(self.url(self.context, '@@import2'))
 
-class DatacenterImportStep2(WAeUPPage):
+class DatacenterImportStep2(SIRPPage):
     """Manual import step 2: choose importer
     """
@@ -891,5 +891,5 @@
             self.flash(warnings)
 
-class DatacenterImportStep3(WAeUPPage):
+class DatacenterImportStep3(SIRPPage):
     """Manual import step 3: modify header
     """
@@ -995,5 +995,5 @@
             self.flash(warnings)
 
-class DatacenterImportStep4(WAeUPPage):
+class DatacenterImportStep4(SIRPPage):
     """Manual import step 4: do actual import
     """
@@ -1052,5 +1052,5 @@
                 linenum - (self.warn_num)))
 
-class DatacenterLogsOverview(WAeUPPage):
+class DatacenterLogsOverview(SIRPPage):
     grok.context(IDataCenter)
     grok.name('logs')
@@ -1073,5 +1073,5 @@
         self.files = self.context.getLogFiles()
 
-class DatacenterLogsFileview(WAeUPPage):
+class DatacenterLogsFileview(SIRPPage):
     grok.context(IDataCenter)
     grok.name('show')
@@ -1092,5 +1092,5 @@
         self.filecontents = open(fullpath, 'rb').read()
 
-class DatacenterSettings(WAeUPPage):
+class DatacenterSettings(SIRPPage):
     grok.context(IDataCenter)
     grok.name('manage')
@@ -1132,5 +1132,5 @@
 
     def render(self):
-        exporter = IWAeUPXMLExporter(self.context)
+        exporter = ISIRPXMLExporter(self.context)
         xml = exporter.export().read()
         self.response.setHeader(
@@ -1138,5 +1138,5 @@
         return xml
 
-class ImportXMLPage(WAeUPPage):
+class ImportXMLPage(SIRPPage):
     """Replace the context object by an object created from an XML
        representation.
@@ -1154,5 +1154,5 @@
         if not xmlfile:
             return
-        importer = IWAeUPXMLImporter(self.context)
+        importer = ISIRPXMLImporter(self.context)
         obj = importer.doImport(xmlfile)
         if type(obj) != type(self.context):
@@ -1175,5 +1175,5 @@
 #
 
-class FacultyContainerPage(WAeUPPage):
+class FacultyContainerPage(SIRPPage):
     """ Index page for faculty containers.
     """
@@ -1186,5 +1186,5 @@
     grok.template('facultypage')
 
-class FacultyContainerManageFormPage(WAeUPEditFormPage):
+class FacultyContainerManageFormPage(SIRPEditFormPage):
     """Manage the basic properties of a `Faculty` instance.
     """
@@ -1224,5 +1224,5 @@
 
 
-class FacultyAddFormPage(WAeUPAddFormPage):
+class FacultyAddFormPage(SIRPAddFormPage):
     """ Page form to add a new faculty to a faculty container.
     """
@@ -1253,5 +1253,5 @@
 # Faculty pages
 #
-class FacultyPage(WAeUPPage):
+class FacultyPage(SIRPPage):
     """Index page of faculties.
     """
@@ -1269,5 +1269,5 @@
         return 'Departments'
 
-class FacultyManageFormPage(WAeUPEditFormPage):
+class FacultyManageFormPage(SIRPEditFormPage):
     """Manage the basic properties of a `Faculty` instance.
     """
@@ -1341,5 +1341,5 @@
         return del_local_roles(self,3,**data)
 
-class DepartmentAddFormPage(WAeUPAddFormPage):
+class DepartmentAddFormPage(SIRPAddFormPage):
     """Add a department to a faculty.
     """
@@ -1374,5 +1374,5 @@
 # Department pages
 #
-class DepartmentPage(WAeUPPage):
+class DepartmentPage(SIRPPage):
     """Department index page.
     """
@@ -1407,5 +1407,5 @@
             yield(dict(url=url, name=key, container=val))
 
-class ShowStudentsPage(WAeUPPage):
+class ShowStudentsPage(SIRPPage):
     """Page that lists all students in the department.
     """
@@ -1430,5 +1430,5 @@
         return
 
-class DepartmentManageFormPage(WAeUPEditFormPage):
+class DepartmentManageFormPage(SIRPEditFormPage):
     """Manage the basic properties of a `Department` instance.
     """
@@ -1530,5 +1530,5 @@
         return del_local_roles(self,4,**data)
 
-class CourseAddFormPage(WAeUPAddFormPage):
+class CourseAddFormPage(SIRPAddFormPage):
     """Add-form to add course to a department.
     """
@@ -1571,5 +1571,5 @@
         return
 
-class CertificateAddFormPage(WAeUPAddFormPage):
+class CertificateAddFormPage(SIRPAddFormPage):
     """Add-form to add certificate to a department.
     """
@@ -1616,5 +1616,5 @@
 # Courses pages
 #
-class CoursePage(WAeUPPage):
+class CoursePage(SIRPPage):
     """Course index page.
     """
@@ -1629,5 +1629,5 @@
         return 'Course: %s (%s)' % (self.context.title, self.context.code)
 
-class CourseManageFormPage(WAeUPEditFormPage):
+class CourseManageFormPage(SIRPEditFormPage):
     """Edit form page for courses.
     """
@@ -1663,5 +1663,5 @@
 # Certificate pages
 #
-class CertificatePage(WAeUPDisplayFormPage):
+class CertificatePage(SIRPDisplayFormPage):
     """Index page for certificates.
     """
@@ -1683,5 +1683,5 @@
         return super(CertificatePage, self).update()
 
-class CertificateManageFormPage(WAeUPEditFormPage):
+class CertificateManageFormPage(SIRPEditFormPage):
     """Manage the properties of a `Certificate` instance.
     """
@@ -1738,5 +1738,5 @@
 
 
-class CertificateCourseAddFormPage(WAeUPAddFormPage):
+class CertificateCourseAddFormPage(SIRPAddFormPage):
     """Add-page to add a course ref to a certificate
     """
@@ -1771,5 +1771,5 @@
 # Certificate course pages...
 #
-class CertificateCoursePage(WAeUPPage):
+class CertificateCoursePage(SIRPPage):
     """CertificateCourse index page.
     """
@@ -1788,5 +1788,5 @@
         return course_levels.getTerm(self.context.level).title
 
-class CertificateCourseManageFormPage(WAeUPEditFormPage):
+class CertificateCourseManageFormPage(SIRPEditFormPage):
     """Manage the basic properties of a `CertificateCourse` instance.
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py	(revision 7321)
@@ -257,5 +257,5 @@
     depends=[reset_fonts_grids])
 
-#: Register basic WAeUP base CSS (which is based on ``yuiapp.css`` as a
+#: Register basic SIRP base CSS (which is based on ``yuiapp.css`` as a
 #: resource.
 waeup_base_css = ResourceInclusion(
@@ -263,10 +263,10 @@
     depends=[yuiapp_css, base])
 
-#: The red WAeUP theme registered as a resource.
+#: The red SIRP theme registered as a resource.
 waeuptheme_red1 = ResourceInclusion(
     waeup_sirp, 'waeuptheme-red1.css',
     depends=[waeup_base_css])
 
-#: The gray WAeUP theme registered as a resource.
+#: The gray SIRP theme registered as a resource.
 waeuptheme_gray1 = ResourceInclusion(
     waeup_sirp, 'waeuptheme-gray1.css',
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 7321)
@@ -1,3 +1,3 @@
-/* This is the base stylesheet for WAeUP SIRP. It defines base styles
+/* This is the base stylesheet for SIRP. It defines base styles
 additionally or modifying yuiapp.css styles and yuirfg.css. For themes, please create
 a stylesheet overriding values set here in a file named
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py	(revision 7321)
@@ -23,5 +23,5 @@
 from zope.interface import Interface
 from zope.schema.interfaces import IVocabularyFactory
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 from waeup.sirp.browser.interfaces import ITheme
 from waeup.sirp.browser.resources import (
@@ -30,5 +30,5 @@
     )
 
-class WAeUPThemeBase(grok.GlobalUtility):
+class SIRPThemeBase(grok.GlobalUtility):
     grok.implements(ITheme)
     grok.name('base waeup theme')
@@ -39,5 +39,5 @@
         return [waeup_base_css]
 
-class WAeUPThemeRed1(grok.GlobalUtility):
+class SIRPThemeRed1(grok.GlobalUtility):
     grok.implements(ITheme)
     grok.name('red waeup theme')
@@ -48,5 +48,5 @@
         return [waeuptheme_red1]
 
-class WAeUPThemeGray1(grok.GlobalUtility):
+class SIRPThemeGray1(grok.GlobalUtility):
     grok.implements(ITheme)
     grok.name('gray waeup theme')
@@ -57,5 +57,5 @@
         return [waeuptheme_gray1]
 
-class WAeUPThemeEmpty(grok.GlobalUtility):
+class SIRPThemeEmpty(grok.GlobalUtility):
     """A theme based on jQuery only.
 
@@ -113,4 +113,4 @@
         terms = [(theme.description, name)
                  for name, theme in get_all_themes()]
-        vocab = SimpleWAeUPVocabulary(*terms)
+        vocab = SimpleSIRPVocabulary(*terms)
         return vocab
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7321)
@@ -28,11 +28,11 @@
     IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
     ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
-from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
-                                   IWAeUPXMLImporter, IDataCenter, IUserAccount)
-from waeup.sirp.browser.layout import WAeUPPage, default_primary_nav_template
+from waeup.sirp.interfaces import (ISIRPObject, ISIRPXMLExporter,
+                                   ISIRPXMLImporter, IDataCenter, IUserAccount)
+from waeup.sirp.browser.layout import SIRPPage, default_primary_nav_template
 from waeup.sirp.utils.helpers import get_user_account
 
 grok.templatedir('templates')
-grok.context(IWAeUPObject) # Make IWAeUPObject the default context
+grok.context(ISIRPObject) # Make ISIRPObject the default context
 
 class LeftSidebar(grok.ViewletManager):
@@ -74,5 +74,5 @@
     """
     grok.baseclass()
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.viewletmanager(ActionBar)
     icon = 'actionicon_modify.png' # File must exist in static/
@@ -185,5 +185,5 @@
 
 class BreadCrumbs(grok.Viewlet):
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.viewletmanager(BreadCrumbManager)
     grok.order(1)
@@ -227,5 +227,5 @@
     grok.baseclass()
     grok.viewletmanager(LeftSidebar)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.order(5)
     grok.require('waeup.manageUniversity')
@@ -279,5 +279,5 @@
     """
     grok.viewletmanager(LeftSidebar)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(2)
@@ -313,5 +313,5 @@
     """
     grok.viewletmanager(LeftSidebar)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(5)
@@ -519,5 +519,5 @@
 class BrowseActionButton(ActionButton):
     grok.baseclass()
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.template('actionbutton')
     grok.viewletmanager(ActionBar)
Index: main/waeup.sirp/trunk/src/waeup/sirp/catalog.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/catalog.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/catalog.py	(revision 7321)
@@ -31,5 +31,5 @@
 
 # not yet used
-class WAeUPQuery(Query):
+class SIRPQuery(Query):
     """A hurry.query-like query that supports also ``apply``.
     """
@@ -50,5 +50,5 @@
         return results
 
-grok.global_utility(WAeUPQuery)
+grok.global_utility(SIRPQuery)
 
 # not yet used
Index: main/waeup.sirp/trunk/src/waeup/sirp/catalog.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/catalog.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/catalog.txt	(revision 7321)
@@ -1,12 +1,12 @@
-:mod:`waeup.sirp.catalog` -- Cataloging support for WAeUP SIRP
-**************************************************************
+:mod:`waeup.sirp.catalog` -- Cataloging support SIRP
+****************************************************
 
 .. module:: waeup.sirp.catalog
 
 Components that support cataloging and searching objects inside a
-WAeUP SIRP site.
+SIRP site.
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 .. contents::
@@ -15,8 +15,8 @@
 =======
 
-:class:`WAeUPQuery`
--------------------
-
-.. class:: WAeUPQuery()
+:class:`SIRPQuery`
+------------------
+
+.. class:: SIRPQuery()
 
    .. attribute:: grok.implements(hurry.query.interfaces.IQuery)
@@ -25,5 +25,5 @@
    retrival of plain ``Bree`` result sets as used inside a catalog.
 
-   Like `hurry.query.query.Query` objects, `WAeUPQuery` is some kind
+   Like `hurry.query.query.Query` objects, `SIRPQuery` is some kind
    of a meta query or 'compound query' that can give the cataloged
    objects (or their int ids) matching one or more 'subqueries'.
@@ -55,5 +55,5 @@
 ------------------------------
 
-We can get a WAeUPQuery object by asking for an unnamed global utility
+We can get a SIRPQuery object by asking for an unnamed global utility
 implementing `hurry.query.interfaces.IQuery`:
 
@@ -62,5 +62,5 @@
     >>> q = getUtility(IQuery)
     >>> q
-    <waeup.sirp.catalog.WAeUPQuery object at 0x...>
+    <waeup.sirp.catalog.SIRPQuery object at 0x...>
 
 This query can get 'subqueries' and delivers the objects found or
@@ -101,5 +101,5 @@
 
 We also setup a `zope.intid.interfaces.IIntIds` utility. This is not
-necessary for plain catalogs, but when we want to use WAeUPQuery (or
+necessary for plain catalogs, but when we want to use SIRPQuery (or
 `hurry.query.query.Query` objects), as to get a unique mapping from
 objects (stored in ZODB) to integer numbers (stored in catalogs),
@@ -204,5 +204,5 @@
 
 This can be done by using the ``searchResults`` method of
-``WAeUPQuery``:
+``SIRPQuery``:
 
     >>> r2 = q.searchResults(subquery1)
Index: main/waeup.sirp/trunk/src/waeup/sirp/datacenter.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/datacenter.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/datacenter.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""WAeUP data center.
+"""SIRP data center.
 
 The waeup data center cares for management of upload data and provides
Index: main/waeup.sirp/trunk/src/waeup/sirp/datacenter.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/datacenter.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/datacenter.txt	(revision 7321)
@@ -1,9 +1,9 @@
-WAeUP Data Center
-*****************
-
-The WAeUP data center cares for managing CSV files and importing then.
+SIRP Data Center
+****************
+
+The SIRP data center cares for managing CSV files and importing then.
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 Creating a data center
Index: main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7321)
@@ -21,5 +21,5 @@
 import sys
 from waeup.sirp.browser import (
-    WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
+    SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
     NullValidator)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
@@ -29,5 +29,5 @@
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, PrimaryNavTab)
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 from waeup.sirp.hostels.vocabularies import NOT_OCCUPIED
 from waeup.sirp.hostels.hostel import Hostel
@@ -57,5 +57,5 @@
     """
 
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.order(5)
     grok.require('waeup.viewHostels')
@@ -91,5 +91,5 @@
         return 'Block %s, Room %s, Bed %s' % (co[1], co[2], co[3])
 
-class HostelsContainerPage(WAeUPDisplayFormPage):
+class HostelsContainerPage(SIRPDisplayFormPage):
     """The standard view for hostels containers.
     """
@@ -109,5 +109,5 @@
     text = 'Manage accommodation section'
 
-class HostelsContainerManagePage(WAeUPDisplayFormPage):
+class HostelsContainerManagePage(SIRPDisplayFormPage):
     """The manage page for hostel containers.
     """
@@ -141,5 +141,5 @@
         return
 
-class HostelAddFormPage(WAeUPAddFormPage):
+class HostelAddFormPage(SIRPAddFormPage):
     """Add-form to add a hostel.
     """
@@ -169,5 +169,5 @@
         return
 
-class HostelDisplayFormPage(WAeUPDisplayFormPage):
+class HostelDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display hostel data
     """
@@ -194,5 +194,5 @@
     target = 'manage'
 
-class HostelManageFormPage(WAeUPEditFormPage):
+class HostelManageFormPage(SIRPEditFormPage):
     """ View to edit hostel data
     """
@@ -294,5 +294,5 @@
         return
 
-class BedManageFormPage(WAeUPEditFormPage):
+class BedManageFormPage(SIRPEditFormPage):
     """ View to edit bed data
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/hostels/interfaces.py	(revision 7321)
@@ -18,14 +18,14 @@
 from zope.interface import invariant, Invalid
 from zope import schema
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 from waeup.sirp.hostels.vocabularies import (
     bed_letters, blocks, special_handling, StudentSource)
 
-class IHostelsContainer(IWAeUPObject):
+class IHostelsContainer(ISIRPObject):
     """A container for all kind of hostel objects.
 
     """
 
-class IHostel(IWAeUPObject):
+class IHostel(ISIRPObject):
     """A base representation of hostels.
 
@@ -145,5 +145,5 @@
             raise Invalid('Bed categories overlap.')
 
-class IBed(IWAeUPObject):
+class IBed(ISIRPObject):
     """A base representation of beds.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/hostels/vocabularies.py	(revision 7321)
@@ -22,5 +22,5 @@
 from zope.catalog.interfaces import ICatalog
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 
 NOT_OCCUPIED = u'not occupied'
@@ -53,5 +53,5 @@
         return "%s - %s" % (value, self.acco_students(context)[value])
 
-bed_letters = SimpleWAeUPVocabulary(
+bed_letters = SimpleSIRPVocabulary(
     ('Bed A','A'),
     ('Bed B','B'),
@@ -65,5 +65,5 @@
     )
 
-blocks = SimpleWAeUPVocabulary(
+blocks = SimpleSIRPVocabulary(
     ('Block A','A'),
     ('Block B','B'),
@@ -83,5 +83,5 @@
     )
 
-special_handling = SimpleWAeUPVocabulary(
+special_handling = SimpleSIRPVocabulary(
     ('Regular Hostel','regular'),
     ('Blocked Hostel','blocked'),
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/README.txt	(revision 7321)
@@ -2,8 +2,8 @@
 ========================================
 
-The image file widget is built on top of the :class:`WAeUPImageFile` object::
-
-  >>> from waeup.sirp.image import WAeUPImageFile
-  >>> file = WAeUPImageFile('foo.jpg', 'mydata')
+The image file widget is built on top of the :class:`SIRPImageFile` object::
+
+  >>> from waeup.sirp.image import SIRPImageFile
+  >>> file = SIRPImageFile('foo.jpg', 'mydata')
   >>> file.filename
   'foo.jpg'
@@ -16,5 +16,5 @@
   'mydata'
 
-We can also create WAeUPImageFile objects from file-like objects::
+We can also create SIRPImageFile objects from file-like objects::
 
   >>> from StringIO import StringIO
@@ -36,5 +36,5 @@
 ----------------
 
-The WAeUPImageFile object normally stores the file data using ZODB
+The SIRPImageFile object normally stores the file data using ZODB
 persistence. Files can however also be stored by tramline.  If
 tramline is installed in Apache, the Tramline takes care of generating
@@ -73,5 +73,5 @@
 just '1') will now be created::
 
-  >>> file = WAeUPImageFile('foo.jpg', '1')
+  >>> file = SIRPImageFile('foo.jpg', '1')
 
 The data is now '1', referring to the real file::
@@ -102,5 +102,5 @@
 We expect the same behavior as when tramline is not installed::
 
-  >>> file = WAeUPImageFile('foo.jpg', 'data')
+  >>> file = SIRPImageFile('foo.jpg', 'data')
   >>> f = file.file
   >>> f.read()
@@ -141,12 +141,12 @@
   Traceback (most recent call last):
   ...
-  WrongType: ('asd', <class 'waeup.sirp.image.image.WAeUPImageFile'>, 'foo')
+  WrongType: ('asd', <class 'waeup.sirp.image.image.SIRPImageFile'>, 'foo')
 
 which means: `ImageFile` fields should better contain
-:class:`WAeUPImageFile` instances.
-
-We can store normal :class:`WAeUPImageFile` instances:
-
-  >>> field.validate(WAeUPImageFile('bar.jpg', 'data')) is None
+:class:`SIRPImageFile` instances.
+
+We can store normal :class:`SIRPImageFile` instances:
+
+  >>> field.validate(SIRPImageFile('bar.jpg', 'data')) is None
   True
 
@@ -173,9 +173,9 @@
 
   >>> field.validate(
-  ...     WAeUPImageFile('bar.jpg', '123456789012')) is None
-  True
-
-  >>> field.validate(
-  ...     WAeUPImageFile('bar.jpg', '12345')) is None
+  ...     SIRPImageFile('bar.jpg', '123456789012')) is None
+  True
+
+  >>> field.validate(
+  ...     SIRPImageFile('bar.jpg', '12345')) is None
   True
 
@@ -183,5 +183,5 @@
 
   >>> field.validate(
-  ...     WAeUPImageFile('bar.jpg', '1234567890123'))
+  ...     SIRPImageFile('bar.jpg', '1234567890123'))
   Traceback (most recent call last):
   ...
@@ -189,5 +189,5 @@
 
   >>> field.validate(
-  ...     WAeUPImageFile('bar.jpg', '1234'))
+  ...     SIRPImageFile('bar.jpg', '1234'))
   Traceback (most recent call last):
   ...
@@ -198,10 +198,10 @@
 ----------------------------
 
-WAeUPImageFile does not reproduce the broken unequal comparison from
+SIRPImageFile does not reproduce the broken unequal comparison from
 its base:
 
-  >>> f1 = WAeUPImageFile('bar.jpg', '123456789')
-  >>> f2 = WAeUPImageFile('bar.jpg', '123456789')
-  >>> f3 = WAeUPImageFile('baz.jpg', '1234')
+  >>> f1 = SIRPImageFile('bar.jpg', '123456789')
+  >>> f2 = SIRPImageFile('bar.jpg', '123456789')
+  >>> f3 = SIRPImageFile('baz.jpg', '1234')
   >>> f1 == f2
   True
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/__init__.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/__init__.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/__init__.py	(revision 7321)
@@ -3,8 +3,8 @@
 Includings schemas, widgets and the content components.
 """
-from waeup.sirp.image.image import WAeUPImageFile, createWAeUPImageFile
+from waeup.sirp.image.image import SIRPImageFile, createSIRPImageFile
 
 __all__ = [
-    "WAeUPImageFile",
-    "createWAeUPImageFile",
+    "SIRPImageFile",
+    "createSIRPImageFile",
     ]
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/browser/tests/image.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/browser/tests/image.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/browser/tests/image.txt	(revision 7321)
@@ -12,8 +12,8 @@
 
   >>> import os
-  >>> from waeup.sirp.image import WAeUPImageFile
+  >>> from waeup.sirp.image import SIRPImageFile
   >>> testimage = os.path.join(os.path.dirname(__file__), 'sample.jpg')
   >>> testimage2 = os.path.join(os.path.dirname(__file__), 'sample2.jpg')
-  >>> some_file = WAeUPImageFile('foo.jpg', open(testimage, 'rb').read())
+  >>> some_file = SIRPImageFile('foo.jpg', open(testimage, 'rb').read())
   >>> some_file.filename
   'foo.jpg'
@@ -166,5 +166,5 @@
 prepare some new file:
 
-  >>> another_file = WAeUPImageFile('bar.txt', 'bar contents')
+  >>> another_file = SIRPImageFile('bar.txt', 'bar contents')
 
 We happen to know, due to the implementation of
@@ -200,5 +200,5 @@
 ---------------------------
 
-As :class:`waeup.sirp.image.WAeUPImageFile` objects support storing
+As :class:`waeup.sirp.image.SIRPImageFile` objects support storing
 image data by using external 'storages', also our widgets should do
 so.
@@ -220,5 +220,5 @@
   ...         contents = f.read()
   ...         id_string = hashlib.md5(contents).hexdigest()
-  ...         result = WAeUPImageFile(filename, id_string)
+  ...         result = SIRPImageFile(filename, id_string)
   ...         self.storage[id_string] = contents
   ...         return result
@@ -260,9 +260,9 @@
 We now want to simulate, that the field contains already data,
 identified by some `file_id`. To do so, we first store the data in our
-file retrieval and then create a WAeUPImageFile object with that
+file retrieval and then create a SIRPImageFile object with that
 file_id stored:
 
-  >>> from waeup.sirp.image import createWAeUPImageFile
-  >>> image = createWAeUPImageFile(
+  >>> from waeup.sirp.image import createSIRPImageFile
+  >>> image = createSIRPImageFile(
   ...     'sample.jpg', open(testimage, 'rb'))
   >>> file_id = image.data
@@ -274,5 +274,5 @@
   '9feac4265077922000aa8b88748e25be'
 
-The new file was stored by our utility, as createWAeUPImageFile looks
+The new file was stored by our utility, as createSIRPImageFile looks
 up IFileRetrieval utilities and uses them:
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/browser/widget.py	(revision 7321)
@@ -19,5 +19,5 @@
 """
 import os
-from waeup.sirp.image import WAeUPImageFile
+from waeup.sirp.image import SIRPImageFile
 from hurry.file.browser.widget import (
     EncodingFileWidget, DownloadWidget, FakeFieldStorage)
@@ -62,5 +62,5 @@
                 seek(0)
                 return retrieval.createFile(input.filename, input)
-            return WAeUPImageFile(input.filename, data)
+            return SIRPImageFile(input.filename, data)
         else:
             return self.context.missing_value
@@ -143,5 +143,5 @@
         data = file_id.decode('base64')
         filename, filedata = data.split('\n', 1)
-        return WAeUPImageFile(filename, filedata)
+        return SIRPImageFile(filename, filedata)
 
 class ThumbnailWidget(DownloadWidget):
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/image.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/image.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/image.py	(revision 7321)
@@ -23,7 +23,7 @@
 from zope.component import getUtility
 from zope.interface import implements
-from waeup.sirp.image.interfaces import IWAeUPImageFile
+from waeup.sirp.image.interfaces import ISIRPImageFile
 
-class WAeUPImageFile(HurryFile):
+class SIRPImageFile(HurryFile):
     """A file prepared for storing image files.
 
@@ -32,8 +32,8 @@
     regular hurry files.
 
-    To create a :class:`WAeUPImageFile` you should use
-    :func:`createWAeUPImageFile`.
+    To create a :class:`SIRPImageFile` you should use
+    :func:`createSIRPImageFile`.
     """
-    implements(IWAeUPImageFile)
+    implements(ISIRPImageFile)
 
     def __ne__(self, other):
@@ -45,5 +45,5 @@
             return True
 
-def createWAeUPImageFile(filename, f):
+def createSIRPImageFile(filename, f):
     retrieval = getUtility(IFileRetrieval)
     return retrieval.createFile(filename, f)
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/interfaces.py	(revision 7321)
@@ -24,5 +24,5 @@
     """
     
-class IWAeUPImageFile(IHurryFile):
+class ISIRPImageFile(IHurryFile):
     """Image file.
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/image/schema.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/image/schema.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/image/schema.py	(revision 7321)
@@ -23,5 +23,5 @@
 from hurry.file.schema import File
 from waeup.sirp.image.interfaces import IImageFile
-from waeup.sirp.image.image import WAeUPImageFile
+from waeup.sirp.image.image import SIRPImageFile
 
 class MinMaxSize(object):
@@ -82,3 +82,3 @@
     implements(IImageFile)
 
-    _type = WAeUPImageFile
+    _type = SIRPImageFile
Index: main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7321)
@@ -44,5 +44,5 @@
         os.path.dirname(__file__), 'frontpage.rst'), 'rb').read()
 
-def SimpleWAeUPVocabulary(*terms):
+def SimpleSIRPVocabulary(*terms):
     """A well-buildt vocabulary provides terms with a value, token and
        title for each term
@@ -60,7 +60,7 @@
     return [('%s/%s' % (year,year+1), year) for year in year_range]
 
-academic_sessions_vocab = SimpleWAeUPVocabulary(*academic_sessions())
-
-registration_states_vocab = SimpleWAeUPVocabulary(
+academic_sessions_vocab = SimpleSIRPVocabulary(*academic_sessions())
+
+registration_states_vocab = SimpleSIRPVocabulary(
     ('created', CREATED),
     ('admitted', ADMITTED),
@@ -140,24 +140,24 @@
         return value
 
-class IWAeUPObject(Interface):
-    """A WAeUP object.
+class ISIRPObject(Interface):
+    """A SIRP object.
 
     This is merely a marker interface.
     """
 
-class IUniversity(IWAeUPObject):
+class IUniversity(ISIRPObject):
     """Representation of a university.
     """
 
 
-class IWAeUPContainer(IWAeUPObject):
-    """A container for WAeUP objects.
-    """
-
-class IWAeUPContained(IWAeUPObject):
-    """An item contained in an IWAeUPContainer.
-    """
-
-class IWAeUPExporter(Interface):
+class ISIRPContainer(ISIRPObject):
+    """A container for SIRP objects.
+    """
+
+class ISIRPContained(ISIRPObject):
+    """An item contained in an ISIRPContainer.
+    """
+
+class ISIRPExporter(Interface):
     """An exporter for objects.
     """
@@ -171,5 +171,5 @@
         """
 
-class IWAeUPXMLExporter(Interface):
+class ISIRPXMLExporter(Interface):
     """An XML exporter for objects.
     """
@@ -183,5 +183,5 @@
         """
 
-class IWAeUPXMLImporter(Interface):
+class ISIRPXMLImporter(Interface):
     """An XML import for objects.
     """
@@ -220,5 +220,5 @@
         """
 
-class IContactForm(IWAeUPObject):
+class IContactForm(ISIRPObject):
     """A contact form.
     """
@@ -251,5 +251,5 @@
 
 class ISIRPPrincipalInfo(IPrincipalInfo):
-    """Infos about principals that are users of WAeUP SIRP.
+    """Infos about principals that are users of SIRP SIRP.
     """
     email = Attribute("The email address of a user")
@@ -258,5 +258,5 @@
 
 class ISIRPPrincipal(IPrincipal):
-    """A principle for WAeUP SIRP.
+    """A principle for SIRP SIRP.
 
     This interface extends zope.security.interfaces.IPrincipal and
@@ -274,5 +274,5 @@
         required=False,)
 
-class IUserAccount(IWAeUPObject):
+class IUserAccount(ISIRPObject):
     """A user account.
     """
@@ -318,5 +318,5 @@
 
 
-class IUsersContainer(IWAeUPObject):
+class IUsersContainer(ISIRPObject):
     """A container for users (principals).
 
@@ -343,5 +343,5 @@
         """
 
-class IConfigurationContainer(IWAeUPObject):
+class IConfigurationContainer(ISIRPObject):
     """A container for session configuration objects.
     """
@@ -438,5 +438,5 @@
         )
 
-class ISessionConfiguration(IWAeUPObject):
+class ISessionConfiguration(ISIRPObject):
     """A session configuration object.
     """
@@ -505,5 +505,5 @@
     'academic_session'].order
 
-class IDataCenter(IWAeUPObject):
+class IDataCenter(ISIRPObject):
     """A data center.
 
@@ -568,6 +568,6 @@
         title = u'Longer description of the item found.')
 
-class IWAeUPSIRPPluggable(Interface):
-    """A component that might be plugged into a WAeUP SIRP app.
+class ISIRPPluggable(Interface):
+    """A component that might be plugged into a SIRP SIRP app.
 
     Components implementing this interface are referred to as
@@ -706,5 +706,5 @@
         """
 
-class IWAeUPWorkflowInfo(IWorkflowInfo):
+class ISIRPWorkflowInfo(IWorkflowInfo):
     """A :class:`hurry.workflow.workflow.WorkflowInfo` with additional
        methods for convenience.
@@ -719,5 +719,5 @@
 class ISiteLoggers(Interface):
 
-    loggers = Attribute("A list or generator of registered WAeUPLoggers")
+    loggers = Attribute("A list or generator of registered SIRPLoggers")
 
     def register(name, filename=None, site=None, **options):
@@ -740,5 +740,5 @@
 
     def __init__(name, filename=None, site=None, **options):
-        """Create a WAeUP logger instance.
+        """Create a SIRP logger instance.
         """
 
@@ -872,5 +872,5 @@
 
         Returns a tuple ``(raw_file, path, file_like_obj)`` where the
-        ``file_like_obj`` should be a HurryFile, a WAeUPImageFile or
+        ``file_like_obj`` should be a HurryFile, a SIRPImageFile or
         similar. ``raw_file`` is the (maybe changed) input file and
         ``path`` the relative internal path to store the file at.
Index: main/waeup.sirp/trunk/src/waeup/sirp/meta.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/meta.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/meta.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""Grokkers for WAeUP components.
+"""Grokkers for SIRP components.
 
 Stuff in here is mainly taken from grok.meta, with some modifications
@@ -61,5 +61,5 @@
             return False
 
-        subscriber = WAeUPIndexesUpgradeSubscriber(
+        subscriber = SIRPIndexesUpgradeSubscriber(
             catalog_name, indexes, context, module_info)
         subscribed = (site, IObjectUpgradeEvent)
@@ -72,5 +72,5 @@
 
 
-class WAeUPIndexesUpgradeSubscriber(IndexesSetupSubscriber):
+class SIRPIndexesUpgradeSubscriber(IndexesSetupSubscriber):
     """Helper that sets up indexes when their Grok site is upgraded.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py	(revision 7321)
@@ -20,5 +20,5 @@
 from persistent.list import PersistentList
 from zope.annotation.interfaces import IAnnotations
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPObject
+from waeup.sirp.interfaces import IObjectHistory, ISIRPObject
 from waeup.sirp.utils.helpers import get_current_principal
 
@@ -26,9 +26,9 @@
     """A history for objects.
 
-    For any object implementing `IWAeUPObject` which is annotatable,
+    For any object implementing `ISIRPObject` which is annotatable,
     we provide histories. A history for such an object can be obtained
     by adapting it to `IObjectHistory`.
     """
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.implements(IObjectHistory)
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/payments/interfaces.py	(revision 7321)
@@ -18,14 +18,14 @@
 from zope.interface import Attribute
 from zope import schema
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import ISIRPObject
 from waeup.sirp.payments.vocabularies import (
     payment_states, payment_categories)
 
-class IPaymentsContainer(IWAeUPObject):
+class IPaymentsContainer(ISIRPObject):
     """A container for all kind of payment objects.
 
     """
 
-class IPayment(IWAeUPObject):
+class IPayment(ISIRPObject):
     """A base representation of payments.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py	(revision 7321)
@@ -18,12 +18,12 @@
 """Vocabularies and sources for payments.
 """
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 
-payment_states = SimpleWAeUPVocabulary(
+payment_states = SimpleSIRPVocabulary(
     ('Not yet paid','unpaid'),
     ('Paid','paid'),
     )
 
-payment_categories = SimpleWAeUPVocabulary(
+payment_categories = SimpleSIRPVocabulary(
     ('School Fee','schoolfee'),
     ('Clearance','clearance'),
Index: main/waeup.sirp/trunk/src/waeup/sirp/permissions.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 7321)
@@ -128,11 +128,11 @@
 
 def get_waeup_roles(also_local=False):
-    """Get all WAeUP roles.
-
-    WAeUP roles are ordinary roles whose id by convention starts with
+    """Get all SIRP roles.
+
+    SIRP roles are ordinary roles whose id by convention starts with
     a ``waeup.`` prefix.
 
     If `also_local` is ``True`` (``False`` by default), also local
-    roles are returned. Local WAeUP roles are such whose id starts
+    roles are returned. Local SIRP roles are such whose id starts
     with ``waeup.local.`` prefix (this is also a convention).
 
@@ -141,5 +141,5 @@
     for name, item in get_all_roles():
         if not name.startswith('waeup.'):
-            # Ignore non-WAeUP roles...
+            # Ignore non-SIRP roles...
             continue
         if not also_local and name.startswith('waeup.local.'):
@@ -149,9 +149,9 @@
 
 def get_waeup_role_names():
-    """Get the ids of all WAeUP roles.
-
-    See :func:`get_waeup_roles` for what a 'WAeUPRole' is.
-
-    This function returns a sorted list of WAeUP role names.
+    """Get the ids of all SIRP roles.
+
+    See :func:`get_waeup_roles` for what a 'SIRPRole' is.
+
+    This function returns a sorted list of SIRP role names.
     """
     return sorted([x.id for x in get_waeup_roles()])
Index: main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt	(revision 7321)
@@ -1,9 +1,9 @@
-WAeUP permissions and roles
-***************************
+SIRP permissions and roles
+**************************
 
-Permissions and roles used in a WAeUP portal.
+Permissions and roles used in a SIRP portal.
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 Convenience functions
@@ -16,5 +16,5 @@
 ---------------------
 
-Gives us all roles defined in a WAeUP SIRP portal. We get tuples of
+Gives us all roles defined in SIRP. We get tuples of
 kind
 
@@ -34,5 +34,5 @@
 -----------------------
 
-Gives us all roles, except the WAeUP specific roles. We can get a list
+Gives us all roles, except the SIRP specific roles. We can get a list
 with or without local roles:
 
@@ -48,5 +48,5 @@
 ----------------------------
 
-We can get all role names defined in a WAeUP portal (except 'local'
+We can get all role names defined in SIRP (except 'local'
 roles that are meant not to be assigned globally):
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7321)
@@ -32,5 +32,5 @@
 from waeup.sirp.accesscodes.workflow import USED
 from waeup.sirp.browser import (
-    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
+    SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
     ContactAdminForm)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
@@ -39,5 +39,5 @@
     ManageActionButton, AddActionButton)
 from waeup.sirp.interfaces import (
-    IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
+    ISIRPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm)
 from waeup.sirp.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget,
@@ -155,5 +155,5 @@
         return self.context.level_title
 
-class StudentsContainerPage(WAeUPPage):
+class StudentsContainerPage(SIRPPage):
     """The standard view for student containers.
     """
@@ -188,6 +188,6 @@
         return
 
-class SetPasswordPage(WAeUPPage):
-    grok.context(IWAeUPObject)
+class SetPasswordPage(SIRPPage):
+    grok.context(ISIRPObject)
     grok.name('setpassword')
     grok.require('waeup.Public')
@@ -253,5 +253,5 @@
 
 
-class StudentsContainerManagePage(WAeUPPage):
+class StudentsContainerManagePage(SIRPPage):
     """The manage page for student containers.
     """
@@ -310,5 +310,5 @@
     target = 'addstudent'
 
-class StudentAddFormPage(WAeUPAddFormPage):
+class StudentAddFormPage(SIRPAddFormPage):
     """Add-form to add a student.
     """
@@ -331,5 +331,5 @@
         return
 
-class StudentBaseDisplayFormPage(WAeUPDisplayFormPage):
+class StudentBaseDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student base data
     """
@@ -406,5 +406,5 @@
     target = 'manage_base'
 
-class StudentBaseManageFormPage(WAeUPEditFormPage):
+class StudentBaseManageFormPage(SIRPEditFormPage):
     """ View to manage student base data
     """
@@ -467,5 +467,5 @@
         return
 
-class StudentClearanceDisplayFormPage(WAeUPDisplayFormPage):
+class StudentClearanceDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student clearance data
     """
@@ -552,5 +552,5 @@
             self.context.getStudent(), studentview)
 
-class StudentClearanceManageFormPage(WAeUPEditFormPage):
+class StudentClearanceManageFormPage(SIRPEditFormPage):
     """ Page to edit student clearance data
     """
@@ -622,5 +622,5 @@
         return
 
-class StudentPersonalDisplayFormPage(WAeUPDisplayFormPage):
+class StudentPersonalDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student personal data
     """
@@ -644,5 +644,5 @@
     target = 'edit_personal'
 
-class StudentPersonalManageFormPage(WAeUPEditFormPage):
+class StudentPersonalManageFormPage(SIRPEditFormPage):
     """ Page to edit student clearance data
     """
@@ -660,5 +660,5 @@
         return
 
-class StudyCourseDisplayFormPage(WAeUPDisplayFormPage):
+class StudyCourseDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display the student study course data
     """
@@ -703,5 +703,5 @@
     target = 'manage'
 
-class StudyCourseManageFormPage(WAeUPEditFormPage):
+class StudyCourseManageFormPage(SIRPEditFormPage):
     """ Page to edit the student study course data
     """
@@ -773,5 +773,5 @@
         return
 
-class StudyLevelDisplayFormPage(WAeUPDisplayFormPage):
+class StudyLevelDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display student study levels
     """
@@ -854,5 +854,5 @@
     target = 'manage'
 
-class StudyLevelManageFormPage(WAeUPEditFormPage):
+class StudyLevelManageFormPage(SIRPEditFormPage):
     """ Page to edit the student study level data
     """
@@ -913,5 +913,5 @@
         return
 
-class CourseTicketAddFormPage(WAeUPAddFormPage):
+class CourseTicketAddFormPage(SIRPAddFormPage):
     """Add a course ticket.
     """
@@ -956,5 +956,5 @@
         self.redirect(self.url(self.context))
 
-class CourseTicketDisplayFormPage(WAeUPDisplayFormPage):
+class CourseTicketDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display course tickets
     """
@@ -983,5 +983,5 @@
     target = 'manage'
 
-class CourseTicketManageFormPage(WAeUPEditFormPage):
+class CourseTicketManageFormPage(SIRPEditFormPage):
     """ Page to manage course tickets
     """
@@ -1007,5 +1007,5 @@
 
 # We don't need the display form page yet
-#class PaymentsDisplayFormPage(WAeUPDisplayFormPage):
+#class PaymentsDisplayFormPage(SIRPDisplayFormPage):
 #    """ Page to display the student payments
 #    """
@@ -1028,5 +1028,5 @@
 
 # This manage form page is for both students and students officers.
-class PaymentsManageFormPage(WAeUPEditFormPage):
+class PaymentsManageFormPage(SIRPEditFormPage):
     """ Page to manage the student payments
     """
@@ -1093,5 +1093,5 @@
 #    target = 'manage'
 
-class OnlinePaymentAddFormPage(WAeUPAddFormPage):
+class OnlinePaymentAddFormPage(SIRPAddFormPage):
     """ Page to add an online payment ticket
     """
@@ -1152,5 +1152,5 @@
         return
 
-class OnlinePaymentDisplayFormPage(WAeUPDisplayFormPage):
+class OnlinePaymentDisplayFormPage(SIRPDisplayFormPage):
     """ Page to view an online payment ticket
     """
@@ -1279,5 +1279,5 @@
 
 # We don't need the display form page yet
-#class AccommodationDisplayFormPage(WAeUPDisplayFormPage):
+#class AccommodationDisplayFormPage(SIRPDisplayFormPage):
 #    """ Page to display the student accommodation data
 #    """
@@ -1295,5 +1295,5 @@
 
 # This manage form page is for both students and students officers.
-class AccommodationManageFormPage(WAeUPEditFormPage):
+class AccommodationManageFormPage(SIRPEditFormPage):
     """ Page to manage bed tickets.
     """
@@ -1358,5 +1358,5 @@
     target = 'add'
 
-class BedTicketAddPage(WAeUPPage):
+class BedTicketAddPage(SIRPPage):
     """ Page to add an online payment ticket
     """
@@ -1449,5 +1449,5 @@
         return
 
-class BedTicketDisplayFormPage(WAeUPDisplayFormPage):
+class BedTicketDisplayFormPage(SIRPDisplayFormPage):
     """ Page to display bed tickets
     """
@@ -1576,5 +1576,5 @@
         return
 
-class StudentHistoryPage(WAeUPPage):
+class StudentHistoryPage(SIRPPage):
     """ Page to display student clearance data
     """
@@ -1624,5 +1624,5 @@
         return self.view.url(self.view.context, self.target)
 
-class StudentBaseEditFormPage(WAeUPEditFormPage):
+class StudentBaseEditFormPage(SIRPEditFormPage):
     """ View to edit student base data
     """
@@ -1641,5 +1641,5 @@
         return
 
-class StudentChangePasswordPage(WAeUPEditFormPage):
+class StudentChangePasswordPage(SIRPEditFormPage):
     """ View to manage student base data
     """
@@ -1668,5 +1668,5 @@
         return
 
-class StudentFilesUploadPage(WAeUPPage):
+class StudentFilesUploadPage(SIRPPage):
     """ View to upload files by student
     """
@@ -1701,5 +1701,5 @@
         return self.view.url(self.view.context, self.target)
 
-class StartClearancePage(WAeUPPage):
+class StartClearancePage(SIRPPage):
     grok.context(IStudent)
     grok.name('start_clearance')
@@ -1823,5 +1823,5 @@
         return
 
-class RequestClearancePage(WAeUPPage):
+class RequestClearancePage(SIRPPage):
     grok.context(IStudent)
     grok.name('request_clearance')
@@ -1870,5 +1870,5 @@
         return self.view.url(self.view.context, self.target)
 
-class StartCourseRegistrationPage(WAeUPPage):
+class StartCourseRegistrationPage(SIRPPage):
     grok.context(IStudentStudyCourse)
     grok.name('start_course_registration')
@@ -1939,5 +1939,5 @@
         return self.view.url(self.view.context, self.target)
 
-class AddStudyLevelFormPage(WAeUPEditFormPage):
+class AddStudyLevelFormPage(SIRPEditFormPage):
     """ Page for students to add current study levels
     """
@@ -1995,5 +1995,5 @@
         return self.view.url(self.view.context, self.target)
 
-class StudyLevelEditFormPage(WAeUPEditFormPage):
+class StudyLevelEditFormPage(SIRPEditFormPage):
     """ Page to edit the student study level data by students
     """
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py	(revision 7321)
@@ -20,5 +20,5 @@
 from zope import schema
 from waeup.sirp.interfaces import (
-    IWAeUPObject, academic_sessions_vocab, validate_email)
+    ISIRPObject, academic_sessions_vocab, validate_email)
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.university.vocabularies import CourseSource, study_modes
@@ -56,5 +56,5 @@
         """
 
-class IStudentsContainer(IWAeUPObject):
+class IStudentsContainer(ISIRPObject):
     """A students container contains university students.
 
@@ -95,5 +95,5 @@
         """
 
-class IStudentNavigation(IWAeUPObject):
+class IStudentNavigation(ISIRPObject):
     """Interface needed for student navigation.
 
@@ -104,5 +104,5 @@
         """
 
-class IStudentBase(IWAeUPObject):
+class IStudentBase(ISIRPObject):
     """Representation of student base data.
 
@@ -173,5 +173,5 @@
         )
 
-class IStudentClearance(IWAeUPObject):
+class IStudentClearance(ISIRPObject):
     """Representation of student clearance data.
 
@@ -194,5 +194,5 @@
         )
 
-class IStudentPersonal(IWAeUPObject):
+class IStudentPersonal(ISIRPObject):
     """Representation of student personal data.
 
@@ -228,5 +228,5 @@
         )
 
-class IStudentStudyCourse(IWAeUPObject):
+class IStudentStudyCourse(ISIRPObject):
     """A container for student study levels.
 
@@ -295,5 +295,5 @@
         )
 
-class IStudentStudyLevel(IWAeUPObject):
+class IStudentStudyLevel(ISIRPObject):
     """A container for course tickets.
 
@@ -317,5 +317,5 @@
         )
 
-class ICourseTicket(IWAeUPObject):
+class ICourseTicket(ISIRPObject):
     """A course ticket.
 
@@ -362,10 +362,10 @@
         )
 
-class IStudentAccommodation(IWAeUPObject):
+class IStudentAccommodation(ISIRPObject):
     """A container for student accommodation objects.
 
     """
 
-class IBedTicket(IWAeUPObject):
+class IBedTicket(ISIRPObject):
     """A ticket for accommodation booking.
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/student.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/student.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/student.py	(revision 7321)
@@ -27,5 +27,5 @@
 from waeup.sirp.interfaces import (
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler)
-from waeup.sirp.image import WAeUPImageFile
+from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
 from waeup.sirp.students.interfaces import (
@@ -257,4 +257,4 @@
             StudentFileStoreHandler, self).createFile(
             store, root,  filename, file_id, file)
-        return file, path, WAeUPImageFile(
+        return file, path, SIRPImageFile(
             file_obj.filename, file_obj.data)
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7321)
@@ -21,5 +21,5 @@
 from zope.interface import Interface
 from waeup.sirp.interfaces import (
-    IWAeUPObject, IExtFileStore, IFileStoreNameChooser)
+    ISIRPObject, IExtFileStore, IFileStoreNameChooser)
 from waeup.sirp.utils.helpers import string_from_bytes, file_size
 from waeup.sirp.browser import DEFAULT_IMAGE_PATH
@@ -32,5 +32,5 @@
 from waeup.sirp.students.interfaces import IStudent, IStudentClearance
 
-grok.context(IWAeUPObject) # Make IWAeUPObject the default context
+grok.context(ISIRPObject) # Make ISIRPObject the default context
 grok.templatedir('browser_templates')
 
@@ -47,5 +47,5 @@
     grok.baseclass()
     grok.viewletmanager(StudentManageSidebar)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(5)
@@ -108,5 +108,5 @@
     grok.baseclass()
     grok.viewletmanager(StudentMenu)
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.view(Interface)
     grok.order(5)
@@ -162,5 +162,5 @@
     """
 
-    grok.context(IWAeUPObject)
+    grok.context(ISIRPObject)
     grok.order(4)
     grok.require('waeup.viewStudentsTab')
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py	(revision 7321)
@@ -25,9 +25,9 @@
 from zc.sourcefactory.basic import BasicSourceFactory
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.university.vocabularies import course_levels
 
-lgas_vocab = SimpleWAeUPVocabulary(
+lgas_vocab = SimpleSIRPVocabulary(
     *sorted([(x[1],x[0]) for x in LGAS]))
 
@@ -71,5 +71,5 @@
         return title
 
-verdicts = SimpleWAeUPVocabulary(
+verdicts = SimpleSIRPVocabulary(
     ('not yet','0'),
     ('Successful student','A'),
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py	(revision 7321)
@@ -5,8 +5,8 @@
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.sirp.interfaces import (
-    IObjectHistory, IWAeUPWorkflowInfo,
+    IObjectHistory, ISIRPWorkflowInfo,
     CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
     REGISTERED, VALIDATED)
-from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
 from waeup.sirp.utils.helpers import get_current_principal
 from waeup.sirp.students.interfaces import IStudent
@@ -152,5 +152,5 @@
 UNLOCK_CLEARANCE_TRANS = ('reset3', 'reset4', 'start_clearance')
 
-registration_workflow = WAeUPWorkflow(REGISTRATION_TRANSITIONS)
+registration_workflow = SIRPWorkflow(REGISTRATION_TRANSITIONS)
 
 class RegistrationWorkflowState(WorkflowState, grok.Adapter):
@@ -163,9 +163,9 @@
     state_id = 'wf.registration.id'
 
-class RegistrationWorkflowInfo(WAeUPWorkflowInfo, grok.Adapter):
+class RegistrationWorkflowInfo(SIRPWorkflowInfo, grok.Adapter):
     """Adapter to adapt Student objects to workflow info objects.
     """
     grok.context(IStudent)
-    grok.provides(IWAeUPWorkflowInfo)
+    grok.provides(ISIRPWorkflowInfo)
 
     def __init__(self, context):
Index: main/waeup.sirp/trunk/src/waeup/sirp/testing.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/testing.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/testing.py	(revision 7321)
@@ -161,5 +161,5 @@
          If you use the Zope testrunner (from :mod:`zope.testing`)
          then you have to use appropriate layers like the
-         :class:`waeup.sirp.testing.WAeUPSIRPUnitTestLayer`.
+         :class:`waeup.sirp.testing.SIRPUnitTestLayer`.
 
     Usage with :mod:`zope.testing` testrunners
@@ -170,5 +170,5 @@
     like the one defined in this module.
 
-    .. seealso:: :class:`waeup.sirp.testing.WAeUPSIRPUnitTestLayer`
+    .. seealso:: :class:`waeup.sirp.testing.SIRPUnitTestLayer`
 
     """
@@ -187,5 +187,5 @@
 
 
-class WAeUPSIRPUnitTestLayer(object):
+class SIRPUnitTestLayer(object):
     """A layer for tests that groks `waeup.sirp`.
 
@@ -210,9 +210,9 @@
 
       import unittest
-      from waeup.sirp.testing import WAeUPSIRPUnitTestLayer
+      from waeup.sirp.testing import SIRPUnitTestLayer
 
       class MyTestCase(unittest.TestCase):
 
-          layer = WAeUPSIRPUnitTestLayer
+          layer = SIRPUnitTestLayer
 
           # per-test setups and real tests go here...
Index: main/waeup.sirp/trunk/src/waeup/sirp/tests/test_interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/tests/test_interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/tests/test_interfaces.py	(revision 7321)
@@ -48,10 +48,10 @@
         # Register a role not visible to waeup portal as its name does
         # not start with 'waeup.'
-        class NonWAeUPRole(grok.Role):
+        class NonSIRPRole(grok.Role):
             grok.name('nonwaeup.testrole')
             grok.title('Role not suitable for waeup')
             grok.permissions('waeup.Public')
         grok.testing.grok_component('SomeRole', SomeRole)
-        grok.testing.grok_component('NonWAeUPRole', NonWAeUPRole)
+        grok.testing.grok_component('NonSIRPRole', NonSIRPRole)
         return
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/tests/test_objecthistory.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/tests/test_objecthistory.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/tests/test_objecthistory.py	(revision 7321)
@@ -26,10 +26,10 @@
 from zope.security.testing import Principal, Participation
 from waeup.sirp.app import University
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPObject
+from waeup.sirp.interfaces import IObjectHistory, ISIRPObject
 from waeup.sirp.testing import FunctionalTestCase, FunctionalLayer
 from waeup.sirp.objecthistory import ObjectHistory
 
 class SampleObject(grok.Model):
-    grok.implements(IWAeUPObject)
+    grok.implements(ISIRPObject)
     pass
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""WAeUP portal certificates
+"""SIRP certificates
 """
 import grok
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt	(revision 7321)
@@ -1,3 +1,3 @@
-:mod:`waeup.sirp.university.certificate` -- Certificates for WAeUP
+:mod:`waeup.sirp.university.certificate` -- Certificates for SIRP
 ******************************************************************
 
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/course.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/department.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 Content Classes (models and containers)
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py	(revision 7321)
@@ -19,5 +19,5 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.interfaces import IWAeUPSIRPPluggable
+from waeup.sirp.interfaces import ISIRPPluggable
 from waeup.sirp.university.interfaces import IFacultyContainer, IFaculty
 
@@ -51,10 +51,10 @@
     """A plugin that creates a faculty container inside a university.
     """
-    grok.implements(IWAeUPSIRPPluggable)
+    grok.implements(ISIRPPluggable)
     grok.name('faculties')
 
     def setup(self, site, name, logger):
         if 'faculties' in site.keys():
-            logger.warn('Could not create faculty container in WAeUP SIRP.')
+            logger.warn('Could not create faculty container in SIRP.')
             return
         site['faculties'] = FacultyContainer()
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.txt	(revision 7321)
@@ -7,5 +7,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
@@ -77,11 +77,10 @@
 .. class:: AcademicsPlugin()
 
-   .. attribute:: grok.implements(IWAeUPSIRPPluggable)
+   .. attribute:: grok.implements(ISIRPPluggable)
 
    This plugin component tells under which name (``faculties``) an
-   instance of academics stuff should be created in plain WAeUP SIRP
+   instance of academics stuff should be created in plain SIRP
    instances. It also tells the factory name for FacultyContainer
-   instances, which serve as root object for academics stuff in WAeUP
-   SIRP apps.
+   instances, which serve as root object for academics stuff in SIRP apps.
 
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/interfaces.py	(revision 7321)
@@ -20,5 +20,5 @@
 from zope import schema
 from zope.interface import Attribute
-from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPContainer)
+from waeup.sirp.interfaces import (ISIRPObject, ISIRPContainer)
 
 from waeup.sirp.university.vocabularies import (
@@ -32,5 +32,5 @@
 
 
-class IFaculty(IWAeUPContainer):
+class IFaculty(ISIRPContainer):
     """Representation of a university faculty.
     """
@@ -73,5 +73,5 @@
 IFacultyAdd['code'].order =  IFaculty['code'].order
 
-class IFacultyContainer(IWAeUPContainer):
+class IFacultyContainer(ISIRPContainer):
     """A container for faculties.
     """
@@ -80,5 +80,5 @@
 
         """
-class IDepartment(IWAeUPObject):
+class IDepartment(ISIRPObject):
     """Representation of a department.
     """
@@ -124,5 +124,5 @@
 IDepartmentAdd['code'].order =  IDepartment['code'].order
 
-class ICourseContainer(IWAeUPContainer):
+class ICourseContainer(ISIRPContainer):
     """A container for faculties.
     """
@@ -133,5 +133,5 @@
         """
 
-class ICourse(IWAeUPObject):
+class ICourse(ISIRPObject):
     """Representation of a course.
     """
@@ -186,5 +186,5 @@
 ICourseAdd['code'].order =  ICourse['code'].order
 
-class ICertificate(IWAeUPObject):
+class ICertificate(ISIRPObject):
     """Representation of a certificate.
     """
@@ -248,5 +248,5 @@
 ICertificateAdd['code'].order =  ICertificate['code'].order
 
-class ICertificateContainer(IWAeUPContainer):
+class ICertificateContainer(ISIRPContainer):
     """A container for certificates.
     """
@@ -257,5 +257,5 @@
         """
 
-class ICertificateCourse(IWAeUPObject):
+class ICertificateCourse(ISIRPObject):
     """A certificatecourse is referring a course and provides some own
        attributes.
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultycontainer.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultycontainer.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/tests/test_facultycontainer.py	(revision 7321)
@@ -90,5 +90,5 @@
         self.assertEqual(
             self._logger_factory.get_messages(),
-            'Could not create faculty container in WAeUP SIRP.\n'
+            'Could not create faculty container in SIRP.\n'
             )
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py	(revision 7321)
@@ -21,7 +21,7 @@
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 
-inst_types = SimpleWAeUPVocabulary(
+inst_types = SimpleSIRPVocabulary(
     ('Faculty of','faculty'),
     ('Department of','department'),
@@ -34,5 +34,5 @@
     )
 
-course_levels = SimpleWAeUPVocabulary(
+course_levels = SimpleSIRPVocabulary(
     ('Pre-Studies',0),
     ('100 (Year 1)',100),
@@ -46,5 +46,5 @@
     )
 
-semester = SimpleWAeUPVocabulary(
+semester = SimpleSIRPVocabulary(
     ('N/A', 0),
     ('First Semester', 1),
@@ -53,5 +53,5 @@
     )
 
-application_categories = SimpleWAeUPVocabulary(
+application_categories = SimpleSIRPVocabulary(
     ('PUME, PDE, PCE, PRENCE','basic'),
     ('Part-Time, Diploma, Certificate','cest'),
@@ -60,5 +60,5 @@
     )
 
-study_modes = SimpleWAeUPVocabulary(
+study_modes = SimpleSIRPVocabulary(
     ('UME Full Time','ume_ft'),
     ('Direct Entry Full Time','de_ft'),
Index: main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""Users container for the WAeUP portal.
+"""Users container for the SIRP portal.
 """
 import grok
Index: main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/userscontainer.txt	(revision 7321)
@@ -1,7 +1,7 @@
-User container for the WAeUP portal
-***********************************
+User container for the SIRP
+***************************
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 Before we can start, we need some password managers available:
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""WAeUP components for batch processing.
+"""SIRP components for batch processing.
 
 Batch processors eat CSV files to add, update or remove large numbers
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/converters.txt	(revision 7321)
@@ -10,5 +10,5 @@
 
 .. :NOdoctest:
-.. :NOlayer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :NOlayer: waeup.sirp.testing.SIRPUnitTestLayer
 
 
@@ -672,9 +672,9 @@
     '1'
 
-    >>> from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+    >>> from waeup.sirp.interfaces import SimpleSIRPVocabulary
     >>> field = Choice(
     ...   title = u'Favourite Dish',
     ...   default = 0,
-    ...   vocabulary = SimpleWAeUPVocabulary(
+    ...   vocabulary = SimpleSIRPVocabulary(
     ...        ('N/A', 0), ('Pizza', 1),
     ...        ('Cake', 2), ('Muffins', 3)),
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.py	(revision 7321)
@@ -16,5 +16,5 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""General helper functions for WAeUP.
+"""General helper functions for SIRP.
 """
 import os
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/helpers.txt	(revision 7321)
@@ -1,8 +1,8 @@
-:mod:`waeup.sirp.utils.helpers` -- Helpers for the WAeUP SRP
-************************************************************
+:mod:`waeup.sirp.utils.helpers` -- Helpers for SIRP
+***************************************************
 
 .. module:: waeup.sirp.utils.helpers
 
-Helper functions for the WAeUP SRP.
+Helper functions for SIRP.
 
 .. :doctest:
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.py	(revision 7321)
@@ -22,6 +22,6 @@
 from cStringIO import StringIO
 from zope.interface import Interface
-from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPExporter,
-                                   IWAeUPXMLExporter, IWAeUPXMLImporter)
+from waeup.sirp.interfaces import (ISIRPObject, ISIRPExporter,
+                                   ISIRPXMLExporter, ISIRPXMLImporter)
 
 def readFile(f):
@@ -40,11 +40,11 @@
 
 class Exporter(grok.Adapter):
-    """Export a WAeUP object as pickle.
+    """Export a SIRP object as pickle.
 
     This all-purpose exporter exports attributes defined in schemata
     and contained objects (if the exported thing is a container).
     """
-    grok.context(IWAeUPObject)
-    grok.provides(IWAeUPExporter)
+    grok.context(ISIRPObject)
+    grok.provides(ISIRPExporter)
 
     def __init__(self, context):
@@ -61,5 +61,5 @@
 
 class XMLExporter(grok.Adapter):
-    """Export a WAeUP object as XML.
+    """Export a SIRP object as XML.
 
     This all-purpose exporter exports XML representations of pickable
@@ -67,5 +67,5 @@
     """
     grok.context(Interface)
-    grok.provides(IWAeUPXMLExporter)
+    grok.provides(ISIRPXMLExporter)
 
     def __init__(self, context):
@@ -84,8 +84,8 @@
 
 class XMLImporter(grok.Adapter):
-    """Import a WAeUP object from XML.
+    """Import a SIRP object from XML.
     """
     grok.context(Interface)
-    grok.provides(IWAeUPXMLImporter)
+    grok.provides(ISIRPXMLImporter)
 
     def __init__(self, context):
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.txt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.txt	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/importexport.txt	(revision 7321)
@@ -6,5 +6,5 @@
 
 .. :doctest:
-.. :layer: waeup.sirp.testing.WAeUPSIRPUnitTestLayer
+.. :layer: waeup.sirp.testing.SIRPUnitTestLayer
 
 As imports and exports of data are a cruical point when doing updates
@@ -60,6 +60,6 @@
 an exporter::
 
-    >>> from waeup.sirp.interfaces import IWAeUPXMLExporter
-    >>> exporter = IWAeUPXMLExporter(mycave)
+    >>> from waeup.sirp.interfaces import ISIRPXMLExporter
+    >>> exporter = ISIRPXMLExporter(mycave)
     >>> exporter
     <waeup.sirp.utils.importexport.XMLExporter object at 0x...>
@@ -101,6 +101,6 @@
 Now we create an importer for that object:
 
-    >>> from waeup.sirp.interfaces import IWAeUPXMLImporter
-    >>> importer = IWAeUPXMLImporter(mycave)
+    >>> from waeup.sirp.interfaces import ISIRPXMLImporter
+    >>> importer = ISIRPXMLImporter(mycave)
 
 Importing from filenames
Index: main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py	(revision 7321)
@@ -36,12 +36,12 @@
 from waeup.sirp.utils.converters import IObjectConverter
 from waeup.sirp.utils.helpers import attrs_to_fields
-from waeup.sirp.interfaces import SimpleWAeUPVocabulary
-
-colors = SimpleWAeUPVocabulary(
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
+
+colors = SimpleSIRPVocabulary(
     ('Red', u'red'),
     ('Green', u'green'),
     ('Blue', u'blue'),
     )
-car_nums = SimpleWAeUPVocabulary(
+car_nums = SimpleSIRPVocabulary(
     ('None', 0),
     ('One', 1),
Index: main/waeup.sirp/trunk/src/waeup/sirp/widgets/__init__.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/widgets/__init__.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/widgets/__init__.py	(revision 7321)
@@ -1,2 +1,2 @@
-"""JS-driven widgets for WAeUP.
+"""JS-driven widgets for SIRP.
 """
Index: main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py	(revision 7321)
@@ -25,8 +25,8 @@
 from zope.schema import getFieldNamesInOrder
 
-class WAeUPObjectWidgetView(ObjectWidgetView):
+class SIRPObjectWidgetView(ObjectWidgetView):
     template = ViewPageTemplateFile('objectwidget.pt')
 
-class WAeUPObjectWidget(ObjectWidget):
+class SIRPObjectWidget(ObjectWidget):
 
     def __init__(self, context, request, factory, **kw):
@@ -58,7 +58,7 @@
 
     def _getView(self, request):
-        return WAeUPObjectWidgetView(self, request)
+        return SIRPObjectWidgetView(self, request)
 
-class WAeUPObjectDisplayWidget(WAeUPObjectWidget):
+class SIRPObjectDisplayWidget(SIRPObjectWidget):
 
     implementsOnly(IDisplayWidget)
Index: main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py	(revision 7321)
@@ -38,7 +38,7 @@
 from zope.formlib.interfaces import IWidgetInputErrorView
 
-from waeup.sirp.widgets.objectwidget import WAeUPObjectWidget as ObjectWidget
+from waeup.sirp.widgets.objectwidget import SIRPObjectWidget as ObjectWidget
 from waeup.sirp.widgets.objectwidget import (
-    WAeUPObjectDisplayWidget as ObjectDisplayWidget)
+    SIRPObjectDisplayWidget as ObjectDisplayWidget)
 
 class ITestContact(Interface):
Index: main/waeup.sirp/trunk/src/waeup/sirp/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/workflow.py	(revision 7320)
+++ main/waeup.sirp/trunk/src/waeup/sirp/workflow.py	(revision 7321)
@@ -25,7 +25,7 @@
 from zope.security.interfaces import NoInteraction
 from zope.security.management import getInteraction
-from waeup.sirp.interfaces import IWAeUPWorkflowInfo
+from waeup.sirp.interfaces import ISIRPWorkflowInfo
 
-class WAeUPWorkflow(Workflow):
+class SIRPWorkflow(Workflow):
     """A :mod:`hurry.workflow` workflow with more appropriate error
        messages.
@@ -71,9 +71,9 @@
         return False
 
-class WAeUPWorkflowInfo(WorkflowInfo):
+class SIRPWorkflowInfo(WorkflowInfo):
     """A workflow info that provides a convenience transition getter.
     """
 
-    grok.provides(IWAeUPWorkflowInfo)
+    grok.provides(ISIRPWorkflowInfo)
 
     def getManualTransitions(self):
