diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index fbab663eeb..a397e11ab8 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -18,8 +18,8 @@ $lang->bug->productplan      = '所属' . $lang->planCommon;
 $lang->bug->module           = '所属模块';
 $lang->bug->moduleAB         = '模块';
 $lang->bug->project          = '所属' . $lang->projectCommon;
-$lang->bug->story            = "相关{$lang->productSRCommon}";
-$lang->bug->storyVersion     = "{$lang->productSRCommon}版本";
+$lang->bug->story            = "相关{$lang->projectSRCommon}";
+$lang->bug->storyVersion     = "{$lang->projectSRCommon}版本";
 $lang->bug->color            = '标题颜色';
 $lang->bug->task             = '相关任务';
 $lang->bug->title            = 'Bug标题';
@@ -39,7 +39,7 @@ $lang->bug->activatedDate    = '激活日期';
 $lang->bug->confirmed        = '是否确认';
 $lang->bug->confirmedAB      = '确认';
 $lang->bug->toTask           = '转任务';
-$lang->bug->toStory          = "转{$lang->productSRCommon}";
+$lang->bug->toStory          = "转{$lang->projectSRCommon}";
 $lang->bug->mailto           = '抄送给';
 $lang->bug->openedBy         = '由谁创建';
 $lang->bug->openedByAB       = '创建者';
@@ -110,7 +110,7 @@ $lang->bug->exportAction       = '导出Bug';
 $lang->bug->delete             = '删除';
 $lang->bug->deleteAction       = '删除Bug';
 $lang->bug->deleted            = '已删除';
-$lang->bug->confirmStoryChange = "确认{$lang->productSRCommon}变动";
+$lang->bug->confirmStoryChange = "确认{$lang->projectSRCommon}变动";
 $lang->bug->copy               = '复制Bug';
 $lang->bug->search             = '搜索';
 
@@ -129,7 +129,7 @@ $lang->bug->postponedBugs      = '被延期';
 $lang->bug->overdueBugs        = '过期Bug';
 $lang->bug->allBugs            = '所有';
 $lang->bug->byQuery            = '搜索';
-$lang->bug->needConfirm        = "{$lang->productSRCommon}变动";
+$lang->bug->needConfirm        = "{$lang->projectSRCommon}变动";
 $lang->bug->allProduct         = '所有' . $lang->productCommon;
 $lang->bug->my                 = '我的';
 $lang->bug->yesterdayResolved  = '昨天解决Bug数';
@@ -159,7 +159,7 @@ $lang->bug->createBuild   = '创建';
 /* legend列表。*/
 $lang->bug->legendBasicInfo             = '基本信息';
 $lang->bug->legendAttatch               = '附件';
-$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->productSRCommon}/任务";
+$lang->bug->legendPrjStoryTask          = $lang->projectCommon . "/{$lang->projectSRCommon}/任务";
 $lang->bug->lblTypeAndSeverity          = '类型/严重程度';
 $lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
 $lang->bug->legendSteps                 = '重现步骤';
@@ -173,7 +173,7 @@ $lang->bug->buttonConfirm = '确认';
 
 /* 交互提示。*/
 $lang->bug->summary              = "本页共 <strong>%s</strong> 个Bug，未解决 <strong>%s</strong>。";
-$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、{$lang->productSRCommon}和任务发生变化，确定吗？";
+$lang->bug->confirmChangeProduct = "修改{$lang->productCommon}会导致相应的{$lang->projectCommon}、{$lang->projectSRCommon}和任务发生变化，确定吗？";
 $lang->bug->confirmDelete        = '您确认要删除该Bug吗？';
 $lang->bug->remindTask           = '该Bug已经转化为任务，是否更新任务(编号:%s)状态 ?';
 $lang->bug->skipClose            = 'Bug %s 不是已解决状态，不能关闭。';
@@ -270,7 +270,7 @@ $lang->bug->resolutionList['fixed']      = '已解决';
 $lang->bug->resolutionList['notrepro']   = '无法重现';
 $lang->bug->resolutionList['postponed']  = '延期处理';
 $lang->bug->resolutionList['willnotfix'] = "不予解决";
