diff --git a/module/bug/config/search.php b/module/bug/config/search.php
index 67ad972a70..cb7ee71233 100644
--- a/module/bug/config/search.php
+++ b/module/bug/config/search.php
@@ -15,7 +15,7 @@ $config->bug->search['fields']['story']          = $lang->bug->story;
 $config->bug->search['fields']['project']        = $lang->bug->project;
 $config->bug->search['fields']['product']        = $lang->bug->product;
 $config->bug->search['fields']['branch']         = '';
-$config->bug->search['fields']['plan']           = $lang->bug->productplan;
+$config->bug->search['fields']['plan']           = $lang->bug->plan;
 $config->bug->search['fields']['id']             = $lang->bug->id;
 $config->bug->search['fields']['execution']      = $lang->bug->execution;
 
diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php
index 452885f9ec..436f8bfdc2 100644
--- a/module/bug/lang/de.php
+++ b/module/bug/lang/de.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'ID';
 $lang->bug->product          = $lang->productCommon;
 $lang->bug->branch           = 'Branch/Platform';
-$lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Modul';
 $lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 7f5431e1e8..fb3077567e 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'ID';
 $lang->bug->product          = $lang->productCommon;
 $lang->bug->branch           = 'Branch/Platform';
-$lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php
index 2a6c11083b..d6a78886da 100644
--- a/module/bug/lang/fr.php
+++ b/module/bug/lang/fr.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'ID';
 $lang->bug->product          = $lang->productCommon;
 $lang->bug->branch           = 'Branche/Plateforme';
-$lang->bug->productplan      = 'Plan';
 $lang->bug->module           = 'Module';
 $lang->bug->project          = $lang->projectCommon;
 $lang->bug->execution        = $lang->execution->common;
diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php
index 36624db674..98741148cc 100644
--- a/module/bug/lang/vi.php
+++ b/module/bug/lang/vi.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'ID';
 $lang->bug->product          = $lang->productCommon;
 $lang->bug->branch           = 'Branch/Platform';
-$lang->bug->productplan      = 'Kế hoạch';
 $lang->bug->module           = 'Module';
 $lang->bug->project          = 'Project';
 $lang->bug->execution        = $lang->execution->common;
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index 361a229bea..bf323dc3e7 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'Bug编号';
 $lang->bug->product          = '所属' . $lang->productCommon;
 $lang->bug->branch           = '平台/分支';
-$lang->bug->productplan      = '所属' . '计划';
 $lang->bug->module           = '所属模块';
 $lang->bug->project          = '所属' . $lang->projectCommon;
 $lang->bug->execution        = '所属' . $lang->execution->common;
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index bc63b67ca9..8889cbbf2d 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -14,7 +14,6 @@ $lang->bug->common           = 'Bug';
 $lang->bug->id               = 'Bug編號';
 $lang->bug->product          = '所屬' . $lang->productCommon;
 $lang->bug->branch           = '分支/平台';
-$lang->bug->productplan      = '所屬' . '計劃';
 $lang->bug->module           = '所屬模組';
 $lang->bug->project          = '所屬項目';
 $lang->bug->execution        = '所屬' . $lang->execution->common;
diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index e33dc5c3a0..13cf70bca9 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -131,7 +131,7 @@ panel
                 ),
                 formGroup
                 (
-                    set::label($lang->bug->productplan),
+                    set::label($lang->bug->plan),
                     inputGroup
                     (
                         set('id', 'planBox'),
diff --git a/module/bug/ui/view.html.php b/module/bug/ui/view.html.php
index 57a444e0b9..b8d84b663f 100644
--- a/module/bug/ui/view.html.php
+++ b/module/bug/ui/view.html.php
@@ -116,7 +116,7 @@ $legendBasic = array();
 $legendBasic['product']        = array('name' => $lang->bug->product,        'text' => $product->name, 'href' => $productLink, 'attr' => array('data-app' => 'product'));
 $legendBasic['branch']         = array('name' => $branchTitle,               'text' => $branchName,    'href' => $branchLink);
 $legendBasic['module']         = array('name' => $lang->bug->module,         'text' => $moduleTitle);
-$legendBasic['productplan']    = array('name' => $lang->bug->productplan,    'text' => $bug->planName, 'href' => $planLink);
+$legendBasic['productplan']    = array('name' => $lang->bug->plan,           'text' => $bug->planName, 'href' => $planLink);
 $legendBasic['type']           = array('name' => $lang->bug->type,           'text' => zget($lang->bug->typeList, $bug->type));
 $legendBasic['status']         = array('name' => $lang->bug->status,         'text' => $this->processStatus('bug', $bug), 'attr' => array('class' => 'status-' . $bug->status));
 $legendBasic['severity']       = array('name' => $lang->bug->severity,       'text' => severityLabel(set::level(zget($lang->bug->severityList, $bug->severity)), set::isIcon(true)));
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index 8f3c952039..e6efae96a2 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -58,7 +58,7 @@
             <th class='c-branch'><?php echo $lang->bug->branch;?></th>
             <?php endif;?>
             <th class='c-module<?php echo zget($requiredFields, 'module', '', ' required');?>'> <?php echo $lang->bug->module;?></th>
-            <th class='c-plan<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
+            <th class='c-plan<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->plan;?></th>
             <th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
             <th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
             <th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index c5dbe857e0..31ed2a4048 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -126,7 +126,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                   </td>
                 </tr>
                 <tr class='<?php if($product->shadow and isset($project) and empty($project->multiple)) echo 'hide'?>'>
-                  <th><?php echo $lang->bug->productplan;?></th>
+                  <th><?php echo $lang->bug->plan;?></th>
                   <td>
                     <span id="planIdBox"><?php echo html::select('plan', $plans, $bug->plan, "class='form-control chosen'");?></span>
                   </td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 2a7b230327..b6d4ea4037 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -162,7 +162,7 @@
                   <td><?php if($bug->case) echo html::a(helper::createLink('testcase', 'view', "caseID=$bug->case&version=$bug->caseVersion", '', true), "<i class='icon icon-sitemap'></i> {$lang->bug->fromCase}$lang->colon$bug->case", '', isonlybody() ? '' : "data-toggle='modal' data-type='iframe' data-width='80%'");?></td>
                 </tr>
                 <tr valign='middle' class='<?php if($product->shadow and isset($project) and empty($project->multiple)) echo 'hide'?>'>
-                  <th><?php echo $lang->bug->productplan;?></th>
+                  <th><?php echo $lang->bug->plan;?></th>
                   <td><?php if(!$bug->plan or !common::printLink('productplan', 'view', "planID=$bug->plan&type=bug", $bug->planName)) echo $bug->planName;?></td>
                 </tr>
                 <tr>