diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 523268bf59..1d1d63de9d 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->viewMenu->dynamic     = 'Dynamic|product|dynamic|productID=%s';
 $lang->product->viewMenu->project     = "Project|product|project|status=all&productID=%s";
 $lang->product->viewMenu->doc         = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->setting     = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
+$lang->product->viewMenu->set         = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
 
-$lang->product->settingMenu = new stdclass();
-$lang->product->settingMenu->branch    = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
-$lang->product->settingMenu->module    = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
-$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
+$lang->product->setMenu = new stdclass();
+$lang->product->setMenu->branch    = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
+$lang->product->setMenu->module    = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
+$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
 
 $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 75d1100f38..83aea2a8bb 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->viewMenu->dynamic     = 'Dynamic|product|dynamic|productID=%s';
 $lang->product->viewMenu->project     = "Project|product|project|status=all&productID=%s";
 $lang->product->viewMenu->doc         = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->setting     = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
+$lang->product->viewMenu->set         = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
 
-$lang->product->settingMenu = new stdclass();
-$lang->product->settingMenu->branch    = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
-$lang->product->settingMenu->module    = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
-$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
+$lang->product->setMenu = new stdclass();
+$lang->product->setMenu->branch    = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
+$lang->product->setMenu->module    = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
+$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
 
 $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 870abe447e..1e9a956c47 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->viewMenu->dynamic     = 'Dynamic|product|dynamic|productID=%s';
 $lang->product->viewMenu->project     = "Project|product|project|status=all&productID=%s";
 $lang->product->viewMenu->doc         = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->setting     = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
+$lang->product->viewMenu->set         = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
 
