Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt	(revision 8920)
@@ -1000,5 +1000,5 @@
 with their code as key.
 
-Each certificate provides a ``Add course referrer`` action button near top.
+Each certificate provides a ``Add certificate course`` action button near top.
 
 Certificates provide an add-form to add new certcourses:
@@ -1006,5 +1006,5 @@
   >>> cert_url = dept_url + '/certificates/CERT1'
   >>> browser.open(cert_url + '/manage')
-  >>> browser.getControl('Add course referrer').click()
+  >>> browser.getControl('Add certificate course').click()
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
@@ -1025,5 +1025,5 @@
   >>> ctrl.getControl('COURSE1').selected = True
   >>> browser.getControl(name='form.level').value = ['100']
-  >>> browser.getControl('Add course referrer').click()
+  >>> browser.getControl('Add certificate course').click()
 
 Our certificatecourse will be linked on the parent certificate page:
@@ -1038,10 +1038,10 @@
   >>> cert_url = dept_url + '/certificates/CERT1'
   >>> browser.open(cert_url + '/manage')
-  >>> browser.getControl('Add course referrer').click()
+  >>> browser.getControl('Add certificate course').click()
   >>> ctrl = browser.getControl(name='form.course')
   >>> ctrl.getControl('COURSE1').selected = True
   >>> browser.getControl(name='form.level').value = ['100']
-  >>> browser.getControl('Add course referrer').click()
-  >>> 'The chosen course referrer is already' in browser.contents
+  >>> browser.getControl('Add certificate course').click()
+  >>> 'The chosen certificate course is already' in browser.contents
   True
 
@@ -1063,5 +1063,5 @@
 
   >>> browser.open(cert_url + '/COURSE1_100')
-  >>> browser.getLink('Edit course referrer').click()
+  >>> browser.getLink('Edit certificate course').click()
 
 If we just click 'Save and return' nothing will change:
@@ -1088,5 +1088,5 @@
 changed:
 
-  >>> browser.getLink('Edit course referrer').click()
+  >>> browser.getLink('Edit certificate course').click()
   >>> browser.getControl(name='form.level').value = ['400']
   >>> browser.getControl('Cancel').click()
@@ -1125,10 +1125,10 @@
   >>> 'COURSE1_200</a>' in browser.contents
   True
-  >>> browser.getControl('Remove selected course referrers').click()
+  >>> browser.getControl('Remove selected certificate courses').click()
   >>> 'No item selected' in browser.contents
   True
   >>> browser.getControl(name='val_id').getControl(
   ...    value='COURSE1_200').selected = True
-  >>> browser.getControl('Remove selected course referrers').click()
+  >>> browser.getControl('Remove selected certificate courses').click()
   >>> 'Successfully removed: COURSE1_200' in browser.contents
   True
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8920)
@@ -1920,6 +1920,6 @@
     grok.template('certificatemanagepage')
     taboneactions = [_('Save'),_('Cancel')]
-    tabtwoactions = [_('Add course referrer'),
-                     _('Remove selected course referrers'),_('Cancel')]
+    tabtwoactions = [_('Add certificate course'),
+                     _('Remove selected certificate courses'),_('Cancel')]
     tabthreeactions1 = [_('Remove selected local roles')]
     tabthreeactions2 = [_('Add local role')]
@@ -1944,10 +1944,10 @@
         return msave(self, **data)
 
-    @jsaction(_('Remove selected course referrers'))
+    @jsaction(_('Remove selected certificate courses'))
     def delCertificateCourses(self, **data):
         delSubobjects(self, redirect='@@manage', tab='2')
         return
 
-    @action(_('Add course referrer'), validator=NullValidator)
+    @action(_('Add certificate course'), validator=NullValidator)
     def addCertificateCourse(self, **data):
         self.redirect(self.url(self.context, 'addcertificatecourse'))
@@ -1986,16 +1986,16 @@
     form_fields = grok.AutoFields(ICertificateCourseAdd)
     pnav = 1
-    label = _('Add course referrer')
-
-    @action(_('Add course referrer'))
+    label = _('Add certificate course')
+
+    @action(_('Add certificate course'))
     def addCertcourse(self, **data):
         try:
-            self.context.addCourseRef(**data)
+            self.context.addCertCourse(**data)
         except KeyError:
-            self.status = self.flash(_('The chosen course referrer is already '
+            self.status = self.flash(_('The chosen certificate course is already '
                                   'part of this certificate.'))
             return
         self.status = self.flash(
-            _("Course referrer ${a}_${b} added.",
+            _("certificate course ${a}_${b} added.",
             mapping = {'a': data['course'].code, 'b': data['level']}))
         code = "%s_%s" % (data['course'].code, data['level'])
@@ -2038,5 +2038,5 @@
     grok.require('waeup.manageAcademics')
     form_fields = grok.AutoFields(ICertificateCourse)
-    label = _('Edit course referrer')
+    label = _('Edit certificate course')
     pnav = 1
 
@@ -2051,6 +2051,6 @@
             old_level = self.context.level
             data['course'] = self.context.course
-            parent.addCourseRef(**data)
-            parent.delCourseRef(data['course'].code, level=old_level)
+            parent.addCertCourse(**data)
+            parent.delCertCourse(data['course'].code, level=old_level)
             self.flash(_('Form has been saved.'))
             old_code = "%s_%s" % (data['course'].code, old_level)
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 8920)
@@ -4,5 +4,5 @@
   <ul class="tabs" data-tabs="tabs">
     <li tal:attributes="class view/tab1"><a href="#tab-1" i18n:translate="">Settings</a></li>
-    <li tal:attributes="class view/tab2"><a href="#tab-2" i18n:translate="">Course Referrers</a></li>
+    <li tal:attributes="class view/tab2"><a href="#tab-2" i18n:translate="">Certificate Courses</a></li>
     <li tal:attributes="class view/tab3"><a href="#tab-3" i18n:translate="">Local Roles</a></li>
   </ul>
@@ -24,11 +24,17 @@
     </div>
     <div id="tab-2" tal:attributes="class view/tab2">
-      <h3 i18n:translate="">Course Referrers</h3>
+      <h3>
+        <span tal:content="context/__name__">Code</span>
+        <span i18n:domain="waeup.kofa" i18n:translate="">Courses</span>
+      </h3>
       <table class="display dataTableManage">
         <thead>
           <tr>
-            <th>&nbsp;</th><th i18n:translate="">Level</th>
-            <th i18n:translate="">Semester</th><th i18n:translate="">Referrer</th>
-            <th i18n:translate="">Course</th><th i18n:translate="">Title</th>
+            <th>&nbsp;</th>
+            <th i18n:translate="">Level</th>
+            <th i18n:translate="">Semester</th>
+            <th i18n:translate="">Cert. Course</th>
+            <th i18n:translate="">Dep. Course</th>
+            <th i18n:translate="">Title</th>
             <th i18n:translate="">Mandatory</th>
           </tr>
@@ -37,6 +43,5 @@
           <tr tal:repeat="cc context/values" class="gradeC">
              <td>
-              <input type="checkbox"
-        		 name="val_id"
+              <input type="checkbox" name="val_id"
         		 tal:attributes="value cc/__name__" />
             </td>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt	(revision 8920)
@@ -20,5 +20,5 @@
 <h3>
   <span tal:content="context/__name__">Code</span>
-  <span i18n:domain="waeup.kofa" i18n:translate="">Course Referrers</span>
+  <span i18n:domain="waeup.kofa" i18n:translate="">Courses</span>
 </h3>
 <br />
@@ -26,7 +26,10 @@
 <thead>
   <tr>
-    <th i18n:translate="">Level</th><th i18n:translate="">Semester</th>
-    <th i18n:translate="">Referrer</th><th i18n:translate="">Course</th>
-    <th i18n:translate="">Title</th><th i18n:translate="">Mandatory</th>
+    <th i18n:translate="">Level</th>
+    <th i18n:translate="">Semester</th>
+    <th i18n:translate="">Cert. Course</th>
+    <th i18n:translate="">Dep. Course</th>
+    <th i18n:translate="">Title</th>
+    <th i18n:translate="">Mandatory</th>
   </tr>
 </thead>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 8920)
@@ -84,5 +84,5 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
             self.course, level=100)
 
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py	(revision 8920)
@@ -91,5 +91,5 @@
         cert.code = 'cert1'
         dept.certificates.addCertificate(cert)
-        cert.addCourseRef(course)
+        cert.addCertCourse(course)
 
         self.browser = Browser()
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py	(revision 8858)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py	(revision 8920)
@@ -456,5 +456,5 @@
     grok.context(ICertificateCourse)
     grok.view(CertificateCoursePage)
-    text = _('Edit course referrer')
+    text = _('Edit certificate course')
 
 #
