diff --git a/module/bug/config.php b/module/bug/config.php
index 482938c24f..685f2e2e68 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -40,9 +40,9 @@ $config->bug->list->customBatchCreateFields = 'module,project,steps,type,pri,sev
 $config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,assignedTo,status,resolvedBy,resolution,os,browser,keywords';
 
 $config->bug->custom = new stdclass();
-$config->bug->custom->create      = $config->bug->list->customCreateFields;
-$config->bug->custom->batchcreate = 'module,project,steps,type,severity,os,browser';
-$config->bug->custom->batchedit   = 'type,severity,pri,assignedTo,status,resolvedBy,resolution';
+$config->bug->custom->createFields      = $config->bug->list->customCreateFields;
+$config->bug->custom->batchCreateFields = 'module,project,steps,type,severity,os,browser';
+$config->bug->custom->batchEditFields   = 'type,severity,pri,assignedTo,status,resolvedBy,resolution';
 
 $config->bug->editor = new stdclass();
 $config->bug->editor->create     = array('id' => 'steps', 'tools' => 'bugTools');
diff --git a/module/bug/control.php b/module/bug/control.php
index e2a7938c66..5eab2356d2 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -309,7 +309,7 @@ class bug extends control
         /* Set custom. */
         foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->bug->custom->create;
