diff --git a/api/v1/entries/programs.php b/api/v1/entries/programs.php
index 1eccac99f3..d20d11690a 100644
--- a/api/v1/entries/programs.php
+++ b/api/v1/entries/programs.php
@@ -22,7 +22,7 @@ class programsEntry extends Entry
         $_COOKIE['showClosed'] = $this->param('showClosed', 0);
         $mergeChildren = $this->param('mergeChildren', 0);
 
-        $this->config->systemMode = 'new';
+        $this->config->systemMode = 'ALM';
 
         $fields = $this->param('fields', '');
         if(stripos(strtolower(",{$fields},"), ",dropmenu,") !== false) return $this->getDropMenu();
diff --git a/api/v1/entries/projects.php b/api/v1/entries/projects.php
index 53a8658c86..db1b689d84 100644
--- a/api/v1/entries/projects.php
+++ b/api/v1/entries/projects.php
@@ -26,7 +26,7 @@ class projectsEntry extends entry
 
         $_COOKIE['involved'] = $this->param('involved', 0);
 
-        $this->config->systemMode = 'new';
+        $this->config->systemMode = 'ALM';
 
         if($programID)
         {
diff --git a/extension/lite/block/ext/control/welcome.php b/extension/lite/block/ext/control/welcome.php
index 22ce608d4f..cb4b8f438d 100644
--- a/extension/lite/block/ext/control/welcome.php
+++ b/extension/lite/block/ext/control/welcome.php
@@ -21,7 +21,7 @@ class myBlock extends block
             ->orWhere('t3.status')->ne('suspended')
             ->markRight(1)
             ->andWhere('t1.deleted')->eq('0')
-            ->beginIF($this->config->systemMode == 'new')->andWhere('t2.deleted')->eq('0')->fi()
+            ->beginIF($this->config->systemMode == 'ALM')->andWhere('t2.deleted')->eq('0')->fi()
             ->andWhere('t3.deleted')->eq('0')
             ->andWhere('t1.vision')->eq($this->config->vision)
             ->fetchAll('id');
diff --git a/extension/lite/execution/ext/view/create.html.php b/extension/lite/execution/ext/view/create.html.php
index c39bedc1b0..dc5997f855 100644
--- a/extension/lite/execution/ext/view/create.html.php
+++ b/extension/lite/execution/ext/view/create.html.php
@@ -26,7 +26,6 @@
 <?php js::set('productID', empty($productID) ? 0 : $productID);?>
 <?php js::set('isStage', $isStage);?>
 <?php js::set('copyExecutionID', $copyExecutionID);?>
-<?php js::set('systemMode', $config->systemMode);?>
 <?php js::set('projectCommon', $lang->project->common);?>
 <?php js::set('multiBranchProducts', $multiBranchProducts);?>
 <?php js::set('systemMode', $config->systemMode);?>
@@ -38,7 +37,7 @@
     </div>
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
-        <?php if($config->systemMode == 'new'):?>
+        <?php if($config->systemMode == 'ALM'):?>
         <tr>
           <th class='w-120px'><?php echo $lang->execution->projectName;?></th>
           <td class="col-main"><?php echo html::select("project", $allProjects, $projectID, "class='form-control chosen' required onchange='refreshPage(this.value)'");?></td>
diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php
index a5e4409b96..5117a5df52 100644
--- a/extension/lite/group/ext/lang/resource.php
+++ b/extension/lite/group/ext/lang/resource.php
@@ -149,7 +149,7 @@ $lang->personnel->methodOrder[15] = 'whitelist';
 $lang->personnel->methodOrder[20] = 'addWhitelist';
 $lang->personnel->methodOrder[25] = 'unbindWhitelist';
 
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->resource->my->project = 'project';
 
@@ -158,7 +158,7 @@ if($config->systemMode == 'new')
     $lang->resource->project->index               = 'index';
     $lang->resource->project->browse              = 'browse';
     $lang->resource->project->kanban              = 'kanban';
-//    $lang->resource->project->programTitle        = 'moduleOpen';
+  //$lang->resource->project->programTitle        = 'moduleOpen';
     $lang->resource->project->create              = 'create';
     $lang->resource->project->edit                = 'edit';
     $lang->resource->project->batchEdit           = 'batchEdit';
diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php
index 51885c6128..1c034610cb 100644
--- a/extension/lite/my/ext/view/task.html.php
+++ b/extension/lite/my/ext/view/task.html.php
@@ -58,7 +58,7 @@
           </th>
           <th class='c-pri'><?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
           <th class='c-name'><?php common::printOrderLink('name',       $orderBy, $vars, $lang->task->name);?></th>
-          <?php if($config->systemMode == 'new'):?>
+          <?php if($config->systemMode == 'ALM'):?>
           <th class='c-project'><?php common::printOrderLink('project',    $orderBy, $vars, $lang->my->projects);?></th>
           <?php endif;?>
           <th class='c-project'><?php common::printOrderLink('execution',  $orderBy, $vars, $lang->my->executions);?></th>
@@ -109,7 +109,7 @@
             ?>
             <?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
           </td>
-          <?php if($config->systemMode == 'new'):?>
+          <?php if($config->systemMode == 'ALM'):?>
           <td class='c-project' title="<?php echo $task->projectName;?>"><?php echo html::a($this->createLink('project', 'index', "projectID=$task->project"), $task->projectName);?></td>
           <?php endif;?>
           <td class='c-project' title="<?php echo $task->executionName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$task->execution"), $task->executionName, '');?></td>
