diff --git a/polynum_blackboard/views.py b/polynum_blackboard/views.py
index b2e4a1d..d4021e7 100644
--- a/polynum_blackboard/views.py
+++ b/polynum_blackboard/views.py
@@ -36,14 +36,10 @@ def create_course(request):
         conn = django_ws.get_bb_conn()
         course_id = form.cleaned_data['course_id']
         entity = form.cleaned_data['entity']
-        diploma = entity.parents().get(
-                entity_type__name=settings.POLYNUM_BB_DIPLOMA_DESIGNATION)
-        owner_name = request.user.display_name().title()
+        owner_name = request.sponsor_name()
         if document and '(' in document.sponsor:
             owner_name = document.sponsor.split('(')[0]
-        course_label = diploma.get_name() + '_' + \
-                settings.POLYNUM_BB_COURSE_YEAR + '_' + \
-                entity.get_name()
+        course_label = entity.code.upper() + '_' + settings.POLYNUM_BB_COURSE_YEAR
         if form.cleaned_data.get('td_group'):
             course_label += '_Gr' + form.cleaned_data['td_group']
         course_label += '_' + owner_name