+        $this->view->showFields   = $this->config->bug->custom->createFields;
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->create;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
@@ -396,7 +396,7 @@ class bug extends control
         /* Set custom. */
         foreach(explode(',', $this->config->bug->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->bug->custom->batchcreate;
+        $this->view->showFields   = $this->config->bug->custom->batchCreateFields;
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->bug->batchCreate;
         $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
@@ -635,14 +635,14 @@ class bug extends control
 
         /* Judge whether the editedTasks is too large and set session. */
         $showSuhosinInfo = false;
-        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($bugs), count(explode(',', $this->config->bug->custom->batchedit)) + 2);
+        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($bugs), count(explode(',', $this->config->bug->custom->batchEditFields)) + 2);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
         if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
 
         /* Set Custom*/
         foreach(explode(',', $this->config->bug->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->bug->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->bug->custom->batchedit;
+        $this->view->showFields   = $this->config->bug->custom->batchEditFields;
 
         /* Set users. */
         $users          = $this->user->getPairs('nodeleted,devfirst');
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index e1563ebb61..d75b37194f 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -143,7 +143,7 @@ foreach(explode(',', $showFields) as $field)
   </tbody>
 </table>
 <?php js::set('branch', $branch)?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index ad04ff9a63..fbd81e8ae2 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -100,6 +100,6 @@ $columns = count($hasFields) + 2;
     </tfoot>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index eb1f5f7e19..b729178b38 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -268,6 +268,6 @@ js::set('refresh', $lang->refresh);
   </div>
 </div>
 <?php js::set('bugModule', $lang->bug->module);?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=create');?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=bug&section=custom&key=createFields');?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/config.php b/module/product/config.php
index 7ca68f270a..a773bc3bf3 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -5,7 +5,7 @@ $config->product->orderBy = 'isClosed,order_desc';
 $config->product->customBatchEditFields = 'PO,QD,RD,status,type,desc';
 
 $config->product->custom = new stdclass();
-$config->product->custom->batchedit = 'PO,QD,RD,status';
+$config->product->custom->batchEditFields = 'PO,QD,RD,status';
 
 global $lang, $app;
 $app->loadLang('story');
diff --git a/module/product/control.php b/module/product/control.php
index b28d740d32..e7850f1d94 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -288,7 +288,7 @@ class product extends control
         /* Set custom. */
         foreach(explode(',', $this->config->product->customBatchEditFields) as $field) $customFields[$field] = $this->lang->product->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->product->custom->batchedit;
+        $this->view->showFields   = $this->config->product->custom->batchEditFields;
 
         $this->view->title         = $this->lang->product->batchEdit;
         $this->view->position[]    = $this->lang->product->batchEdit;
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 12ec27af62..820d51f7e7 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -59,6 +59,6 @@ foreach(explode(',', $showFields) as $field)
     <tr><td colspan='<?php echo count($hasFields) + 4?>' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=product&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=product&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/config.php b/module/project/config.php
index 051be49900..30dc936641 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -14,7 +14,7 @@ $config->project->edit->requiredFields   = 'name,code,begin,end';
 $config->project->customBatchEditFields = 'days,type,teamname,status,desc,PO,QD,PM,RD';
 
 $config->project->custom = new stdclass();
-$config->project->custom->batchedit = 'days,status,PM';
+$config->project->custom->batchEditFields = 'days,status,PM';
 
 $config->project->editor = new stdclass();
 $config->project->editor->create  = array('id' => 'desc',    'tools' => 'simpleTools');
diff --git a/module/project/control.php b/module/project/control.php
index 1e46d47153..426e7e7a08 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -999,7 +999,7 @@ class project extends control
         /* Set custom. */
         foreach(explode(',', $this->config->project->customBatchEditFields) as $field) $customFields[$field] = $this->lang->project->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->project->custom->batchedit;
+        $this->view->showFields   = $this->config->project->custom->batchEditFields;
 
         $this->view->title         = $this->lang->project->batchEdit;
         $this->view->position[]    = $this->lang->project->batchEdit;
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 29e531202c..ada21ae14c 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -76,6 +76,6 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
   <tr><td colspan='<?php echo count($hasFields) + 6?>' class='text-center'><?php echo html::submitButton();?></td></tr>
 </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=project&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=project&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/config.php b/module/story/config.php
index 9bc8344706..1223186b60 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -28,7 +28,7 @@ $config->story->editor->review   = array('id' => 'comment', 'tools' => 'simpleTo
 $config->story->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->story->list = new stdclass();
-$config->story->list->exportFields = '
+$config->story->list->exportFields      = '
     id, product, module, plan, source, title, spec, verify, keywords, 
     pri, estimate, status, stage,
     openedBy, openedDate, assignedTo, assignedDate, mailto, 
@@ -36,14 +36,15 @@ $config->story->list->exportFields = '
     closedBy, closedDate, closedReason,
     lastEditedBy, lastEditedDate, 
     childStories, linkStories, duplicateStory, files';
-$config->story->list->customCreateFields = 'source,verify,pri,estimate,mailto,keywords';
-$config->story->list->batchCreateFields  = 'module,plan,source,spec,verify,pri,estimate,review,keywords';
-$config->story->list->batchEditFields    = 'module,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords';
+
+$config->story->list->customCreateFields      = 'source,verify,pri,estimate,mailto,keywords';
+$config->story->list->customBatchCreateFields = 'module,plan,source,spec,verify,pri,estimate,review,keywords';
+$config->story->list->customBatchEditFields   = 'module,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords';
 
 $config->story->custom = new stdclass();
-$config->story->custom->create      = $config->story->list->customCreateFields;
-$config->story->custom->batchcreate = 'module,plan,spec,pri,estimate,review';
-$config->story->custom->batchedit   = 'module,plan,estimate,pri,source,stage,closedBy,closedReason';
+$config->story->custom->createFields      = $config->story->list->customCreateFields;
+$config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review';
+$config->story->custom->batchEditFields   = 'module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
 $config->story->datatable = new stdclass();
 $config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'source', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'actions');
diff --git a/module/story/control.php b/module/story/control.php
index 3e144a2107..863c9d5a1b 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -164,7 +164,7 @@ class story extends control
         /* Set Custom*/
         foreach(explode(',', $this->config->story->list->customCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->story->custom->create;
+        $this->view->showFields   = $this->config->story->custom->createFields;
 
         $this->view->title            = $product->name . $this->lang->colon . $this->lang->story->create;
         $this->view->position[]       = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name);
@@ -250,9 +250,9 @@ class story extends control
         $sourceList['ditto'] = $this->lang->story->ditto;
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->story->list->batchCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
+        foreach(explode(',', $this->config->story->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->story->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->story->custom->batchcreate;
+        $this->view->showFields   = $this->config->story->custom->batchCreateFields;
 
         $this->view->title            = $product->name . $this->lang->colon . $this->lang->story->batchCreate;
         $this->view->productName      = $product->name;
@@ -430,13 +430,13 @@ class story extends control
         $this->lang->story->reasonList['ditto'] = $this->lang->story->ditto;
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->story->list->batchEditFields) as $field) $customFields[$field] = $this->lang->story->$field;
+        foreach(explode(',', $this->config->story->list->customBatchEditFields) as $field) $customFields[$field] = $this->lang->story->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->story->custom->batchedit;
+        $this->view->showFields   = $this->config->story->custom->batchEditFields;
 
         /* Judge whether the editedStories is too large and set session. */
         $showSuhosinInfo = false;
-        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($stories), count(explode(',', $this->config->story->custom->batchedit)) + 3);
+        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($stories), count(explode(',', $this->config->story->custom->batchEditFields)) + 3);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
         if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
 
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index a3864b71c8..08884d6da1 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -114,7 +114,7 @@ foreach(explode(',', $showFields) as $field)
     </tr>
   </tbody>
 </table>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 531dfeccf9..6d72963fb7 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -108,6 +108,6 @@ foreach(explode(',', $showFields) as $field)
     </tfoot>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 6dfea23806..105123e181 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -177,7 +177,7 @@
     <span id='responser'></span>
   </form>
 </div>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=create')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=story&section=custom&key=createFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php js::set('storyModule', $lang->story->module);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/config.php b/module/task/config.php