-$lang->bug->resolutionList['tostory']    = "转为{$lang->productSRCommon}";
+$lang->bug->resolutionList['tostory']    = "转为{$lang->projectSRCommon}";
 
 /* 统计报表。*/
 $lang->bug->report = new stdclass();
@@ -371,7 +371,7 @@ $lang->bug->report->bugHistories->graph->xAxisName          = '处理步骤';
 /* 操作记录。*/
 $lang->bug->action = new stdclass();
 $lang->bug->action->resolved            = array('main' => '$date, 由 <strong>$actor</strong> 解决，方案为 <strong>$extra</strong> $appendLink。', 'extra' => 'resolutionList');
-$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 转为<strong> ' . $lang->productSRCommon . '</strong>，编号为 <strong>$extra</strong>。');
+$lang->bug->action->tostory             = array('main' => '$date, 由 <strong>$actor</strong> 转为<strong> ' . $lang->projectSRCommon . '</strong>，编号为 <strong>$extra</strong>。');
 $lang->bug->action->totask              = array('main' => '$date, 由 <strong>$actor</strong> 导入为<strong>任务</strong>，编号为 <strong>$extra</strong>。');
 $lang->bug->action->linked2plan         = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->planCommon . ' <strong>$extra</strong>。');
 $lang->bug->action->unlinkedfromplan    = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->planCommon . '  <strong>$extra</strong> 移除。');
diff --git a/module/program/control.php b/module/program/control.php
index 43fc147b2f..cba9ea6364 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -788,6 +788,7 @@ class program extends control
      */
     public function PRJEdit($projectID = 0, $programID = 0)
     {
+        $this->app->loadLang('custom');
         $this->lang->navGroup->program = 'project';
         $this->app->loadLang('project');
         $this->loadModel('productplan');
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php
index 788cbdd732..41f33035d4 100644
--- a/module/program/view/prjedit.html.php
+++ b/module/program/view/prjedit.html.php
@@ -128,6 +128,12 @@
           <td></td>
         </tr>
         <?php endif;?>
+        <tr>
+          <th><?php echo $lang->program->PRJStoryConcept;?></th>
+          <td>
+            <?php echo html::select('storyConcept', $lang->custom->URSRList, $project->storyConcept, "class='form-control chosen'");?>
+          </td>
+        </tr>
         <tr>
           <th><?php echo $lang->program->PRJDesc;?></th>
           <td colspan='3'>
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index cf7abcf7f5..9b6c4ba3e5 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -57,12 +57,12 @@ $lang->project->totalLeft     = '剩余';
 $lang->project->progress      = '进度';
 $lang->project->hours         = '预计 %s 消耗 %s 剩余 %s';
 $lang->project->viewBug       = '查看bug';
-$lang->project->noProduct     = "无{$lang->productCommon}{$lang->projectCommon}";
-$lang->project->createStory   = "添加{$lang->productSRCommon}";
+$lang->project->noProduct     = "无{$lang->projectCommon}{$lang->projectCommon}";
+$lang->project->createStory   = "添加{$lang->projectSRCommon}";
 $lang->project->all           = '所有';
 $lang->project->undone        = '未完成';
 $lang->project->unclosed      = '未关闭';
-$lang->project->typeDesc      = "运维{$lang->projectCommon}没有{$lang->productSRCommon}、bug、版本、测试功能。";
+$lang->project->typeDesc      = "运维{$lang->projectCommon}没有{$lang->projectSRCommon}、bug、版本、测试功能。";
 $lang->project->mine          = '我负责：';
 $lang->project->other         = '其他：';
 $lang->project->deleted       = '已删除';
@@ -126,7 +126,7 @@ $lang->project->burnByList['storyPoint'] = '按故事点查看';
 $lang->project->index             = "{$lang->projectCommon}主页";
 $lang->project->task              = '任务列表';
 $lang->project->groupTask         = '分组浏览任务';
-$lang->project->story             = "{$lang->productSRCommon}列表";
+$lang->project->story             = "{$lang->projectSRCommon}列表";
 $lang->project->bug               = 'Bug列表';
 $lang->project->dynamic           = '动态';
 $lang->project->latestDynamic     = '最新动态';
@@ -140,10 +140,10 @@ $lang->project->team              = '团队成员';
 $lang->project->doc               = '文档列表';
 $lang->project->doclib            = '文档库列表';
 $lang->project->manageProducts    = '关联' . $lang->productCommon;
-$lang->project->linkStory         = "关联{$lang->productSRCommon}";
+$lang->project->linkStory         = "关联{$lang->projectSRCommon}";
 $lang->project->linkStoryByPlan   = "按照{$lang->planCommon}关联";
 $lang->project->linkPlan          = "关联{$lang->planCommon}";
-$lang->project->unlinkStoryTasks  = "未关联{$lang->productSRCommon}任务";
+$lang->project->unlinkStoryTasks  = "未关联{$lang->projectSRCommon}任务";
 $lang->project->linkedProducts    = '已关联';
 $lang->project->unlinkedProducts  = '未关联';
 $lang->project->view              = "{$lang->projectCommon}概况";
@@ -167,21 +167,21 @@ $lang->project->edit              = "编辑{$lang->projectCommon}";
 $lang->project->batchEdit         = "批量编辑";
 $lang->project->manageMembers     = '团队管理';
 $lang->project->unlinkMember      = '移除成员';
-$lang->project->unlinkStory       = "移除{$lang->productSRCommon}";
-$lang->project->unlinkStoryAB     = "移除{$lang->productSRCommon}";
-$lang->project->batchUnlinkStory  = "批量移除{$lang->productSRCommon}";
+$lang->project->unlinkStory       = "移除{$lang->projectSRCommon}";
+$lang->project->unlinkStoryAB     = "移除{$lang->projectSRCommon}";
+$lang->project->batchUnlinkStory  = "批量移除{$lang->projectSRCommon}";
 $lang->project->importTask        = '转入任务';
-$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->productSRCommon}";
+$lang->project->importPlanStories = "按{$lang->planCommon}关联{$lang->projectSRCommon}";
 $lang->project->importBug         = '导入Bug';
 $lang->project->updateOrder       = "{$lang->projectCommon}排序";
 $lang->project->tree              = '树状图';
 $lang->project->treeTask          = '只看任务';
