diff --git a/classes/local/helpers/download.php b/classes/local/helpers/download.php
index 9176edcb91ec5c027626524678ddc37ce8c2b2c8..581cf305f03158d9e7ed1b272f4f1361a04b0d93 100644
--- a/classes/local/helpers/download.php
+++ b/classes/local/helpers/download.php
@@ -41,12 +41,16 @@ class download {
         }
 
         $timestamp = download::get_file_timestamp();
+        $filename = $course_code;
 
-        if ($course_code != null) {
-            $filename = FILENAME_PREFIX . $course_code . '_' . $timestamp;
-        } else {
-            $filename = FILENAME_PREFIX . $course->shortname . '_' . $timestamp;
+        // use course shortname if no course_code is given
+        if ($course_code == null) {
+            $filename = str_replace(',', '-', $course->shortname);
         }
+
+        // extend filename with prefix and date
+        $filename = FILENAME_PREFIX . $filename . '_' . $timestamp;
+
         return $filename;
     }