diff --git a/module/task/config/form.php b/module/task/config/form.php
index 224f299adb..6548d9e6cb 100644
--- a/module/task/config/form.php
+++ b/module/task/config/form.php
@@ -83,6 +83,7 @@ $config->task->form->edit['closedDate']     = array('type' => 'datetime', 'requi
 $config->task->form->edit['lastEditedBy']   = array('type' => 'string',   'required' => false, 'default' => $account);
 $config->task->form->edit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
 $config->task->form->edit['deleteFiles']    = array('type' => 'array',    'required' => false, 'default' => array());
+$config->task->form->edit['renameFiles']    = array('type' => 'array',    'required' => false, 'default' => array());
 
 $config->task->form->team->create = array();
 $config->task->form->team->create['team']         = array('type' => 'array',  'required' => false, 'default' => array());
diff --git a/module/task/model.php b/module/task/model.php
index 6b94f9b2b2..2c71af8315 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3031,7 +3031,7 @@ class taskModel extends model
         /* Logging history when multi-task team members have changed. */
         if(!empty($oldTask->team) && !empty($teamData->team)) list($oldTask, $task) = $this->taskTao->createChangesForTeam($oldTask, $task);
 
-        $this->loadModel('file')->processFile4Object('task', $oldTask, $task);
+        $this->loadModel('file')->processFileDiffsForObject('task', $oldTask, $task);
         $changes = common::createChanges($oldTask, $task);
 
         /* Record log. */
diff --git a/module/task/tao.php b/module/task/tao.php
index edb11302fc..d8c157dc90 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -439,7 +439,7 @@ class taskTao extends taskModel
             $task->lastEditedDate = helper::now();
         }
 
-        $this->dao->update(TABLE_TASK)->data($task, 'deleteFiles')
+        $this->dao->update(TABLE_TASK)->data($task, 'deleteFiles,renameFiles')
             ->autoCheck()
             ->batchCheckIF($task->status != 'cancel', $requiredFields, 'notempty')
             ->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php
index 05a4186c19..6fbe814966 100644
--- a/module/task/ui/edit.html.php
+++ b/module/task/ui/edit.html.php
@@ -173,14 +173,7 @@ detailBody
         section
         (
             set::title($lang->files),
-            $task->files ? fileList
-            (
-                set::files($task->files),
-                set::fieldset(false),
-                set::showEdit(true),
-                set::showDelete(true)
-            ) : null,
-            fileSelector()
+            fileSelector($task->files ? set::defaultFiles(array_values($task->files)) : null)
         ),
         formHidden('lastEditedDate', helper::isZeroDate($task->lastEditedDate) ? '' : $task->lastEditedDate)
     ),