Index: main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 8920)
@@ -932,13 +932,6 @@
         ticket.automatic = False
         ticket.carry_over = False
-        ticket.code = course.code
-        ticket.title = course.title
-        ticket.fcode = course.__parent__.__parent__.__parent__.code
-        ticket.dcode = course.__parent__.__parent__.code
-        ticket.credits = course.credits
-        ticket.passmark = course.passmark
-        ticket.semester = course.semester
         try:
-            self.context.addCourseTicket(ticket)
+            self.context.addCourseTicket(ticket, course)
         except KeyError:
             self.flash(_('The ticket exists.'))
@@ -1784,5 +1777,5 @@
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)
-        return _('Add and remove course tickets of study level ${a}',
+        return _('Edit course list of ${a}',
             mapping = {'a':level_title})
 
@@ -1855,9 +1848,8 @@
         ticket = createObject(u'waeup.CourseTicket')
         course = data['course']
-        for name in ['code', 'title', 'credits', 'passmark', 'semester']:
-            setattr(ticket, name, getattr(course, name))
         ticket.automatic = False
+        ticket.carry_over = False
         try:
-            self.context.addCourseTicket(ticket)
+            self.context.addCourseTicket(ticket, course)
         except KeyError:
             self.flash(_('The ticket exists.'))
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt	(revision 8920)
@@ -34,6 +34,6 @@
       <th i18n:translate="">Code</th>
       <th i18n:translate="">Title</th>
-      <th i18n:translate="">Dept.</th>
-      <th i18n:translate="">Fact.</th>
+      <th i18n:translate="">Dep.</th>
+      <th i18n:translate="">Fac.</th>
       <th i18n:translate="">Cred.</th>
       <th i18n:translate="">Mand.</th>
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 8920)
@@ -402,5 +402,5 @@
         )
 
-    def addCourseTicket(courseticket):
+    def addCourseTicket(ticket, course):
         """Add a course ticket object.
         """
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py	(revision 8920)
@@ -56,11 +56,18 @@
         return studylevelsource.factory.getTitle(self.__parent__, self.level)
 
-    def addCourseTicket(self, courseticket):
+    def addCourseTicket(self, ticket, course):
         """Add a course ticket object.
         """
-        if not ICourseTicket.providedBy(courseticket):
+        if not ICourseTicket.providedBy(ticket):
             raise TypeError(
                 'StudentStudyLeves contain only ICourseTicket instances')
-        self[courseticket.code] = courseticket
+        ticket.code = course.code
+        ticket.title = course.title
+        ticket.fcode = course.__parent__.__parent__.__parent__.code
+        ticket.dcode = course.__parent__.__parent__.code
+        ticket.credits = course.credits
+        ticket.passmark = course.passmark
+        ticket.semester = course.semester
+        self[ticket.code] = ticket
         return
 
@@ -87,6 +94,7 @@
 
     A course ticket contains a copy of the original course and
-    course referrer data. If the courses and/or their referrers are removed, the
-    corresponding tickets remain unchanged. So we do not need any event
+    certificate course data. If the courses and/or the referrin certificate
+    courses are removed, the corresponding tickets remain unchanged.
+    So we do not need any event
     triggered actions on course tickets.
     """
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 8920)
@@ -218,5 +218,5 @@
         ticket.passmark = 100
         ticket.semester = 2
-        study_level.addCourseTicket(ticket)
+        study_level[ticket.code] = ticket
         self.add_payment(student)
         return student
@@ -688,5 +688,5 @@
         shutil.rmtree(os.path.dirname(fin_file))
 
-        # Add course and course referrer
+        # Add course and certificate course
         self.course = createObject('waeup.Course')
         self.course.code = 'COURSE1'
@@ -696,5 +696,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/students/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8920)
@@ -171,5 +171,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)
 
@@ -1240,5 +1240,5 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("100").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1253,5 +1253,5 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("200").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1521,5 +1521,5 @@
         # The new SFE-0 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1570,5 +1570,5 @@
         # The new SFE-0 pin can be used for starting session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1610,5 +1610,5 @@
         # The new SFE-1 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         self.browser.getControl(name="ac_series").value = sfeseries
         self.browser.getControl(name="ac_number").value = sfenumber
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 8920)
@@ -129,5 +129,5 @@
         studylevel = StudentStudyLevel()
         self.assertRaises(
-            TypeError, studylevel.addCourseTicket, department)
+            TypeError, studylevel.addCourseTicket, department, department)
 
     def test_booking_date(self):
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 8920)
@@ -445,5 +445,5 @@
     grok.require('waeup.handleStudent')
     icon = 'actionicon_start.gif'
-    text = _('Start session')
+    text = _('Start new session')
     target = 'start_session'
 
@@ -477,5 +477,5 @@
     grok.view(StudyLevelDisplayFormPage)
     grok.require('waeup.handleStudent')
-    text = _('Add and remove courses')
+    text = _('Edit course list')
     target = 'edit'
 
