diff --git a/templates/macros.html b/templates/macros.html
index 8bcb597e8c28684c839b0e85692c9bf0e0aeda4b..1921aad046613b8a5e4cba1194a34a8b9cb87d67 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -68,7 +68,7 @@
 {% macro course_list_item(course,show_semester=False) %}
 <li class="list-group-item {% if (not course.visible) or (not course.listed) %}list-group-item-danger{% endif %}">
 	<div class="row">
-		<a href="{{url_for('course', id=course.handle)}}">
+		<a href="{{url_for('course_id', id=course.handle)}}">
 			{% if show_semester %}
 				<span class="col-xs-1">
 					{{ course.semester }}
diff --git a/templates/play.html b/templates/play.html
index 4b78d0f1b42412fc110a557da4b696bfc8a5e7d2..6ffa50688b04ebf0ed70bf4a9622290f538132af 100644
--- a/templates/play.html
+++ b/templates/play.html
@@ -11,10 +11,10 @@
 	</div>
 	<div class="panel-body">
 		<p class="col-xs-12" style="padding: 0px;">
-			<span><a href="{{url_for('course', id=course.handle)}}" class="btn btn-default" >Zur Veranstaltungsseite</a><span>
+			<span><a href="{{url_for('course_id', id=course.handle)}}" class="btn btn-default" >Zur Veranstaltungsseite</a><span>
 			<span class="pull-right">
 				<span>{{ video_embed_btn(lecture.id) }}</span>
-				<span>{{video_download_btn(videos)}}</span>
+				<span>{{ video_download_btn(videos) }}</span>
 			</span>
 		</p>
 		<div class="row">
diff --git a/templates/schedule.html b/templates/schedule.html
index 42328d4bd527fbab070ddee436528edc77ff7335..2a021eb6c2a662648807a35b43a3909ef43d76a8 100644
--- a/templates/schedule.html
+++ b/templates/schedule.html
@@ -17,7 +17,7 @@
 						{% for l in d.lectures|selectattr('schedule_col','equalto',i) if (((l.time_asdate.time() > t) and (l.time_asdate.time() < times[time_loop.index+1])) != (l.time_asdate.time() == t ) ) %}
 						<td rowspan="{{l.duration / 15}}" style="background: lightgrey;">
 							<p class="small">
-							<strong><a href="{{url_for('course', id=l['course_id'])}}#lecture-{{l.id}}">{{l.short}}</a></strong><br>
+							<strong><a href="{{url_for('course_id', id=l['course_id'])}}#lecture-{{l.id}}">{{l.short}}</a></strong><br>
 								{{l.time_asdate.strftime("%H:%M")}} - {{l.end_asdate.strftime("%H:%M")}}<br>
 								{{l.place}}</p>
 						</td>