-$lang->project->treeStory         = "只看{$lang->productSRCommon}";
+$lang->project->treeStory         = "只看{$lang->projectSRCommon}";
 $lang->project->treeOnlyTask      = '树状图只看任务';
-$lang->project->treeOnlyStory     = "树状图只看{$lang->productSRCommon}";
-$lang->project->storyKanban       = "{$lang->productSRCommon}看板";
-$lang->project->storySort         = "{$lang->productSRCommon}排序";
-$lang->project->importPlanStory   = '创建' . $lang->projectCommon . '成功！\n是否导入' . $lang->planCommon . '关联的相关' . $lang->productSRCommon . '？';
+$lang->project->treeOnlyStory     = "树状图只看{$lang->projectSRCommon}";
+$lang->project->storyKanban       = "{$lang->projectSRCommon}看板";
+$lang->project->storySort         = "{$lang->projectSRCommon}排序";
+$lang->project->importPlanStory   = '创建' . $lang->projectCommon . '成功！\n是否导入' . $lang->planCommon . '关联的相关' . $lang->projectSRCommon . '？';
 $lang->project->iteration         = '版本迭代';
 $lang->project->iterationInfo     = '迭代%s次';
 $lang->project->viewAll           = '查看所有';
@@ -201,7 +201,7 @@ $lang->project->statusSelects['closed']       = '已关闭';
 $lang->project->statusSelects['cancel']       = '已取消';
 
 $lang->project->groups['']           = '分组查看';
-$lang->project->groups['story']      = "{$lang->productSRCommon}分组";
+$lang->project->groups['story']      = "{$lang->projectSRCommon}分组";
 $lang->project->groups['status']     = '状态分组';
 $lang->project->groups['pri']        = '优先级分组';
 $lang->project->groups['assignedTo'] = '指派给分组';
@@ -210,7 +210,7 @@ $lang->project->groups['closedBy']   = '关闭者分组';
 $lang->project->groups['type']       = '类型分组';
 
 $lang->project->groupFilter['story']['all']         = '所有';