@@ -179,7 +179,7 @@
               <?php if($child->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
               <?php echo html::a($this->createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?>
             </td>
-            <?php if($config->systemMode == 'new'):?>
+            <?php if($config->systemMode == 'ALM'):?>
             <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('project', 'view', "projectID=$child->project"), $child->projectName);?></td>
             <?php endif;?>
             <td class='c-project' title="<?php echo $child->projectName;?>"><?php echo html::a($this->createLink('execution', 'task', "executionID=$child->project"), $child->executionName, '');?></td>
diff --git a/extension/lite/user/ext/view/featurebar.html.php b/extension/lite/user/ext/view/featurebar.html.php
index a73135924e..66612cb338 100644
--- a/extension/lite/user/ext/view/featurebar.html.php
+++ b/extension/lite/user/ext/view/featurebar.html.php
@@ -42,7 +42,7 @@
     $active = ($methodName == 'story' and $storyType == 'story')  ? ' btn-active-text' : '';
     common::printLink('user', 'story', "userID={$user->id}&storyType=story", $label, '', "class='btn btn-link $active SRTab'");
 
-    if($this->config->systemMode == 'new')
+    if($this->config->systemMode == 'ALM')
     {
         $label  = "<span class='text'>{$lang->user->execution}</span>";
         $active = $methodName == 'execution' ? ' btn-active-text' : '';
diff --git a/module/action/config.php b/module/action/config.php
index a582a4d737..053d148d83 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -69,8 +69,8 @@ $config->action->ignoreObjectType4Dynamic = 'kanbanregion,kanbanlane,kanbancolum
 $config->action->preferredTypeNum = 10;
 
 $config->action->preferredType = new stdclass();
-$config->action->preferredType->new  = array('user', 'story', 'task', 'bug', 'case', 'doc', 'program', 'product', 'project', 'execution');
-$config->action->preferredType->lean = array('user', 'story', 'task', 'bug', 'case', 'doc', 'product', 'project', 'execution');
+$config->action->preferredType->ALM   = array('user', 'story', 'task', 'bug', 'case', 'doc', 'program', 'product', 'project', 'execution');
+$config->action->preferredType->light = array('user', 'story', 'task', 'bug', 'case', 'doc', 'product', 'project', 'execution');
 
 global $app, $lang;
 $app->loadLang('action');
diff --git a/module/action/control.php b/module/action/control.php
index 78861c4853..fb83740280 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -103,8 +103,8 @@ class action extends control
 
         $preferredType       = array();
         $moreType            = array();
-        $preferredTypeConfig = $this->config->action->preferredType->new;
-        if($this->config->systemMode == 'lean') $preferredTypeConfig = $this->config->action->preferredType->lean;
+        $preferredTypeConfig = $this->config->action->preferredType->ALM;
+        if($this->config->systemMode == 'light') $preferredTypeConfig = $this->config->action->preferredType->light;
         foreach($objectTypeList as $objectType)
         {
             if(!isset($this->config->objectTables[$objectType])) continue;
diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index d34c767934..40ccd09b94 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -224,7 +224,7 @@ $lang->action->desc->reopen               = '$date, reopened by <strong>$actor</
 $lang->action->desc->merged               = '$date, merged by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->submitreview         = '$date, submitted for review by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->ganttmove            = '$date, sort by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->switchtolean         = '$date, Switch from new mode to lean mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
+$lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the sprints of the project from the $extra.' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
@@ -394,7 +394,7 @@ $lang->action->label->tolib                 = 'imported';
 $lang->action->label->updatetolib           = 'updated';
 $lang->action->label->ganttmove             = 'sorted';
 $lang->action->label->submitreview          = 'submitted';
-$lang->action->label->switchtolean          = 'switch from new mode to lean mode';
+$lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
 $lang->action->label->unlinkproduct         = 'Unlinked Product';
@@ -417,13 +417,13 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']       = 'Create Project';
-$lang->action->dynamicAction->project['edited']       = 'Edit Project';
-$lang->action->dynamicAction->project['started']      = 'Start Project';
-$lang->action->dynamicAction->project['suspended']    = 'Suspend Project';
-$lang->action->dynamicAction->project['activated']    = 'Activate Project';
-$lang->action->dynamicAction->project['closed']       = 'Close Project';
-$lang->action->dynamicAction->project['switchtolean'] = 'Switch Mode';
+$lang->action->dynamicAction->project['opened']        = 'Create Project';
+$lang->action->dynamicAction->project['edited']        = 'Edit Project';
+$lang->action->dynamicAction->project['started']       = 'Start Project';
+$lang->action->dynamicAction->project['suspended']     = 'Suspend Project';
+$lang->action->dynamicAction->project['activated']     = 'Activate Project';
+$lang->action->dynamicAction->project['closed']        = 'Close Project';
+$lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Create ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']    = 'Edit ' . $lang->productCommon;
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 891ba83336..d81a9e8162 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -224,7 +224,7 @@ $lang->action->desc->reopen               = '$date, reopened by <strong>$actor</
 $lang->action->desc->merged               = '$date, merged by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->submitreview         = '$date, submitted for review by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->ganttmove            = '$date, sort by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->switchtolean         = '$date, Switch from new mode to lean mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
+$lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the sprints of the project from the $extra.' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
@@ -394,7 +394,7 @@ $lang->action->label->tolib                 = 'imported';
 $lang->action->label->updatetolib           = 'updated';
 $lang->action->label->ganttmove             = 'sorted';
 $lang->action->label->submitreview          = 'submitted';
-$lang->action->label->switchtolean          = 'switch from new mode to lean mode';
+$lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
 $lang->action->label->unlinkproduct         = 'Unlinked Product';
@@ -417,13 +417,13 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']       = 'Create Project';
-$lang->action->dynamicAction->project['edited']       = 'Edit Project';
-$lang->action->dynamicAction->project['started']      = 'Start Project';
-$lang->action->dynamicAction->project['suspended']    = 'Suspend Project';
-$lang->action->dynamicAction->project['activated']    = 'Activate Project';
-$lang->action->dynamicAction->project['closed']       = 'Close Project';
-$lang->action->dynamicAction->project['switchtolean'] = 'Switch Mode';
+$lang->action->dynamicAction->project['opened']        = 'Create Project';
+$lang->action->dynamicAction->project['edited']        = 'Edit Project';
+$lang->action->dynamicAction->project['started']       = 'Start Project';
+$lang->action->dynamicAction->project['suspended']     = 'Suspend Project';
+$lang->action->dynamicAction->project['activated']     = 'Activate Project';
+$lang->action->dynamicAction->project['closed']        = 'Close Project';
+$lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Create ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']    = 'Edit ' . $lang->productCommon;
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index cc9a594369..764d4f04af 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -224,7 +224,7 @@ $lang->action->desc->reopen               = '$date, reopened by <strong>$actor</
 $lang->action->desc->merged               = '$date, merged by <strong>$actor</strong> .' . "\n";
 $lang->action->desc->submitreview         = '$date, submitted for review by <strong>$actor</strong>.' . "\n";
 $lang->action->desc->ganttmove            = '$date, sort by <strong>$actor</strong> .' . "\n";
-$lang->action->desc->switchtolean         = '$date, Switch from new mode to lean mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
+$lang->action->desc->switchtolight        = '$date, Switch from ALM mode to light mode by <strong>'. $lang->admin->system .'</strong>.' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, the project is disassociated from the $extra, synchronization disassociates the sprints of the project from the $extra.' . "\n";
 
 /* Used to describe the history of operations related to parent-child tasks. */
@@ -394,7 +394,7 @@ $lang->action->label->tolib                 = 'Importé';
 $lang->action->label->updatetolib           = 'MàJ';
 $lang->action->label->ganttmove             = 'sorted';
 $lang->action->label->submitreview          = 'submitted';
-$lang->action->label->switchtolean          = 'switch from new mode to lean mode';
+$lang->action->label->switchtolight         = 'switch from ALM mode to light mode';
 $lang->action->label->linkedrepo            = 'Linked Code Repo';
 $lang->action->label->unlinkedrepo          = 'Unlinked Code Repo';
 $lang->action->label->unlinkproduct         = 'Unlinked Product';
@@ -417,13 +417,13 @@ $lang->action->dynamicAction->program['activated'] = 'Activate Program';
 $lang->action->dynamicAction->program['deleted']   = 'Delete Program';
 $lang->action->dynamicAction->program['closed']    = 'Close Program';
 
-$lang->action->dynamicAction->project['opened']       = 'Créer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['edited']       = 'Editer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['started']      = 'Commencer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['suspended']    = 'Suspendre ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['activated']    = 'Activer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['closed']       = 'Fermer ' . $lang->executionCommon;
-$lang->action->dynamicAction->project['switchtolean'] = 'Switch Mode';
+$lang->action->dynamicAction->project['opened']        = 'Créer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['edited']        = 'Editer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['started']       = 'Commencer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['suspended']     = 'Suspendre ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['activated']     = 'Activer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['closed']        = 'Fermer ' . $lang->executionCommon;
+$lang->action->dynamicAction->project['switchtolight'] = 'Switch Mode';
 
 $lang->action->dynamicAction->product['opened']    = 'Créer ' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']    = 'Editer ' . $lang->productCommon;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 4b8375e262..6cedccbb1d 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -224,7 +224,7 @@ $lang->action->desc->reopen               = '$date, 由 <strong>$actor</strong>
 $lang->action->desc->merged               = '$date, 由 <strong>$actor</strong> 合并。' . "\n";
 $lang->action->desc->submitreview         = '$date, 由 <strong>$actor</strong> 提交评审。' . "\n";
 $lang->action->desc->ganttmove            = '$date, 由 <strong>$actor</strong> 排序。' . "\n";
-$lang->action->desc->switchtolean         = '$date, 由 <strong>'. $lang->admin->system .'</strong> 从综合模式切换为迅捷模式。' . "\n";
+$lang->action->desc->switchtolight        = '$date, 由 <strong>'. $lang->admin->system .'</strong> 从全生命周期管理模式切换为轻量管理模式。' . "\n";
 $lang->action->desc->unlinkproduct        = '$date, 系统判断由于迭代所属项目与$extra取消关联，同步将迭代与$extra取消关联。' . "\n";
 
 /* 用来描述和父子任务相关的操作历史记录。*/
@@ -394,7 +394,7 @@ $lang->action->label->tolib                 = '导入了';
 $lang->action->label->updatetolib           = '更新了';
 $lang->action->label->ganttmove             = '排序了';
 $lang->action->label->submitreview          = '提交了评审';
-$lang->action->label->switchtolean          = '从综合模式切换为迅捷模式';
+$lang->action->label->switchtolight         = '从全生命周期管理模式切换为轻量管理模式';
 $lang->action->label->linkedrepo            = '关联代码库到';
 $lang->action->label->unlinkedrepo          = '取消了项目与代码库的关联';
 $lang->action->label->unlinkproduct         = '取消了与产品的关联';
@@ -417,13 +417,13 @@ $lang->action->dynamicAction->program['activated'] = '激活项目集';
 $lang->action->dynamicAction->program['deleted']   = '删除项目集';
 $lang->action->dynamicAction->program['closed']    = '关闭项目集';
 
-$lang->action->dynamicAction->project['opened']       = '创建项目';
-$lang->action->dynamicAction->project['edited']       = '编辑项目';
-$lang->action->dynamicAction->project['started']      = '开始项目';
-$lang->action->dynamicAction->project['suspended']    = '延期项目';
-$lang->action->dynamicAction->project['activated']    = '激活项目';
-$lang->action->dynamicAction->project['closed']       = '关闭项目';
-$lang->action->dynamicAction->project['switchtolean'] = '切换模式';
+$lang->action->dynamicAction->project['opened']        = '创建项目';
+$lang->action->dynamicAction->project['edited']        = '编辑项目';
+$lang->action->dynamicAction->project['started']       = '开始项目';
+$lang->action->dynamicAction->project['suspended']     = '延期项目';
+$lang->action->dynamicAction->project['activated']     = '激活项目';
+$lang->action->dynamicAction->project['closed']        = '关闭项目';
+$lang->action->dynamicAction->project['switchtolight'] = '切换模式';
 
 $lang->action->dynamicAction->product['opened']    = '创建' . $lang->productCommon;
 $lang->action->dynamicAction->product['edited']    = '编辑' . $lang->productCommon;
diff --git a/module/action/model.php b/module/action/model.php
index df0af1c69d..f305d0d4d2 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1090,7 +1090,7 @@ class actionModel extends model
             ->markRight(1)
             /* Types excluded from Lite. */
             ->beginIF($this->config->vision == 'lite')->andWhere('objectType')->notin('product')->fi()
-            ->beginIF($this->config->systemMode == 'lean')->andWhere('objectType')->notin('program')->fi()
+            ->beginIF($this->config->systemMode == 'light')->andWhere('objectType')->notin('program')->fi()
             ->beginIF($productID == 'notzero')->andWhere('product')->gt(0)->andWhere('product')->notlike('%,0,%')->fi()
             ->beginIF($projectID == 'notzero')->andWhere('project')->gt(0)->fi()
             ->beginIF($executionID == 'notzero')->andWhere('execution')->gt(0)->fi()
diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 6f0fba3ac8..dc31661af3 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -564,7 +564,7 @@ $lang->block->gridOptions[4] = 'Rechts';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Abteilung erstellen', 'Benutzer erstellen', 'Rechte pflegen');
-if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Besitzer', $lang->productCommon . ' erstellen', 'Module pflegen', 'Pläne pflegen', 'Storys pflegen', 'Release erstellen');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 1c28ad31b8..6d15304c9b 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -564,7 +564,7 @@ $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
-if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index d64e912b3f..d06a0f7a59 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -564,7 +564,7 @@ $lang->block->gridOptions[4] = 'Right';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('Administrateur', 'Ajoute Compartiment', 'Ajoute Utilisateurs', 'Administre Privilèges');
-if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('Program Owner', 'Create Program', 'Link Product', "Create Project", "Budgeting and planning", 'Add Stakeholder');
 $lang->block->flowchart['product'] = array($lang->productCommon . ' Owner', 'Ajoute ' . $lang->productCommon . '/Modules', 'Ajoute ' . $lang->executionCommon . 's', 'Ajoute Stories', 'Maintient Plans', 'Crée Releases');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
 $lang->block->flowchart['project'] = array('Project Manager', 'Add projects and ' . $lang->executionCommon . 's', 'Maintain Teams', 'Link Stories', 'Create Tasks', 'Track');
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 6185ec96ab..763aa29ed0 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -564,7 +564,7 @@ $lang->block->gridOptions[4] = '右侧';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('管理员', '维护公司', '添加用户', '维护权限');
-if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('项目集负责人', '创建项目集', '关联产品', "创建项目", "制定预算和规划", '添加干系人');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('项目集负责人', '创建项目集', '关联产品', "创建项目", "制定预算和规划", '添加干系人');
 $lang->block->flowchart['product'] = array($lang->productCommon . '经理', '创建' . $lang->productCommon, '维护模块', "维护计划", "维护需求", '创建发布');
 $lang->block->flowchart['project'] = array('项目经理', '创建项目、' . $lang->executionCommon, '维护团队', "关联需求", '分解任务', '跟踪进度');
 $lang->block->flowchart['dev']     = array('研发人员', '领取任务和Bug', '设计实现方案', '更新状态', '完成任务和Bug', '提交代码');
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 96818c2410..a821639e8e 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -534,7 +534,7 @@ $lang->block->gridOptions[4] = '右側';
 
 $lang->block->flowchart            = array();
 $lang->block->flowchart['admin']   = array('管理員', '維護公司', '添加用戶', '維護權限');
-if($config->systemMode == 'new') $lang->block->flowchart['program'] = array('項目集負責人', '創建項目集', '關聯產品', "創建項目", "制定預算和規劃", '添加干係人');
+if($config->systemMode == 'ALM') $lang->block->flowchart['program'] = array('項目集負責人', '創建項目集', '關聯產品', "創建項目", "制定預算和規劃", '添加干係人');
 $lang->block->flowchart['product'] = array($lang->productCommon . '經理', '創建' . $lang->productCommon, '維護模組', "維護計劃", "維護需求", '創建發佈');
 $lang->block->flowchart['project'] = array('項目經理', '創建項目、' . $lang->executionCommon, '維護團隊', "關聯需求", '分解任務', '跟蹤進度');
 $lang->block->flowchart['dev']     = array('研發人員', '領取任務和Bug', '設計實現方案', '更新狀態', '完成任務和Bug', '提交代碼');
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index b9aff5305f..9f038f7883 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -61,7 +61,7 @@ $lang->mainNav->menuOrder[50] = 'report';
 $lang->mainNav->menuOrder[55] = 'system';
 $lang->mainNav->menuOrder[60] = 'admin';
 
-if($config->systemMode == 'lean') unset($lang->mainNav->program, $lang->mainNav->menuOrder[10]);
+if($config->systemMode == 'light') unset($lang->mainNav->program, $lang->mainNav->menuOrder[10]);
 
 /* My menu. */
 $lang->my->menu             = new stdclass();
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 610ad48b75..f9f57f850e 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -148,7 +148,7 @@ $lang->mainNav->doc       = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report    = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
 $lang->mainNav->system    = '<i class="icon icon-menu-users"></i> System|company|browse|';
 $lang->mainNav->admin     = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
-if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
+if($config->systemMode == 'ALM') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
 $lang->dividerMenu = ',qa,report,admin,';
 
diff --git a/module/common/model.php b/module/common/model.php
index 1c693632e7..eb225fad72 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -70,7 +70,7 @@ class commonModel extends model
             $project   = $this->dao->select('id, parent, path')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
             $this->syncProgramStatus($project);
         }
-        if($rawModule == 'program' and $this->config->systemMode == 'new')
+        if($rawModule == 'program' and $this->config->systemMode == 'ALM')
         {
             $programID = $objectID;
             $program   = $this->dao->select('id, parent, path')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
@@ -613,8 +613,8 @@ class commonModel extends model
             if(empty($object)) unset($lang->createIcons['story'], $lang->createIcons['task'], $lang->createIcons['execution']);
         }
 
-        if($config->edition == 'open')    unset($lang->createIcons['effort']);
-        if($config->systemMode == 'lean') unset($lang->createIcons['program']);
+        if($config->edition == 'open')     unset($lang->createIcons['effort']);
+        if($config->systemMode == 'light') unset($lang->createIcons['program']);
 
         /* Check whether the creation permission is available, and print create buttons. */
 
@@ -1240,7 +1240,7 @@ class commonModel extends model
         echo "<ul id='searchTypeMenu' class='dropdown-menu'>";
 
         $searchObjects = $lang->searchObjects;
-        if($config->systemMode == 'lean') unset($searchObjects['program']);
+        if($config->systemMode == 'light') unset($searchObjects['program']);
 
         foreach($searchObjects as $key => $value)
         {
diff --git a/module/custom/control.php b/module/custom/control.php
index a4dcd21590..5d5e979dd1 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -623,13 +623,13 @@ class custom extends control
      */
     public function mode()
     {
-        $mode = zget($this->config->global, 'mode', 'lean');
+        $mode = zget($this->config->global, 'mode', 'light');
         if($this->post->mode and $this->post->mode != $mode) // If mode value change.
         {
             $mode    = fixer::input('post')->get('mode');
             $program = isset($_POST['program']) ? $_POST['program'] : 0;
 
-            if($mode == 'lean' and empty($program)) $program = $this->loadModel('program')->createDefaultProgram();
+            if($mode == 'light' and empty($program)) $program = $this->loadModel('program')->createDefaultProgram();
 
             $this->loadModel('setting')->setItem('system.common.global.mode', $mode);
             $this->setting->setItem('system.common.global.defaultProgram', $program);
@@ -639,21 +639,21 @@ class custom extends control
 
             $this->custom->disableFeaturesByMode($mode);
 
-            if($mode == 'lean') $this->custom->processProjectAcl();
+            if($mode == 'light') $this->custom->processProjectAcl();
 
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'top'));
         }
 
         $this->app->loadLang('upgrade');
 
-        $this->lang->custom->changeModeContentTips['lean'] = $this->lang->custom->hasMoreData['yes'];
+        $this->lang->custom->changeModeContentTips['light'] = $this->lang->custom->hasMoreData['yes'];
 
         $counts = $this->custom->getCounts();
         foreach($counts as $function => $count)
         {
             if($count) unset($this->lang->custom->needClosedFunctions[$function]);
         }
-        if(!empty($this->lang->custom->needClosedFunctions)) $this->lang->custom->changeModeContentTips['lean'] = sprintf($this->lang->custom->hasMoreData['no'], implode($this->lang->comma, $this->lang->custom->needClosedFunctions));
+        if(!empty($this->lang->custom->needClosedFunctions)) $this->lang->custom->changeModeContentTips['light'] = sprintf($this->lang->custom->hasMoreData['no'], implode($this->lang->comma, $this->lang->custom->needClosedFunctions));
 
         $this->view->title      = $this->lang->custom->mode;
         $this->view->position[] = $this->lang->custom->common;
diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js
index 2e3ba0a05d..b670ff28cc 100644
--- a/module/custom/js/mode.js
+++ b/module/custom/js/mode.js
@@ -6,7 +6,7 @@ $(function()
     {
         $('#submit').prop('disabled', 'disabled');
         if(mode != $(this).val()) $('#submit').prop('disabled', '');
-        $('#program').closest('tr').toggle(mode == 'new' && $(this).val() == 'lean');
+        $('#program').closest('tr').toggle(mode == 'ALM' && $(this).val() == 'light');
     });
 
 
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index e4a9773b0d..1430b96e43 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -245,12 +245,12 @@ $lang->custom->saveFail       = 'Failed to save!';
 $lang->custom->page           = ' Page';
 $lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
 
-$lang->custom->changeModeTitleTips['new']   = 'Please double confirm to switch to New mode.';
-$lang->custom->changeModeTitleTips['lean']  = 'Please double confirm to switch to Lean mode.';
-$lang->custom->changeModeContentTips['new'] = 'The new mode is suitable for medium and large R&D teams. After switching the new mode, the system will enable functions such as program sets.';
+$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
+$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
+$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to lean mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to lean mode, the system will close functions such as program sets, %s.';
+$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
+$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 8eec961fa7..ef36660265 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -245,12 +245,12 @@ $lang->custom->saveFail       = 'Failed to save!';
 $lang->custom->page           = ' Page';
 $lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
 
-$lang->custom->changeModeTitleTips['new']   = 'Please double confirm to switch to New mode.';
-$lang->custom->changeModeTitleTips['lean']  = 'Please double confirm to switch to Lean mode.';
-$lang->custom->changeModeContentTips['new'] = 'The new mode is suitable for medium and large R&D teams. After switching the new mode, the system will enable functions such as program sets.';
+$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
+$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
+$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to lean mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to lean mode, the system will close functions such as program sets, %s.';
+$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
+$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index d85755952a..8bfa03c885 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -245,12 +245,12 @@ $lang->custom->saveFail       = 'Echec de la sauvegarde !';
 $lang->custom->page           = ' Page';
 $lang->custom->changeModeTips = 'Historical deleted data does not participate in the data merging process. After switching the mode, it will not support restoration. Please know.';
 
-$lang->custom->changeModeTitleTips['new']   = 'Please double confirm to switch to New mode.';
-$lang->custom->changeModeTitleTips['lean']  = 'Please double confirm to switch to Lean mode.';
-$lang->custom->changeModeContentTips['new'] = 'The new mode is suitable for medium and large R&D teams. After switching the new mode, the system will enable functions such as program sets.';
+$lang->custom->changeModeTitleTips['ALM']   = 'Please double confirm to switch to ALM Mode.';
+$lang->custom->changeModeTitleTips['light'] = 'Please double confirm to switch to Light Mode.';
+$lang->custom->changeModeContentTips['ALM'] = 'The ALM mode is suitable for medium and large R&D teams. After switching the ALM mode, the system will enable functions such as program sets.';
 
-$lang->custom->hasMoreData['yes'] = 'After switching to lean mode, the system will close the program function, and the related functions of the program will be hidden.';
-$lang->custom->hasMoreData['no']  = 'After switching to lean mode, the system will close functions such as program sets, %s.';
+$lang->custom->hasMoreData['yes'] = 'After switching to light mode, the system will close the program function, and the related functions of the program will be hidden.';
+$lang->custom->hasMoreData['no']  = 'After switching to light mode, the system will close functions such as program sets, %s.';
 
 $lang->custom->needClosedFunctions['waterfall'] = 'Waterfall';
 $lang->custom->needClosedFunctions['URStory']   = 'User Story';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index dfefca92eb..47f924062b 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -246,12 +246,12 @@ $lang->custom->saveFail       = '保存失败！';
 $lang->custom->page           = '页面';
 $lang->custom->changeModeTips = '历史删除数据不参与数据归并流程，切换模式后将不支持还原，请知悉';
 
-$lang->custom->changeModeTitleTips['new']   = '您确定要切换到综合模式吗？';
-$lang->custom->changeModeTitleTips['lean']  = '您确定要切换到迅捷模式吗？';
-$lang->custom->changeModeContentTips['new'] = '综合模式适用于中大型研发团队，切换综合模式后，系统将启用项目集等功能。';
+$lang->custom->changeModeTitleTips['ALM']   = '您确定要切换到全生命周期管理模式吗？';
+$lang->custom->changeModeTitleTips['light'] = '您确定要切换到轻量管理模式吗？';
+$lang->custom->changeModeContentTips['ALM'] = '全生命周期管理模式适用于中大型研发团队，切换全生命周期管理模式后，系统将启用项目集等功能。';
 
-$lang->custom->hasMoreData['yes'] = '切换到迅捷模式后，系统将关闭项目集功能，项目集的相关功能将会被隐藏。';
-$lang->custom->hasMoreData['no']  = '切换到迅捷模式后，系统将关闭项目集，%s等功能。';
+$lang->custom->hasMoreData['yes'] = '切换到轻量管理模式后，系统将关闭项目集功能，项目集的相关功能将会被隐藏。';
+$lang->custom->hasMoreData['no']  = '切换到轻量管理模式后，系统将关闭项目集，%s等功能。';
 
 $lang->custom->needClosedFunctions['waterfall'] = '瀑布项目';
 $lang->custom->needClosedFunctions['URStory']   = '用户需求';
diff --git a/module/custom/model.php b/module/custom/model.php
index 485235ca4b..2b17f41420 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -894,7 +894,7 @@ class customModel extends model
                     $this->user->updateUserView($executionPairs, 'sprint');
                 }
                 $changes = common::createChanges($project, $data);
-                $actionID = $this->action->create('project', $project->id, 'SwitchToLean');
+                $actionID = $this->action->create('project', $project->id, 'SwitchToLight');
                 $this->action->logHistory($actionID, $changes);
             }
         }
