diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php
index cc3b573c2c..a2bb232afd 100644
--- a/module/bug/view/browse.custom.html.php
+++ b/module/bug/view/browse.custom.html.php
@@ -74,7 +74,7 @@
               <div class='f-left'>
                 <?php 
                 echo html::selectAll() . html::selectReverse(); 
-                if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->bug->batchEdit);
+                if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->edit);
                ?>
               </div>
               <?php endif?>
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 84c29cebe9..932fbe1fa7 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -167,7 +167,7 @@ js::set('customed', $customed);
                 <div class='f-left'>
                   <?php 
                   echo html::selectAll() . html::selectReverse(); 
-                  if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->bug->batchEdit);
+                  if(common::hasPriv('bug', 'batchEdit') and $bugs) echo html::submitButton($lang->edit);
                  ?>
                 </div>
                 <?php endif?>
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index 46d338780b..574f9db2cc 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -77,7 +77,7 @@ js::set('deptID', $deptID);
           <td colspan='11'>
           <?php
           echo html::selectAll() . html::selectReverse();
-          echo html::submitButton($lang->user->batchEdit, 'onclick=batchEdit()');
+          echo html::submitButton($lang->edit, 'onclick=batchEdit()');
           echo html::submitButton($lang->user->contacts->manage, 'onclick=manageContacts()');
           $pager->show();
           ?>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index f92166fea0..636d1e3656 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -101,7 +101,7 @@
         if(common::hasPriv('todo', 'batchEdit'))
         {
             $actionLink = $this->createLink('todo', 'batchEdit', "from=myTodo&type=$type&account=$account&status=$status");
-            echo html::commonButton($lang->todo->batchEdit, "onclick=\"changeAction('todoform', 'batchEdit', '$actionLink')\"");
+            echo html::commonButton($lang->edit, "onclick=\"changeAction('todoform', 'batchEdit', '$actionLink')\"");
 
         }
         if(common::hasPriv('todo', 'import2Today') and $importFuture)
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 7f2d95ad08..0ad1551736 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -114,12 +114,12 @@ var browseType = '<?php echo $browseType;?>';
                   if(common::hasPriv('story', 'batchEdit'))
                   {
                       $actionLink = $this->createLink('story', 'batchEdit', "from=productBrowse&productID=$productID&projectID=0&orderBy=$orderBy");
-                      echo html::commonButton($lang->story->batchEdit, "onclick=\"changeAction('productStoryForm', 'batchEdit', '$actionLink')\"");
+                      echo html::commonButton($lang->edit, "onclick=\"changeAction('productStoryForm', 'batchEdit', '$actionLink')\"");
                   }
                   if(common::hasPriv('story', 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory')
                   {
                       $actionLink = $this->createLink('story', 'batchClose', "from=productBrowse&productID=$productID&projectID=0&orderBy=$orderBy");
-                      echo html::commonButton($lang->story->batchClose, "onclick=\"changeAction('productStoryForm', 'batchClose', '$actionLink')\"");
+                      echo html::commonButton($lang->close, "onclick=\"changeAction('productStoryForm', 'batchClose', '$actionLink')\"");
                   }
               }
               echo $summary;
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index deb561d2ec..57c1a0198e 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -96,12 +96,12 @@
               if(common::hasPriv('story', 'batchEdit'))
               {
                   $actionLink = $this->createLink('story', 'batchEdit', "from=projectStory&productID=0&projectID=$project->id&orderBy=$orderBy");
-                  echo html::commonButton($lang->story->batchEdit, "onclick=\"changeAction('projectStoryForm', 'batchEdit', '$actionLink')\"");
+                  echo html::commonButton($lang->edit, "onclick=\"changeAction('projectStoryForm', 'batchEdit', '$actionLink')\"");
               }
               if(common::hasPriv('story', 'batchClose'))
               {
                   $actionLink = $this->createLink('story', 'batchClose', "from=projectStory&productID=0&projectID=$project->id&orderBy=$orderBy");
-                  echo html::commonButton($lang->story->batchClose, "onclick=\"changeAction('projectStoryForm', 'batchClose', '$actionLink')\"");
+                  echo html::commonButton($lang->close, "onclick=\"changeAction('projectStoryForm', 'batchClose', '$actionLink')\"");
               }
           }
           printf($lang->product->storySummary, count($stories), $totalEstimate);
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 7c2a687bf3..9d151ebb97 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -146,7 +146,7 @@ var browseType  = '<?php echo $browseType;?>';
               <td colspan='<?php echo $columns;?>'>
                 <div class='f-left'>
                 <?php 
-                  if(common::hasPriv('task', 'batchEdit') and count($tasks))echo html::selectAll() . html::selectReverse() . html::submitButton($lang->task->batchEdit); 
+                  if(common::hasPriv('task', 'batchEdit') and count($tasks))echo html::selectAll() . html::selectReverse() . html::submitButton($lang->edit); 
                   echo $summary;
                 ?>
                 </div>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 6a4e77c77a..6b1269f5de 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -111,8 +111,8 @@ js::set('moduleID'  , $moduleID);
                <div class='f-left'>
                <?php
                echo html::selectAll() . html::selectReverse(); 
-               if(common::hasPriv('testcase', 'batchEdit'))echo html::submitButton($lang->testcase->batchEdit, "onclick='changeAction(\"" . inLink('batchEdit', "from=testcaseBrowse&productID=$productID&orderBy=$orderBy") . "\")'");
-               if(common::hasPriv('testtask', 'batchRun')) echo html::submitButton($lang->testtask->batchRun,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
+               if(common::hasPriv('testcase', 'batchEdit'))echo html::submitButton($lang->edit, "onclick='changeAction(\"" . inLink('batchEdit', "from=testcaseBrowse&productID=$productID&orderBy=$orderBy") . "\")'");
+               if(common::hasPriv('testtask', 'batchRun')) echo html::submitButton($lang->testtask->runCase,  "onclick='changeAction(\"" . $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy") . "\")'");
                ?>
                </div>
                <?php endif?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 82a2d87d6e..86f9009062 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -92,12 +92,12 @@ var moduleID   = '<?php echo $moduleID;?>';
               echo html::selectAll() . html::selectReverse();
               if(common::hasPriv('testcase', 'batchEdit')):
               ?>
-              <input class='button-s' value="<?php echo $lang->testcase->batchEdit; ?>" type="button" onclick="casesform.action='<?php echo $this->createLink('testcase', 'batchEdit', "from=testtaskCases&productID=$productID");?>';casesform.submit();">
+              <input class='button-s' value="<?php echo $lang->edit; ?>" type="button" onclick="casesform.action='<?php echo $this->createLink('testcase', 'batchEdit', "from=testtaskCases&productID=$productID");?>';casesform.submit();">
               <?php endif;?>
               <?php if(common::hasPriv('testtask', 'batchAssign')):?>
               <?php echo html::select('assignedTo', $users);?>
-              <input class='button-s' value="<?php echo $lang->testtask->batchAssign; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchAssign', "taskID=$task->id");?>';casesform.submit();">
-              <input class='button-s' value="<?php echo $lang->testtask->batchRun; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");?>';casesform.submit();">
+              <input class='button-s' value="<?php echo $lang->testtask->assign; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchAssign', "taskID=$task->id");?>';casesform.submit();">
+              <input class='button-s' value="<?php echo $lang->testtask->runCase; ?>" type="button" onclick="casesform.action='<?php echo inLink('batchRUN', "productID=$productID&orderBy=id_desc&from=testtask");?>';casesform.submit();">
               <?php endif;?>
               </div>
               <?php endif;?>