-$lang->project->groupFilter['story']['linked']      = "已关联{$lang->productSRCommon}的任务";
+$lang->project->groupFilter['story']['linked']      = "已关联{$lang->projectSRCommon}的任务";
 $lang->project->groupFilter['pri']['all']           = '所有';
 $lang->project->groupFilter['pri']['noset']         = '未设置';
 $lang->project->groupFilter['assignedTo']['undone'] = '未完成';
@@ -224,7 +224,7 @@ $lang->project->aboveAllProduct = "以上所有{$lang->productCommon}";
 $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
 
 /* 页面提示。*/
-$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->productSRCommon}全部关联到此{$lang->projectCommon}中";
+$lang->project->linkStoryByPlanTips = "此操作会将所选{$lang->planCommon}下面的{$lang->projectSRCommon}全部关联到此{$lang->projectCommon}中";
 $lang->project->selectProject       = "请选择{$lang->projectCommon}";
 $lang->project->beginAndEnd         = '起止时间';
 $lang->project->begin               = '开始日期';
@@ -242,9 +242,9 @@ $lang->project->groupSummaryAB      = "<div>总任务 <strong>%s : </strong><spa
 $lang->project->wbs                 = "分解任务";
 $lang->project->batchWBS            = "批量分解";
 $lang->project->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
-$lang->project->whyNoStories        = "看起来没有{$lang->productSRCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->productSRCommon}，而且要确保它们已经审核通过。";
-$lang->project->productStories      = "{$lang->projectCommon}关联的{$lang->productSRCommon}是{$lang->productCommon}{$lang->productSRCommon}的子集，并且只有评审通过的{$lang->productSRCommon}才能关联。请<a href='%s'>关联{$lang->productSRCommon}</a>。";
-$lang->project->haveDraft           = "有%s条草稿状态的{$lang->productSRCommon}无法关联到该{$lang->projectCommon}";
+$lang->project->whyNoStories        = "看起来没有{$lang->projectSRCommon}可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有{$lang->projectSRCommon}，而且要确保它们已经审核通过。";
+$lang->project->productStories      = "{$lang->projectCommon}关联的{$lang->projectSRCommon}是{$lang->productCommon}{$lang->projectSRCommon}的子集，并且只有评审通过的{$lang->projectSRCommon}才能关联。请<a href='%s'>关联{$lang->projectSRCommon}</a>。";
+$lang->project->haveDraft           = "有%s条草稿状态的{$lang->projectSRCommon}无法关联到该{$lang->projectCommon}";
 $lang->project->doneProjects        = '已结束';
 $lang->project->selectDept          = '选择部门';
 $lang->project->selectDeptTitle     = '选择一个部门的成员';
@@ -264,14 +264,14 @@ $lang->project->noMembers           = '暂时没有团队成员。';
 /* 交互提示。*/
 $lang->project->confirmDelete         = "您确定删除{$lang->projectCommon}[%s]吗？";
 $lang->project->confirmUnlinkMember   = "您确定从该{$lang->projectCommon}中移除该用户吗？";
-$lang->project->confirmUnlinkStory    = "您确定从该{$lang->projectCommon}中移除该{$lang->productSRCommon}吗？";
+$lang->project->confirmUnlinkStory    = "您确定从该{$lang->projectCommon}中移除该{$lang->projectSRCommon}吗？";
 $lang->project->errorNoLinkedProducts = "该{$lang->projectCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
 $lang->project->errorSameProducts     = "{$lang->projectCommon}不能关联多个相同的{$lang->productCommon}。";
 $lang->project->accessDenied          = "您无权访问该{$lang->projectCommon}！";
 $lang->project->tips                  = '提示';
 $lang->project->afterInfo             = "{$lang->projectCommon}添加成功，您现在可以进行以下操作：";
 $lang->project->setTeam               = '设置团队';
-$lang->project->linkStory             = "关联{$lang->productSRCommon}";
+$lang->project->linkStory             = "关联{$lang->projectSRCommon}";
 $lang->project->createTask            = '创建任务';
 $lang->project->goback                = "返回任务列表";
 $lang->project->noweekend             = '去除周末';
@@ -310,12 +310,12 @@ $lang->project->placeholder->totalLeft = "{$lang->projectCommon}开始时的总
 $lang->project->selectGroup = new stdclass();
 $lang->project->selectGroup->done = '(已结束)';
 