@@ -910,7 +910,7 @@ class customModel extends model
     public function disableFeaturesByMode($mode)
     {
         $disabledFeatures = '';
-        if($mode == 'lean')
+        if($mode == 'light')
         {
             foreach($this->config->custom->features as $feature)
             {
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index 9ea4e45d39..dfb40c38ae 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -26,8 +26,8 @@
         <th class='text-top w-120px'><?php echo $lang->custom->mode;?></th>
         <td class='w-300px'>
           <p>
-            <label class="radio-inline"><input type="radio" name="mode" value="lean" <?php echo $mode == 'lean'? "checked='checked'" : '';?> id="modelean"><?php echo $lang->upgrade->to18Mode['lean'];?></label>
-            <label class="radio-inline"><input type="radio" name="mode" value="new" <?php echo $mode == 'new'? "checked='checked'" : '';?> id="modenew"><?php echo $lang->upgrade->to18Mode['new'];?></label>
+            <label class="radio-inline"><input type="radio" name="mode" value="light" <?php echo $mode == 'light'? "checked='checked'" : '';?> id="modelight"><?php echo $lang->upgrade->to18Mode['light'];?></label>
+            <label class="radio-inline"><input type="radio" name="mode" value="ALM" <?php echo $mode == 'ALM'? "checked='checked'" : '';?> id="modeALM"><?php echo $lang->upgrade->to18Mode['ALM'];?></label>
           </p>
         </td>
         <td></td>
@@ -37,7 +37,7 @@
         <th><?php echo $lang->custom->defaultProgram;?></th>
         <td>
           <?php
-          $disabled = $mode == 'lean' ? "disabled" : '';
+          $disabled = $mode == 'light' ? "disabled" : '';
           echo html::select('program', $program, $programID, "class='form-control chosen' $disabled" );
           ?>
         </td>
diff --git a/module/dev/lang/de.php b/module/dev/lang/de.php
index ed164ae857..684107df19 100644
--- a/module/dev/lang/de.php
+++ b/module/dev/lang/de.php
@@ -159,7 +159,7 @@ $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
 global $config;
-if($config->systemMode != 'new') unset($lang->dev->groupList['program']);
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
diff --git a/module/dev/lang/en.php b/module/dev/lang/en.php
index 8a14448e96..072854edbd 100644
--- a/module/dev/lang/en.php
+++ b/module/dev/lang/en.php
@@ -159,7 +159,7 @@ $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
 global $config;
-if($config->systemMode != 'new') unset($lang->dev->groupList['program']);
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'System';
diff --git a/module/dev/lang/fr.php b/module/dev/lang/fr.php
index 5779da098a..03542662f4 100644
--- a/module/dev/lang/fr.php
+++ b/module/dev/lang/fr.php
@@ -159,7 +159,7 @@ $lang->dev->groupList['message']   = 'Message';
 $lang->dev->groupList['search']    = 'Search';
 
 global $config;
-if($config->systemMode != 'new') unset($lang->dev->groupList['program']);
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 
 $lang->dev->endGroupList['admin']  = 'Admin';
 $lang->dev->endGroupList['system'] = 'Syst?me';
diff --git a/module/dev/lang/zh-cn.php b/module/dev/lang/zh-cn.php
index 3abace2c9d..55910511b9 100644
--- a/module/dev/lang/zh-cn.php
+++ b/module/dev/lang/zh-cn.php
@@ -159,7 +159,7 @@ $lang->dev->groupList['message']   = '消息';
 $lang->dev->groupList['search']    = '搜索';
 
 global $config;
-if($config->systemMode != 'new') unset($lang->dev->groupList['program']);
+if($config->systemMode != 'ALM') unset($lang->dev->groupList['program']);
 
 $lang->dev->endGroupList['admin']  = '后台';
 $lang->dev->endGroupList['system'] = '系统';
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 66a29951bc..2a4f6f0e39 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -288,7 +288,7 @@
                 </p>
               </div>
             </div>
-            <?php if($this->config->systemMode == 'new'):?>
+            <?php if($this->config->systemMode == 'ALM'):?>
             <div class="detail">
               <div class="detail-title">
                 <strong><?php echo $lang->project->parent;?></strong>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 3fef35bd20..1742ff5d16 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1890,7 +1890,7 @@ $lang->dev->methodOrder[20] = 'translate';
 global $config;
 $inUpgrade          = (defined('IN_UPGRADE') and IN_UPGRADE);
 $isURSR             = ($config->URAndSR             or $inUpgrade);
-$hasProgram         = ($config->systemMode == 'new' or $inUpgrade);
+$hasProgram         = ($config->systemMode == 'ALM' or $inUpgrade);
 $hasProductTrack    = (strpos(",$config->disabledFeatures,", ',productTrack,')    === false or $inUpgrade);
 $hasProductRoadmap  = (strpos(",$config->disabledFeatures,", ',productRoadmap,')  === false or $inUpgrade);
 $hasWaterfallTrack  = (strpos(",$config->disabledFeatures,", ',waterfallTrack,')  === false or $inUpgrade);
diff --git a/module/group/model.php b/module/group/model.php
index 47b771d0ea..77a081350c 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -291,7 +291,7 @@ class groupModel extends model
 
         foreach($productList as $id => $product)
         {
-            if(isset($programs[$product->program]) and $this->config->systemMode == 'new') $product->name = $programs[$product->program] . '/' . $product->name;
+            if(isset($programs[$product->program]) and $this->config->systemMode == 'ALM') $product->name = $programs[$product->program] . '/' . $product->name;
             $products[$product->id] = $product->name;
         }
 
diff --git a/module/group/view/manageprojectadmin.html.php b/module/group/view/manageprojectadmin.html.php
index 2ac06382ee..35c47c569b 100644
--- a/module/group/view/manageprojectadmin.html.php
+++ b/module/group/view/manageprojectadmin.html.php
@@ -41,8 +41,8 @@
             <th class='w-70px'><?php echo $lang->group->allCheck . " <span data-toggle='tooltip' class='text-help' title='{$lang->group->allTips}' ><i class='icon-help'></i></sapn>";?></th>
             <th class='w-100px text-center'><?php echo $lang->actions;?></th>
           </tr>
-          <?php $hiddenProgram = $config->systemMode == 'new' ? '' : 'hidden';?>
-          <?php $rowspan       = $config->systemMode == 'new' ? 4 : 3;?>
+          <?php $hiddenProgram = $config->systemMode == 'ALM' ? '' : 'hidden';?>
+          <?php $rowspan       = $config->systemMode == 'ALM' ? 4 : 3;?>
           <?php if($projectAdmins):?>
           <?php foreach($projectAdmins as $account => $group):?>
           <tr class="line<?php echo $group->group;?>">
diff --git a/module/install/control.php b/module/install/control.php
index 701423211c..790c1d07f9 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -242,7 +242,7 @@ class install extends control
             if($this->post->importDemoData) $this->install->importDemoData();
 
             $defaultProgram = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
-            if($this->config->systemMode == 'lean' and empty($defaultProgram))
+            if($this->config->systemMode == 'light' and empty($defaultProgram))
             {
                 /* Lean mode create default program. */
                 $programID = $this->loadModel('program')->createDefaultProgram();
diff --git a/module/install/css/step4.css b/module/install/css/step4.css
index 40be22c10e..bfa7597458 100644
--- a/module/install/css/step4.css
+++ b/module/install/css/step4.css
@@ -8,8 +8,8 @@
 #mainContent tr th {background-color: rgb(241, 241, 241);}
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
-#useLean {background-color: #ddd!important; padding: 6px 85px;}
-#useNew {background-color: #ddd!important; padding: 6px 85px;}
+#useLight {background-color: #ddd!important; padding: 6px 85px;}
+#useALM {background-color: #ddd!important; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
-.container {padding-top: 20px;}
\ No newline at end of file
+.container {padding-top: 20px;}
diff --git a/module/install/js/step4.js b/module/install/js/step4.js
index e6bb22c6cc..03ccc7472b 100644
--- a/module/install/js/step4.js
+++ b/module/install/js/step4.js
@@ -1,14 +1,14 @@
 $(function()
 {
-    $("#useLean").click(function()
+    $("#useLight").click(function()
     {
-        $('#mode').val('lean');
+        $('#mode').val('light');
         $('form').submit();
     })
 
-    $("#useNew").click(function()
+    $("#useALM").click(function()
     {
-        $('#mode').val('new');
+        $('#mode').val('ALM');
         $('form').submit();
     })
 });
diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index fa85510980..a00f993d27 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -293,9 +293,6 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo');
 
-$lang->install->modeList['lean'] = 'Lean mode';
-$lang->install->modeList['new']  = 'Program mode';
-
 $lang->install->promotion = "Produkte von Nature Easy Soft:";
 
 $lang->install->chanzhi       = new stdclass();
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 46c68ddcdd..5cd800865d 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -293,9 +293,6 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot');
 
-$lang->install->modeList['lean'] = 'Lean mode';
-$lang->install->modeList['new']  = 'Program mode';
-
 $lang->install->promotion = "Products also from EasyCorp:";
 
 $lang->install->chanzhi       = new stdclass();
diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php
index a5f3ab68ac..e41b04de73 100644
--- a/module/install/lang/fr.php
+++ b/module/install/lang/fr.php
@@ -293,9 +293,6 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo');
 
-$lang->install->modeList['lean'] = 'Lean mode';
-$lang->install->modeList['new']  = 'Program mode';
-
 $lang->install->promotion = "Autres produits de l'équipe Nature Easy Soft :";
 
 $lang->install->chanzhi       = new stdclass();
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index 4da78a0faa..69bfbf5880 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -293,9 +293,6 @@ EOT;
 
 $lang->install->product = array('chanzhi', 'zdoo', 'xuanxuan', 'ydisk', 'meshiot');
 
-$lang->install->modeList['lean'] = '迅捷模式';
-$lang->install->modeList['new']  = '综合模式';
-
 $lang->install->promotion = "为您推荐易软天创旗下其他产品：";
 
 $lang->install->chanzhi       = new stdclass();
diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php
index 7e122b80b1..8384e01523 100644
--- a/module/install/view/step4.html.php
+++ b/module/install/view/step4.html.php
@@ -37,15 +37,15 @@
             <thead>
               <tr>
                 <th colspan='2'><?php echo $this->lang->upgrade->mode;?></th>
-                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['lean'];?></th>
-                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['new'];?></th>
+                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['light'];?></th>
+                <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['ALM'];?></th>
               </tr>
             </thead>
             <tbody>
               <tr>
                 <td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
-                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
-                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
+                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->lightUsage;?></td>
+                <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->ALMUsage;?></td>
               </tr>
               <tr>
                 <td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
@@ -115,8 +115,8 @@
               </tr>
               <tr>
                 <td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
-                <td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
-                <td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
+                <td colspan='2' class="text-center"><button class="btn" type="button" id='useLight'><?php echo $this->lang->upgrade->useLight;?></button></td>
+                <td colspan='2' class="text-center"><button class="btn" type="button" id='useALM'><?php echo $this->lang->upgrade->useALM;?></button></td>
               </tr>
               <tr>
                 <td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php
index 9be413f39e..f7986a2b18 100644
--- a/module/kanban/view/importexecution.html.php
+++ b/module/kanban/view/importexecution.html.php
@@ -89,7 +89,7 @@
   <div class='table-empty-tip'><?php echo $lang->noData;?></div>
   <?php endif;?>
 </div>
-<?php if($config->systemMode == 'classic'):?>
+<?php if($config->systemMode == 'light'):?>
 <style>.input-group {width: 45% !important}</style>
 <?php else:?>
 <style>#project_chosen {width: 45% !important}</style>
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 97b632c463..7545ee0fe7 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -50,7 +50,7 @@
       <tr class='text-left'>
         <td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
         <td class='c-name text-left'>
-          <?php if($config->systemMode == 'new'):?>
+          <?php if($config->systemMode == 'ALM'):?>
           <?php
           if($execution->type === 'stage') echo "<span class='project-type-label label label-outline label-warning'>{$lang->project->stage}</span> ";
           if($execution->type === 'sprint') echo "<span class='project-type-label label label-outline label-info'>{$lang->executionCommon}</span> ";
diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php
index 40955646f3..a1512c65b8 100755
--- a/module/my/view/preference.html.php
+++ b/module/my/view/preference.html.php
@@ -42,7 +42,7 @@ html,body {height: 100%;}
         <th class='w-120px'><?php echo $lang->my->storyConcept;?></th>
         <td><?php echo html::select('URSR', $URSRList, $URSR, "class='form-control chosen'");?></td>
       </tr>
-      <?php if($this->config->systemMode == 'new'):?>
+      <?php if($this->config->systemMode == 'ALM'):?>
       <tr>
         <th><?php echo $lang->my->programLink;?></th>
         <td><?php echo html::select('programLink', $lang->my->programLinkList, $programLink, "class='form-control chosen'");?></td>
diff --git a/module/product/config.php b/module/product/config.php
index 56967b63f2..eca608a237 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -4,12 +4,12 @@ $config->product->orderBy         = 'isClosed,program_asc,order_asc';
 $config->product->showAllProjects = 0;
 
 $config->product->customBatchEditFields = 'line,PO,QD,RD,status,type,acl';
-if($config->systemMode == 'new') $config->product->customBatchEditFields = 'program,' . $config->product->customBatchEditFields;
+if($config->systemMode == 'ALM') $config->product->customBatchEditFields = 'program,' . $config->product->customBatchEditFields;
 
 $config->product->browse = new stdclass();
 $config->product->custom = new stdclass();
 $config->product->custom->batchEditFields = 'line,PO,QD,RD';
-if($config->systemMode == 'new') $config->product->custom->batchEditFields .= ',program';
+if($config->systemMode == 'ALM') $config->product->custom->batchEditFields .= ',program';
 
 $config->product->list = new stdclass();
 $config->product->list->exportFields = 'id,program,line,name,manager,draftStories,activeStories,changedStories,reviewingStories,closedStories,storyCompleteRate,bugs,unResolvedBugs,assignToNullBugs,bugFixedRate,plans,releases';
@@ -98,7 +98,7 @@ $config->product->all->search['module']                = 'product';
 $config->product->all->search['fields']['name']        = $lang->product->name;
 if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code;
 $config->product->all->search['fields']['id']          = $lang->product->id;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $config->product->all->search['fields']['program'] = $lang->product->program;
     $config->product->all->search['fields']['line']    = $lang->product->line;
@@ -115,7 +115,7 @@ $config->product->all->search['fields']['createdBy']   = $lang->product->created
 $config->product->all->search['params']['name']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
 if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['id']          = array('operator' => '=',       'control' => 'input',  'values' => '');
-if($config->systemMode == 'new') $config->product->all->search['params']['program'] = array('operator' => '=', 'control' => 'select', 'values' => '');
+if($config->systemMode == 'ALM') $config->product->all->search['params']['program'] = array('operator' => '=', 'control' => 'select', 'values' => '');
 $config->product->all->search['params']['line']        = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->product->all->search['params']['desc']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['PO']          = array('operator' => '=',       'control' => 'select', 'values' => 'users');
diff --git a/module/product/control.php b/module/product/control.php
index 42f31136c2..e78e365449 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -427,7 +427,7 @@ class product extends control
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $lines = array();
-        if($programID and $this->config->systemMode == 'new') $lines = array('') + $this->product->getLinePairs($programID);
+        if($programID and $this->config->systemMode == 'ALM') $lines = array('') + $this->product->getLinePairs($programID);
 
         if($this->app->tab == 'doc') unset($this->lang->doc->menu->product['subMenu']);
 
@@ -510,7 +510,7 @@ class product extends control
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $lines = array();
-        if($product->program and $this->config->systemMode == 'new') $lines = array('') + $this->product->getLinePairs($product->program);
+        if($product->program and $this->config->systemMode == 'ALM') $lines = array('') + $this->product->getLinePairs($product->program);
 
         /* Get programs. */
         $programs = $this->loadModel('program')->getTopPairs('', 'noclosed');
@@ -599,7 +599,7 @@ class product extends control
 
         $programs             = array();
         $unauthorizedPrograms = array();
-        if($this->config->systemMode == 'new')
+        if($this->config->systemMode == 'ALM')
         {
             $programs = $this->loadModel('program')->getTopPairs();
 
@@ -1238,7 +1238,7 @@ class product extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Process product structure. */
-        if($this->config->systemMode == 'lean' and $orderBy == 'program_asc') $orderBy = 'order_asc';
+        if($this->config->systemMode == 'light' and $orderBy == 'program_asc') $orderBy = 'order_asc';
         $productStats     = $this->product->getStats($orderBy, $pager, $browseType, '', 'story', '', $queryID);
         $productStructure = $this->product->statisticProgram($productStats);
         $productLines     = $this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq(0)->orderBy('`order` asc')->fetchAll();
@@ -1422,7 +1422,7 @@ class product extends control
                 $fields[$fieldName] = zget($productLang, $fieldName);
 
                 unset($fields[$key]);
-                if($this->config->systemMode == 'lean' and ($fieldName == 'line' or $fieldName == 'program')) unset($fields[$fieldName]);
+                if($this->config->systemMode == 'light' and ($fieldName == 'line' or $fieldName == 'program')) unset($fields[$fieldName]);
             }
 
             $lastProgram  = $lastLine = '';
diff --git a/module/product/js/kanban.js b/module/product/js/kanban.js
index 73fe67015c..4798d26c96 100644
--- a/module/product/js/kanban.js
+++ b/module/product/js/kanban.js
@@ -155,7 +155,7 @@ function initKanban()
         $kanban.kanban(
         {
             data:            data,
-            noLaneName:      isLeanMode,
+            noLaneName:      isLightMode,
             virtualize:      true,
             virtualCardList: true,
             calcColHeight:   calcColHeight
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index bb295db199..aade1f1b1d 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -189,7 +189,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Geschlossen';
 
 global $config;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
 }
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index cc8985363f..ebba2b6f43 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -189,7 +189,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Closed';
 
 global $config;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
 }
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 0a0cd79847..1869910653 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -189,7 +189,7 @@ $lang->product->statusList['normal'] = 'Normal';
 $lang->product->statusList['closed'] = 'Fermé';
 
 global $config;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->product->aclList['private'] = "Private {$lang->productCommon} (Manager and Stakeholders of the respective program, team members and stakeholders of the associated project can access)";
 }
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 35386ccff5..fc6a52dfef 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -189,7 +189,7 @@ $lang->product->statusList['normal'] = '正常';
 $lang->product->statusList['closed'] = '结束';
 
 global $config;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->product->aclList['private'] = "私有({$lang->productCommon}相关负责人、所属项目集的负责人及干系人、相关联项目的团队成员和干系人可访问)";
 }
diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php
index 7b568db8e5..31b23dc4f0 100644
--- a/module/product/lang/zh-tw.php
+++ b/module/product/lang/zh-tw.php
@@ -174,7 +174,7 @@ $lang->product->statusList['normal'] = '正常';
 $lang->product->statusList['closed'] = '結束';
 
 global $config;
-if($config->systemMode == 'new')
+if($config->systemMode == 'ALM')
 {
     $lang->product->aclList['private'] = "私有({$lang->productCommon}相關負責人、所屬項目集的干係人、相關聯項目的團隊成員和干係人可訪問)";
 }
diff --git a/module/product/model.php b/module/product/model.php
index 6a4b431092..32b5caae60 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -728,7 +728,7 @@ class productModel extends model
 
         /* Lean mode relation defaultProgram. */
         $programID = isset($product->program) ? $product->program : 0;
-        if($this->config->systemMode == 'lean')
+        if($this->config->systemMode == 'light')
         {
             $programID = $this->config->global->defaultProgram;
             $product->program = $this->config->global->defaultProgram;
@@ -756,7 +756,7 @@ class productModel extends model
                 $line->parent = 0;
                 $line->grade  = 1;
                 $line->name   = $this->post->lineName;
-                $line->root   = $this->config->systemMode == 'new' ? $product->program : 0;
+                $line->root   = $this->config->systemMode == 'ALM' ? $product->program : 0;
                 $line->order  = $maxOrder;
 
                 $lines = $this->dao->select('name')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('root')->eq($line->root)->andWhere('name')->eq($line->name)->fetch();
@@ -868,8 +868,8 @@ class productModel extends model
 
             $productID = (int)$productID;
             $products[$productID] = new stdClass();
-            if($this->config->systemMode == 'new' and isset($data->programs[$productID])) $products[$productID]->program = (int)$data->programs[$productID];
-            if($this->config->systemMode == 'new' and isset($data->lines[$productID]))    $products[$productID]->line    = (int)$data->lines[$productID];
+            if($this->config->systemMode == 'ALM' and isset($data->programs[$productID])) $products[$productID]->program = (int)$data->programs[$productID];
+            if($this->config->systemMode == 'ALM' and isset($data->lines[$productID]))    $products[$productID]->line    = (int)$data->lines[$productID];
             $products[$productID]->name    = $productName;
             $products[$productID]->PO      = $data->POs[$productID];
             $products[$productID]->QD      = $data->QDs[$productID];
@@ -896,13 +896,13 @@ class productModel extends model
         foreach($products as $productID => $product)
         {
             $oldProduct = $oldProducts[$productID];
-            if($this->config->systemMode == 'new') $programID  = !isset($product->program) ? $oldProduct->program : (empty($product->program) ? 0 : $product->program);
+            if($this->config->systemMode == 'ALM') $programID  = !isset($product->program) ? $oldProduct->program : (empty($product->program) ? 0 : $product->program);
 
             $this->dao->update(TABLE_PRODUCT)
                 ->data($product)
                 ->autoCheck()
                 ->batchCheck($this->config->product->edit->requiredFields , 'notempty')
-                ->checkIF((!empty($product->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $productID and `program` = $programID and `deleted` = '0'")
+                ->checkIF((!empty($product->name) and $this->config->systemMode == 'ALM'), 'name', 'unique', "id != $productID and `program` = $programID and `deleted` = '0'")
                 ->checkFlow()
                 ->where('id')->eq($productID)
                 ->exec();
@@ -981,7 +981,7 @@ class productModel extends model
         $data     = fixer::input('post')->get();
 
         /* When there are products under the line, the program cannot be modified  */
-        if($this->config->systemMode == 'new')
+        if($this->config->systemMode == 'ALM')
         {
             foreach($oldLines as $oldLine)
             {
@@ -1006,7 +1006,7 @@ class productModel extends model
         foreach($data->modules as $id => $name)
         {
             if(empty($name)) continue;
-            if($this->config->systemMode == 'new' and empty($data->programs[$id]))
+            if($this->config->systemMode == 'ALM' and empty($data->programs[$id]))
             {
                 dao::$errors[] = $this->lang->product->programEmpty;
                 return false;
@@ -1216,7 +1216,7 @@ class productModel extends model
         $this->config->product->all->search['queryID']   = $queryID;
         $this->config->product->all->search['actionURL'] = $actionURL;
 
-        if($this->config->systemMode == 'new')
+        if($this->config->systemMode == 'ALM')
         {
             $programPairs = $this->loadModel('program')->getTopPairs('', 'noclosed');
             $this->config->product->all->search['params']['program']['values'] = array('' => '') + $programPairs;
@@ -1952,7 +1952,7 @@ class productModel extends model
             ->andWhere('t2.deleted')->eq('0')
             ->fetchGroup('product', 'project');
 
-        if($this->config->systemMode == 'new' and !$this->config->product->showAllProjects)
+        if($this->config->systemMode == 'ALM' and !$this->config->product->showAllProjects)
         {
             foreach($projectProduct as $productID => $projects)
             {
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 9d1043f863..8de228df5e 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -56,14 +56,14 @@ foreach($products as $programID => $programProducts)
 }
 $productsPinYin = common::convert2Pinyin($productNames);
 
-$myProductsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$normalProductsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$closedProductsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$myProductsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$normalProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$closedProductsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 
 foreach($products as $programID => $programProducts)
 {
     /* Add the program name before project. */
-    if($programID and $config->systemMode == 'new')
+    if($programID and $config->systemMode == 'ALM')
     {
         $programName = zget($programs, $programID);
 
@@ -76,7 +76,7 @@ foreach($products as $programID => $programProducts)
     {
         if($product->id == $productID) $currentProduct = $product;
         $selected    = $product->id == $productID ? 'selected' : '';
-        $productName = ($config->systemMode == 'new' and $product->line) ? zget($lines, $product->line, '') . ' / ' . $product->name : $product->name;
+        $productName = ($config->systemMode == 'ALM' and $product->line) ? zget($lines, $product->line, '') . ' / ' . $product->name : $product->name;
         $linkHtml    = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
         $locateTab   = ($module == 'testtask' and $method == 'browseUnits' and $app->tab == 'project') ? '' : "data-app='$app->tab'";
 
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index a5abd2795a..2654ddf619 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -25,7 +25,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('product', 'export', "status=$browseType&orderBy=$orderBy", "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export'", true, true)?>
-    <?php if($config->systemMode == 'new'):?>
+    <?php if($config->systemMode == 'ALM'):?>
     <?php common::printLink('product', 'manageLine', '', "<i class='icon-edit'></i> &nbsp;" . $lang->product->line, '', 'class="btn btn-link iframe"', '', true);?>
     <?php endif;?>
     <?php common::printLink('product', 'create', '', '<i class="icon icon-plus"></i>' . $lang->product->create, '', 'class="btn btn-primary create-product-btn"');?>
@@ -99,7 +99,7 @@
               }
           }
           ?>
-          <?php if(isset($program['programName']) and $config->systemMode == 'new'):?>
+          <?php if(isset($program['programName']) and $config->systemMode == 'ALM'):?>
           <tr class="row-program" <?php echo $trAttrs;?>>
             <?php if($canBatchEdit):?>
             <td class='c-checkbox'><div class='checkbox-primary program-checkbox'><label></label></div></td>
@@ -138,10 +138,10 @@
           <?php endif;?>
 
           <?php foreach($program as $lineID => $line):?>
-          <?php if(isset($line['lineName']) and isset($line['products']) and is_array($line['products']) and $config->systemMode == 'new'):?>
+          <?php if(isset($line['lineName']) and isset($line['products']) and is_array($line['products']) and $config->systemMode == 'ALM'):?>
           <?php $lineNames[] = $line['lineName'];?>
           <?php
-          if($this->config->systemMode == 'new' and $programID)
+          if($this->config->systemMode == 'ALM' and $programID)
           {
               $trAttrs  = "data-id='line.$lineID' data-parent='program.$programID'";
               $trAttrs .= " data-nest-parent='program.$programID' data-nest-path='program.$programID,line.$lineID'" . "class='text-center'";
@@ -183,15 +183,15 @@
           $totalStories = $product->stories['active'] + $product->stories['closed'] + $product->stories['draft'] + $product->stories['changing'] + $product->stories['reviewing'];
 
           $trClass = '';
-          if($product->line and $this->config->systemMode == 'new')
+          if($product->line and $this->config->systemMode == 'ALM')
           {
               $path = "line.$product->line,$product->id";
-              if($this->config->systemMode == 'new' and $product->program) $path = "program.$product->program,$path";
+              if($this->config->systemMode == 'ALM' and $product->program) $path = "program.$product->program,$path";
               $trAttrs  = "data-id='$product->id' data-parent='line.$product->line'";
               $trClass .= ' is-nest-child  table-nest';
               $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='$path'";
           }
-          elseif($product->program and $this->config->systemMode == 'new')
+          elseif($product->program and $this->config->systemMode == 'ALM')
           {
               $trAttrs  = "data-id='$product->id' data-parent='program.$product->program'";
               $trClass .= ' is-nest-child  table-nest';
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index f55b3192b5..3b26d0c156 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -52,11 +52,11 @@
                 $full  = '';
             }
             ?>
-            <?php if($this->config->systemMode == 'new'):?>
+            <?php if($this->config->systemMode == 'ALM'):?>
             <th class='c-program<?php echo zget($visibleFields, 'program', ' hidden') . zget($requiredFields, 'program', '', ' required');?>'><?php echo $lang->product->program;?></th>
             <?php endif;?>
             <th class='required <?php echo $width;?>' style="<?php echo $full;?>"><?php echo $lang->product->name;?></th>
-            <?php if($this->config->systemMode == 'new'):?>
+            <?php if($this->config->systemMode == 'ALM'):?>
             <th class='c-line<?php echo zget($visibleFields, 'line',     ' hidden') . zget($requiredFields, 'line',   '', ' required');?>'><?php echo $lang->product->line;?></th>
             <?php endif;?>
             <th class='c-user-box<?php echo zget($visibleFields, 'PO',   ' hidden') . zget($requiredFields, 'PO',     '', ' required');?>'><?php echo $lang->product->PO;?></th>
@@ -81,7 +81,7 @@
           ?>
           <tr>
             <td><?php echo sprintf('%03d', $productID) . html::hidden("productIDList[$productID]", $productID);?></td>
-            <?php if($this->config->systemMode == 'new'):?>
+            <?php if($this->config->systemMode == 'ALM'):?>
             <?php if(isset($unauthorizedPrograms[$products[$productID]->program])):?>
             <td class='text-left<?php echo zget($visibleFields, 'program', ' hidden')?>' style='overflow:visible'><?php echo html::select("programs[$productID]",  $unauthorizedPrograms, $products[$productID]->program, "class='form-control' disabled");?></td>
             <?php else:?>
@@ -89,9 +89,9 @@
             <?php endif;?>
             <?php endif;?>
             <td title='<?php echo $products[$productID]->name?>'><?php echo html::input("names[$productID]", $products[$productID]->name, "class='form-control'");?></td>
-            <?php if($this->config->systemMode == 'new'):?>
+            <?php if($this->config->systemMode == 'ALM'):?>
             <?php $productLines = isset($lines[$products[$productID]->program]) ? $lines[$products[$productID]->program] : '';?>
-            <td class='text-left<?php echo zget($visibleFields, 'line', ' hidden')?>' style='overflow:visible' id="line_<?php echo $productID;?>"><?php echo html::select("lines[$productID]", $this->config->systemMode == 'new' ? $productLines : $lines, $products[$productID]->line, "class='form-control picker-select'");?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'line', ' hidden')?>' style='overflow:visible' id="line_<?php echo $productID;?>"><?php echo html::select("lines[$productID]", $this->config->systemMode == 'ALM' ? $productLines : $lines, $products[$productID]->line, "class='form-control picker-select'");?></td>
             <?php endif;?>
             <td class='text-left<?php echo zget($visibleFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$productID]",  $poUsers, $products[$productID]->PO, "class='form-control picker-select'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$productID]",  $qdUsers, $products[$productID]->QD, "class='form-control picker-select'");?></td>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index a8441bdf56..15de85310f 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -24,7 +24,7 @@
     <form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
       <table class="table table-form">
         <tbody>
-          <?php if($this->config->systemMode == 'new'):?>
+          <?php if($this->config->systemMode == 'ALM'):?>
           <tr>
             <th class='w-140px'><?php echo $lang->program->common;?></th>
             <td><?php echo html::select('program', $programs, $programID, "class='form-control chosen' onchange='setParentProgram(this.value)'");?></td><td></td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 28b23e2d77..55fb5c3cc1 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -31,7 +31,7 @@
     <form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
       <table class="table table-form">
         <tbody>
-          <?php if($this->config->systemMode == 'new'):?>
+          <?php if($this->config->systemMode == 'ALM'):?>
           <tr>
             <th class='w-140px'><?php echo $lang->product->program;?></th>
             <?php $attr = ($product->program and strpos(",{$this->app->user->view->programs},", ",{$product->program},") === false) ? 'disabled' : '';?>
diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php
index 472b57535c..c4bc081ce4 100644
--- a/module/product/view/kanban.html.php
+++ b/module/product/view/kanban.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kanban.html.php';?>
-<?php if($config->systemMode == 'new'):?>
+<?php if($config->systemMode == 'ALM'):?>
 <div id='showSettingsBox'>
   <div class="checkbox-primary checkbox">
     <input type="checkbox" value="1" id="showAllProjects" title="<?php echo $lang->program->showNotCurrentProjects;?>" <?php echo $config->product->showAllProjects ? 'checked' : '';?>>
@@ -62,7 +62,7 @@
   js::set('releaseList',      $releaseList);
   js::set('hourList',         $hourList);
   js::set('doingText',        $lang->product->doing);
-  js::set('isLeanMode',       $config->systemMode == 'lean');
+  js::set('isLightMode',      $config->systemMode == 'light');
   ?>
   <?php endif; ?>
 </div>
diff --git a/module/product/view/manageline.html.php b/module/product/view/manageline.html.php
index e5b4d859ef..5606b39c5f 100644
--- a/module/product/view/manageline.html.php
+++ b/module/product/view/manageline.html.php
@@ -33,7 +33,7 @@
                   <div id='son'>
                     <div class="table-row row-module row-module-new">
                       <div class="table-col text-center"><strong><?php echo $lang->product->lineName;?></strong></div>
-                      <?php if($this->config->systemMode == 'new'):?>
+                      <?php if($this->config->systemMode == 'ALM'):?>
                       <div class="table-col text-center"><strong><?php echo $lang->product->program;?></strong></div>
                       <?php endif;?>
                       <div class="table-col col-actions"> </div>
@@ -42,7 +42,7 @@
                     <?php foreach($lines as $line):?>
                     <div class="table-row row-module">
                       <div class="table-col col-module"><?php echo html::input("modules[id$line->id]", $line->name, 'class="form-control"');?></div>
-                      <?php if($this->config->systemMode == 'new'):?>
+                      <?php if($this->config->systemMode == 'ALM'):?>
                       <div class="table-col col-programs"><?php echo html::select("programs[id$line->id]", $programs, $line->root, "class='form-control chosen' required");?></div>
                       <?php endif;?>
                       <div class="table-col col-actions"> </div>
@@ -51,7 +51,7 @@
                     <?php for($i = 0; $i <= 5 ; $i ++):?>
                     <div class="table-row row-module row-module-new">
                       <div class="table-col col-module"><?php echo html::input("modules[]", '', "class='form-control'");?></div>
-                      <?php if($this->config->systemMode == 'new'):?>
+                      <?php if($this->config->systemMode == 'ALM'):?>
                       <div class="table-col col-programs"><?php echo html::select("programs[]", $programs, '', "class='form-control chosen' required");?></div>
                       <?php endif;?>
                       <div class="table-col col-actions">
@@ -64,7 +64,7 @@
                   <div id="insertItemBox" class="template">
                     <div class="table-row row-module row-module-new">
                       <div class="table-col col-module"><?php echo html::input("modules[]", '', "class='form-control'");?></div>
-                      <?php if($this->config->systemMode == 'new'):?>
+                      <?php if($this->config->systemMode == 'ALM'):?>
                       <div class="table-col col-programs"><?php echo html::select("programs[]", $programs, '', "class='form-control chosen' required");?></div>
                       <?php endif;?>
                       <div class="table-col col-actions">
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 36adb75a17..f7fe5bea91 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -37,7 +37,7 @@
       <thead>
         <tr>
           <th class='c-id'><?php echo $lang->idAB;?></th>
-          <?php if($config->systemMode == 'new'):?>
+          <?php if($config->systemMode == 'ALM'):?>
           <th class='c-program'><?php echo $lang->program->common;?></th>
           <?php endif;?>
           <th><?php echo $lang->project->name;?></th>
@@ -68,7 +68,7 @@
         <?php if($project->status == 'closed')    $closedCount ++;?>
         <tr>
           <td><?php printf('%03d', $project->id);?></td>
-          <?php if($config->systemMode == 'new'):?>
+          <?php if($config->systemMode == 'ALM'):?>
           <td title='<?php echo $project->programName;?>' class='text-ellipsis'><?php echo $project->programName;?></td>
           <?php endif;?>
           <td class='text-left'>
diff --git a/module/program/model.php b/module/program/model.php
index ba41b91085..4b4ff95b57 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -392,7 +392,7 @@ class programModel extends model
                 foreach($projects as $project)
                 {
                     if(helper::diffDate(helper::today(), $project->end) > 0) $project->delay = 1;
-                    if($this->config->systemMode == 'new' and !$this->config->program->showAllProjects and $project->parent != $product->program and strpos($project->path, ",{$product->program},") !== 0) continue;
+                    if($this->config->systemMode == 'ALM' and !$this->config->program->showAllProjects and $project->parent != $product->program and strpos($project->path, ",{$product->program},") !== 0) continue;
 
                     $status    = $project->status == 'wait' ? 'wait' : 'doing';
                     $execution = zget($doingExecutions, $project->id, array());
@@ -650,7 +650,7 @@ class programModel extends model
             ->fetchAll('id');
 
         /* Determine how to display the name of the program. */
-        if($programTitle and $this->config->systemMode == 'new')
+        if($programTitle and $this->config->systemMode == 'ALM')
         {
             $programList = $this->getPairs();
             foreach($projectList as $id => $project)
diff --git a/module/project/control.php b/module/project/control.php
index 58c1b56bce..60d0d81467 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -22,7 +22,7 @@ class project extends control
     public function __construct($moduleName = '', $methodName = '', $appName = '')
     {
         parent::__construct($moduleName, $methodName, $appName);
-        $this->view->globalDisableProgram = $this->config->systemMode == 'lean';
+        $this->view->globalDisableProgram = $this->config->systemMode == 'light';
     }
 
     /**
@@ -853,7 +853,7 @@ class project extends control
         $projectID = $this->project->setMenu($projectID);
         $project   = $this->project->getById($projectID);
 
-        if($this->config->systemMode == 'new')
+        if($this->config->systemMode == 'ALM')
         {
             $programList = array_filter(explode(',', $project->path));
             array_pop($programList);
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index cf132789eb..e351d8ccff 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -296,7 +296,7 @@ $lang->project->kanbanSubAclList['open']    = "Open (accessible with project vie
 $lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
 
 global $config;
-if($config->systemMode == 'lean')
+if($config->systemMode == 'light')
 {
     unset($lang->project->subAclList['program']);
     unset($lang->project->kanbanSubAclList['program']);
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index 62f239c26b..a81bcdf36f 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -296,7 +296,7 @@ $lang->project->kanbanSubAclList['open']    = "Open (accessible with project vie
 $lang->project->kanbanSubAclList['program'] = 'Open in the program (all upper-level program team leaders and stakeholders, the project leader, team members can access)';
 
 global $config;
-if($config->systemMode == 'lean')
+if($config->systemMode == 'light')
 {
     unset($lang->project->subAclList['program']);
     unset($lang->project->kanbanSubAclList['program']);
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index e89dfbf272..11125826fd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -296,7 +296,7 @@ $lang->project->kanbanSubAclList['open']    = "公开 (有项目视图权限即
 $lang->project->kanbanSubAclList['program'] = '项目集内公开（所有上级项目集负责人和干系人、项目负责人、团队成员可访问）';
 
 global $config;
-if($config->systemMode == 'lean')
+if($config->systemMode == 'light')
 {
     unset($lang->project->subAclList['program']);
     unset($lang->project->kanbanSubAclList['program']);
diff --git a/module/project/model.php b/module/project/model.php
index 4efb7d53b5..07cc7f63f1 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -990,7 +990,7 @@ class projectModel extends model
         $this->config->project->search['params']['parent']['values'] = $programPairs;
 
         if(isset($this->config->setCode) and $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']);
-        if($this->config->systemMode == 'lean') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']);
+        if($this->config->systemMode == 'light') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']);
 
         $this->loadModel('search')->setSearchParams($this->config->project->search);
     }
@@ -1096,7 +1096,7 @@ class projectModel extends model
             {
                 $projectName = $project->name;
 
-                if($this->config->systemMode == 'new')
+                if($this->config->systemMode == 'ALM')
                 {
                     $programID = zget($projectProgram, $project->id, '');
                     if($programID != $project->id) $projectName = zget($programs, $programID, '') . ' / ' . $projectName;
@@ -1215,7 +1215,7 @@ class projectModel extends model
         if(isset($this->config->setCode) and $this->config->setCode == 0) unset($project->code);
 
         /* Lean mode relation defaultProgram. */
-        if($this->config->systemMode == 'lean') $project->parent = $this->config->global->defaultProgram;
+        if($this->config->systemMode == 'light') $project->parent = $this->config->global->defaultProgram;
 
         $linkedProductsCount = 0;
         if($project->hasProduct && isset($_POST['products']))
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 489bf64498..6400849538 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -53,14 +53,14 @@ foreach($projects as $programID => $programProjects)
 }
 $projectsPinYin = common::convert2Pinyin($projectNames);
 
-$myProjectsHtml     = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$normalProjectsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
-$closedProjectsHtml = $config->systemMode == 'new' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$myProjectsHtml     = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$normalProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
+$closedProjectsHtml = $config->systemMode == 'ALM' ? '<ul class="tree tree-angles" data-ride="tree">' : '<ul class="noProgram">';
 
 foreach($projects as $programID => $programProjects)
 {
     /* Add the program name before project. */
-    if(isset($programs[$programID]) and $config->systemMode == 'new')
+    if(isset($programs[$programID]) and $config->systemMode == 'ALM')
     {
         $programName = zget($programs, $programID);
 
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 16f042fde3..4f9049bd42 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -11,7 +11,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kanban.html.php';?>
-<?php if($this->config->systemMode == 'lean'):?>
+<?php if($this->config->systemMode == 'light'):?>
 <style>
 .kanban-lane-name{display:none;}
 .kanban-header-cols{left:0px !important;}
diff --git a/module/search/control.php b/module/search/control.php
index 23196f3c3b..fc3594ff97 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -20,8 +20,8 @@ class search extends control
     public function __construct($module = '', $method = '')
     {
         parent::__construct($module, $method);
-        if($this->config->edition != 'max')     unset($this->lang->search->modules['effort']);
-        if($this->config->systemMode == 'lean') unset($this->lang->search->modules['program']);
+        if($this->config->edition != 'max')      unset($this->lang->search->modules['effort']);
+        if($this->config->systemMode == 'light') unset($this->lang->search->modules['program']);
     }
 
     /**
@@ -236,7 +236,7 @@ class search extends control
         foreach($typeCount as $objectType => $count)
         {
             if(!isset($this->lang->search->modules[$objectType])) continue;
-            if($this->config->systemMode == 'lean' and $objectType == 'program') continue;
+            if($this->config->systemMode == 'light' and $objectType == 'program') continue;
 
             $typeList[$objectType] = $this->lang->search->modules[$objectType];
         }
diff --git a/module/search/model.php b/module/search/model.php
index abab230628..fe374390ec 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -634,7 +634,7 @@ class searchModel extends model
         }
         else
         {
-            if($this->config->systemMode == 'lean') unset($this->config->search->fields->program);
+            if($this->config->systemMode == 'light') unset($this->config->search->fields->program);
 
             foreach($this->config->search->fields as $objectType => $fields)
             {
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 40620f9699..68dccc54af 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -161,7 +161,7 @@ class upgrade extends control
 
             if($systemMode == 'classic')
             {
-                $this->loadModel('setting')->setItem('system.common.global.mode', 'lean');
+                $this->loadModel('setting')->setItem('system.common.global.mode', 'light');
 
                 $programID = $this->loadModel('program')->createDefaultProgram();
                 $this->loadModel('setting')->setItem('system.common.global.defaultProgram', $programID);
@@ -171,12 +171,12 @@ class upgrade extends control
 
                 $this->upgrade->upgradeInProjectMode($programID, $systemMode);
 
-                $this->loadModel('custom')->disableFeaturesByMode('lean');
+                $this->loadModel('custom')->disableFeaturesByMode('light');
 
                 $selectMode = false;
             }
             if(version_compare($openVersion, '18_0', '>=')) $selectMode = false;
-            if(version_compare($openVersion, '15_0', '>=') and $systemMode == 'new') $selectMode = false;
+            if(version_compare($openVersion, '15_0', '>=') and $systemMode == 'ALM') $selectMode = false;
 
             if($selectMode) $this->locate(inlink('to18Guide', "fromVersion=$fromVersion"));
 
@@ -217,7 +217,7 @@ class upgrade extends control
             $this->setting->setItem('system.custom.sprintConcept', $sprintConcept);
 
             $openVersion = $this->upgrade->getOpenVersion(str_replace('.', '_', $fromVersion));
-            if($mode == 'lean')
+            if($mode == 'light')
             {
                 $programID = $this->loadModel('program')->createDefaultProgram();
                 $this->loadModel('setting')->setItem('system.common.global.defaultProgram', $programID);
@@ -225,19 +225,19 @@ class upgrade extends control
                 /* Set default program for product and project with no program. */
                 $this->upgrade->relateDefaultProgram($programID);
 
-                if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=lean"));
+                if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=light"));
 
                 $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
             }
-            if($mode == 'new')
+            if($mode == 'ALM')
             {
-                if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=new"));
+                if(version_compare($openVersion, '15_0', '<')) $this->locate(inlink('selectMergeMode', "fromVersion=$fromVersion&mode=ALM"));
 
                 $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
             }
         }
 
-        $checkHistoryResult = $this->upgrade->checkHistoryDataForLeanMode();
+        $checkHistoryResult = $this->upgrade->checkHistoryDataForLightMode();
 
         $this->view->ur        = $checkHistoryResult['ur'];
         $this->view->cmmi      = $checkHistoryResult['cmmi'];
@@ -591,7 +591,7 @@ class upgrade extends control
             if(empty($noMergedSprints)) $this->locate($this->createLink('upgrade', 'mergeProgram', "type=moreLink"));
 
             $this->view->noMergedSprints = $noMergedSprints;
-            if(!$programID && $systemMode == 'lean') $programID = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
+            if(!$programID && $systemMode == 'light') $programID = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
         }
 
         /* Get no merged projects that link more then two products. */
@@ -656,19 +656,19 @@ class upgrade extends control
      * Select the merge mode when upgrading to zentaopms 18.0.
      *
      * @param  string  $fromVersion
-     * @param  string  $mode   lean | new
+     * @param  string  $mode   light | ALM
      * @access public
      * @return void
      */
-    public function selectMergeMode($fromVersion, $mode = 'lean')
+    public function selectMergeMode($fromVersion, $mode = 'light')
     {
         if($_POST)
         {
             $mergeMode = $this->post->projectType;
             if($mergeMode == 'manually') $this->locate(inlink('mergeProgram'));
 
-            if($mode == 'lean') $programID = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
-            if($mode == 'new')  $programID = $this->loadModel('program')->createDefaultProgram();
+            if($mode == 'light') $programID = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=defaultProgram');
+            if($mode == 'ALM')   $programID = $this->loadModel('program')->createDefaultProgram();
 
             if($mergeMode == 'project')   $this->upgrade->upgradeInProjectMode($programID);
             if($mergeMode == 'execution') $this->upgrade->upgradeInExecutionMode($programID);
diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css
index 826b828f5e..dca9e0ac0d 100644
--- a/module/upgrade/css/to18guide.css
+++ b/module/upgrade/css/to18guide.css
@@ -9,8 +9,8 @@
 #mainContent tr th {background-color: rgb(241, 241, 241);}
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
-#useLean {background-color: #ddd!important; padding: 6px 85px;}
-#useNew {background-color: #ddd!important; padding: 6px 85px;}
+#useLight {background-color: #ddd!important; padding: 6px 85px;}
+#useALM {background-color: #ddd!important; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
-.container {padding-top: 20px;}
\ No newline at end of file
+.container {padding-top: 20px;}
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 13730130ad..b5e7909ad1 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -545,7 +545,7 @@ $(function()
 
         if($(this).val() == 'project')
         {
-            if(mode == 'lean') $('.programForm').hide();
+            if(mode == 'light') $('.programForm').hide();
             $('[name=projectAcl]').attr('disabled', 'disabled');
             $('[name=programAcl]').removeAttr('disabled');
         }
@@ -816,7 +816,7 @@ function hiddenProject()
     $('#programBox').show();
     if($('[name^=sprints]:checked').length == 0)
     {
-        if(mode == 'lean') $('#programBox').hide();
+        if(mode == 'light') $('#programBox').hide();
         $(".programParams input").attr('disabled' ,'disabled');
         $(".programParams select").attr('disabled' ,'disabled').trigger('chosen:updated');
         $('.programParams').hide();
@@ -847,7 +847,7 @@ function hiddenProject()
             $('.projectStatus').addClass('hidden');
             $('[name=projectAcl]').attr('disabled', 'disabled');
             $('[name=programAcl]').removeAttr('disabled');
-            if(mode == 'lean') $('.programForm').hide();
+            if(mode == 'light') $('.programForm').hide();
         }
 
         if(projectType == 'execution')
@@ -860,7 +860,7 @@ function hiddenProject()
             $('[name=projectAcl]').removeAttr('disabled');
         }
 
-        if(mode == 'lean')
+        if(mode == 'light')
         {
             $('form #newProgram0').prop('checked', false);
             toggleProgram($('form #newProgram0'));
diff --git a/module/upgrade/js/to18guide.js b/module/upgrade/js/to18guide.js
index e6bb22c6cc..03ccc7472b 100644
--- a/module/upgrade/js/to18guide.js
+++ b/module/upgrade/js/to18guide.js
@@ -1,14 +1,14 @@
 $(function()
 {
-    $("#useLean").click(function()
+    $("#useLight").click(function()
     {
-        $('#mode').val('lean');
+        $('#mode').val('light');
         $('form').submit();
     })
 
-    $("#useNew").click(function()
+    $("#useALM").click(function()
     {
-        $('#mode').val('new');
+        $('#mode').val('ALM');
         $('form').submit();
     })
 });
diff --git a/module/upgrade/lang/de.php b/module/upgrade/lang/de.php
index f40863ca67..ca619397f8 100644
--- a/module/upgrade/lang/de.php
+++ b/module/upgrade/lang/de.php
@@ -139,8 +139,8 @@ $lang->upgrade->recoveryActions->review = 'Review';
 $lang->upgrade->selectMode       = 'Select Mode';
 $lang->upgrade->mode             = 'Mode';
 $lang->upgrade->usage            = 'Usage scenarios';
-$lang->upgrade->leanUsage        = 'Provides the core function of project management, suitable for small R&D teams';
-$lang->upgrade->newUsage         = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
+$lang->upgrade->lightUsage       = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->upgrade->ALMUsage         = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 $lang->upgrade->program          = 'Program';
 $lang->upgrade->productRR        = 'Product - R&D requirements';
 $lang->upgrade->productUR        = 'Product - User requirements';
@@ -154,10 +154,10 @@ $lang->upgrade->assetlib         = 'Assetlib';
 $lang->upgrade->oa               = 'OA, operation and maintenance, feedback, school, workflow';
 $lang->upgrade->vision           = 'Full Feature Interface, Operation Management Interface';
 $lang->upgrade->selectUsage      = 'Select a scenario';
-$lang->upgrade->useLean          = 'Use lean mode';
-$lang->upgrade->useNew           = 'User program mode';
+$lang->upgrade->useLight         = 'Use Light Mode';
+$lang->upgrade->useALM           = 'Use ALM Mode';
 $lang->upgrade->remark           = 'Remark';
 $lang->upgrade->remarkDesc       = 'You can also switch the mode in the Admin-System-Mode page of the system.';
 
-$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
-$lang->upgrade->to18Mode['new']  = 'Program Mode';
+$lang->upgrade->to18Mode['light'] = 'Light Mode';
+$lang->upgrade->to18Mode['ALM']   = 'ALM Mode';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 091b69d074..f185008ad4 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -139,8 +139,8 @@ $lang->upgrade->recoveryActions->review = 'Review';
 $lang->upgrade->selectMode       = 'Select Mode';
 $lang->upgrade->mode             = 'Mode';
 $lang->upgrade->usage            = 'Usage scenarios';
-$lang->upgrade->leanUsage        = 'Provides the core function of project management, suitable for small R&D teams';
-$lang->upgrade->newUsage         = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
+$lang->upgrade->lightUsage       = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->upgrade->ALMUsage         = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 $lang->upgrade->program          = 'Program';
 $lang->upgrade->productRR        = 'Product - R&D requirements';
 $lang->upgrade->productUR        = 'Product - User requirements';
@@ -154,10 +154,10 @@ $lang->upgrade->assetlib         = 'Assetlib';
 $lang->upgrade->oa               = 'OA, operation and maintenance, feedback, school, workflow';
 $lang->upgrade->vision           = 'Full Feature Interface, Operation Management Interface';
 $lang->upgrade->selectUsage      = 'Select a scenario';
-$lang->upgrade->useLean          = 'Use lean mode';
-$lang->upgrade->useNew           = 'User program mode';
+$lang->upgrade->useLight         = 'Use Light Mode';
+$lang->upgrade->useALM           = 'Use ALM Mode';
 $lang->upgrade->remark           = 'Remark';
 $lang->upgrade->remarkDesc       = 'You can also switch the mode in the Admin-System-Mode page of the system.';
 
-$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
-$lang->upgrade->to18Mode['new']  = 'Program Mode';
+$lang->upgrade->to18Mode['light'] = 'Light Mode';
+$lang->upgrade->to18Mode['ALM']   = 'ALM Mode';
diff --git a/module/upgrade/lang/fr.php b/module/upgrade/lang/fr.php
index 76c0a7a663..8f1ecef538 100644
--- a/module/upgrade/lang/fr.php
+++ b/module/upgrade/lang/fr.php
@@ -139,7 +139,7 @@ $lang->upgrade->recoveryActions->review = 'Review';
 $lang->upgrade->selectMode       = 'Select Mode';
 $lang->upgrade->mode             = 'Mode';
 $lang->upgrade->usage            = 'Usage scenarios';
-$lang->upgrade->leanUsage        = 'Provides the core function of project management, suitable for small R&D teams';
+$lang->upgrade->lightUsage       = 'Provides the core function of project management, suitable for small R&D teams';
 $lang->upgrade->newUsage         = 'The concept is more complete and rigorous, and the function is more abundant. It is suitable for medium and large R&D teams';
 $lang->upgrade->program          = 'Program';
 $lang->upgrade->productRR        = 'Product - R&D requirements';
@@ -154,10 +154,10 @@ $lang->upgrade->assetlib         = 'Assetlib';
 $lang->upgrade->oa               = 'OA, operation and maintenance, feedback, school, workflow';
 $lang->upgrade->vision           = 'Full Feature Interface, Operation Management Interface';
 $lang->upgrade->selectUsage      = 'Select a scenario';
-$lang->upgrade->useLean          = 'Use lean mode';
-$lang->upgrade->useNew           = 'User program mode';
+$lang->upgrade->useLight         = 'Use light mode';
+$lang->upgrade->useALM           = 'User ALM mode';
 $lang->upgrade->remark           = 'Remark';
 $lang->upgrade->remarkDesc       = 'You can also switch the mode in the Admin-System-Mode page of the system.';
 
-$lang->upgrade->to18Mode['lean'] = 'Lean Mode';
-$lang->upgrade->to18Mode['new']  = 'Program Mode';
+$lang->upgrade->to18Mode['light'] = 'Light Mode';
+$lang->upgrade->to18Mode['ALM']   = 'ALM Mode';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 5fe006c02f..1004c8ef7e 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -139,8 +139,8 @@ $lang->upgrade->recoveryActions->review = '评审';
 $lang->upgrade->selectMode       = '请选择使用模式';
 $lang->upgrade->mode             = '模式';
 $lang->upgrade->usage            = '使用场景';
-$lang->upgrade->leanUsage        = '提供了项目管理的核心功能，适用于小型研发团队';
-$lang->upgrade->newUsage         = '概念更加完整、严谨，功能更加丰富，适用于中大型研发团队';
+$lang->upgrade->lightUsage       = '提供了项目管理的核心功能，适用于小型研发团队';
+$lang->upgrade->ALMUsage         = '概念更加完整、严谨，功能更加丰富，适用于中大型研发团队';
 $lang->upgrade->program          = '项目集';
 $lang->upgrade->productRR        = '产品-研发需求';
 $lang->upgrade->productUR        = '产品-用户需求';
@@ -154,10 +154,10 @@ $lang->upgrade->assetlib         = '资产库';
 $lang->upgrade->oa               = '办公、运维、反馈、学堂、工作流';
 $lang->upgrade->vision           = '研发综合界面、运营管理界面';
 $lang->upgrade->selectUsage      = '请选择使用场景';
-$lang->upgrade->useLean          = '使用迅捷模式';
-$lang->upgrade->useNew           = '使用综合模式';
+$lang->upgrade->useLight         = '使用轻量管理模式';
+$lang->upgrade->useALM           = '使用全生命周期管理模式';
 $lang->upgrade->remark           = '备注';
 $lang->upgrade->remarkDesc       = '后续您还可以在禅道的后台-系统-模式中进行切换。';
 
-$lang->upgrade->to18Mode['lean'] = '迅捷模式';
-$lang->upgrade->to18Mode['new']  = '综合模式';
+$lang->upgrade->to18Mode['light'] = '轻量管理模式';
+$lang->upgrade->to18Mode['ALM']   = '全生命周期管理模式';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 11290ae603..626f885c42 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7706,13 +7706,13 @@ class upgradeModel extends model
     }
 
     /**
-     * Check history data form lean mode.
-     * 简要迅捷模式历史数据是否存在
+     * Check history data form light mode.
+     * 检查轻量管理模式历史数据是否存在
      *
      * @access public
      * @return array
      */
-    public function checkHistoryDataForLeanMode()
+    public function checkHistoryDataForLightMode()
     {
         $returnData = array(
             'ur' => false,
@@ -7721,7 +7721,7 @@ class upgradeModel extends model
             'assetlib' => false,
         );
 
-        if($this->config->systemMode == 'new')
+        if($this->config->systemMode == 'ALM')
         {
             /* User requriement */
             $requirementStory = $this->dao->select('count(1) as total')->from(TABLE_STORY)->where('type')->eq('requirement')->andWhere('deleted')->eq('0')->fetch('total');
diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php
index 4bfa43ee30..073e3f6ce7 100644
--- a/module/upgrade/view/createprogram.html.php
+++ b/module/upgrade/view/createprogram.html.php
@@ -5,8 +5,8 @@
   <tr><td class='createExecutionTip text-gray <?php echo $projectType == 'execution' ? '' : 'hidden';?>'><?php echo $lang->upgrade->createExecutionTip?></td></tr>
 </table>
 <table class='table table-form programForm'>
-  <caption class='strong'><?php echo $systemMode == 'lean' ? $lang->upgrade->setProject : $lang->upgrade->setProgram;?></caption>
-  <tr class="<?php echo $systemMode == 'lean' ? 'hide' : '';?>">
+  <caption class='strong'><?php echo $systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram;?></caption>
+  <tr class="<?php echo $systemMode == 'light' ? 'hide' : '';?>">
     <th>
       <span class="pgm-exist hidden"><?php echo $lang->upgrade->existProgram;?></span>
       <span class="pgm-no-exist"><?php echo $lang->upgrade->programName;?></span>
@@ -25,7 +25,7 @@
       <?php echo html::hidden('programID', '');?>
     </td>
   </tr>
-  <tr class="<?php echo $systemMode == 'lean' ? 'hide' : '';?>">
+  <tr class="<?php echo $systemMode == 'light' ? 'hide' : '';?>">
     <th><?php echo $lang->program->common . $lang->program->status;?></th>
     <td><?php echo html::select('programStatus', $lang->program->statusList, '', "class='form-control chosen'");?></td>
   </tr>
@@ -53,7 +53,7 @@
     <th><?php echo $lang->project->status;?></th>
     <td><?php echo html::select('projectStatus', $lang->project->statusList, '', "class='form-control chosen'");?></td>
   </tr>
-  <tr class='LineName <?php echo $systemMode == 'lean' ? 'hide' : '';?>'>
+  <tr class='LineName <?php echo $systemMode == 'light' ? 'hide' : '';?>'>
     <th>
       <span class="line-exist hidden"><?php echo $lang->upgrade->existLine;?></span>
       <span class="line-no-exist"><?php echo $lang->upgrade->line;?></span>
@@ -94,7 +94,7 @@
     </td>
   </tr>
   <tr class='programParams'>
-    <?php if($systemMode == 'lean') unset($lang->project->subAclList['program']);?>
+    <?php if($systemMode == 'light') unset($lang->project->subAclList['program']);?>
     <th><?php echo $lang->project->acl;?></th>
     <td class='programAcl'><?php echo nl2br(html::radio('programAcl', $lang->program->aclList, 'open', '', 'block'));?></td>
     <td class='projectAcl hidden'><?php echo nl2br(html::radio('projectAcl', $lang->project->subAclList, 'open', '', 'block'));?></td>
diff --git a/module/upgrade/view/selectmergemode.html.php b/module/upgrade/view/selectmergemode.html.php
index 5639ec29ba..51b2cadf2b 100644
--- a/module/upgrade/view/selectmergemode.html.php
+++ b/module/upgrade/view/selectmergemode.html.php
@@ -31,7 +31,7 @@
                       <?php echo $label;?>
                       <?php $tipLang = 'merge' . ucfirst($mode) . 'Tip';?>
                       <div class='tips text-gray'><?php echo $lang->upgrade->{$tipLang};?></div>
-                      <?php if($systemMode == 'new' && $mode != 'manually'):?>
+                      <?php if($systemMode == 'ALM' && $mode != 'manually'):?>
                       <div class='tips text-gray'><?php echo $lang->upgrade->createProgramTip;?></div>
                       <?php endif;?>
                     </label>
diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php
index df69123edf..4deab5aaf9 100644
--- a/module/upgrade/view/to18guide.html.php
+++ b/module/upgrade/view/to18guide.html.php
@@ -22,15 +22,15 @@
               <thead>
                 <tr>
                   <th colspan='2'><?php echo $this->lang->upgrade->mode;?></th>
-                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['lean'];?></th>
-                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['new'];?></th>
+                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['light'];?></th>
+                  <th colspan='2' class="text-center"><?php echo $this->lang->upgrade->to18Mode['ALM'];?></th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
                   <td colspan='2'><?php echo $this->lang->upgrade->usage;?></td>
-                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->leanUsage;?></td>
-                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->newUsage;?></td>
+                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->lightUsage;?></td>
+                  <td colspan='2' class="text-center"><?php echo $this->lang->upgrade->ALMUsage;?></td>
                 </tr>
                 <tr>
                   <td colspan='2'><?php echo $this->lang->upgrade->program;?></td>
@@ -104,8 +104,8 @@
                 </tr>
                 <tr>
                   <td colspan='2' style="font-weight:bold;font-size:14px;"><?php echo $this->lang->upgrade->selectUsage;?></td>
-                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useLean'><?php echo $this->lang->upgrade->useLean;?></button></td>
-                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useNew'><?php echo $this->lang->upgrade->useNew;?></button></td>
+                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useLight'><?php echo $this->lang->upgrade->useLight;?></button></td>
+                  <td colspan='2' class="text-center"><button class="btn" type="button" id='useALM'><?php echo $this->lang->upgrade->useALM;?></button></td>
                 </tr>
                 <tr>
                   <td colspan='2'><?php echo $this->lang->upgrade->remark;?></td>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 816199e89d..c9ce81010e 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -39,7 +39,7 @@
     $active = $methodName == 'testcase' ? ' btn-active-text' : '';
     common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active testcaseTab'");
 
-    if($this->config->systemMode == 'new')
+    if($this->config->systemMode == 'ALM')
     {
         $label  = "<span class='text'>{$lang->user->execution}</span>";
         $active = $methodName == 'execution' ? ' btn-active-text' : '';