index dda1c5ed9c..59af65f211 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -37,14 +37,14 @@ $config->task->exportFields = '
     closedBy, closedDate, closedReason,
     lastEditedBy, lastEditedDate,files
     ';
-$config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate'; 
-$config->task->batchCreateFields  = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri'; 
-$config->task->batchEditFields    = 'module,assignedTo,status,pri,estimate,record,left,estStarted,deadline,finishedBy,canceledBy,closedBy,closedReason';
+$config->task->customCreateFields      = 'story,estStarted,deadline,mailto,pri,estimate'; 
+$config->task->customBatchCreateFields = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri'; 
+$config->task->customBatchEditFields   = 'module,assignedTo,status,pri,estimate,record,left,estStarted,deadline,finishedBy,canceledBy,closedBy,closedReason';
 
 $config->task->custom = new stdclass();
-$config->task->custom->create      = $config->task->customCreateFields;
-$config->task->custom->batchcreate = 'module,story,assignedTo,estimate,desc,pri';
-$config->task->custom->batchedit   = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
+$config->task->custom->createFields      = $config->task->customCreateFields;
+$config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
+$config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
 
 $config->task->datatable = new stdclass();
 $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'deadline', 'openedDate', 'assignedTo', 'finishedBy', 'finishedDate', 'estimate', 'consumed', 'left', 'story', 'actions');
diff --git a/module/task/control.php b/module/task/control.php
index 01bf90eab2..c8eebd7181 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -144,7 +144,7 @@ class task extends control
         /* Set Custom*/
         foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->task->custom->create;
+        $this->view->showFields   = $this->config->task->custom->createFields;
 
         $this->view->title            = $title;
         $this->view->position         = $position;
@@ -187,9 +187,9 @@ class task extends control
         }
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->task->batchCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
+        foreach(explode(',', $this->config->task->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->task->custom->batchcreate;
+        $this->view->showFields   = $this->config->task->custom->batchCreateFields;
 
         $stories = $this->story->getProjectStoryPairs($projectID, 0, 0, 0, 'short');
         $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
@@ -370,14 +370,14 @@ class task extends control
 
         /* Judge whether the editedTasks is too large and set session. */
         $showSuhosinInfo = false;
-        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($tasks), count(explode(',', $this->config->task->custom->batchedit)) + 3);
+        $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($tasks), count(explode(',', $this->config->task->custom->batchEditFields)) + 3);
         $this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
         if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
 
         /* Set Custom*/