-$lang->project->orderList['order_asc']  = "{$lang->productSRCommon}排序正序";
-$lang->project->orderList['order_desc'] = "{$lang->productSRCommon}排序倒序";
-$lang->project->orderList['pri_asc']    = "{$lang->productSRCommon}优先级正序";
-$lang->project->orderList['pri_desc']   = "{$lang->productSRCommon}优先级倒序";
-$lang->project->orderList['stage_asc']  = "{$lang->productSRCommon}阶段正序";
-$lang->project->orderList['stage_desc'] = "{$lang->productSRCommon}阶段倒序";
+$lang->project->orderList['order_asc']  = "{$lang->projectSRCommon}排序正序";
+$lang->project->orderList['order_desc'] = "{$lang->projectSRCommon}排序倒序";
+$lang->project->orderList['pri_asc']    = "{$lang->projectSRCommon}优先级正序";
+$lang->project->orderList['pri_desc']   = "{$lang->projectSRCommon}优先级倒序";
+$lang->project->orderList['stage_asc']  = "{$lang->projectSRCommon}阶段正序";
+$lang->project->orderList['stage_desc'] = "{$lang->projectSRCommon}阶段倒序";
 
 $lang->project->kanban        = "看板";
 $lang->project->kanbanSetting = "看板设置";
@@ -352,7 +352,7 @@ $lang->project->featureBar['task']['unclosed']     = $lang->project->unclosed;
 $lang->project->featureBar['task']['assignedtome'] = $lang->project->assignedToMe;
 $lang->project->featureBar['task']['myinvolved']   = $lang->project->myInvolved;
 $lang->project->featureBar['task']['delayed']      = '已延期';
-$lang->project->featureBar['task']['needconfirm']  = "{$lang->productSRCommon}变更";
+$lang->project->featureBar['task']['needconfirm']  = "{$lang->projectSRCommon}变更";
 $lang->project->featureBar['task']['status']       = $lang->project->statusSelects[''];
 
 $lang->project->featureBar['all']['all']       = $lang->project->all;
@@ -366,4 +366,4 @@ $lang->project->treeLevel = array();
 $lang->project->treeLevel['all']   = '全部展开';
 $lang->project->treeLevel['root']  = '全部折叠';
 $lang->project->treeLevel['task']  = '全部显示';
-$lang->project->treeLevel['story'] = "只看{$lang->productSRCommon}";
+$lang->project->treeLevel['story'] = "只看{$lang->projectSRCommon}";
diff --git a/module/project/model.php b/module/project/model.php
index 53640269e7..f5e2cc408c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1556,7 +1556,12 @@ class projectModel extends model
         }
 
         /* Build search form. */
