diff --git a/module/testcase/config/form.php b/module/testcase/config/form.php
index 3012820ee7..c8eeb420d8 100644
--- a/module/testcase/config/form.php
+++ b/module/testcase/config/form.php
@@ -66,6 +66,8 @@ $config->testcase->form->edit['stepType']     = array('required' => false, 'type
 $config->testcase->form->edit['version']      = array('required' => false, 'type' => 'int',    'default' => 1);
 $config->testcase->form->edit['auto']         = array('required' => false, 'type' => 'string', 'default' => 'no');
 $config->testcase->form->edit['script']       = array('required' => false, 'type' => 'string', 'default' => '');
+$config->testcase->form->edit['deleteFiles']  = array('required' => false, 'type' => 'array',  'default' => array());
+$config->testcase->form->edit['renameFiles']  = array('required' => false, 'type' => 'array',  'default' => array());
 $config->testcase->form->edit['comment']      = array('required' => false, 'type' => 'string', 'default' => '', 'control' => 'editor');
 
 $config->testcase->form->batchEdit = array();
diff --git a/module/testcase/model.php b/module/testcase/model.php
index ae9c865762..005bd6b373 100755
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -629,7 +629,7 @@ class testcaseModel extends model
 
         if($case->branch && !empty($testtasks)) $this->testcaseTao->unlinkCaseFromTesttask($oldCase->id, $case->branch, $testtasks);
 
-        $this->loadModel('file')->processFile4Object('testcase', $oldCase, $case);
+        $this->loadModel('file')->processFileDiffsForObject('testcase', $oldCase, $case);
 
         /* Join the steps to diff. */
         if(!empty($case->stepChanged) && $case->steps)
diff --git a/module/testcase/tao.php b/module/testcase/tao.php
index c0cd154d10..1770e0eb1c 100644
--- a/module/testcase/tao.php
+++ b/module/testcase/tao.php
@@ -374,7 +374,7 @@ class testcaseTao extends testcaseModel
         $requiredFields = $this->config->testcase->edit->requiredFields;
         if(!empty($case->lib)) $requiredFields = str_replace(',story,', ',', ",$requiredFields,");
 
-        $this->dao->update(TABLE_CASE)->data($case, 'deleteFiles,uid,stepChanged,comment,steps,expects,stepType,linkBug')
+        $this->dao->update(TABLE_CASE)->data($case, 'deleteFiles,uid,stepChanged,comment,steps,expects,stepType,linkBug,renameFiles')
             ->autoCheck()
             ->batchCheck($requiredFields, 'notempty')
             ->checkFlow()
diff --git a/module/testcase/ui/edit.html.php b/module/testcase/ui/edit.html.php
index fbd7f4ca7d..2945f13d42 100644
--- a/module/testcase/ui/edit.html.php
+++ b/module/testcase/ui/edit.html.php
@@ -137,14 +137,7 @@ detailBody
         section
         (
             set::title($lang->files),
-            $case->files ? fileList
-            (
-                set::files($case->files),
-                set::fieldset(false),
-                set::showEdit(true),
-                set::showDelete(true)
-            ) : null,
-            fileSelector()
+            fileSelector($case->files ? set::defaultFiles(array_values($case->files)) : false)
         ),
         section
         (