-        foreach(explode(',', $this->config->task->batchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
+        foreach(explode(',', $this->config->task->customBatchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->task->custom->batchedit;
+        $this->view->showFields   = $this->config->task->custom->batchEditFields;
 
         /* Set ditto option for pri, status and type list. */
         $this->lang->task->priList['ditto']    = $this->lang->task->ditto;
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 35529e50e6..585ff732ee 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -118,7 +118,7 @@ foreach(explode(',', $showFields) as $field)
 </table>
 <?php js::set('mainField', 'name');?>
 <?php js::set('ditto', $lang->task->ditto);?> 
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index d54b627330..2d3d303d4e 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -95,6 +95,6 @@ foreach(explode(',', $showFields) as $field)
     </tfoot>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 25af37d214..ffeba0c4b6 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -154,6 +154,6 @@
     <span id='responser'></span>
   </form>
 </div>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=create')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=createFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index eacacaaa4b..2900613bee 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -21,14 +21,14 @@ $config->testcase->exportFields = '
     pri, type, stage, status, lastRunResult, openedBy, openedDate,
     lastEditedBy, lastEditedDate, version,linkCase';
 
-$config->testcase->customCreateFields      = 'stage,story,pri,keywords';
+$config->testcase->customCreateFields      = 'story,stage,pri,keywords';
 $config->testcase->customBatchCreateFields = 'module,stage,story,pri,precondition,keywords';
 $config->testcase->customBatchEditFields   = 'module,stage,precondition,status,pri,keywords';
 
 $config->testcase->custom = new stdclass();
-$config->testcase->custom->create      = $config->testcase->customCreateFields;
-$config->testcase->custom->batchcreate = 'module,story';
-$config->testcase->custom->batchedit   = 'module,stage,status,pri';
+$config->testcase->custom->createFields      = $config->testcase->customCreateFields;
+$config->testcase->custom->batchCreateFields = 'module,story';
+$config->testcase->custom->batchEditFields   = 'module,stage,status,pri';
 
 global $lang;
 $config->testcase->search['module']                   = 'testcase';
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 956ef348c8..94cdf9606f 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -303,7 +303,7 @@ class testcase extends control
         /* Set custom. */
         foreach(explode(',', $this->config->testcase->customCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->testcase->custom->create;
+        $this->view->showFields   = $this->config->testcase->custom->createFields;
 
         $this->view->title            = $title;
         $this->view->caseTitle        = $caseTitle;
@@ -372,7 +372,7 @@ class testcase extends control
         /* Set custom. */
         foreach(explode(',', $this->config->testcase->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->testcase->custom->batchcreate;
+        $this->view->showFields   = $this->config->testcase->custom->batchCreateFields;
 
         $this->view->title            = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->batchCreate;
         $this->view->position[]       = html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]);
@@ -600,7 +600,7 @@ class testcase extends control
         /* Set custom. */
         foreach(explode(',', $this->config->testcase->customBatchEditFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->testcase->custom->batchedit;
+        $this->view->showFields   = $this->config->testcase->custom->batchEditFields;
 
         /* Assign. */
         $this->view->position[] = $this->lang->testcase->common;
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index fe6a5af440..84646d30ca 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -95,7 +95,7 @@ foreach(explode(',', $showFields) as $field)
     </tr>
   </tbody>
 </table>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index a8c97bef87..0905829114 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -75,6 +75,6 @@ foreach(explode(',', $showFields) as $field)
     </tfoot>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 2d325f901b..18c57c3c94 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -180,7 +180,7 @@
     </div>
   </div>
 </div>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=create');?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=testcase&section=custom&key=createFields');?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php js::set('caseModule', $lang->testcase->module)?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/config.php b/module/user/config.php
index 6918e3b7a5..eedb75b09b 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -10,8 +10,8 @@ $config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,
 $config->user->customBatchEditFields   = 'dept,email,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode';
 
 $config->user->custom = new stdclass();
-$config->user->custom->batchcreate = 'dept,email,gender';
-$config->user->custom->batchedit   = 'dept,join,email,commiter';
+$config->user->custom->batchCreateFields = 'dept,email,gender';
+$config->user->custom->batchEditFields   = 'dept,join,email,commiter';
 
 $config->user->failTimes   = 6;
 $config->user->lockMinutes = 10;
diff --git a/module/user/control.php b/module/user/control.php
index dd75d3aa63..7a23d5a648 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -445,7 +445,7 @@ class user extends control
         /* Set custom. */
         foreach(explode(',', $this->config->user->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->user->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->user->custom->batchcreate;
+        $this->view->showFields   = $this->config->user->custom->batchCreateFields;
 
         $title      = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchCreate;
         $position[] = $this->lang->user->batchCreate;
@@ -518,7 +518,7 @@ class user extends control
         /* Set custom. */
         foreach(explode(',', $this->config->user->customBatchEditFields) as $field) $customFields[$field] = $this->lang->user->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->user->custom->batchedit;
+        $this->view->showFields   = $this->config->user->custom->batchEditFields;
 
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchEdit;
         $this->view->position[] = $this->lang->user->batchEdit;
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 98123c678d..ec87a471ef 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -101,6 +101,6 @@ $minWidth = (count($hasFields) > 5) ? 'w-150px' : '';
     <tr><td colspan='<?php echo count($hasFields) + 6?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchcreate')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchCreateFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index d51833fe16..fa07784e45 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -93,6 +93,6 @@ $minWidth = (count($hasFields) > 7) ? 'w-120px' : '';
     <tr><td colspan='<?php echo count($hasFields) + 4?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchedit')?>
+<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=user&section=custom&key=batchEditFields')?>
 <?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/footer.html.php';?>