-        if($type == 'projectStory') $this->config->product->search['module'] = 'projectStory';
+        if($type == 'projectStory') 
+        {
+            $this->config->product->search['module'] = 'projectStory';
+        }
+
+        $this->config->product->search['fields']['title'] = str_replace($this->lang->productSRCommon, $this->lang->projectSRCommon, $this->lang->story->title);
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
         $this->config->product->search['params']['product']['values'] = $productPairs + array('all' => $this->lang->product->allProductsOfProject);
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 0f38ab7907..7fe637b735 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations  = 'Convert Relations';
 
 $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->projectSRCommon} and link {$lang->projectSRCommon} to the task. The closed {$lang->projectSRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
 
 $lang->story->common         = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version        = 'Version';
 $lang->story->plan           = 'Plan';
 $lang->story->planAB         = 'Plan';
 $lang->story->comment        = 'Kommentar';
-$lang->story->children       = "Child {$lang->productSRCommon}";
+$lang->story->children       = "Child {$lang->projectSRCommon}";
 $lang->story->childrenAB     = "C";
 $lang->story->linkStories    = 'Story verknüpfen';
 $lang->story->childStories   = 'Story aufteilen';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult     = 'Ergebnis wählen';
 $lang->story->mustChoosePreVersion = 'Version wählen um es umzukhren.';
 $lang->story->noStory              = 'Keine Storys. ';
 $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent   = "Can not delete parent {$lang->productSRCommon}";
-$lang->story->moveChildrenTips     = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
+$lang->story->cannotDeleteParent   = "Can not delete parent {$lang->projectSRCommon}";
+$lang->story->moveChildrenTips     = "Its Child {$lang->projectSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->projectSRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 
 $lang->story->form = new stdclass();
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 6e48397a9b..2b541c1bdc 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations  = 'Convert Relations';
 
 $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->projectSRCommon} and link {$lang->projectSRCommon} to the task. The closed {$lang->projectSRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
 
 $lang->story->common         = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version        = 'Version';
 $lang->story->plan           = 'Linked Plan';
 $lang->story->planAB         = 'Plan';
 $lang->story->comment        = 'Comment';
-$lang->story->children       = "Child {$lang->productSRCommon}";
+$lang->story->children       = "Child {$lang->projectSRCommon}";
 $lang->story->childrenAB     = "C";
 $lang->story->linkStories    = 'Linked Stories';
 $lang->story->childStories   = 'Decomposed Stories';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult     = 'Select Result';
 $lang->story->mustChoosePreVersion = 'Select a version to revert to.';
 $lang->story->noStory              = 'No stories yet. ';
 $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent   = "Can not delete parent {$lang->productSRCommon}";
-$lang->story->moveChildrenTips     = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
+$lang->story->cannotDeleteParent   = "Can not delete parent {$lang->projectSRCommon}";
+$lang->story->moveChildrenTips     = "Its Child {$lang->projectSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->projectSRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 
 $lang->story->form = new stdclass();
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 4669cf9aab..9b1175359a 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations  = 'Convert Relations';
 
 $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->projectSRCommon} and link {$lang->projectSRCommon} to the task. The closed {$lang->projectSRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
 
 $lang->story->common         = 'Story';
@@ -128,7 +128,7 @@ $lang->story->version        = 'Version';
 $lang->story->plan           = 'Intégrée Plans';
 $lang->story->planAB         = 'Plan';
 $lang->story->comment        = 'Commentaire';
-$lang->story->children       = "Enfant {$lang->productSRCommon}";
+$lang->story->children       = "Enfant {$lang->projectSRCommon}";
 $lang->story->childrenAB     = "C";
 $lang->story->linkStories    = 'Stories Liées';
 $lang->story->childStories   = 'Stories Décomposées';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult     = 'Sélect Résultat';
 $lang->story->mustChoosePreVersion = 'Sélect une version pour revenir en arrière.';
 $lang->story->noStory              = "Aucune story pour l'instant. ";
 $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent   = "Impossible de supprimer {$lang->productSRCommon} parent";
-$lang->story->moveChildrenTips     = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
+$lang->story->cannotDeleteParent   = "Impossible de supprimer {$lang->projectSRCommon} parent";
+$lang->story->moveChildrenTips     = "Its Child {$lang->projectSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->projectSRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 
 $lang->story->form = new stdclass();
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index c98798cdc4..e637e6dc02 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -81,7 +81,7 @@ $lang->story->convertRelations  = 'Convert Relations';
 
 $lang->story->skipStory       = '%s is a parent story. It cannot be closed.';
 $lang->story->closedStory     = 'Story %s is closed and will not be closed.';
-$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->productSRCommon} and link {$lang->productSRCommon} to the task. The closed {$lang->productSRCommon} will not be converted into tasks.";
+$lang->story->batchToTaskTips = "This action will create a task with the same name as the selected {$lang->projectSRCommon} and link {$lang->projectSRCommon} to the task. The closed {$lang->projectSRCommon} will not be converted into tasks.";
 $lang->story->successToTask   = "Converted to task.";
 
 $lang->story->common         = 'Câu chuyện';
@@ -128,7 +128,7 @@ $lang->story->version        = 'Phiên bản';
 $lang->story->plan           = 'Kế hoạch liên kết';
 $lang->story->planAB         = 'Kế hoạch';
 $lang->story->comment        = 'Nhận xét';
-$lang->story->children       = "$lang->productSRCommon} con";
+$lang->story->children       = "$lang->projectSRCommon} con";
 $lang->story->childrenAB     = "C";
 $lang->story->linkStories    = 'Câu chuyện liên kết';
 $lang->story->childStories   = 'Câu chuyện được phân rã';