-$lang->product->settingMenu = new stdclass();
-$lang->product->settingMenu->branch    = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
-$lang->product->settingMenu->module    = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
-$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
+$lang->product->setMenu = new stdclass();
+$lang->product->setMenu->branch    = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
+$lang->product->setMenu->module    = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
+$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
 
 $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 3ccd697947..da4bd1d0b4 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap     = 'Roadmap|product|roadmap|productID=%s';
 $lang->product->viewMenu->dynamic     = 'Dynamic|product|dynamic|productID=%s';
 $lang->product->viewMenu->project     = "Project|product|project|status=all&productID=%s";
 $lang->product->viewMenu->doc         = array('link' => 'Doc|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->setting     = array('link' => 'Setting|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
+$lang->product->viewMenu->set         = array('link' => 'Setting|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
 
-$lang->product->settingMenu = new stdclass();
-$lang->product->settingMenu->branch    = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
-$lang->product->settingMenu->module    = array('link' => 'Module|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
-$lang->product->settingMenu->whitelist = array('link' => 'Whitelist|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
+$lang->product->setMenu = new stdclass();
+$lang->product->setMenu->branch    = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
+$lang->product->setMenu->module    = array('link' => 'Module|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
+$lang->product->setMenu->whitelist = array('link' => 'Whitelist|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
 
 $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 481a1c7930..796b2cc829 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -176,12 +176,12 @@ $lang->product->viewMenu->roadmap     = '路线图|product|roadmap|productID=%s'
 $lang->product->viewMenu->dynamic     = '动态|product|dynamic|productID=%s';
 $lang->product->viewMenu->project     = "项目|product|project|status=all&productID=%s";
 $lang->product->viewMenu->doc         = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc');
-$lang->product->viewMenu->setting     = array('link' => '设置|product|setting|mode=branch&productID=%s', 'alias' => 'addwhitelist');
+$lang->product->viewMenu->set         = array('link' => '设置|product|set|mode=branch&productID=%s', 'alias' => 'addwhitelist');
 
-$lang->product->settingMenu = new stdclass();
-$lang->product->settingMenu->branch    = array('link' => '@branch@|product|setting|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
-$lang->product->settingMenu->module    = array('link' => '模块|product|setting|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
-$lang->product->settingMenu->whitelist = array('link' => '白名单|product|setting|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
+$lang->product->setMenu = new stdclass();
+$lang->product->setMenu->branch    = array('link' => '@branch@|product|set|mode=branch&productID={PRODUCT}', 'subModule' => 'branch');
+$lang->product->setMenu->module    = array('link' => '模块|product|set|mode=module&productID={PRODUCT}', 'subModule' => 'tree');
+$lang->product->setMenu->whitelist = array('link' => '白名单|product|set|mode=whitelist&productID={PRODUCT}', 'subModule' => 'personnel');
 
 $lang->release     = new stdclass();
 $lang->branch      = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index 6d7ef6cf9b..1930dcc4d2 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -803,9 +803,9 @@ class commonModel extends model
         if($group == 'repo' || $group == 'ops' || $group == 'feedback') return;
         if($group == 'my') self::getMyModuleMenu($moduleName, $methodName);
         if($group == 'project') self::getProgramModuleMenu($moduleName);
-        if($moduleName == 'product' and ($methodName == 'setting' or $methodName == 'addwhitelist'))
+        if($moduleName == 'product' and ($methodName == 'set' or $methodName == 'addwhitelist'))
         {
-            $lang->product->menu = $lang->product->settingMenu;
+            $lang->product->menu = $lang->product->setMenu;
             self::processMenuVars($lang->product->menu);
         }
 
diff --git a/module/doc/control.php b/module/doc/control.php
index 5aaea8446f..f02361401f 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -112,7 +112,6 @@ class doc extends control
         if($from == 'product')
         {
             $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menu      = $this->lang->product->menu;
             $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
             $this->product->setMenu($this->product->getPairs(), $lib->product);
             $this->lang->set('menugroup.doc', 'product');
@@ -864,7 +863,6 @@ class doc extends control
         if($from == 'product')
         {
             $this->lang->navGroup->doc  = 'product';
-            $this->lang->doc->menu      = $this->lang->product->menu;
             $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
             $this->product->setMenu($this->product->getPairs(), $objectID);
             $this->lang->set('menugroup.doc', 'product');
diff --git a/module/product/control.php b/module/product/control.php
index d520f59584..f1f9da9fdc 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -672,7 +672,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function setting($mode = 'branch', $productID)
+    public function set($mode = 'branch', $productID)
     {
         $moduleIndex = array_search('product', $this->lang->noMenuModule);
         if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
diff --git a/module/product/model.php b/module/product/model.php
index 2395b93dd4..f0a631c005 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -115,7 +115,7 @@ class productModel extends model
         $this->app->loadLang('product');
         if(!$productID)
         {
-            unset($this->lang->product->settingMenu->branch);
+            unset($this->lang->product->setMenu->branch);
             return;
         }
         $isMobile = $this->app->viewType == 'mhtml';
@@ -133,11 +133,11 @@ class productModel extends model
             $output .= "</div></div>";
             if($isMobile) $output = "<a id='currentItem' href=\"javascript:showSearchMenu('product', '$productID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentProduct->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
 
-            if($currentProduct->type == 'normal') unset($this->lang->product->settingMenu->branch);
+            if($currentProduct->type == 'normal') unset($this->lang->product->setMenu->branch);
             if($currentProduct->type != 'normal' && $currentModule != 'programplan')
             {
                 $this->lang->product->branch = $this->lang->product->branchName[$currentProduct->type];
-                $this->lang->product->settingMenu->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->settingMenu->branch);
+                $this->lang->product->setMenu->branch = str_replace('@branch@', $this->lang->product->branch, $this->lang->product->setMenu->branch);
 
                 $branches   = $this->loadModel('branch')->getPairs($productID);
                 $branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 32321a1302..56973aa6a0 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -78,7 +78,7 @@ class testsuiteModel extends model
     {
         if(!$productID)
         {
-            unset($this->lang->product->settingMenu->branch);
+            unset($this->lang->product->setMenu->branch);
             return;
         }