diff --git a/main/work/downloadfolder.inc.php b/main/work/downloadfolder.inc.php
index ef2b41c8b6..7b990aca68 100755
--- a/main/work/downloadfolder.inc.php
+++ b/main/work/downloadfolder.inc.php
@@ -73,7 +73,7 @@ if (api_is_allowed_to_edit() || api_is_coach()) {
                 title,
                 description,
                 insert_user_id,
-                insert_date,
+                sent_date,
                 contains_file
                 $filenameCondition
             FROM $tbl_student_publication AS work
@@ -115,7 +115,7 @@ if (api_is_allowed_to_edit() || api_is_coach()) {
                 title,
                 description,
                 insert_user_id,
-                insert_date,
+                sent_date,
                 contains_file
                 $filenameCondition
             FROM $tbl_student_publication AS work
@@ -142,7 +142,7 @@ $query = Database::query($sql);
 //add tem to the zip file
 while ($not_deleted_file = Database::fetch_assoc($query)) {
     $user_info = api_get_user_info($not_deleted_file['insert_user_id']);
-    $insert_date = api_get_local_time($not_deleted_file['insert_date']);
+    $insert_date = api_get_local_time($not_deleted_file['sent_date']);
     $insert_date = str_replace(array(':', '-', ' '), '_', $insert_date);
 
     $title = basename($not_deleted_file['title']);
diff --git a/main/work/upload_corrections.php b/main/work/upload_corrections.php
index 8834dc7b75..65a7679934 100644
--- a/main/work/upload_corrections.php
+++ b/main/work/upload_corrections.php
@@ -127,7 +127,8 @@ if ($form->validate()) {
         $finalResult = [];
         foreach ($result as $item) {
             $title = $item['title_clean'];
-            $title = api_replace_dangerous_char($title);
+            $insert_date = str_replace(array(':', '-', ' '), '_', api_get_local_time($item['sent_date_from_db']));
+            $title =  api_replace_dangerous_char($insert_date.'_'.$item['username'].'_'.$title);
             $finalResult[$title] = $item['id'];
         }
 
@@ -138,13 +139,10 @@ if ($form->validate()) {
         $finder = new Finder();
         $finder->files()->in($destinationDir);
         $table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
-
+        //var_dump($finalResult);
         /** @var SplFileInfo $file */
         foreach ($finder as $file) {
             $fileName = $file->getBasename();
-            $fileName = substr($fileName, 20, strlen($fileName));
-            $pos = strpos($fileName, '_') + 1;
-            $fileName = substr($fileName, $pos, strlen($fileName));
 
             if (isset($finalResult[$fileName])) {
                 $workStudentId = $finalResult[$fileName];
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 0cfd199373..ac48eff692 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -2076,12 +2076,12 @@ function get_work_user_list(
                 $work['qualification_only'] = $qualification_string;
 
                 // Date.
-                $work_date = api_convert_and_format_date($work['sent_date']);
+                $work_date = api_get_local_time($work['sent_date']);
                 $date = date_to_str_ago($work['sent_date']). ' ' . $work_date;
                 $work['formatted_date'] = $work_date . ' ' . $add_string;
 
                 $work['sent_date_from_db'] = $work['sent_date'];
-                $work['sent_date'] = '<div class="work-date" title="'.$date.'">' . $add_string . ' ' . $work['sent_date'] . '</div>';
+                $work['sent_date'] = '<div class="work-date" title="'.$date.'">' . $add_string . ' ' . $work_date . '</div>';
 
                 // Actions.
                 $correction = '';