@@ -262,8 +262,8 @@ $lang->story->mustChooseResult     = 'Chọn kết quả';
 $lang->story->mustChoosePreVersion = 'Chọn một phiên bản để chuyển thành.';
 $lang->story->noStory              = 'Không có câu chuyện nào';
 $lang->story->ignoreChangeStage    = 'Story %s is in Draft or Closed status. Please review it..';
-$lang->story->cannotDeleteParent   = "Không thể xóa {$lang->productSRCommon} mẹ";
-$lang->story->moveChildrenTips     = "Its Child {$lang->productSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->productSRCommon}.";
+$lang->story->cannotDeleteParent   = "Không thể xóa {$lang->projectSRCommon} mẹ";
+$lang->story->moveChildrenTips     = "Its Child {$lang->projectSRCommon} will be moved to the selected product when editing the linked product of Parent {$lang->projectSRCommon}.";
 $lang->story->changeTips           = 'The story associated with the requirements to change, click "Cancel" ignore this change, click "Confirm" to change the story.';
 
 $lang->story->form = new stdclass();
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index a714c02517..274279476f 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -118,44 +118,44 @@
                     </ul>
                     <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title"  data-provide="colorpicker">
                   </div>
-                  <?php if(strpos(",$showFields,", ',pri,') !== false): // begin print pri selector?>
-                  <span class="input-group-addon fix-border br-0"><?php echo $lang->testcase->pri;?></span>
-                  <?php
-                  $hasCustomPri = false;
-                  foreach($lang->testcase->priList as $priKey => $priValue)
-                  {
-                      if(!empty($priKey) and (string)$priKey != (string)$priValue)
-                      {
-                          $hasCustomPri = true;
-                          break;
-                      }
-                  }
-                  $priList = $lang->testcase->priList;
-                  if(end($priList)) unset($priList[0]);
-                  if(!isset($priList[$pri]))
-                  {
-                      reset($priList);
-                      $pri = key($priList);
-                  }
-                  ?>
-                  <?php if($hasCustomPri):?>
-                  <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>
-                  <?php else: ?>
-                  <?php ksort($priList);?>
-                  <div class="input-group-btn pri-selector" data-type="pri">
-                    <button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
-                      <span class="pri-text"><span class="label-pri label-pri-<?php echo empty($pri) ? '0' : $pri?>" title="<?php echo $pri?>"><?php echo $pri?></span></span> &nbsp;<span class="caret"></span>
-                    </button>
-                    <div class='dropdown-menu pull-right'>
-                      <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
-                    </div>
-                  </div>
-                  <?php endif; ?>
-                  <?php endif; // end print pri selector ?>
-                  <?php if(!$this->testcase->forceNotReview()):?>
-                  <span class="input-group-addon"><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview0'");?></span>
-                  <?php endif;?>
                 </div>
+                <?php if(strpos(",$showFields,", ',pri,') !== false): // begin print pri selector?>
+                <span class="input-group-addon fix-border br-0"><?php echo $lang->testcase->pri;?></span>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->testcase->priList as $priKey => $priValue)
+                {
+                    if(!empty($priKey) and (string)$priKey != (string)$priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                $priList = $lang->testcase->priList;
+                if(end($priList)) unset($priList[0]);
+                if(!isset($priList[$pri]))
+                {
+                    reset($priList);
+                    $pri = key($priList);
+                }
+                ?>
+                <?php if($hasCustomPri):?>
+                <?php echo html::select('pri', (array)$priList, $pri, "class='form-control'");?>
+                <?php else: ?>
+                <?php ksort($priList);?>
+                <div class="input-group-btn pri-selector" data-type="pri">
+                  <button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
+                    <span class="pri-text"><span class="label-pri label-pri-<?php echo empty($pri) ? '0' : $pri?>" title="<?php echo $pri?>"><?php echo $pri?></span></span> &nbsp;<span class="caret"></span>
+                  </button>
+                  <div class='dropdown-menu pull-right'>
+                    <?php echo html::select('pri', (array)$priList, $pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
+                  </div>
+                </div>
+                <?php endif; ?>
+                <?php endif; // end print pri selector ?>
+                <?php if(!$this->testcase->forceNotReview()):?>
+                <span class="input-group-addon"><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview0'");?></span>
+                <?php endif;?>
               </div>
             </td>
           </tr>