diff --git a/module/block/control.php b/module/block/control.php
index 06377dddb3..8cc8d9d167 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -215,7 +215,7 @@ class block extends control
         $commonField = 'common';
         if($module == 'program')
         {
-            $program     = $this->loadModel('project')->getByID($this->session->PRJ);
+            $program     = $this->loadModel('project')->getByID($this->session->project);
             $commonField = $program->model . 'common';
         }
 
@@ -438,7 +438,7 @@ class block extends control
             /* Create a project block. */
             if($dashboard == 'program')
             {
-                $project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
+                $project = $this->loadModel('project')->getByID($this->session->project);
                 $model   = $project->model;
             }
 
@@ -594,7 +594,7 @@ class block extends control
         $this->session->set('storyList', $uri);
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy, $projectID);
     }
 
@@ -609,7 +609,7 @@ class block extends control
         $this->session->set('bugList', $this->app->getURI(true));
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
         $this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $projectID);
     }
@@ -626,7 +626,7 @@ class block extends control
         $this->app->loadLang('testcase');
         $this->app->loadLang('testtask');
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
 
         $cases = array();
@@ -670,7 +670,7 @@ class block extends control
         $this->session->set('testtaskList', $this->app->getURI(true));
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
 
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
         $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
 
         $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
@@ -740,7 +740,7 @@ class block extends control
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
             ->where('t1.deleted')->eq('0')
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('t1.PRJ')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.PRJ')->eq((int)$this->session->project)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
             ->orderBy('t1.id desc')
             ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
@@ -761,7 +761,7 @@ class block extends control
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
             ->where('t1.deleted')->eq('0')
             ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('t1.PRJ')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.PRJ')->eq((int)$this->session->project)->fi()
             ->orderBy('t1.id desc')
             ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
             ->fetchAll();
@@ -781,7 +781,7 @@ class block extends control
         $type    = isset($this->params->type)    ? $this->params->type    : 'all';
         $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
 
-        $this->view->projects = $this->loadModel('program')->getPRJOverview('byStatus', $type, $orderBy, $count);
+        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $type, $orderBy, $count);
         $this->view->users    = $this->loadModel('user')->getPairs('noletter');
     }
 
@@ -848,7 +848,7 @@ class block extends control
         $count  = isset($this->params->count) ? (int)$this->params->count : 15;
 
         /* Get projects. */
-        $projects = $this->loadModel('program')->getPRJOverview('byStatus', $status, 'id_desc', $count);
+        $projects = $this->loadModel('project')->getOverviewList('byStatus', $status, 'id_desc', $count);
         if(empty($projects))
         {
             $this->view->projects = $projects;
@@ -857,8 +857,8 @@ class block extends control
 
         $today  = helper::today();
         if(isset($this->config->maxVersion)) $monday = date('Ymd', strtotime($this->loadModel('weekly')->getThisMonday($today)));
-        $tasks  = $this->dao->select("PRJ, 
-            sum(consumed) as totalConsumed, 
+        $tasks  = $this->dao->select("PRJ,
+            sum(consumed) as totalConsumed,
             sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")
             ->from(TABLE_TASK)
             ->where('PRJ')->in(array_keys($projects))
@@ -872,7 +872,7 @@ class block extends control
             if($project->model == 'scrum')
             {
                 $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
-                $project->executions = $this->project->getExecutionStats($projectID, 'all', 0, 0, 30, 'id_asc');
+                $project->executions = $this->loadModel('execution')->getStats($projectID, 'all', 0, 0, 30, 'id_asc');
             }
             elseif($project->model == 'waterfall' and isset($this->config->maxVersion))
             {
@@ -1046,7 +1046,7 @@ class block extends control
         $count   = isset($this->params->count) ? (int)$this->params->count : 0;
 
         /* Get projects. */
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $executions = $this->loadModel('project')->getOrderedExecutions($projectID, $status, $count);
         if(empty($executions))
         {
@@ -1166,7 +1166,7 @@ class block extends control
      */
     public function printWaterfallReportBlock()
     {
-        $project = $this->loadModel('program')->getPRJByID($this->session->PRJ);
+        $project = $this->loadModel('project')->getByID($this->session->project);
         $today   = helper::today();
         $date    = date('Ymd', strtotime('this week Monday'));
         $begin   = $project->begin;
@@ -1174,16 +1174,16 @@ class block extends control
         $current = zget($weeks, $date, '');
 
         $task = $this->dao->select("
-            sum(consumed) as totalConsumed, 
+            sum(consumed) as totalConsumed,
             sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")
-            ->from(TABLE_TASK)->where('PRJ')->eq($this->session->PRJ)
+            ->from(TABLE_TASK)->where('PRJ')->eq($this->session->project)
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->fetch();
 
-        $this->view->pv = $this->weekly->getPV($this->session->PRJ, $today);
-        $this->view->ev = $this->weekly->getEV($this->session->PRJ, $today);
-        $this->view->ac = $this->weekly->getAC($this->session->PRJ, $today);
+        $this->view->pv = $this->weekly->getPV($this->session->project, $today);
+        $this->view->ev = $this->weekly->getEV($this->session->project, $today);
+        $this->view->ac = $this->weekly->getAC($this->session->project, $today);
         $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
         $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
 
@@ -1199,11 +1199,11 @@ class block extends control
      */
     public function printWaterfallGanttBlock()
     {
-        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->project);
         $productID = $this->session->product ? $this->session->product : 0;
         $productID = isset($products[$productID]) ? $productID : key($products);
 
-        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->PRJ, $productID, 0, 'task', false);
+        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->project, $productID, 0, 'task', false);
         $this->view->products  = $products;
         $this->view->productID = $productID;
     }
@@ -1220,7 +1220,7 @@ class block extends control
         $this->session->set('issueList',  $uri);
         if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
         $this->view->users  = $this->loadModel('user')->getPairs('noletter');
-        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->PRJ, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
 
     /**
@@ -1234,7 +1234,7 @@ class block extends control
         $uri = $this->app->getURI(true);
         $this->session->set('riskList',  $uri);
         $this->view->users = $this->loadModel('user')->getPairs('noletter');
-        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->PRJ, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
     }
 
     /**
@@ -1246,14 +1246,14 @@ class block extends control
     public function printWaterfallEstimateBlock()
     {
         $this->app->loadLang('durationestimation');
-        $programID = $this->session->PRJ;
-        $members   = $this->loadModel('project')->getTeamMemberPairs($programID);
-        $budget    = $this->loadModel('workestimation')->getBudget($programID);
+        $projectID = $this->session->project;
+        $members   = $this->loadModel('project')->getTeamMemberPairs($projectID);
+        $budget    = $this->loadModel('workestimation')->getBudget($projectID);
         if(empty($budget)) $budget = new stdclass();
 
-        $this->view->people   = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('PRJ')->eq($this->session->PRJ)->fetch('people');
+        $this->view->people   = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('PRJ')->eq($this->session->project)->fetch('people');
         $this->view->members  = count($members) ? count($members) - 1 : 0;
-        $this->view->consumed = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('PRJ')->eq($programID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
+        $this->view->consumed = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('PRJ')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
         $this->view->budget   = $budget;
     }
 
@@ -1267,8 +1267,8 @@ class block extends control
     {
         $this->loadModel('milestone');
         $this->loadModel('weekly');
-        $projectID = $this->session->PRJ;
-        $project   = $this->loadModel('program')->getPRJByID($projectID);
+        $projectID = $this->session->project;
+        $project   = $this->loadModel('project')->getByID($projectID);
 
         $begin = $project->begin;
         $today = helper::today();
@@ -1304,8 +1304,8 @@ class block extends control
      */
     public function printScrumOverviewBlock()
     {
-        $projectID = $this->session->PRJ;
-        $totalData = $this->loadModel('program')->getPRJOverview('byId', $projectID, 'id_desc', 1);
+        $projectID = $this->session->project;
+        $totalData = $this->loadModel('project')->getOverviewList('byId', $projectID, 'id_desc', 1);
 
         $this->view->totalData = $totalData;
         $this->view->projectID = $projectID;
@@ -1324,7 +1324,7 @@ class block extends control
         $count = isset($this->params->count) ? (int)$this->params->count : 15;
         $type  = isset($this->params->type) ? $this->params->type : 'all';
         $pager = pager::init(0, $count, 1);
-        $this->view->executionStats = $this->loadModel('project')->getExecutionStats($this->session->PRJ, $type, 0, 0, 30, 'id_desc', $pager);
+        $this->view->executionStats = $this->loadModel('execution')->getStats($this->session->project, $type, 0, 0, 30, 'id_desc', $pager);
     }
 
     /**
@@ -1340,7 +1340,7 @@ class block extends control
         $releases = array();
         $count    = isset($this->params->count) ? (int)$this->params->count : 15;
 
-        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->PRJ)->limit(15)->fetchPairs();
+        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->project)->limit(15)->fetchPairs();
         $productIdList = array_keys($products);
         if(!empty($productIdList))
         {
@@ -1367,7 +1367,7 @@ class block extends control
         $sprints = $this->dao->select('status, count(*) as sprints')->from(TABLE_EXECUTION)
             ->where('deleted')->eq(0)
             ->andWhere('type')->eq('sprint')
-            ->andWhere('parent')->eq($this->session->PRJ)
+            ->andWhere('parent')->eq($this->session->project)
             ->groupBy('status')
             ->fetchPairs();
 
@@ -1392,7 +1392,7 @@ class block extends control
      */
     public function printProjectDynamicBlock()
     {
-        $projectID = $this->session->PRJ;
+        $projectID = $this->session->project;
 
         $executions = $this->loadModel('project')->getExecutionPairs($projectID);
         $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
@@ -1424,7 +1424,7 @@ class block extends control
         $this->session->set('releaseList',     $this->app->getURI(true));
         $this->session->set('productPlanList', $this->app->getURI(true));
 
-        $products  = $this->loadModel('product')->getPairs('', $this->session->PRJ);
+        $products  = $this->loadModel('product')->getPairs('', $this->session->project);
         if(!is_numeric($productID)) $productID = key($products);
 
         $this->view->roadmaps  = $this->product->getRoadmap($productID, 0, 6);
@@ -1461,7 +1461,7 @@ class block extends control
             ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
             ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
+            ->andWhere('t1.PRJ')->eq($this->session->project)->fi()
             ->andWhere('t1.product = t5.product')
             ->beginIF($status != 'all')->andWhere('t1.status')->eq($status)->fi()
             ->orderBy('t1.id desc')
@@ -1483,7 +1483,7 @@ class block extends control
         $status = isset($this->params->type)  ? $this->params->type : '';
         $count  = isset($this->params->count) ? (int)$this->params->count : 0;
 
-        $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->PRJ : 0;
+        $projectID = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0;
         $products  = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID);
         if(empty($products))
         {
@@ -1587,7 +1587,7 @@ class block extends control
      */
     public function printProjectOverviewBlock()
     {
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $executions = $this->loadModel('project')->getExecutionList($projectID);
 
         $total = 0;
@@ -1620,7 +1620,7 @@ class block extends control
     {
         $casePairs = $this->dao->select('lastRunResult, COUNT(*) AS count')->from(TABLE_CASE)
             ->where('1=1')
-            ->beginIF($this->view->block->module != 'my' and $this->session->PRJ)->andWhere('PRJ')->eq((int)$this->session->PRJ)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('PRJ')->eq((int)$this->session->project)->fi()
             ->groupBy('lastRunResult')
             ->fetchPairs();
 
@@ -1657,8 +1657,8 @@ class block extends control
         $status = isset($this->params->type)  ? $this->params->type : 'all';
         $pager  = pager::init(0, $count, 1);
 
-        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ;
-        $this->view->executionStats = $this->loadModel('project')->getExecutionStats($projectID, $status, 0, 0, 30, 'id_asc', $pager);
+        $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
+        $this->view->executionStats = $this->loadModel('execution')->getStats($projectID, $status, 0, 0, 30, 'id_asc', $pager);
     }
 
     /**
@@ -1794,7 +1794,7 @@ class block extends control
         /* load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager(0, 3, 1);
-        $this->view->projects = $this->loadModel('program')->getPRJInfo('all', 30, 'id_desc', $pager);
+        $this->view->projects = $this->loadModel('project')->getInfoList('all', 30, 'id_desc', $pager);
     }
 
     /**
@@ -1811,7 +1811,7 @@ class block extends control
 
         /* Get projects. */
         $this->app->loadLang('task');
-        $this->view->projects = $this->loadModel('program')->getPRJOverview('byStatus', $status, $orderBy, $count);
+        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $status, $orderBy, $count);
     }
 
     /**
diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php
index 795cc6db7c..5af4c1331f 100644
--- a/module/block/view/programblock.html.php
+++ b/module/block/view/programblock.html.php
@@ -9,16 +9,16 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-programs <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr>
-        <th class='c-name w-100px'><?php echo $lang->program->PRJName;?></th>
-        <th class='w-100px'><?php echo $lang->program->PGMPM;?></th>
-        <th class='w-80px'><?php echo $lang->program->PGMStatus;?></th>
+        <th class='c-name w-100px'><?php echo $lang->project->name;?></th>
+        <th class='w-100px'><?php echo $lang->program->PM;?></th>
+        <th class='w-80px'><?php echo $lang->program->status;?></th>
         <?php if($longBlock):?>
         <th class='w-60px'><?php echo $lang->program->teamCount;?></th>
         <th class='w-90px text-right'><?php echo $lang->task->consumed;?></th>
-        <th class='w-80px text-right'><?php echo $lang->program->PGMBudget;?></th>
-        <th class='w-80px'><?php echo $lang->program->leftStories;?></th>
-        <th class='w-80px'><?php echo $lang->program->leftTasks;?></th>
-        <th class='w-80px'><?php echo $lang->program->leftBugs;?></th>
+        <th class='w-80px text-right'><?php echo $lang->program->budget;?></th>
+        <th class='w-80px'><?php echo $lang->project->leftStories;?></th>
+        <th class='w-80px'><?php echo $lang->project->leftTasks;?></th>
+        <th class='w-80px'><?php echo $lang->project->leftBugs;?></th>
         <?php endif;?>
       </tr>
     </thead>
@@ -35,9 +35,9 @@
         </td>
         <?php if($longBlock):?>
         <td class='text-center'><?php echo $project->teamCount;?></td>
-        <td class='text-right' title="<?php echo $project->consumed . ' ' . $lang->project->workHour;?>"><?php echo $project->consumed . ' ' . $lang->project->workHourUnit;?></td>
+        <td class='text-right' title="<?php echo $project->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->consumed . ' ' . $lang->execution->workHourUnit;?></td>
         <?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format((float)$project->budget, 1);?>
-        <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->program->future;?></td>
+        <td class='text-right'><?php echo $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
         <td class='text-center'><?php echo $project->leftStories;?></td>
         <td class='text-center'><?php echo $project->leftTasks;?></td>
         <td class='text-center'><?php echo $project->leftBugs;?></td>
diff --git a/module/block/view/programstatisticblock.html.php b/module/block/view/programstatisticblock.html.php
index ab6fc2877f..f3ff2ebd49 100644
--- a/module/block/view/programstatisticblock.html.php
+++ b/module/block/view/programstatisticblock.html.php
@@ -108,7 +108,7 @@ $(function()
         <?php foreach($projects as $project):?>
         <li <?php if($project->id == $selected) echo "class='active' id='activeProject'";?> projectID='<?php echo $project->id;?>'>
           <a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a>
-          <?php echo html::a(helper::createLink('program', 'index', "projectID=$project->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->program->PGMIndex}");?>
+          <?php echo html::a(helper::createLink('program', 'index', "projectID=$project->id"), "<i class='icon-arrow-right text-primary'></i>", '', "class='btn-view' title={$lang->project->index}");?>
         </li>
         <?php endforeach;?>
         <li class='switch-icon next'><a><i class='icon icon-arrow-right'></i></a></li>
@@ -123,39 +123,39 @@ $(function()
             <div class="progress-pie inline-block space" data-value="<?php echo $project->progress;?>" data-doughnut-size="84">
               <canvas width="120" height="120"></canvas>
               <div class="progress-info">
-                <small><?php echo $lang->story->common . $lang->program->doneStories;?></small>
+                <small><?php echo $lang->story->common . $lang->project->doneStories;?></small>
                 <strong><?php echo $project->doneStories;?></strong>
               </div>
             </div>
             <div class="table-row text-center small text-muted with-padding">
               <div class="col-4 text-bottom">
-                <div><?php echo $lang->program->allStories;?></div>
+                <div><?php echo $lang->project->allStories;?></div>
                 <div><?php echo $project->allStories;?></div>
               </div>
               <div class="col-4">
                 <span class="label label-dot label-primary"></span>
-                <div><?php echo $lang->program->doneStories;?></div>
+                <div><?php echo $lang->project->doneStories;?></div>
                 <div><?php echo $project->doneStories;?></div>
               </div>
               <div class="col-4">
                 <span class="label label-dot label-pale"></span>
-                <div><?php echo $lang->program->leftStories;?></div>
+                <div><?php echo $lang->project->leftStories;?></div>
                 <div><?php echo $project->leftStories;?></div>
               </div>
             </div>
           </div>
           <div class="col-7">
             <div class="project-info">
-              <h4><?php echo $lang->program->allInput;?></h4>
+              <h4><?php echo $lang->project->allInput;?></h4>
               <div class='info'>
-                <span><i class='icon icon-group'></i> <?php echo sprintf($lang->program->membersUnit, $project->teamCount);?></span>
-                <span><i class='icon icon-clock'></i> <?php echo sprintf($lang->program->hoursUnit, $project->estimate);?></span>
-                <span><i class='icon icon-cost'></i> <?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></span>
+                <span><i class='icon icon-group'></i> <?php echo sprintf($lang->project->membersUnit, $project->teamCount);?></span>
+                <span><i class='icon icon-clock'></i> <?php echo sprintf($lang->project->hoursUnit, $project->estimate);?></span>
+                <span><i class='icon icon-cost'></i> <?php echo $project->budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?></span>
               </div>
             </div>
             <div class="project-info">
               <?php $i = 0;?>
-              <h4><?php echo $lang->program->lastIteration;?></h4>
+              <h4><?php echo $lang->project->lastIteration;?></h4>
               <?php foreach($project->executions as $execution):?>
               <?php $i ++;?>
               <?php if($i > 3) break;?>
@@ -173,12 +173,12 @@ $(function()
         <?php else:?>
           <div class="col-6">
             <div class='table-row text-left weekly-row with-padding'>
-              <span class='weekly-title'><?php echo $lang->program->weekly;?></span>
+              <span class='weekly-title'><?php echo $lang->project->weekly;?></span>
               <span class='stage text-muted'><?php echo $project->current;?></span>
             </div>
             <div class='progress-group col-10 center-block'>
               <div class='progress-num text-center'>
-                <div class='weekly-title'><?php echo $lang->program->PRJProgress;?></div>
+                <div class='weekly-title'><?php echo $lang->project->PRJProgress;?></div>
                 <div class='weekly-progress'><?php echo $project->progress . '%';?></div>
               </div>
               <div class='progress'>
@@ -187,15 +187,15 @@ $(function()
             </div>
             <div class="table-row text-center small with-padding col-10 center-block">
               <div class="col-4 text-bottom">
-                <div class='weekly-name'><?php echo $lang->program->pv;?></div>
+                <div class='weekly-name'><?php echo $lang->project->pv;?></div>
                 <div class='weekly-value'><?php echo $project->pv;?></div>
               </div>
               <div class="col-4">
-                <div class='weekly-name'><?php echo $lang->program->ev;?></div>
+                <div class='weekly-name'><?php echo $lang->project->ev;?></div>
                 <div class='weekly-value'><?php echo $project->ev;?></div>
               </div>
               <div class="col-4">
-                <div class='weekly-name'><?php echo $lang->program->sv;?></div>
+                <div class='weekly-name'><?php echo $lang->project->sv;?></div>
                 <div class='weekly-value'><?php echo $project->sv;?></div>
               </div>
             </div>
@@ -203,33 +203,33 @@ $(function()
           <div class='col-6'>
             <div class='table-row weekly-row with-padding'>
               <div class='col-4 text-center'>
-                <span class='weekly-title'><?php echo $lang->program->allInput;?></span>
+                <span class='weekly-title'><?php echo $lang->project->allInput;?></span>
               </div>
               <div class='col-8'></div>
             </div>
             <div class='progress-group'>
               <div class="table-row text-center small with-padding">
                 <div class="col-4 text-bottom">
-                  <div class='weekly-name'><?php echo $lang->program->PRJPM;?></div>
-                  <div class='weekly-value'><?php echo $project->PM ? zget($users, $project->PM) : $lang->program->emptyPM;?></div>
+                  <div class='weekly-name'><?php echo $lang->project->PRJPM;?></div>
+                  <div class='weekly-value'><?php echo $project->PM ? zget($users, $project->PM) : $lang->project->emptyPM;?></div>
                 </div>
                 <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->program->teamCount;?></div>
+                  <div class='weekly-name'><?php echo $lang->project->teamCount;?></div>
                   <div class='weekly-value'><?php echo $project->teamCount;?></div>
                 </div>
                 <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->program->PRJBudget;?></div>
+                  <div class='weekly-name'><?php echo $lang->project->PRJBudget;?></div>
                   <div class='weekly-value'><?php echo $project->budget;?></div>
                 </div>
               </div>
             </div>
             <div class="table-row text-center small with-padding">
                 <div class="col-4 text-bottom">
-                  <div class='weekly-name'><?php echo $lang->program->ac;?></div>
+                  <div class='weekly-name'><?php echo $lang->project->ac;?></div>
                   <div class='weekly-value'><?php echo $project->ac;?></div>
                 </div>
                 <div class="col-4">
-                  <div class='weekly-name'><?php echo $lang->program->cv;?></div>
+                  <div class='weekly-name'><?php echo $lang->project->cv;?></div>
                   <div class='weekly-value'><?php echo $project->cv;?></div>
                 </div>
                 <div>
diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php
index bb89a6860b..7e4fff2426 100644
--- a/module/block/view/programteamblock.html.php
+++ b/module/block/view/programteamblock.html.php
@@ -8,7 +8,7 @@ $maxConsumed  = 0;
 <div class='panel-body'>
   <div class='table-row'>
     <div class='table-col chart-titles'>
-      <div class='chart-col-title strong'><span><?php echo $lang->program->PRJName;?></span></div>
+      <div class='chart-col-title strong'><span><?php echo $lang->project->name;?></span></div>
       <?php foreach($projects as $project):?>
       <?php
       $maxTeamCount = max($maxTeamCount, $project->teamCount);
@@ -37,7 +37,7 @@ $maxConsumed  = 0;
           <div class='chart-col-item'>
             <div class='progress'>
               <div class='progress-bar' style='width: <?php echo $maxConsumed ? (100 * $project->consumed / $maxConsumed) : 0; ?>%'>
-                <div class='progress-text' title="<?php echo $project->consumed . $lang->project->workHour;?>"><?php echo $project->consumed . $lang->project->workHourUnit;?></div>
+                <div class='progress-text' title="<?php echo $project->consumed . $lang->execution->workHour;?>"><?php echo $project->consumed . $lang->execution->workHourUnit;?></div>
               </div>
             </div>
           </div>
diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php
index 575f824fa7..e21038f0ad 100644
--- a/module/block/view/recentprojectblock.html.php
+++ b/module/block/view/recentprojectblock.html.php
@@ -41,9 +41,9 @@
         <div class='panel-heading not-move-handler'>
           <strong class='project-name' title='<?php echo $project->name;?>'> <?php echo html::a($this->createLink('project', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?> </strong>
           <?php if($project->model === 'waterfall'): ?>
-          <span class='project-type-label label label-warning label-outline'><?php echo $lang->program->waterfall; ?></span>
+          <span class='project-type-label label label-warning label-outline'><?php echo $lang->project->waterfall; ?></span>
           <?php else: ?>
-          <span class='project-type-label label label-info label-outline'><?php echo $lang->program->scrum; ?></span>
+          <span class='project-type-label label label-info label-outline'><?php echo $lang->project->scrum; ?></span>
           <?php endif; ?>
           <nav class='panel-actions nav nav-default'>
             <li class='dropdown'>
@@ -63,12 +63,12 @@
         </div>
         <div class='panel-body'>
           <div class='project-infos'>
-            <span><i class='icon icon-group'></i> <?php printf($lang->program->membersUnit, $project->teamCount); ?></span>
-            <span><i class='icon icon-clock'></i> <?php printf($lang->program->hoursUnit, $project->estimate); ?></span>
+            <span><i class='icon icon-group'></i> <?php printf($lang->project->membersUnit, $project->teamCount); ?></span>
+            <span><i class='icon icon-clock'></i> <?php printf($lang->project->hoursUnit, $project->estimate); ?></span>
           </div>
           <?php if($project->model === 'waterfall'): ?>
           <div class='project-detail project-stages'>
-            <p class='text-muted'><?php echo $lang->program->ongoingStage;?></p>
+            <p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
             <?php
             $projectProjects = array();
             foreach($project->executions as $project)
@@ -93,7 +93,7 @@
           <?php else: ?>
           <?php $project = empty($project->executions ) ? '' : end($project->executions);?>
           <div class='project-detail project-iteration'>
-            <p class='text-muted'><?php echo $lang->program->lastIteration; ?></p>
+            <p class='text-muted'><?php echo $lang->project->lastIteration; ?></p>
             <?php if($project):?>
             <div class='row'>
               <div class='col-xs-5'><?php echo $project->name;?></div>
diff --git a/module/doc/model.php b/module/doc/model.php
index b56c7c7cdd..a41c79e33d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -157,7 +157,7 @@ class docModel extends model
             if($type == 'project')
             {
                 $status = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'undone' : 'all';
-                $idList = $this->loadModel('project')->getExecutionIdList($projectID, $status);
+                $idList = $this->loadModel('execution')->getIdList($projectID, $status);
             }
 
             $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
@@ -170,7 +170,7 @@ class docModel extends model
         {
             /* If extra have unclosedProject then ignore unclosed project libs. */
             $status          = (strpos($extra, 'unclosedProject') !== false) ? 'undone' : 'all';
-            $executionIdList = $this->loadModel('project')->getExecutionIdList($projectID, $status);
+            $executionIdList = $this->loadModel('execution')->getIdList($projectID, $status);
             $productIdList   = $this->loadModel('product')->getProductIDByProject($projectID, false);
 
             $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
@@ -195,7 +195,7 @@ class docModel extends model
         if(strpos($extra, 'withObject') !== false)
         {
             $products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
-            $projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'noclosed');
+            $projects = $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'noclosed');
         }
 
         $libPairs = array();
@@ -780,7 +780,7 @@ class docModel extends model
         $this->config->doc->search['actionURL'] = $actionURL;
         $this->config->doc->search['queryID']   = $queryID;
         $this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode', $this->session->PRJ) + array('all'=>$this->lang->doc->allProduct);
-        $this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'noclosed') + array('all'=>$this->lang->doc->allProject);
+        $this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->loadModel('execution')->getPairs($this->session->PRJ, 'all', 'noclosed') + array('all'=>$this->lang->doc->allProject);
         $this->config->doc->search['params']['lib']['values']     = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
 
         /* Get the modules. */
@@ -1141,7 +1141,7 @@ class docModel extends model
                 $objectList = $this->loadModel('product')->getPairs();
             }
 
-            if($type == 'project') $objectList = $this->loadModel('project')->getExecutionsByProject($projectID, $executionStatus, 0, true);
+            if($type == 'project') $objectList = $this->loadModel('execution')->getByProject($projectID, $executionStatus, 0, true);
             if(empty($objectList)) return $libs;
 
             $docLibs = $this->dao->select('*')->from(TABLE_DOCLIB)
@@ -1565,7 +1565,7 @@ class docModel extends model
     public function getLibIdListByProject($projectID = 0)
     {
         $products = $this->loadModel('product')->getProductIDByProject($projectID, false);
-        $projects = $this->loadModel('project')->getExecutionPairs($projectID, 'all', 'noclosed');
+        $projects = $this->loadModel('execution')->getPairs($projectID, 'all', 'noclosed');
 
         $projectLibs = array();
         $productLibs = array();
@@ -1592,7 +1592,7 @@ class docModel extends model
         $today  = date('Y-m-d');
         $lately = date('Y-m-d', strtotime('-3 day'));
         $statisticInfo = $this->dao->select("count(id) as totalDocs, count(editedDate like '{$today}%' or null) as todayEditedDocs,
-            count(editedDate > '{$lately}' or null) as lastEditedDocs, count(addedDate > '{$lately}' or null) as lastAddedDocs, 
+            count(editedDate > '{$lately}' or null) as lastEditedDocs, count(addedDate > '{$lately}' or null) as lastAddedDocs,
             count(collector like '%,{$this->app->user->account},%' or null) as myCollection, count(addedBy = '{$this->app->user->account}' or null) as myDocs")->from(TABLE_DOC)
             ->where('deleted')->eq(0)
             ->andWhere('id')->in($docIdList)
diff --git a/module/execution/control.php b/module/execution/control.php
index a30509981f..88c02eb8ee 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1,22 +1,22 @@
 <?php
 /**
- * The control file of project module of ZenTaoPMS.
+ * The control file of execution module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: control.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-class project extends control
+class execution extends control
 {
     /**
-     * The global $projects.
+     * The global $executions.
      *
      * @var array
      * @access public
      */
-    public $projects;
+    public $executions;
 
     /**
      * The global $objectType.
@@ -27,7 +27,7 @@ class project extends control
     public $objectType;
 
     /**
-     * Construct function, Set projects.
+     * Construct function, Set executions.
      *
      * @param  string $moduleName
      * @param  string $methodName
@@ -37,48 +37,51 @@ class project extends control
     public function __construct($moduleName = '', $methodName = '')
     {
         parent::__construct($moduleName, $methodName);
+
+        $this->loadModel('project');
+
         if(!in_array($this->methodName, array('computeburn', 'ajaxgetrecentexecutions')))
         {
-            $this->projects = $this->project->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
-            if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create'));
+            $this->executions = $this->execution->getPairs($this->session->project, 'all', 'nocode');
+            if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
         }
-        $this->objectType = $this->config->systemMode == 'classic' ? 'project' : 'exection';
+        $this->objectType = $this->config->systemMode == 'classic' ? 'execution' : 'exection';
     }
 
     /**
      * The index page.
      *
      * @param  string $locate     yes|no locate to the browse page or not.
-     * @param  string $status     the projects status, if locate is no, then get projects by the $status.
-     * @param  int    $projectID
+     * @param  string $status     the executions status, if locate is no, then get executions by the $status.
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function index($locate = 'auto', $projectID = 0)
+    public function index($locate = 'auto', $executionID = 0)
     {
-        if($locate == 'yes') $this->locate($this->createLink('project', 'task'));
+        if($locate == 'yes') $this->locate($this->createLink('execution', 'task'));
 
-        if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index);
-        $this->commonAction($projectID);
+        if($this->app->viewType != 'mhtml') unset($this->lang->execution->menu->index);
+        $this->commonAction($executionID);
 
-        if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary'");
+        if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
-        $this->view->title         = $this->lang->project->index;
-        $this->view->position[]    = $this->lang->project->index;
+        $this->view->title         = $this->lang->execution->index;
+        $this->view->position[]    = $this->lang->execution->index;
 
         $this->display();
     }
 
     /**
-     * Browse a project.
+     * Browse a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function browse($projectID = 0)
+    public function browse($executionID = 0)
     {
-        $this->locate($this->createLink($this->moduleName, 'task', "projectID=$projectID"));
+        $this->locate($this->createLink($this->moduleName, 'task', "executionID=$executionID"));
     }
 
     /**
@@ -94,20 +97,20 @@ class project extends control
         $this->loadModel('product');
 
         /* Get executions and products info. */
-        $executionID     = $this->project->saveState($executionID, $this->projects);
-        $execution       = $this->project->getById($executionID);
-        $products        = $this->project->getProducts($executionID);
-        $childExecutions = $this->project->getChildExecutions($executionID);
-        $teamMembers     = $this->project->getTeamMembers($executionID);
+        $executionID     = $this->execution->saveState($executionID, $this->executions);
+        $execution       = $this->execution->getById($executionID);
+        $products        = $this->execution->getProducts($executionID);
+        $childExecutions = $this->execution->getChildExecutions($executionID);
+        $teamMembers     = $this->execution->getTeamMembers($executionID);
         $actions         = $this->loadModel('action')->getList('execution', $executionID);
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $executionID, $buildID = 0, $extra);
+        $this->execution->setMenu($this->executions, $executionID, $buildID = 0, $extra);
 
         /* Assign. */
-        $this->view->projects      = $this->projects;
-        $this->view->project       = $execution;
-        $this->view->childProjects = $childExecutions;
+        $this->view->executions      = $this->executions;
+        $this->view->execution       = $execution;
+        $this->view->childExecutions = $childExecutions;
         $this->view->products      = $products;
         $this->view->teamMembers   = $teamMembers;
 
@@ -132,9 +135,9 @@ class project extends control
         /* Save last PRJ. */
         if($this->config->systemMode == 'new')
         {
-            $projectID = $this->loadModel('program')->savePRJState($this->session->PRJ, $this->program->getPRJPairs());
-            if(!$projectID) $this->locate($this->createLink('program', 'PRJbrowse')); 
-            setCookie("lastPRJ", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+            $executionID = $this->project->saveState($this->session->project, $this->project->getPairs());
+            if(!$executionID) $this->locate($this->createLink('program', 'PRJbrowse'));
+            setCookie("lastPRJ", $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         }
 
         $this->loadModel('tree');
@@ -143,7 +146,7 @@ class project extends control
         $this->loadModel('datatable');
         $this->loadModel('setting');
 
-        if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create', ''), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary'");
+        if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create', ''), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
         /* Set browse type. */
         $browseType = strtolower($status);
@@ -151,18 +154,18 @@ class project extends control
         /* Get products by execution. */
         $execution   = $this->commonAction($executionID, $status);
         $executionID = $execution->id;
-        $products    = $this->loadModel('product')->getProductPairsByProject($executionID);
-        setcookie('preProjectID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        $products    = $this->loadModel('product')->getProductPairsByExecution($executionID);
+        setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
         /* Save the recently five executions visited in the cookie. */
-        $recentExecutions = isset($this->config->project->recentExecutions) ? explode(',', $this->config->project->recentExecutions) : array();
+        $recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array();
         array_unshift($recentExecutions, $executionID);
         $recentExecutions = array_unique($recentExecutions);
         $recentExecutions = array_slice($recentExecutions, 0, 5);
-        $this->setting->setItem($this->app->user->account . 'common.project.recentExecutions', implode(',', $recentExecutions));
-        $this->setting->setItem($this->app->user->account . 'common.project.lastExecution', $executionID);
+        $this->setting->setItem($this->app->user->account . 'common.execution.recentExecutions', implode(',', $recentExecutions));
+        $this->setting->setItem($this->app->user->account . 'common.execution.lastExecution', $executionID);
 
-        if($this->cookie->preProjectID != $executionID)
+        if($this->cookie->preExecutionID != $executionID)
         {
             $_COOKIE['moduleBrowseParam'] = $_COOKIE['productBrowseParam'] = 0;
             setcookie('moduleBrowseParam',  0, 0, $this->config->webRoot, '', false, false);
@@ -194,19 +197,19 @@ class project extends control
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList',    $uri);
         $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('projectList', $uri);
+        $this->app->session->set('executionList', $uri);
 
         /* Process the order by field. */
-        if(!$orderBy) $orderBy = $this->cookie->projectTaskOrder ? $this->cookie->projectTaskOrder : 'status,id_desc';
-        setcookie('projectTaskOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
+        if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_desc';
+        setcookie('executionTaskOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         /* Header and position. */
-        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->project->task;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "executionID=$executionID"), $execution->name);
-        $this->view->position[] = $this->lang->project->task;
+        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->task;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->task;
 
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
@@ -214,30 +217,30 @@ class project extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Get tasks. */
-        $tasks = $this->project->getTasks($productID, $executionID, $this->projects, $browseType, $queryID, $moduleID, $sort, $pager);
+        $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         if(empty($tasks) and $pageID > 1)
         {
             $pager = pager::init(0, $recPerPage, 1);
-            $tasks = $this->project->getTasks($productID, $executionID, $this->projects, $browseType, $queryID, $moduleID, $sort, $pager);
+            $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
         }
 
         /* Build the search form. */
-        $actionURL = $this->createLink('project', 'task', "executionID=$executionID&status=bySearch&param=myQueryID");
-        $this->config->project->search['onMenuBar'] = 'yes';
-        $this->project->buildTaskSearchForm($executionID, $this->projects, $queryID, $actionURL);
+        $actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch&param=myQueryID");
+        $this->config->execution->search['onMenuBar'] = 'yes';
+        $this->execution->buildTaskSearchForm($executionID, $this->executions, $queryID, $actionURL);
 
         /* team member pairs. */
         $memberPairs = array();
         foreach($this->view->teamMembers as $key => $member) $memberPairs[$key] = $member->realname;
 
-        $showAllModule = isset($this->config->project->task->allModule) ? $this->config->project->task->allModule : '';
-        $extra         = (isset($this->config->project->task->allModule) && $this->config->project->task->allModule == 1) ? 'allModule' : '';
-        $showModule    = !empty($this->config->datatable->projectTask->showModule) ? $this->config->datatable->projectTask->showModule : '';
+        $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
+        $extra         = (isset($this->config->execution->task->allModule) && $this->config->execution->task->allModule == 1) ? 'allModule' : '';
+        $showModule    = !empty($this->config->datatable->executionTask->showModule) ? $this->config->datatable->executionTask->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($executionID, 'task', $showModule) : array();
 
         /* Assign. */
         $this->view->tasks        = $tasks;
-        $this->view->summary      = $this->project->summary($tasks);
+        $this->view->summary      = $this->execution->summary($tasks);
         $this->view->tabID        = 'task';
         $this->view->pager        = $pager;
         $this->view->recTotal     = $pager->recTotal;
@@ -256,7 +259,7 @@ class project extends control
         $this->view->memberPairs  = $memberPairs;
         $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
         $this->view->setModule    = true;
-        $this->view->canBeChanged = common::canModify('project', $execution); // Determines whether an object is editable.
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
@@ -264,30 +267,30 @@ class project extends control
     /**
      * Browse tasks in group.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $groupBy    the field to group by
      * @access public
      * @return void
      */
-    public function grouptask($projectID = 0, $groupBy = 'story', $filter = '')
+    public function grouptask($executionID = 0, $groupBy = 'story', $filter = '')
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         /* Save session. */
         $this->app->session->set('taskList',  $this->app->getURI(true));
         $this->app->session->set('storyList', $this->app->getURI(true));
 
         /* Header and session. */
-        $this->view->title      = $project->name . $this->lang->colon . $this->lang->project->task;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $this->view->position[] = $this->lang->project->task;
+        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->task;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->task;
 
         /* Get tasks and group them. */
         if(empty($groupBy))$groupBy = 'story';
-        if(($groupBy == 'story') and ($project->type == 'ops'))$groupBy = 'status';
+        if(($groupBy == 'story') and ($execution->type == 'ops'))$groupBy = 'status';
         $sort        = $this->loadModel('common')->appendOrder($groupBy);
-        $tasks       = $this->loadModel('task')->getProjectTasks($projectID, $productID = 0, $status = 'all', $modules = 0, $sort);
+        $tasks       = $this->loadModel('task')->getTasks($executionID, $productID = 0, $status = 'all', $modules = 0, $sort);
         $groupBy     = str_replace('`', '', $groupBy);
         $taskLang    = $this->lang->task;
         $groupByList = array();
@@ -402,7 +405,7 @@ class project extends control
         }
 
         /* Remove task by filter and group. */
-        $filter = (empty($filter) and isset($this->lang->project->groupFilter[$groupBy])) ? key($this->lang->project->groupFilter[$groupBy]) : $filter;
+        $filter = (empty($filter) and isset($this->lang->execution->groupFilter[$groupBy])) ? key($this->lang->execution->groupFilter[$groupBy]) : $filter;
         if($filter != 'all')
         {
             if($groupBy == 'story' and $filter == 'linked' and isset($groupTasks[0]))
@@ -444,14 +447,14 @@ class project extends control
 
         /* Assign. */
         $this->app->loadLang('tree');
-        $this->view->members     = $this->project->getTeamMembers($projectID);
+        $this->view->members     = $this->execution->getTeamMembers($executionID);
         $this->view->tasks       = $groupTasks;
         $this->view->tabID       = 'task';
         $this->view->groupByList = $groupByList;
         $this->view->browseType  = 'group';
         $this->view->groupBy     = $groupBy;
         $this->view->orderBy     = $groupBy;
-        $this->view->projectID   = $projectID;
+        $this->view->executionID   = $executionID;
         $this->view->users       = $users;
         $this->view->moduleID    = 0;
         $this->view->moduleName  = $this->lang->tree->all;
@@ -461,60 +464,60 @@ class project extends control
     }
 
     /**
-     * Import tasks undoned from other projects.
+     * Import tasks undoned from other executions.
      *
-     * @param  int    $projectID
-     * @param  int    $fromProject
+     * @param  int    $executionID
+     * @param  int    $fromExecution
      * @access public
      * @return void
      */
-    public function importTask($toProject, $fromProject = 0)
+    public function importTask($toExecution, $fromExecution = 0)
     {
         if(!empty($_POST))
         {
-            $this->project->importTask($toProject);
-            die(js::locate(inlink('importTask', "toProject=$toProject&fromProject=$fromProject"), 'parent'));
+            $this->execution->importTask($toExecution);
+            die(js::locate(inlink('importTask', "toExecution=$toExecution&fromExecution=$fromExecution"), 'parent'));
         }
 
-        $project   = $this->commonAction($toProject);
-        $toProject = $project->id;
-        $branches  = $this->project->getExecutionBranches($toProject);
-        $tasks     = $this->project->getTasks2Imported($toProject, $branches);
-        $projects  = $this->project->getExecutionsToImport(array_keys($tasks), $project->type);
-        unset($projects[$toProject]);
-        unset($tasks[$toProject]);
+        $execution   = $this->commonAction($toExecution);
+        $toExecution = $execution->id;
+        $branches  = $this->execution->getBranches($toExecution);
+        $tasks     = $this->execution->getTasks2Imported($toExecution, $branches);
+        $executions  = $this->execution->getsToImport(array_keys($tasks), $execution->type);
+        unset($executions[$toExecution]);
+        unset($tasks[$toExecution]);
 
-        if($fromProject == 0)
+        if($fromExecution == 0)
         {
             $tasks2Imported = array();
-            foreach($projects as $id  => $projectName)
+            foreach($executions as $id  => $executionName)
             {
                 $tasks2Imported = array_merge($tasks2Imported, $tasks[$id]);
             }
         }
         else
         {
-            $tasks2Imported = zget($tasks, $fromProject, array());
+            $tasks2Imported = zget($tasks, $fromExecution, array());
         }
 
         /* Save session. */
         $this->app->session->set('taskList',  $this->app->getURI(true));
         $this->app->session->set('storyList', $this->app->getURI(true));
 
-        $this->view->title          = $project->name . $this->lang->colon . $this->lang->project->importTask;
-        $this->view->position[]     = html::a(inlink('browse', "projectID=$toProject"), $project->name);
-        $this->view->position[]     = $this->lang->project->importTask;
+        $this->view->title          = $execution->name . $this->lang->colon . $this->lang->execution->importTask;
+        $this->view->position[]     = html::a(inlink('browse', "executionID=$toExecution"), $execution->name);
+        $this->view->position[]     = $this->lang->execution->importTask;
         $this->view->tasks2Imported = $tasks2Imported;
-        $this->view->projects       = $projects;
-        $this->view->projectID      = $project->id;
-        $this->view->fromProject    = $fromProject;
+        $this->view->executions       = $executions;
+        $this->view->executionID      = $execution->id;
+        $this->view->fromExecution    = $fromExecution;
         $this->display();
     }
 
     /**
      * Import from Bug.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -522,16 +525,16 @@ class project extends control
      * @access public
      * @return void
      */
-    public function importBug($projectID = 0, $browseType = 'all', $param = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
+    public function importBug($executionID = 0, $browseType = 'all', $param = 0, $recTotal = 0, $recPerPage = 30, $pageID = 1)
     {
         $this->app->loadConfig('task');
 
         if(!empty($_POST))
         {
-            $mails = $this->project->importBug($projectID);
+            $mails = $this->execution->importBug($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
-            die(js::locate($this->createLink('project', 'importBug', "projectID=$projectID"), 'parent'));
+            die(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
         }
 
         /* Set browseType, productID, moduleID and queryID. */
@@ -542,48 +545,48 @@ class project extends control
         $uri = $this->app->getURI(true);
         $this->app->session->set('bugList',    $uri);
         $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('projectList', $uri);
+        $this->app->session->set('executionList', $uri);
 
         $this->loadModel('bug');
-        $projects = $this->project->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
-        $this->project->setMenu($projects, $projectID);
+        $executions = $this->execution->getPairs($this->session->project, 'all', 'nocode');
+        $this->execution->setMenu($executions, $executionID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $title      = $projects[$projectID] . $this->lang->colon . $this->lang->project->importBug;
-        $position[] = html::a($this->createLink('project', 'task', "projectID=$projectID"), $projects[$projectID]);
-        $position[] = $this->lang->project->importBug;
+        $title      = $executions[$executionID] . $this->lang->colon . $this->lang->execution->importBug;
+        $position[] = html::a($this->createLink('execution', 'task', "executionID=$executionID"), $executions[$executionID]);
+        $position[] = $this->lang->execution->importBug;
 
-        /* Get users, products and projects.*/
-        $users    = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
+        /* Get users, products and executions.*/
+        $users    = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
         $products = $this->dao->select('t1.product, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')
             ->on('t1.product = t2.id')
-            ->where('t1.project')->eq($projectID)
+            ->where('t1.execution')->eq($executionID)
             ->fetchPairs('product');
         if(!empty($products))
         {
-            unset($projects);
-            $projects = $this->dao->select('t1.project, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_PROJECT)->alias('t2')
-                ->on('t1.project = t2.id')
+            unset($executions);
+            $executions = $this->dao->select('t1.execution, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')
+                ->on('t1.execution = t2.id')
                 ->where('t1.product')->in(array_keys($products))
-                ->fetchPairs('project');
+                ->fetchPairs('execution');
         }
         else
         {
-            $projectName = $projects[$projectID];
-            unset($projects);
-            $projects[$projectID] = $projectName;
+            $executionName = $executions[$executionID];
+            unset($executions);
+            $executions[$executionID] = $executionName;
         }
 
         /* Get bugs.*/
         $bugs = array();
         if($browseType != "bysearch")
         {
-            $bugs = $this->bug->getActiveAndPostponedBugs(array_keys($products), $projectID, $pager);
+            $bugs = $this->bug->getActiveAndPostponedBugs(array_keys($products), $executionID, $pager);
         }
         else
         {
@@ -604,26 +607,26 @@ class project extends control
             {
                 if($this->session->importBugQuery == false) $this->session->set('importBugQuery', ' 1 = 1');
             }
-            $bugQuery = str_replace("`product` = 'all'", "`product`" . helper::dbIN(array_keys($products)), $this->session->importBugQuery); // Search all project.
-            $bugs = $this->project->getSearchBugs($products, $projectID, $bugQuery, $pager, 'id_desc');
+            $bugQuery = str_replace("`product` = 'all'", "`product`" . helper::dbIN(array_keys($products)), $this->session->importBugQuery); // Search all execution.
+            $bugs = $this->execution->getSearchBugs($products, $executionID, $bugQuery, $pager, 'id_desc');
         }
 
        /* Build the search form. */
-        $this->config->bug->search['actionURL'] = $this->createLink('project', 'importBug', "projectID=$projectID&browseType=bySearch&param=myQueryID");
+        $this->config->bug->search['actionURL'] = $this->createLink('execution', 'importBug', "executionID=$executionID&browseType=bySearch&param=myQueryID");
         $this->config->bug->search['queryID']   = $queryID;
         if(!empty($products))
         {
-            $this->config->bug->search['params']['product']['values'] = array(''=>'') + $products + array('all'=>$this->lang->project->aboveAllProduct);
+            $this->config->bug->search['params']['product']['values'] = array(''=>'') + $products + array('all'=>$this->lang->execution->aboveAllProduct);
         }
         else
         {
             $this->config->bug->search['params']['product']['values'] = array(''=>'');
         }
-        $this->config->bug->search['params']['project']['values'] = array(''=>'') + $projects + array('all'=>$this->lang->project->aboveAllProject);
+        $this->config->bug->search['params']['execution']['values'] = array(''=>'') + $executions + array('all'=>$this->lang->execution->aboveAllExecution);
         $this->config->bug->search['params']['plan']['values']    = $this->loadModel('productplan')->getPairs(array_keys($products));
         $this->config->bug->search['module'] = 'importBug';
         $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList;
-        $this->config->bug->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($projectID, $viewType = 'bug', $startModuleID = 0);
+        $this->config->bug->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($executionID, $viewType = 'bug', $startModuleID = 0);
         unset($this->config->bug->search['fields']['resolvedBy']);
         unset($this->config->bug->search['fields']['closedBy']);
         unset($this->config->bug->search['fields']['status']);
@@ -658,16 +661,16 @@ class project extends control
         $this->view->browseType     = $browseType;
         $this->view->param          = $param;
         $this->view->users          = $users;
-        $this->view->project        = $this->project->getByID($projectID);
-        $this->view->projectID      = $projectID;
+        $this->view->execution        = $this->execution->getByID($executionID);
+        $this->view->executionID      = $executionID;
         $this->view->requiredFields = explode(',', $this->config->task->create->requiredFields);
         $this->display();
     }
 
     /**
-     * Browse stories of a project.
+     * Browse stories of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  string $type
      * @param  string $param
@@ -677,7 +680,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function story($projectID = 0, $orderBy = 'order_desc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function story($executionID = 0, $orderBy = 'order_desc', $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
         /* Load these models. */
         $this->loadModel('story');
@@ -685,8 +688,8 @@ class project extends control
         $this->app->loadLang('testcase');
 
         $type = strtolower($type);
-        setcookie('storyPreProjectID', $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        if($this->cookie->storyPreProjectID != $projectID)
+        setcookie('storyPreExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        if($this->cookie->storyPreExecutionID != $executionID)
         {
             $_COOKIE['storyModuleParam'] = $_COOKIE['storyProductParam'] = $_COOKIE['storyBranchParam'] = 0;
             setcookie('storyModuleParam',  0, 0, $this->config->webRoot, '', false, true);
@@ -722,61 +725,61 @@ class project extends control
         }
         else
         {
-            $this->session->set('projectStoryBrowseType', $type);
+            $this->session->set('executionStoryBrowseType', $type);
         }
 
         /* Save session. */
         $this->app->session->set('storyList', $this->app->getURI(true));
 
         /* Process the order by field. */
-        if(!$orderBy) $orderBy = $this->cookie->projectStoryOrder ? $this->cookie->projectStoryOrder : 'pri';
-        setcookie('projectStoryOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
+        if(!$orderBy) $orderBy = $this->cookie->executionStoryOrder ? $this->cookie->executionStoryOrder : 'pri';
+        setcookie('executionStoryOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         $queryID   = ($type == 'bysearch') ? (int)$param : 0;
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $stories = $this->story->getProjectStories($projectID, 0, 0, $sort, $type, $param, 'story', '', $pager);
+        $stories = $this->story->getStories($executionID, 0, 0, $sort, $type, $param, 'story', '', $pager);
 
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
         $users   = $this->user->getPairs('noletter');
 
         /* Build the search form. */
         $modules  = array();
-        $projectModules = $this->loadModel('tree')->getTaskTreeModules($projectID, true);
-        $products = $this->project->getProducts($projectID);
+        $executionModules = $this->loadModel('tree')->getTaskTreeModules($executionID, true);
+        $products = $this->execution->getProducts($executionID);
         foreach($products as $product)
         {
             $productModules = $this->tree->getOptionMenu($product->id);
             foreach($productModules as $moduleID => $moduleName)
             {
-                if($moduleID and !isset($projectModules[$moduleID])) continue;
+                if($moduleID and !isset($executionModules[$moduleID])) continue;
                 $modules[$moduleID] = ((count($products) >= 2 and $moduleID) ? $product->name : '') . $moduleName;
             }
         }
-        $actionURL    = $this->createLink('project', 'story', "projectID=$projectID&orderBy=$orderBy&type=bySearch&queryID=myQueryID");
+        $actionURL    = $this->createLink('execution', 'story', "executionID=$executionID&orderBy=$orderBy&type=bySearch&queryID=myQueryID");
         $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
-        $this->project->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'projectStory');
+        $this->execution->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'executionStory');
 
         /* Header and position. */
-        $title      = $project->name . $this->lang->colon . $this->lang->project->story;
-        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $position[] = $this->lang->project->story;
+        $title      = $execution->name . $this->lang->colon . $this->lang->execution->story;
+        $position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $position[] = $this->lang->execution->story;
 
         /* Count T B C */
         $storyIdList = array_keys($stories);;
-        $storyTasks  = $this->loadModel('task')->getStoryTaskCounts($storyIdList, $projectID);
-        $storyBugs   = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $projectID);
+        $storyTasks  = $this->loadModel('task')->getStoryTaskCounts($storyIdList, $executionID);
+        $storyBugs   = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $executionID);
         $storyCases  = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
 
-        $plans = $this->project->getPlans($products);
+        $plans = $this->execution->getPlans($products);
         $allPlans = array('' => '');
         if(!empty($plans))
         {
@@ -793,23 +796,23 @@ class project extends control
             $this->view->branch  = $this->loadModel('branch')->getById($branchID, $productID);
         }
 
-        /* Get project's product. */
+        /* Get execution's product. */
         $productID    = 0;
-        $productPairs = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $productPairs = $this->loadModel('product')->getProductPairsByExecution($executionID);
         if($productPairs) $productID = key($productPairs);
 
         /* Assign. */
         $this->view->title        = $title;
         $this->view->position     = $position;
         $this->view->productID    = $productID;
-        $this->view->project      = $project;
+        $this->view->execution      = $execution;
         $this->view->stories      = $stories;
         $this->view->allPlans     = $allPlans;
         $this->view->summary      = $this->product->summary($stories);
         $this->view->orderBy      = $orderBy;
-        $this->view->type         = $this->session->projectStoryBrowseType;
+        $this->view->type         = $this->session->executionStoryBrowseType;
         $this->view->param        = $param;
-        $this->view->moduleTree   = $this->loadModel('tree')->getProjectStoryTreeMenu($projectID, $startModuleID = 0, array('treeModel', 'createProjectStoryLink'));
+        $this->view->moduleTree   = $this->loadModel('tree')->getStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
         $this->view->tabID        = 'story';
         $this->view->storyTasks   = $storyTasks;
         $this->view->storyBugs    = $storyBugs;
@@ -817,15 +820,15 @@ class project extends control
         $this->view->users        = $users;
         $this->view->pager        = $pager;
         $this->view->branchGroups = $branchGroups;
-        $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable.
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
 
     /**
-     * Browse bugs of a project.
+     * Browse bugs of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  int    $build
      * @param  string $type
@@ -836,7 +839,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function bug($projectID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function bug($executionID = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load these two models. */
         $this->loadModel('bug');
@@ -847,22 +850,22 @@ class project extends control
 
         $type      = strtolower($type);
         $queryID   = ($type == 'bysearch') ? (int)$param : 0;
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
-        $products  = $this->project->getProducts($project->id);
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
+        $products  = $this->execution->getProducts($execution->id);
         $productID = key($products);    // Get the first product for creating bug.
         $branchID  = isset($products[$productID]) ? $products[$productID]->branch : 0;
 
         /* Header and position. */
-        $title      = $project->name . $this->lang->colon . $this->lang->project->bug;
-        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $position[] = $this->lang->project->bug;
+        $title      = $execution->name . $this->lang->colon . $this->lang->execution->bug;
+        $position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $position[] = $this->lang->execution->bug;
 
         /* Load pager and get bugs, user. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
         $sort  = $this->loadModel('common')->appendOrder($orderBy);
-        $bugs  = $this->bug->getProjectBugs($projectID, $build, $type, $param, $sort, '', $pager);
+        $bugs  = $this->bug->getBugs($executionID, $build, $type, $param, $sort, '', $pager);
         $users = $this->user->getPairs('noletter');
 
         /* team member pairs. */
@@ -874,8 +877,8 @@ class project extends control
         }
 
         /* Build the search form. */
-        $actionURL = $this->createLink('project', 'bug', "projectID=$projectID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
-        $this->project->buildBugSearchForm($products, $queryID, $actionURL);
+        $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
+        $this->execution->buildBugSearchForm($products, $queryID, $actionURL);
 
         /* Assign. */
         $this->view->title       = $title;
@@ -897,59 +900,59 @@ class project extends control
     }
 
     /**
-     * Browse builds of a project.
+     * Browse builds of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $type      all|product|bysearch
      * @param  int    $param
      * @access public
      * @return void
      */
-    public function build($projectID = 0, $type = 'all', $param = 0)
+    public function build($executionID = 0, $type = 'all', $param = 0)
     {
         /* Load module and set session. */
         $this->loadModel('testtask');
         $this->session->set('buildList', $this->app->getURI(true));
 
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         /* Get products' list. */
-        $products = $this->project->getProducts($projectID, false);
+        $products = $this->execution->getProducts($executionID, false);
         $products = array('' => '') + $products;
 
         /* Build the search form. */
         $type      = strtolower($type);
         $queryID   = ($type == 'bysearch') ? (int)$param : 0;
-        $actionURL = $this->createLink('project', 'build', "projectID=$projectID&type=bysearch&queryID=myQueryID");
-        $this->project->buildProjectBuildSearchForm($products, $queryID, $actionURL, 'execution');
+        $actionURL = $this->createLink('execution', 'build', "executionID=$executionID&type=bysearch&queryID=myQueryID");
+        $this->execution->buildExecutionBuildSearchForm($products, $queryID, $actionURL, 'execution');
 
         /* Get builds. */
         if($type == 'bysearch')
         {
-            $builds = $this->loadModel('build')->getExecutionBuildsBySearch((int)$projectID, $queryID);
+            $builds = $this->loadModel('build')->getBuildsBySearch((int)$executionID, $queryID);
         }
         else
         {
-            $builds = $this->loadModel('build')->getExecutionBuilds((int)$projectID, $type, $param);
+            $builds = $this->loadModel('build')->getBuilds((int)$executionID, $type, $param);
         }
 
-        /* Set project builds. */
-        $projectBuilds = array();
+        /* Set execution builds. */
+        $executionBuilds = array();
         if(!empty($builds))
         {
-            foreach($builds as $build) $projectBuilds[$build->product][] = $build;
+            foreach($builds as $build) $executionBuilds[$build->product][] = $build;
         }
 
         /* Header and position. */
-        $this->view->title      = $project->name . $this->lang->colon . $this->lang->project->build;
-        $this->view->position[] = html::a(inlink('browse', "projectID=$projectID"), $project->name);
-        $this->view->position[] = $this->lang->project->build;
+        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->build;
+        $this->view->position[] = html::a(inlink('browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->build;
 
         $this->view->users         = $this->loadModel('user')->getPairs('noletter');
         $this->view->buildsTotal   = count($builds);
-        $this->view->projectBuilds = $projectBuilds;
-        $this->view->projectID     = $projectID;
+        $this->view->executionBuilds = $executionBuilds;
+        $this->view->executionID     = $executionID;
         $this->view->product       = $type == 'product' ? $param : 'all';
         $this->view->products      = $products;
         $this->view->type          = $type;
@@ -958,9 +961,9 @@ class project extends control
     }
 
     /**
-     * Browse test tasks of project.
+     * Browse test tasks of execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -968,14 +971,14 @@ class project extends control
      * @access public
      * @return void
      */
-    public function testtask($projectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function testtask($executionID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('testtask');
         /* Save session. */
         $this->session->set('testtaskList', $this->app->getURI(true));
 
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -983,65 +986,65 @@ class project extends control
 
         $productTasks = array();
 
-        $tasks = $this->testtask->getProjectTasks($projectID, $orderBy, $pager);
+        $tasks = $this->testtask->getTasks($executionID, $orderBy, $pager);
         foreach($tasks as $key => $task) $productTasks[$task->product][] = $task;
 
-        $this->view->title        = $this->projects[$projectID] . $this->lang->colon . $this->lang->testtask->common;
-        $this->view->position[]   = html::a($this->createLink('project', 'testtask', "projectID=$projectID"), $this->projects[$projectID]);
+        $this->view->title        = $this->executions[$executionID] . $this->lang->colon . $this->lang->testtask->common;
+        $this->view->position[]   = html::a($this->createLink('execution', 'testtask', "executionID=$executionID"), $this->executions[$executionID]);
         $this->view->position[]   = $this->lang->testtask->common;
-        $this->view->project      = $project;
-        $this->view->projectID    = $projectID;
-        $this->view->projectName  = $this->projects[$projectID];
+        $this->view->execution      = $execution;
+        $this->view->executionID    = $executionID;
+        $this->view->executionName  = $this->executions[$executionID];
         $this->view->pager        = $pager;
         $this->view->orderBy      = $orderBy;
         $this->view->tasks        = $productTasks;
         $this->view->users        = $this->loadModel('user')->getPairs('noclosed|noletter');
-        $this->view->products     = $this->loadModel('product')->getPairs('', $this->session->PRJ);
-        $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable.
+        $this->view->products     = $this->loadModel('product')->getPairs('', $this->session->project);
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
 
     /**
-     * Browse burndown chart of a project.
+     * Browse burndown chart of a execution.
      *
-     * @param  int       $projectID
+     * @param  int       $executionID
      * @param  string    $type
      * @param  int       $interval
      * @access public
      * @return void
      */
-    public function burn($projectID = 0, $type = 'noweekend', $interval = 0, $burnBy = 'left')
+    public function burn($executionID = 0, $type = 'noweekend', $interval = 0, $burnBy = 'left')
     {
         $this->loadModel('report');
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
         $burnBy    = $this->cookie->burnBy ? $this->cookie->burnBy : $burnBy;
 
         /* Header and position. */
-        $title      = $project->name . $this->lang->colon . $this->lang->project->burn;
-        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $position[] = $this->lang->project->burn;
+        $title      = $execution->name . $this->lang->colon . $this->lang->execution->burn;
+        $position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $position[] = $this->lang->execution->burn;
 
         /* Get date list. */
-        $projectInfo = $this->project->getByID($projectID);
-        list($dateList, $interval) = $this->project->getDateList($projectInfo->begin, $projectInfo->end, $type, $interval, 'Y-m-d');
-        $chartData = $this->project->buildBurnData($projectID, $dateList, $type, $burnBy);
+        $executionInfo = $this->execution->getByID($executionID);
+        list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $executionInfo->end, $type, $interval, 'Y-m-d');
+        $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
 
-        $dayList = array_fill(1, floor((int)$project->days / $this->config->project->maxBurnDay) + 5, '');
-        foreach($dayList as $key => $val) $dayList[$key] = $this->lang->project->interval . ($key + 1) . $this->lang->day;
+        $dayList = array_fill(1, floor((int)$execution->days / $this->config->execution->maxBurnDay) + 5, '');
+        foreach($dayList as $key => $val) $dayList[$key] = $this->lang->execution->interval . ($key + 1) . $this->lang->day;
 
         /* Assign. */
         $this->view->title       = $title;
         $this->view->position    = $position;
         $this->view->tabID       = 'burn';
         $this->view->burnBy      = $burnBy;
-        $this->view->projectID   = $projectID;
-        $this->view->projectName = $project->name;
+        $this->view->executionID   = $executionID;
+        $this->view->executionName = $execution->name;
         $this->view->type        = $type;
         $this->view->interval    = $interval;
         $this->view->chartData   = $chartData;
-        $this->view->dayList     = array('full' => $this->lang->project->interval . '1' . $this->lang->day) + $dayList;
+        $this->view->dayList     = array('full' => $this->lang->execution->interval . '1' . $this->lang->day) + $dayList;
 
         unset($this->lang->TRActions);
         $this->display();
@@ -1056,7 +1059,7 @@ class project extends control
      */
     public function computeBurn($reload = 'no')
     {
-        $this->view->burns = $this->project->computeBurn();
+        $this->view->burns = $this->execution->computeBurn();
         if($reload == 'yes') die(js::reload('parent'));
         $this->display();
     }
@@ -1064,81 +1067,81 @@ class project extends control
     /**
      * Fix burn for first date.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function fixFirst($projectID)
+    public function fixFirst($executionID)
     {
         if($_POST)
         {
-            $this->project->fixFirst($projectID);
+            $this->execution->fixFirst($executionID);
             die(js::reload('parent.parent'));
         }
 
-        $project = $this->project->getById($projectID);
+        $execution = $this->execution->getById($executionID);
 
-        $this->view->firstBurn = $this->dao->select('*')->from(TABLE_BURN)->where('project')->eq($projectID)->andWhere('date')->eq($project->begin)->fetch();
-        $this->view->project   = $project;
+        $this->view->firstBurn = $this->dao->select('*')->from(TABLE_BURN)->where('execution')->eq($executionID)->andWhere('date')->eq($execution->begin)->fetch();
+        $this->view->execution   = $execution;
         $this->display();
     }
 
     /**
-     * Browse team of a project.
+     * Browse team of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function team($projectID = 0)
+    public function team($executionID = 0)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
-        $title      = $project->name . $this->lang->colon . $this->lang->project->team;
-        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $position[] = $this->lang->project->team;
+        $title      = $execution->name . $this->lang->colon . $this->lang->execution->team;
+        $position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $position[] = $this->lang->execution->team;
 
         $this->view->title        = $title;
         $this->view->position     = $position;
-        $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable.
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
 
     /**
-     * Create a project.
+     * Create a execution.
      *
      * @param string $productID
-     * @param string $projectID
-     * @param string $copyProjectID
+     * @param string $executionID
+     * @param string $copyExecutionID
      * @param int    $planID
      * @param string $confirm
      *
      * @access public
      * @return void
      */
-    public function create($productID = '', $projectID = '', $copyProjectID = '', $planID = 0, $confirm = 'no')
+    public function create($productID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no')
     {
         $this->app->loadLang('program');
         $this->app->loadLang('stage');
         $this->app->loadLang('programplan');
-        if($projectID)
+        if($executionID)
         {
             if(!empty($planID))
             {
                 if($confirm == 'yes')
                 {
-                    $this->project->linkStories($projectID);
+                    $this->execution->linkStories($executionID);
                 }
                 else
                 {
-                    die(js::confirm($this->lang->project->importPlanStory, inlink('create', "productID=&projectID=$projectID&copyProjectID=&planID=$planID&confirm=yes"), inlink('create', "productID=&projectID=$projectID"), 'parent', 'parent'));
+                    die(js::confirm($this->lang->execution->importPlanStory, inlink('create', "productID=&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "productID=&executionID=$executionID"), 'parent', 'parent'));
                 }
             }
-            $this->view->title     = $this->lang->project->tips;
-            $this->view->tips      = $this->fetch('project', 'tips', "projectID=$projectID");
-            $this->view->projectID = $projectID;
+            $this->view->title     = $this->lang->execution->tips;
+            $this->view->tips      = $this->fetch('execution', 'tips', "executionID=$executionID");
+            $this->view->executionID = $executionID;
             $this->display();
             exit;
         }
@@ -1152,15 +1155,15 @@ class project extends control
         $plan         = new stdClass();
         $productPlan  = array();
         $productPlans = array();
-        if($copyProjectID)
+        if($copyExecutionID)
         {
-            $copyProject = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch();
-            $name        = $copyProject->name;
-            $code        = $copyProject->code;
-            $team        = $copyProject->team;
-            $acl         = $copyProject->acl;
-            $whitelist   = $copyProject->whitelist;
-            $products    = $this->project->getProducts($copyProjectID);
+            $copyExecution = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch();
+            $name        = $copyExecution->name;
+            $code        = $copyExecution->code;
+            $team        = $copyExecution->team;
+            $acl         = $copyExecution->acl;
+            $whitelist   = $copyExecution->whitelist;
+            $products    = $this->execution->getProducts($copyExecutionID);
             foreach($products as $product)
             {
                 $productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id);
@@ -1180,15 +1183,15 @@ class project extends control
 
         if(!empty($_POST))
         {
-            $projectID = $copyProjectID == '' ? $this->project->create() : $this->project->create($copyProjectID);
+            $executionID = $copyExecutionID == '' ? $this->execution->create() : $this->execution->create($copyExecutionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $this->project->updateProducts($projectID);
+            $this->execution->updateProducts($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $this->loadModel('action')->create($this->objectType, $projectID, 'opened', '', join(',', $_POST['products']));
+            $this->loadModel('action')->create($this->objectType, $executionID, 'opened', '', join(',', $_POST['products']));
 
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
 
             $planID = '';
             if(isset($_POST['plans']))
@@ -1200,138 +1203,138 @@ class project extends control
             }
             if(!empty($planID))
             {
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&projectID=$projectID&copyProjectID=&planID=$planID&confirm=no")));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=no")));
             }
             else
             {
-                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&projectID=$projectID")));
+                $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('create', "productID=&executionID=$executionID")));
             }
         }
 
         $this->view->isSprint = false;
-        $project = $this->project->getById($this->session->PRJ);
+        $execution = $this->execution->getById($this->session->project);
 
         if($this->config->systemMode == 'new')
         {
-            if($project->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
+            if($execution->model == 'scrum' && isset($this->config->custom->sprintConcept) and $this->config->custom->sprintConcept == 1)
             {
                 $this->view->isSprint = true;
 
-                unset($this->lang->project->endList[62]);
-                unset($this->lang->project->endList[93]);
-                unset($this->lang->project->endList[186]);
-                unset($this->lang->project->endList[365]);
+                unset($this->lang->execution->endList[62]);
+                unset($this->lang->execution->endList[93]);
+                unset($this->lang->execution->endList[186]);
+                unset($this->lang->execution->endList[365]);
             }
 
-            $this->view->isStage    = $project->model == 'waterfall' ? true : false;
-            $this->view->iconObject = $project->model == 'waterfall' ? 'stage' : 'sprint';
+            $this->view->isStage    = $execution->model == 'waterfall' ? true : false;
+            $this->view->iconObject = $execution->model == 'waterfall' ? 'stage' : 'sprint';
         }
         else
         {
             $this->view->isStage = false;
         }
 
-        $projectID = key($this->projects);
-        $this->project->setMenu($this->projects, $projectID);
+        $executionID = key($this->executions);
+        $this->execution->setMenu($this->executions, $executionID);
 
-        $this->view->title         = $this->lang->project->create;
+        $this->view->title         = $this->lang->execution->create;
         $this->view->position[]    = $this->view->title;
-        $this->view->projects      = array('' => '') + $this->projects;
+        $this->view->executions      = array('' => '') + $this->executions;
         $this->view->groups        = $this->loadModel('group')->getPairs();
-        $this->view->allProducts   = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $this->view->allProducts   = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->session->project);
         $this->view->acl           = $acl;
         $this->view->plan          = $plan;
         $this->view->name          = $name;
         $this->view->code          = $code;
         $this->view->team          = $team;
-        $this->view->projectID     = $projectID;
+        $this->view->executionID     = $executionID;
         $this->view->productID     = $productID;
         $this->view->products      = $products;
         $this->view->productPlan   = array(0 => '') + $productPlan;
         $this->view->productPlans  = array(0 => '') + $productPlans;
         $this->view->whitelist     = $whitelist;
-        $this->view->copyProjectID = $copyProjectID;
+        $this->view->copyExecutionID = $copyExecutionID;
         $this->view->branchGroups  = $this->loadModel('branch')->getByProducts(array_keys($products));
         $this->view->users         = $this->loadModel('user')->getPairs('nodeleted|noclosed');
         $this->display();
     }
 
     /**
-     * Edit a project.
+     * Edit a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $action
      * @param  string $extra
      *
      * @access public
      * @return void
      */
-    public function edit($projectID, $action = 'edit', $extra = '')
+    public function edit($executionID, $action = 'edit', $extra = '')
     {
-        /* Load language files and get browseProjectLink. */
+        /* Load language files and get browseExecutionLink. */
         $this->app->loadLang('program');
         $this->app->loadLang('stage');
         $this->app->loadLang('programplan');
-        $browseProjectLink = $this->createLink('project', 'browse', "projectID=$projectID");
+        $browseExecutionLink = $this->createLink('execution', 'browse', "executionID=$executionID");
 
         if(!empty($_POST))
         {
-            $oldProducts = $this->project->getProducts($projectID);
-            $changes     = $this->project->update($projectID);
+            $oldProducts = $this->execution->getProducts($executionID);
+            $changes     = $this->execution->update($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $this->project->updateProducts($projectID);
+            $this->execution->updateProducts($executionID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if($action == 'undelete')
             {
                 $this->loadModel('action');
-                $this->dao->update(TABLE_PROJECT)->set('deleted')->eq(0)->where('id')->eq($projectID)->exec();
+                $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(0)->where('id')->eq($executionID)->exec();
                 $this->dao->update(TABLE_ACTION)->set('extra')->eq(ACTIONMODEL::BE_UNDELETED)->where('id')->eq($extra)->exec();
-                $this->action->create($this->objectType, $projectID, 'undeleted');
+                $this->action->create($this->objectType, $executionID, 'undeleted');
             }
 
             $oldProducts  = array_keys($oldProducts);
-            $newProducts  = $this->project->getProducts($projectID);
+            $newProducts  = $this->execution->getProducts($executionID);
             $newProducts  = array_keys($newProducts);
             $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
             $products     = $diffProducts ? join(',', $newProducts) : '';
 
             if($changes or $diffProducts)
             {
-                $actionID = $this->loadModel('action')->create($this->objectType, $projectID, 'edited', '', $products);
+                $actionID = $this->loadModel('action')->create($this->objectType, $executionID, 'edited', '', $products);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "projectID=$projectID")));
+            $this->executeHooks($executionID);
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "executionID=$executionID")));
         }
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $projectID);
+        $this->execution->setMenu($this->executions, $executionID);
 
-        $projects = array('' => '') + $this->projects;
-        $project  = $this->project->getById($projectID);
-        $managers = $this->project->getDefaultManagers($projectID);
+        $executions = array('' => '') + $this->executions;
+        $execution  = $this->execution->getById($executionID);
+        $managers = $this->execution->getDefaultManagers($executionID);
 
-        /* Remove current project from the projects. */
-        unset($projects[$projectID]);
+        /* Remove current execution from the executions. */
+        unset($executions[$executionID]);
 
-        $title      = $this->lang->project->edit . $this->lang->colon . $project->name;
-        $position[] = html::a($browseProjectLink, $project->name);
-        $position[] = $this->lang->project->edit;
+        $title      = $this->lang->execution->edit . $this->lang->colon . $execution->name;
+        $position[] = html::a($browseExecutionLink, $execution->name);
+        $position[] = $this->lang->execution->edit;
 
         $allProducts     = array(0 => '');
-        $projectProsucts = $this->project->getProducts($project->project);
-        foreach($projectProsucts as $product) $allProducts[$product->id] = $product->name;
+        $executionProsucts = $this->execution->getProducts($execution->execution);
+        foreach($executionProsucts as $product) $allProducts[$product->id] = $product->name;
 
-        $linkedProducts = $this->project->getProducts($project->id);
+        $linkedProducts = $this->execution->getProducts($execution->id);
         $linkedBranches = array();
 
         /* If the story of the product which linked the execution, you don't allow to remove the product. */
         $unmodifiableProducts = array();
         foreach($linkedProducts as $productID => $linkedProduct)
         {
-            $projectStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->andWhere('product')->eq($productID)->fetchAll('story');
-            if(!empty($projectStories)) array_push($unmodifiableProducts, $productID);
+            $executionStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->andWhere('product')->eq($productID)->fetchAll('story');
+            if(!empty($executionStories)) array_push($unmodifiableProducts, $productID);
         }
 
         foreach($linkedProducts as $product)
@@ -1350,15 +1353,15 @@ class project extends control
         $this->view->isSprint = false;
         if($this->config->systemMode == 'new')
         {
-            $PRJData = $this->project->getById($this->session->PRJ);
+            $PRJData = $this->execution->getById($this->session->project);
             if($PRJData->model == 'scrum' && isset($this->config->custom->sprintConcept) && $this->config->custom->sprintConcept == 1)
             {
                 $this->view->isSprint = true;
 
-                unset($this->lang->project->endList[62]);
-                unset($this->lang->project->endList[93]);
-                unset($this->lang->project->endList[186]);
-                unset($this->lang->project->endList[365]);
+                unset($this->lang->execution->endList[62]);
+                unset($this->lang->execution->endList[93]);
+                unset($this->lang->execution->endList[186]);
+                unset($this->lang->execution->endList[365]);
             }
 
             $this->view->isStage = $PRJData->model == 'waterfall' ? true : false;
@@ -1369,22 +1372,22 @@ class project extends control
         }
 
         $this->loadModel('user');
-        $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $project->PO, $this->config->maxCount);
+        $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $execution->PO, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
 
-        $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst',  $project->PM, $this->config->maxCount);
+        $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst',  $execution->PM, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink;
 
-        $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst',  $project->QD, $this->config->maxCount);
+        $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst',  $execution->QD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink;
 
-        $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD, $this->config->maxCount);
+        $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $execution->RD, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
         $this->view->title                = $title;
         $this->view->position             = $position;
-        $this->view->projects             = $projects;
-        $this->view->project              = $project;
+        $this->view->executions             = $executions;
+        $this->view->execution              = $execution;
         $this->view->poUsers              = $poUsers;
         $this->view->pmUsers              = $pmUsers;
         $this->view->qdUsers              = $qdUsers;
@@ -1402,48 +1405,48 @@ class project extends control
     /**
      * Batch edit.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function batchEdit($projectID = 0)
+    public function batchEdit($executionID = 0)
     {
         $this->app->loadLang('stage');
 
         if($this->post->names)
         {
-            $allChanges = $this->project->batchUpdate();
+            $allChanges = $this->execution->batchUpdate();
             if(!empty($allChanges))
             {
-                foreach($allChanges as $projectID => $changes)
+                foreach($allChanges as $executionID => $changes)
                 {
                     if(empty($changes)) continue;
 
-                    $actionID = $this->loadModel('action')->create($this->objectType, $projectID, 'Edited');
+                    $actionID = $this->loadModel('action')->create($this->objectType, $executionID, 'Edited');
                     $this->action->logHistory($actionID, $changes);
                 }
             }
-            die(js::locate($this->session->projectList, 'parent'));
+            die(js::locate($this->session->executionList, 'parent'));
         }
 
-        $this->project->setMenu($this->projects, $projectID);
+        $this->execution->setMenu($this->executions, $executionID);
 
-        $projectIDList = $this->post->projectIDList ? $this->post->projectIDList : die(js::locate($this->session->projectList, 'parent'));
-        $projects      = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projectIDList)->fetchAll('id');
+        $executionIDList = $this->post->executionIDList ? $this->post->executionIDList : die(js::locate($this->session->executionList, 'parent'));
+        $executions      = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIDList)->fetchAll('id');
 
         $appendPoUsers = $appendPmUsers = $appendQdUsers = $appendRdUsers = array();
-        foreach($projects as $project)
+        foreach($executions as $execution)
         {
-            $appendPoUsers[$project->PO] = $project->PO;
-            $appendPmUsers[$project->PM] = $project->PM;
-            $appendQdUsers[$project->QD] = $project->QD;
-            $appendRdUsers[$project->RD] = $project->RD;
+            $appendPoUsers[$execution->PO] = $execution->PO;
+            $appendPmUsers[$execution->PM] = $execution->PM;
+            $appendQdUsers[$execution->QD] = $execution->QD;
+            $appendRdUsers[$execution->RD] = $execution->RD;
         }
 
         /* Set custom. */
-        foreach(explode(',', $this->config->project->customBatchEditFields) as $field) $customFields[$field] = $this->lang->project->$field;
+        foreach(explode(',', $this->config->execution->customBatchEditFields) as $field) $customFields[$field] = $this->lang->execution->$field;
         $this->view->customFields = $customFields;
-        $this->view->showFields   = $this->config->project->custom->batchEditFields;
+        $this->view->showFields   = $this->config->execution->custom->batchEditFields;
 
         $this->loadModel('user');
         $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $appendPmUsers, $this->config->maxCount);
@@ -1458,12 +1461,12 @@ class project extends control
         $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
-        $PRJData = $this->project->getById($this->session->PRJ);
+        $PRJData = $this->execution->getById($this->session->project);
 
-        $this->view->title         = $this->lang->project->batchEdit;
-        $this->view->position[]    = $this->lang->project->batchEdit;
-        $this->view->projectIDList = $projectIDList;
-        $this->view->projects      = $projects;
+        $this->view->title         = $this->lang->execution->batchEdit;
+        $this->view->position[]    = $this->lang->execution->batchEdit;
+        $this->view->executionIDList = $executionIDList;
+        $this->view->executions      = $executions;
         $this->view->pmUsers       = $pmUsers;
         $this->view->poUsers       = $poUsers;
         $this->view->qdUsers       = $qdUsers;
@@ -1473,184 +1476,184 @@ class project extends control
     }
 
     /**
-     * Start project.
+     * Start execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function start($projectID)
+    public function start($executionID)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->start($projectID);
+            $changes = $this->execution->start($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create($this->objectType, $projectID, 'Started', $this->post->comment);
+                $actionID = $this->action->create($this->objectType, $executionID, 'Started', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->project->start;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $this->view->project->name);
-        $this->view->position[] = $this->lang->project->start;
+        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->execution->start;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name);
+        $this->view->position[] = $this->lang->execution->start;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions    = $this->loadModel('action')->getList('execution', $projectID);
+        $this->view->actions    = $this->loadModel('action')->getList('execution', $executionID);
         $this->display();
     }
 
     /**
-     * Delay project.
+     * Delay execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function putoff($projectID)
+    public function putoff($executionID)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->putoff($projectID);
+            $changes = $this->execution->putoff($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create($this->objectType, $projectID, 'Delayed', $this->post->comment);
+                $actionID = $this->action->create($this->objectType, $executionID, 'Delayed', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->project->putoff;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $this->view->project->name);
-        $this->view->position[] = $this->lang->project->putoff;
+        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->execution->putoff;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name);
+        $this->view->position[] = $this->lang->execution->putoff;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions    = $this->loadModel('action')->getList('execution', $projectID);
+        $this->view->actions    = $this->loadModel('action')->getList('execution', $executionID);
         $this->display();
     }
 
     /**
-     * Suspend project.
+     * Suspend execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function suspend($projectID)
+    public function suspend($executionID)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->suspend($projectID);
+            $changes = $this->execution->suspend($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create($this->objectType, $projectID, 'Suspended', $this->post->comment);
+                $actionID = $this->action->create($this->objectType, $executionID, 'Suspended', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->project->suspend;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $this->view->project->name);
-        $this->view->position[] = $this->lang->project->suspend;
+        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->execution->suspend;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name);
+        $this->view->position[] = $this->lang->execution->suspend;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions    = $this->loadModel('action')->getList('execution', $projectID);
+        $this->view->actions    = $this->loadModel('action')->getList('execution', $executionID);
         $this->display();
     }
 
     /**
-     * Activate project.
+     * Activate execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function activate($projectID)
+    public function activate($executionID)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->activate($projectID);
+            $changes = $this->execution->activate($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create($this->objectType, $projectID, 'Activated', $this->post->comment);
+                $actionID = $this->action->create($this->objectType, $executionID, 'Activated', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
             die(js::reload('parent.parent'));
         }
 
         $newBegin = date('Y-m-d');
-        $dateDiff = helper::diffDate($newBegin, $project->begin);
-        $newEnd   = date('Y-m-d', strtotime($project->end) + $dateDiff * 24 * 3600);
+        $dateDiff = helper::diffDate($newBegin, $execution->begin);
+        $newEnd   = date('Y-m-d', strtotime($execution->end) + $dateDiff * 24 * 3600);
 
-        $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->project->activate;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $this->view->project->name);
-        $this->view->position[] = $this->lang->project->activate;
-        $this->view->project    = $project;
+        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->execution->activate;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name);
+        $this->view->position[] = $this->lang->execution->activate;
+        $this->view->execution    = $execution;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions    = $this->loadModel('action')->getList('execution', $projectID);
+        $this->view->actions    = $this->loadModel('action')->getList('execution', $executionID);
         $this->view->newBegin   = $newBegin;
         $this->view->newEnd     = $newEnd;
         $this->display();
     }
 
     /**
-     * Close project.
+     * Close execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function close($projectID)
+    public function close($executionID)
     {
-        $project   = $this->commonAction($projectID);
-        $projectID = $project->id;
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
 
         if(!empty($_POST))
         {
             $this->loadModel('action');
-            $changes = $this->project->close($projectID);
+            $changes = $this->execution->close($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
-                $actionID = $this->action->create($this->objectType, $projectID, 'Closed', $this->post->comment);
+                $actionID = $this->action->create($this->objectType, $executionID, 'Closed', $this->post->comment);
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->executeHooks($projectID);
+            $this->executeHooks($executionID);
             die(js::reload('parent.parent'));
         }
 
-        $this->view->title      = $this->view->project->name . $this->lang->colon .$this->lang->project->close;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $this->view->project->name);
-        $this->view->position[] = $this->lang->project->close;
+        $this->view->title      = $this->view->execution->name . $this->lang->colon .$this->lang->execution->close;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $this->view->execution->name);
+        $this->view->position[] = $this->lang->execution->close;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
-        $this->view->actions    = $this->loadModel('action')->getList('execution', $projectID);
+        $this->view->actions    = $this->loadModel('action')->getList('execution', $executionID);
         $this->display();
     }
 
@@ -1663,16 +1666,16 @@ class project extends control
      */
     public function view($executionID)
     {
-        $execution = $this->project->getById($executionID, true);
+        $execution = $this->execution->getById($executionID, true);
         if(empty($execution) || strpos('stage,sprint', $execution->type) === false) die(js::error($this->lang->notFound) . js::locate('back'));
 
         $this->app->loadLang('program');
-        $this->session->PRJ = $execution->project;
+        $this->session->project = $execution->execution;
 
-        /* Project not found to prevent searching for .*/
-        if(!isset($this->projects[$execution->id])) $this->projects = $this->project->getExecutionPairs($execution->project, 'all', 'nocode');
+        /* Execution not found to prevent searching for .*/
+        if(!isset($this->executions[$execution->id])) $this->executions = $this->execution->getPairs($execution->execution, 'all', 'nocode');
 
-        $products = $this->project->getProducts($execution->id);
+        $products = $this->execution->getProducts($execution->id);
         $linkedBranches = array();
         foreach($products as $product)
         {
@@ -1680,11 +1683,11 @@ class project extends control
         }
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $execution->id);
+        $this->execution->setMenu($this->executions, $execution->id);
         $this->app->loadLang('bug');
 
-        list($dateList, $interval) = $this->project->getDateList($execution->begin, $execution->end, 'noweekend', 0, 'Y-m-d');
-        $chartData = $this->project->buildBurnData($executionID, $dateList, 'noweekend');
+        list($dateList, $interval) = $this->execution->getDateList($execution->begin, $execution->end, 'noweekend', 0, 'Y-m-d');
+        $chartData = $this->execution->buildBurnData($executionID, $dateList, 'noweekend');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -1692,22 +1695,22 @@ class project extends control
 
         $this->executeHooks($executionID);
 
-        $this->view->title      = $this->lang->project->view;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$executionID"), $execution->name);
+        $this->view->title      = $this->lang->execution->view;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
         $this->view->position[] = $this->view->title;
 
         $this->view->execution    = $execution;
         $this->view->products     = $products;
         $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches);
-        $this->view->planGroups   = $this->project->getPlans($products);
+        $this->view->planGroups   = $this->execution->getPlans($products);
         $this->view->actions      = $this->loadModel('action')->getList('execution', $executionID);
         $this->view->dynamics     = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $executionID);
         $this->view->users        = $this->loadModel('user')->getPairs('noletter');
-        $this->view->teamMembers  = $this->project->getTeamMembers($executionID);
-        $this->view->docLibs      = $this->loadModel('doc')->getLibsByObject('project', $executionID);
-        $this->view->statData     = $this->project->statRelatedData($executionID);
+        $this->view->teamMembers  = $this->execution->getTeamMembers($executionID);
+        $this->view->docLibs      = $this->loadModel('doc')->getLibsByObject('execution', $executionID);
+        $this->view->statData     = $this->execution->statRelatedData($executionID);
         $this->view->chartData    = $chartData;
-        $this->view->canBeChanged = common::canModify('project', $execution); // Determines whether an object is editable.
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
@@ -1715,13 +1718,13 @@ class project extends control
     /**
      * Kanban.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $type
      * @param  string $orderBy
      * @access public
      * @return void
      */
-    public function kanban($projectID, $type = 'story', $orderBy = 'order_asc')
+    public function kanban($executionID, $type = 'story', $orderBy = 'order_asc')
     {
         /* Save to session. */
         $uri = $this->app->getURI(true);
@@ -1732,34 +1735,34 @@ class project extends control
         /* Compatibility IE8*/
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
-        $this->project->setMenu($this->projects, $projectID);
-        $project = $this->loadModel('project')->getById($projectID);
-        $tasks   = $this->project->getKanbanTasks($projectID, "id");
-        $bugs    = $this->loadModel('bug')->getProjectBugs($projectID);
-        $stories = $this->loadModel('story')->getProjectStories($projectID, 0, 0, $orderBy);
+        $this->execution->setMenu($this->executions, $executionID);
+        $execution = $this->loadModel('execution')->getById($executionID);
+        $tasks   = $this->execution->getKanbanTasks($executionID, "id");
+        $bugs    = $this->loadModel('bug')->getBugs($executionID);
+        $stories = $this->loadModel('story')->getStories($executionID, 0, 0, $orderBy);
 
         /* Determines whether an object is editable. */
-        $canBeChanged = common::canModify('project', $project);
+        $canBeChanged = common::canModify('execution', $execution);
 
-        $kanbanGroup   = $this->project->getKanbanGroupData($stories, $tasks, $bugs, $type);
-        $kanbanSetting = $this->project->getKanbanSetting();
+        $kanbanGroup   = $this->execution->getKanbanGroupData($stories, $tasks, $bugs, $type);
+        $kanbanSetting = $this->execution->getKanbanSetting();
 
-        $this->view->title         = $this->lang->project->kanban;
-        $this->view->position[]    = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $this->view->position[]    = $this->lang->project->kanban;
+        $this->view->title         = $this->lang->execution->kanban;
+        $this->view->position[]    = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[]    = $this->lang->execution->kanban;
         $this->view->stories       = $stories;
         $this->view->realnames     = $this->loadModel('user')->getPairs('noletter');
         $this->view->storyOrder    = $orderBy;
         $this->view->orderBy       = 'id_asc';
-        $this->view->projectID     = $projectID;
+        $this->view->executionID     = $executionID;
         $this->view->browseType    = '';
-        $this->view->project       = $project;
+        $this->view->execution       = $execution;
         $this->view->type          = $type;
         $this->view->kanbanGroup   = $kanbanGroup;
-        $this->view->kanbanColumns = $this->project->getKanbanColumns($kanbanSetting);
-        $this->view->statusMap     = $canBeChanged ? $this->project->getKanbanStatusMap($kanbanSetting) : array();
-        $this->view->statusList    = $this->project->getKanbanStatusList($kanbanSetting);
-        $this->view->colorList     = $this->project->getKanbanColorList($kanbanSetting);
+        $this->view->kanbanColumns = $this->execution->getKanbanColumns($kanbanSetting);
+        $this->view->statusMap     = $canBeChanged ? $this->execution->getKanbanStatusMap($kanbanSetting) : array();
+        $this->view->statusList    = $this->execution->getKanbanStatusList($kanbanSetting);
+        $this->view->colorList     = $this->execution->getKanbanColorList($kanbanSetting);
         $this->view->canBeChanged  = $canBeChanged;
 
         $this->display();
@@ -1769,60 +1772,60 @@ class project extends control
      * Tree view.
      * Product
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $type
      * @access public
      * @return void
      */
-    public function tree($projectID, $type = 'task')
+    public function tree($executionID, $type = 'task')
     {
-        $this->project->setMenu($this->projects, $projectID);
-        $project = $this->loadModel('project')->getById($projectID);
-        $tree    = $this->project->getExecutionTree($projectID);
+        $this->execution->setMenu($this->executions, $executionID);
+        $execution = $this->loadModel('execution')->getById($executionID);
+        $tree    = $this->execution->getTree($executionID);
 
         /* Save to session. */
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList',    $uri);
         $this->app->session->set('storyList',   $uri);
-        $this->app->session->set('projectList', $uri);
+        $this->app->session->set('executionList', $uri);
         $this->app->session->set('caseList', $uri);
         $this->app->session->set('bugList', $uri);
 
         if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
 
-        $this->view->title      = $this->lang->project->tree;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $this->view->position[] = $this->lang->project->tree;
-        $this->view->project    = $project;
-        $this->view->projectID  = $projectID;
+        $this->view->title      = $this->lang->execution->tree;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->tree;
+        $this->view->execution    = $execution;
+        $this->view->executionID  = $executionID;
         $this->view->level      = $type;
-        $this->view->tree       = $this->project->printTree($tree);
+        $this->view->tree       = $this->execution->printTree($tree);
         $this->display();
     }
 
     /**
      * Print kanban.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @access public
      * @return void
      */
-    public function printKanban($projectID, $orderBy = 'id_asc')
+    public function printKanban($executionID, $orderBy = 'id_asc')
     {
-        $this->view->title = $this->lang->project->printKanban;
+        $this->view->title = $this->lang->execution->printKanban;
         $contents = array('story', 'wait', 'doing', 'done', 'cancel');
 
         if($_POST)
         {
-            $stories    = $this->loadModel('story')->getProjectStories($projectID, 0, 0, $orderBy);
+            $stories    = $this->loadModel('story')->getStories($executionID, 0, 0, $orderBy);
             $storySpecs = $this->story->getStorySpecs(array_keys($stories));
 
             $order = 1;
             foreach($stories as $story) $story->order = $order++;
 
-            $kanbanTasks = $this->project->getKanbanTasks($projectID, "id");
-            $kanbanBugs  = $this->loadModel('bug')->getProjectBugs($projectID);
+            $kanbanTasks = $this->execution->getKanbanTasks($executionID, "id");
+            $kanbanBugs  = $this->loadModel('bug')->getBugs($executionID);
 
             $users       = array();
             $taskAndBugs = array();
@@ -1854,7 +1857,7 @@ class project extends control
             unset($this->lang->story->stageList['']);
             unset($this->lang->story->stageList['wait']);
             unset($this->lang->story->stageList['planned']);
-            unset($this->lang->story->stageList['projected']);
+            unset($this->lang->story->stageList['executioned']);
             unset($this->lang->story->stageList['released']);
             unset($this->lang->task->statusList['']);
             unset($this->lang->task->statusList['wait']);
@@ -1865,7 +1868,7 @@ class project extends control
             $originalDatas = $datas;
             if($this->post->content == 'increment')
             {
-                $prevKanbans = $this->project->getPrevKanban($projectID);
+                $prevKanbans = $this->execution->getPrevKanban($executionID);
                 foreach($datas as $type => $data)
                 {
                     if(isset($prevKanbans[$type]))
@@ -1879,15 +1882,15 @@ class project extends control
                 }
             }
 
-            $this->project->saveKanbanData($projectID, $originalDatas);
+            $this->execution->saveKanbanData($executionID, $originalDatas);
 
             $hasBurn = $this->post->content == 'all';
             if($hasBurn)
             {
                 /* Get date list. */
-                $projectInfo    = $this->project->getByID($projectID);
-                list($dateList) = $this->project->getDateList($projectInfo->begin, $projectInfo->end, 'noweekend');
-                $chartData      = $this->project->buildBurnData($projectID, $dateList, 'noweekend');
+                $executionInfo    = $this->execution->getByID($executionID);
+                list($dateList) = $this->execution->getDateList($executionInfo->begin, $executionInfo->end, 'noweekend');
+                $chartData      = $this->execution->buildBurnData($executionID, $dateList, 'noweekend');
             }
 
             $this->view->hasBurn    = $hasBurn;
@@ -1895,28 +1898,28 @@ class project extends control
             $this->view->chartData  = $chartData;
             $this->view->storySpecs = $storySpecs;
             $this->view->realnames  = $this->loadModel('user')->getRealNameAndEmails($users);
-            $this->view->projectID  = $projectID;
+            $this->view->executionID  = $executionID;
 
             die($this->display());
 
         }
 
-        $this->project->setMenu($this->projects, $projectID);
-        $project = $this->project->getById($projectID);
+        $this->execution->setMenu($this->executions, $executionID);
+        $execution = $this->execution->getById($executionID);
 
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $this->view->position[] = $this->lang->project->printKanban;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->printKanban;
         $this->display();
     }
 
     /**
      * Story kanban.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function storyKanban($projectID)
+    public function storyKanban($executionID)
     {
         /* Save to session. */
         $uri = $this->app->getURI(true);
@@ -1925,72 +1928,72 @@ class project extends control
         /* Compatibility IE8*/
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
-        $this->project->setMenu($this->projects, $projectID);
-        $project = $this->loadModel('project')->getById($projectID);
-        $stories = $this->loadModel('story')->getProjectStories($projectID);
+        $this->execution->setMenu($this->executions, $executionID);
+        $execution = $this->loadModel('execution')->getById($executionID);
+        $stories = $this->loadModel('story')->getStories($executionID);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
 
-        /* Get project's product. */
+        /* Get execution's product. */
         $productID = 0;
-        $productPairs = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $productPairs = $this->loadModel('product')->getProductPairsByExecution($executionID);
         if($productPairs) $productID = key($productPairs);
 
-        $this->view->title        = $this->lang->project->storyKanban;
-        $this->view->position[]   = html::a($this->createLink('project', 'story', "projectID=$projectID"), $project->name);
-        $this->view->position[]   = $this->lang->project->storyKanban;
+        $this->view->title        = $this->lang->execution->storyKanban;
+        $this->view->position[]   = html::a($this->createLink('execution', 'story', "executionID=$executionID"), $execution->name);
+        $this->view->position[]   = $this->lang->execution->storyKanban;
         $this->view->stories      = $this->story->getKanbanGroupData($stories);
         $this->view->realnames    = $this->loadModel('user')->getPairs('noletter');
-        $this->view->projectID    = $projectID;
-        $this->view->project      = $project;
+        $this->view->executionID    = $executionID;
+        $this->view->execution      = $execution;
         $this->view->productID    = $productID;
-        $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable.
+        $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
     }
 
     /**
-     * Delete a project.
+     * Delete a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $confirm   yes|no
      * @access public
      * @return void
      */
-    public function delete($projectID, $confirm = 'no')
+    public function delete($executionID, $confirm = 'no')
     {
         if($confirm == 'no')
         {
             /* Get the number of unfinished tasks and unresolved bugs. */
             $unfinishedTasks = $this->dao->select('COUNT(id) AS count')->from(TABLE_TASK)
-                ->where('project')->eq($projectID)
+                ->where('execution')->eq($executionID)
                 ->andWhere('deleted')->eq(0)
                 ->andWhere('status')->in('wait,doing,pause')
                 ->fetch();
 
             $unresolvedBugs = $this->dao->select('COUNT(id) AS count')->from(TABLE_BUG)
-                ->where('project')->eq($projectID)
+                ->where('execution')->eq($executionID)
                 ->andWhere('deleted')->eq(0)
                 ->andWhere('status')->eq('active')
                 ->fetch();
 
             /* Set prompt information. */
             $tips = '';
-            if($unfinishedTasks->count) $tips  = sprintf($this->lang->project->unfinishedTask, $unfinishedTasks->count);
-            if($unresolvedBugs->count)  $tips .= sprintf($this->lang->project->unresolvedBug,  $unresolvedBugs->count);
-            if($tips)                   $tips  = $this->lang->project->unfinishedProject . $tips;
+            if($unfinishedTasks->count) $tips  = sprintf($this->lang->execution->unfinishedTask, $unfinishedTasks->count);
+            if($unresolvedBugs->count)  $tips .= sprintf($this->lang->execution->unresolvedBug,  $unresolvedBugs->count);
+            if($tips)                   $tips  = $this->lang->execution->unfinishedExecution . $tips;
 
-            echo js::confirm($tips . sprintf($this->lang->project->confirmDelete, $this->projects[$projectID]), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes"));
+            echo js::confirm($tips . sprintf($this->lang->execution->confirmDelete, $this->executions[$executionID]), $this->createLink('execution', 'delete', "executionID=$executionID&confirm=yes"));
             exit;
         }
         else
         {
-            /* Delete project. */
-            $this->dao->update(TABLE_PROJECT)->set('deleted')->eq(1)->where('id')->eq($projectID)->exec();
-            $this->loadModel('action')->create($this->objectType, $projectID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
-            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
-            $this->project->updateUserView($projectID);
-            $this->session->set('project', '');
-            $this->executeHooks($projectID);
+            /* Delete execution. */
+            $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec();
+            $this->loadModel('action')->create($this->objectType, $executionID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
+            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('execution')->eq($executionID)->exec();
+            $this->execution->updateUserView($executionID);
+            $this->session->set('execution', '');
+            $this->executeHooks($executionID);
             die(js::locate(inlink('index'), 'parent'));
         }
     }
@@ -1998,66 +2001,66 @@ class project extends control
     /**
      * Manage products.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  from   $from
      * @access public
      * @return void
      */
-    public function manageProducts($projectID, $from = '')
+    public function manageProducts($executionID, $from = '')
     {
-        /* use first project if projectID does not exist. */
-        if(!isset($this->projects[$projectID])) $projectID = key($this->projects);
+        /* use first execution if executionID does not exist. */
+        if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
-        $browseProjectLink = $this->createLink('project', 'browse', "projectID=$projectID");
+        $browseExecutionLink = $this->createLink('execution', 'browse', "executionID=$executionID");
 
         if(!empty($_POST))
         {
-            /* Get projectType and determine whether a product is linked with the stage. */
-            $projectType = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch('type');
-            if($projectType == 'stage')
+            /* Get executionType and determine whether a product is linked with the stage. */
+            $executionType = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch('type');
+            if($executionType == 'stage')
             {
-                if(!isset($_POST['products'])) die(js::alert($this->lang->project->noLinkProduct) . js::locate($this->createLink('project', 'manageProducts', "projectID=$projectID&from=$from")));
+                if(!isset($_POST['products'])) die(js::alert($this->lang->execution->noLinkProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
 
-                if(count($_POST['products']) > 1) die(js::alert($this->lang->project->oneProduct) . js::locate($this->createLink('project', 'manageProducts', "projectID=$projectID&from=$from")));
+                if(count($_POST['products']) > 1) die(js::alert($this->lang->execution->oneProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
             }
 
-            $oldProducts = $this->project->getProducts($projectID);
+            $oldProducts = $this->execution->getProducts($executionID);
 
-            if($from == 'buildCreate' && $this->session->buildCreate) $browseProjectLink = $this->session->buildCreate;
+            if($from == 'buildCreate' && $this->session->buildCreate) $browseExecutionLink = $this->session->buildCreate;
 
-            $this->project->updateProducts($projectID);
+            $this->execution->updateProducts($executionID);
             if(dao::isError()) die(js::error(dao::getError()));
 
             $oldProducts  = array_keys($oldProducts);
-            $newProducts  = $this->project->getProducts($projectID);
+            $newProducts  = $this->execution->getProducts($executionID);
             $newProducts  = array_keys($newProducts);
             $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
-            if($diffProducts) $this->loadModel('action')->create($this->objectType, $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
+            if($diffProducts) $this->loadModel('action')->create($this->objectType, $executionID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
 
-            die(js::locate($browseProjectLink));
+            die(js::locate($browseExecutionLink));
         }
 
         $this->loadModel('product');
-        $project  = $this->project->getById($projectID);
+        $execution  = $this->execution->getById($executionID);
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $project->id);
+        $this->execution->setMenu($this->executions, $execution->id);
 
         /* Title and position. */
-        $title      = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
-        $position[] = html::a($browseProjectLink, $project->name);
-        $position[] = $this->lang->project->manageProducts;
+        $title      = $this->lang->execution->manageProducts . $this->lang->colon . $execution->name;
+        $position[] = html::a($browseExecutionLink, $execution->name);
+        $position[] = $this->lang->execution->manageProducts;
 
-        $allProducts     = $this->product->getProductPairsByProject($project->project);
-        $linkedProducts  = $this->project->getProducts($project->id);
+        $allProducts     = $this->product->getProductPairsByExecution($execution->execution);
+        $linkedProducts  = $this->execution->getProducts($execution->id);
         $linkedBranches  = array();
 
         /* If the story of the product which linked the execution, you don't allow to remove the product. */
         $unmodifiableProducts = array();
         foreach($linkedProducts as $productID => $linkedProduct)
         {
-            $projectStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->andWhere('product')->eq($productID)->fetchAll('story');
-            if(!empty($projectStories)) array_push($unmodifiableProducts, $productID);
+            $executionStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->andWhere('product')->eq($productID)->fetchAll('story');
+            if(!empty($executionStories)) array_push($unmodifiableProducts, $productID);
         }
 
         // Merge allProducts and linkedProducts for closed product.
@@ -2071,7 +2074,7 @@ class project extends control
         $this->view->title                = $title;
         $this->view->position             = $position;
         $this->view->allProducts          = $allProducts;
-        $this->view->project              = $project;
+        $this->view->execution              = $execution;
         $this->view->linkedProducts       = $linkedProducts;
         $this->view->unmodifiableProducts = $unmodifiableProducts;
         $this->view->branchGroups         = $this->loadModel('branch')->getByProducts(array_keys($allProducts), '', $linkedBranches);
@@ -2080,34 +2083,34 @@ class project extends control
     }
 
     /**
-     * Manage members of the project.
+     * Manage members of the execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  int    $team2Import    the team to import.
      * @param  int    $dept
      * @access public
      * @return void
      */
-    public function manageMembers($projectID = 0, $team2Import = 0, $dept = 0)
+    public function manageMembers($executionID = 0, $team2Import = 0, $dept = 0)
     {
         if(!empty($_POST))
         {
-            $this->project->manageMembers($projectID);
-            die(js::locate($this->createLink('project', 'team', "projectID=$projectID"), 'parent'));
+            $this->execution->manageMembers($executionID);
+            die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
         }
 
         /* Load model. */
         $this->loadModel('user');
         $this->loadModel('dept');
 
-        $project   = $this->project->getById($projectID);
+        $execution   = $this->execution->getById($executionID);
         $users     = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
         $roles     = $this->user->getUserRoles(array_keys($users));
         $deptUsers = empty($dept) ? array() : $this->dept->getDeptUserPairs($dept);
 
-        $currentMembers = $this->project->getTeamMembers($projectID);
-        $members2Import = $this->project->getMembers2Import($team2Import, array_keys($currentMembers));
-        $teams2Import   = $this->project->getTeams2Import($this->app->user->account, $projectID);
+        $currentMembers = $this->execution->getTeamMembers($executionID);
+        $members2Import = $this->execution->getMembers2Import($team2Import, array_keys($currentMembers));
+        $teams2Import   = $this->execution->getTeams2Import($this->app->user->account, $executionID);
         $teams2Import   = array('' => '') + $teams2Import;
 
         /* Append users for get users. */
@@ -2120,16 +2123,16 @@ class project extends control
         $roles = $this->user->getUserRoles(array_keys($users));
 
         /* Set menu. */
-        $this->project->setMenu($this->projects, $project->id);
+        $this->execution->setMenu($this->executions, $execution->id);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink;
 
-        $title      = $this->lang->project->manageMembers . $this->lang->colon . $project->name;
-        $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $position[] = $this->lang->project->manageMembers;
+        $title      = $this->lang->execution->manageMembers . $this->lang->colon . $execution->name;
+        $position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $position[] = $this->lang->execution->manageMembers;
 
         $this->view->title          = $title;
         $this->view->position       = $position;
-        $this->view->project        = $project;
+        $this->view->execution        = $execution;
         $this->view->users          = $users;
         $this->view->deptUsers      = $deptUsers;
         $this->view->roles          = $roles;
@@ -2145,20 +2148,20 @@ class project extends control
     /**
      * Unlink a memeber.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  int    $userID
      * @param  string $confirm  yes|no
      * @access public
      * @return void
      */
-    public function unlinkMember($projectID, $userID, $confirm = 'no')
+    public function unlinkMember($executionID, $userID, $confirm = 'no')
     {
-        if($confirm == 'no') die(js::confirm($this->lang->project->confirmUnlinkMember, $this->inlink('unlinkMember', "projectID=$projectID&userID=$userID&confirm=yes")));
+        if($confirm == 'no') die(js::confirm($this->lang->execution->confirmUnlinkMember, $this->inlink('unlinkMember', "executionID=$executionID&userID=$userID&confirm=yes")));
 
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $account = $user->account;
 
-        $this->project->unlinkMember($projectID, $account);
+        $this->execution->unlinkMember($executionID, $account);
 
         /* if ajax request, send result. */
         if($this->server->ajax)
@@ -2175,13 +2178,13 @@ class project extends control
             }
             $this->send($response);
         }
-        die(js::locate($this->inlink('team', "projectID=$projectID"), 'parent'));
+        die(js::locate($this->inlink('team', "executionID=$executionID"), 'parent'));
     }
 
     /**
      * Link stories to an execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $browseType
      * @param  int    $param
      * @param  int    $recTotal
@@ -2190,30 +2193,30 @@ class project extends control
      * @access public
      * @return void
      */
-    public function linkStory($projectID = 0, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
+    public function linkStory($executionID = 0, $browseType = '', $param = 0, $recTotal = 0, $recPerPage = 50, $pageID = 1)
     {
         $this->loadModel('story');
         $this->loadModel('product');
 
-        /* Get projects and products. */
-        $project    = $this->project->getById($projectID);
-        $products   = $this->project->getProducts($projectID);
-        $browseLink = $this->createLink('project', 'story', "projectID=$projectID");
-        if($project->type == 'project') $browseLink = $this->createLink('projectstory', 'story', "productID={$this->session->product}");
+        /* Get executions and products. */
+        $execution    = $this->execution->getById($executionID);
+        $products   = $this->execution->getProducts($executionID);
+        $browseLink = $this->createLink('execution', 'story', "executionID=$executionID");
+        if($execution->type == 'execution') $browseLink = $this->createLink('executionstory', 'story', "productID={$this->session->product}");
 
         $this->session->set('storyList', $this->app->getURI(true)); // Save session.
-        if($project->type != 'project') $this->project->setMenu($this->projects, $project->id);     // Set menu.
+        if($execution->type != 'execution') $this->execution->setMenu($this->executions, $execution->id);     // Set menu.
 
         if(empty($products))
         {
-            echo js::alert($this->lang->project->errorNoLinkedProducts);
-            die(js::locate($this->createLink('project', 'manageproducts', "projectID=$projectID")));
+            echo js::alert($this->lang->execution->errorNoLinkedProducts);
+            die(js::locate($this->createLink('execution', 'manageproducts', "executionID=$executionID")));
         }
 
         if(!empty($_POST))
         {
-            $this->project->linkStory($projectID);
-            if($project->project != 0) $this->project->linkStory($project->project);
+            $this->execution->linkStory($executionID);
+            if($execution->execution != 0) $this->execution->linkStory($execution->execution);
             die(js::locate($browseLink));
         }
 
@@ -2241,25 +2244,25 @@ class project extends control
         }
 
         /* Build the search form. */
-        $actionURL    = $this->createLink($this->app->rawModule, 'linkStory', "projectID=$projectID&browseType=bySearch&queryID=myQueryID");
+        $actionURL    = $this->createLink($this->app->rawModule, 'linkStory', "executionID=$executionID&browseType=bySearch&queryID=myQueryID");
         $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
-        $this->project->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'linkStory');
+        $this->execution->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'linkStory');
 
         if($browseType == 'bySearch')
         {
-            $allStories = $this->story->getBySearch('', 0, $queryID, 'id', $projectID);
+            $allStories = $this->story->getBySearch('', 0, $queryID, 'id', $executionID);
         }
         else
         {
             $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
         }
 
-        if($project->project != 0) $executionStories = $this->story->getProjectStoryPairs($project->project);
+        if($execution->execution != 0) $executionStories = $this->story->getStoryPairs($execution->execution);
 
-        $projectStories = $this->story->getProjectStoryPairs($projectID);
+        $executionStories = $this->story->getStoryPairs($executionID);
         foreach($allStories as $id => $story)
         {
-            if(isset($projectStories[$story->id])) unset($allStories[$id]);
+            if(isset($executionStories[$story->id])) unset($allStories[$id]);
 
             if($story->parent < 0) unset($allStories[$id]);
             if(!empty($executionStories) and !isset($executionStories[$story->id])) unset($allStories[$id]);
@@ -2272,11 +2275,11 @@ class project extends control
         $allStories = array_chunk($allStories, $pager->recPerPage);
 
         /* Assign. */
-        $this->view->title      = $project->name . $this->lang->colon . $this->lang->project->linkStory;
-        $this->view->position[] = html::a($browseLink, $project->name);
-        $this->view->position[] = $this->lang->project->linkStory;
+        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->linkStory;
+        $this->view->position[] = html::a($browseLink, $execution->name);
+        $this->view->position[] = $this->lang->execution->linkStory;
 
-        $this->view->project          = $project;
+        $this->view->execution          = $execution;
         $this->view->products         = $products;
         $this->view->executionStories = empty($executionStories) ? '' : $executionStories;
         $this->view->allStories       = empty($allStories) ? $allStories : $allStories[$pageID - 1];;
@@ -2293,22 +2296,22 @@ class project extends control
     /**
      * Unlink a story.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  int    $storyID
      * @param  string $confirm    yes|no
      * @access public
      * @return void
      */
-    public function unlinkStory($projectID, $storyID, $confirm = 'no')
+    public function unlinkStory($executionID, $storyID, $confirm = 'no')
     {
         if($confirm == 'no')
         {
-            $tip = $this->app->rawModule == 'projectstory' ? $this->lang->project->confirmUnlinkProjectStory : $this->lang->project->confirmUnlinkStory;
-            die(js::confirm($tip, $this->createLink('project', 'unlinkstory', "projectID=$projectID&storyID=$storyID&confirm=yes")));
+            $tip = $this->app->rawModule == 'executionstory' ? $this->lang->execution->confirmUnlinkExecutionStory : $this->lang->execution->confirmUnlinkStory;
+            die(js::confirm($tip, $this->createLink('execution', 'unlinkstory', "executionID=$executionID&storyID=$storyID&confirm=yes")));
         }
         else
         {
-            $this->project->unlinkStory($projectID, $storyID);
+            $this->execution->unlinkStory($executionID, $storyID);
 
             /* if kanban then reload and if ajax request then send result. */
             if(isonlybody())
@@ -2336,11 +2339,11 @@ class project extends control
     /**
      * batch unlink story.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function batchUnlinkStory($projectID)
+    public function batchUnlinkStory($executionID)
     {
         if(isset($_POST['storyIdList']))
         {
@@ -2348,17 +2351,17 @@ class project extends control
             $_POST       = array();
             foreach($storyIdList as $storyID)
             {
-                $this->project->unlinkStory($projectID, $storyID);
+                $this->execution->unlinkStory($executionID, $storyID);
             }
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
-        die(js::locate($this->createLink('project', 'story', "projectID=$projectID")));
+        die(js::locate($this->createLink('execution', 'story', "executionID=$executionID")));
     }
 
     /**
-     * Project dynamic.
+     * Execution dynamic.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $type
      * @param  string $param
      * @param  int    $recTotal
@@ -2367,7 +2370,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
+    public function dynamic($executionID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
         /* Save session. */
         $uri   = $this->app->getURI(true);
@@ -2375,28 +2378,28 @@ class project extends control
         $this->session->set('productPlanList', $uri);
         $this->session->set('releaseList',     $uri);
         $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
+        $this->session->set('executionList',     $uri);
         $this->session->set('taskList',        $uri);
         $this->session->set('buildList',       $uri);
         $this->session->set('bugList',         $uri);
         $this->session->set('caseList',        $uri);
         $this->session->set('testtaskList',    $uri);
 
-        /* use first project if projectID does not exist. */
-        if(!isset($this->projects[$projectID])) $projectID = key($this->projects);
+        /* use first execution if executionID does not exist. */
+        if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
         /* Append id for secend sort. */
         $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
         $sort    = $this->loadModel('common')->appendOrder($orderBy);
 
-        /* Set the menu. If the projectID = 0, use the indexMenu instead. */
-        $this->project->setMenu($this->projects, $projectID);
-        if($projectID == 0)
+        /* Set the menu. If the executionID = 0, use the indexMenu instead. */
+        $this->execution->setMenu($this->executions, $executionID);
+        if($executionID == 0)
         {
-            $this->projects = array('0' => $this->lang->project->selectProject) + $this->projects;
-            unset($this->lang->project->menu);
-            $this->lang->project->menu = $this->lang->project->indexMenu;
-            $this->lang->project->menu->list = $this->project->select($this->projects, 0, 'project', 'dynamic');
+            $this->executions = array('0' => $this->lang->execution->selectExecution) + $this->executions;
+            unset($this->lang->execution->menu);
+            $this->lang->execution->menu = $this->lang->execution->indexMenu;
+            $this->lang->execution->menu->list = $this->execution->select($this->executions, 0, 'execution', 'dynamic');
         }
 
         /* Set the pager. */
@@ -2412,19 +2415,19 @@ class project extends control
         }
         $period  = $type == 'account' ? 'all'  : $type;
         $date    = empty($date) ? '' : date('Y-m-d', $date);
-        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $projectID, $date, $direction);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $executionID, $date, $direction);
 
         /* The header and position. */
-        $project = $this->project->getByID($projectID);
-        $this->view->title      = $project->name . $this->lang->colon . $this->lang->project->dynamic;
-        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
-        $this->view->position[] = $this->lang->project->dynamic;
+        $execution = $this->execution->getByID($executionID);
+        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->execution->dynamic;
+        $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
+        $this->view->position[] = $this->lang->execution->dynamic;
 
         $this->view->userIdPairs  = $this->loadModel('user')->getPairs('noletter|nodeleted|useid');
         $this->view->accountPairs = $this->user->getPairs('noletter|nodeleted');
 
         /* Assign. */
-        $this->view->projectID  = $projectID;
+        $this->view->executionID  = $executionID;
         $this->view->type       = $type;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
@@ -2436,29 +2439,29 @@ class project extends control
     }
 
     /**
-     * AJAX: get products of a project in html select.
+     * AJAX: get products of a execution in html select.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function ajaxGetProducts($projectID)
+    public function ajaxGetProducts($executionID)
     {
-        $products = $this->project->getProducts($projectID, false);
+        $products = $this->execution->getProducts($executionID, false);
         die(html::select('product', $products, '', 'class="form-control"'));
     }
 
     /**
-     * AJAX: get team members of the project.
+     * AJAX: get team members of the execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $assignedTo
      * @access public
      * @return void
      */
-    public function ajaxGetMembers($projectID, $assignedTo = '')
+    public function ajaxGetMembers($executionID, $assignedTo = '')
     {
-        $users = $this->project->getTeamMemberPairs($projectID);
+        $users = $this->execution->getTeamMemberPairs($executionID);
         if($this->app->getViewType() === 'json')
         {
             die(json_encode($users));
@@ -2471,39 +2474,39 @@ class project extends control
     }
 
     /**
-     * When create a project, help the user.
+     * When create a execution, help the user.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function tips($projectID)
+    public function tips($executionID)
     {
-        $this->view->project   = $this->project->getById($projectID);
-        $this->view->projectID = $projectID;
-        $this->display('project', 'tips');
+        $this->view->execution   = $this->execution->getById($executionID);
+        $this->view->executionID = $executionID;
+        $this->display('execution', 'tips');
     }
 
     /**
      * Drop menu page.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  int    $module
      * @param  int    $method
      * @param  int    $extra
      * @access public
      * @return void
      */
-    public function ajaxGetDropMenu($projectID, $module, $method, $extra)
+    public function ajaxGetDropMenu($executionID, $module, $method, $extra)
     {
-        $project = $this->project->getByID($projectID);
+        $execution = $this->execution->getByID($executionID);
 
-        $this->view->link      = $this->project->getExecutionLink($module, $method, $extra);
-        $this->view->projectID = $projectID;
+        $this->view->link      = $this->execution->getLink($module, $method, $extra);
+        $this->view->executionID = $executionID;
         $this->view->module    = $module;
         $this->view->method    = $method;
         $this->view->extra     = $extra;
-        $this->view->projects  = $this->project->getExecutionsByProject($project->project);
+        $this->view->executions  = $this->execution->getsByExecution($execution->execution);
         $this->display();
     }
 
@@ -2515,12 +2518,12 @@ class project extends control
      */
     public function ajaxGetRecentExecutions()
     {
-        $allExecution = $this->project->getRecentExecutions();
+        $allExecution = $this->execution->getRecentExecutions();
         if(!empty($allExecution))
         {
             foreach($allExecution as $type => $executionList)
             {
-                echo '<div class="heading">'. $this->lang->project->$type . '</div>';
+                echo '<div class="heading">'. $this->lang->execution->$type . '</div>';
                 $color          = $type == 'recent' ? 'text-brown' : '';
                 $executions     = $allExecution[$type];
                 $executionsName = array();
@@ -2528,7 +2531,7 @@ class project extends control
                 $executionsPinYin = common::convert2Pinyin($executionsName);
                 foreach($executions as $execution)
                 {
-                    $link = helper::createLink('project', 'task', 'executionID=' . $execution->id, '', false, $execution->project);
+                    $link = helper::createLink('execution', 'task', 'executionID=' . $execution->id, '', false, $execution->execution);
                     $execution->code = empty($execution->code) ? $execution->name : $execution->code;
                     $dataKey = 'date-key="' . zget($executionsPinYin, $execution->name, $execution->name) . '"';
                     $class   = "class='search-list-item $color' title='$execution->name' $dataKey";
@@ -2550,44 +2553,44 @@ class project extends control
      */
     public function updateOrder()
     {
-        $idList   = explode(',', trim($this->post->projects, ','));
+        $idList   = explode(',', trim($this->post->executions, ','));
         $orderBy  = $this->post->orderBy;
         if(strpos($orderBy, 'order') === false) return false;
 
-        $projects = $this->dao->select('id,`order`')->from(TABLE_PROJECT)->where('id')->in($idList)->orderBy($orderBy)->fetchPairs('order', 'id');
-        foreach($projects as $order => $id)
+        $executions = $this->dao->select('id,`order`')->from(TABLE_EXECUTION)->where('id')->in($idList)->orderBy($orderBy)->fetchPairs('order', 'id');
+        foreach($executions as $order => $id)
         {
             $newID = array_shift($idList);
             if($id == $newID) continue;
-            $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($order)->where('id')->eq($newID)->exec();
+            $this->dao->update(TABLE_EXECUTION)->set('`order`')->eq($order)->where('id')->eq($newID)->exec();
         }
     }
 
     /**
      * Story sort.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function storySort($projectID)
+    public function storySort($executionID)
     {
         $idList   = explode(',', trim($this->post->storys, ','));
         $orderBy  = $this->post->orderBy;
 
-        $order = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('story')->in($idList)->andWhere('project')->eq($projectID)->orderBy('order_asc')->fetch('order');
+        $order = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('story')->in($idList)->andWhere('execution')->eq($executionID)->orderBy('order_asc')->fetch('order');
         foreach($idList as $storyID)
         {
-            $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('story')->eq($storyID)->andWhere('project')->eq($projectID)->exec();
+            $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('story')->eq($storyID)->andWhere('execution')->eq($executionID)->exec();
             $order++;
         }
     }
 
     /**
-     * All project.
+     * All execution.
      *
      * @param  string $status
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  int    $productID
      * @param  int    $recTotal
@@ -2596,28 +2599,28 @@ class project extends control
      * @access public
      * @return void
      */
-    public function all($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
+    public function all($status = 'all', $executionID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
         $this->app->loadLang('my');
         $this->app->loadLang('programplan');
-        if($this->projects)
+        if($this->executions)
         {
-            $project   = $this->commonAction($projectID);
-            $projectID = $project->id;
+            $execution   = $this->commonAction($executionID);
+            $executionID = $execution->id;
         }
-        $this->session->set('projectList', $this->app->getURI(true));
+        $this->session->set('executionList', $this->app->getURI(true));
 
         /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $this->view->title      = $this->lang->project->allProject;
-        $this->view->position[] = $this->lang->project->allProject;
+        $this->view->title      = $this->lang->execution->allExecution;
+        $this->view->position[] = $this->lang->execution->allExecution;
 
-        $this->view->executionStats = $this->project->getExecutionStats($this->session->PRJ, $status, $productID, 0, 30, $orderBy, $pager);
-        $this->view->products       = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+        $this->view->executionStats = $this->execution->getStats($this->session->project, $status, $productID, 0, 30, $orderBy, $pager);
+        $this->view->products       = array(0 => $this->lang->product->select) + $this->loadModel('product')->getProductPairsByExecution($this->session->project);
         $this->view->productID      = $productID;
-        $this->view->projectID      = $projectID;
+        $this->view->executionID      = $executionID;
         $this->view->pager          = $pager;
         $this->view->orderBy        = $orderBy;
         $this->view->users          = $this->loadModel('user')->getPairs('noletter');
@@ -2629,7 +2632,7 @@ class project extends control
     /**
      * Get white list personnel.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $module
      * @param  string $objectType
      * @param  string $orderby
@@ -2639,34 +2642,34 @@ class project extends control
      * @access public
      * @return void
      */
-    public function whitelist($projectID = 0, $module='project', $objectType = 'sprint', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function whitelist($executionID = 0, $module='execution', $objectType = 'sprint', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        /* use first project if projectID does not exist. */
-        if(!isset($this->projects[$projectID])) $projectID = key($this->projects);
+        /* use first execution if executionID does not exist. */
+        if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
-        /* Set the menu. If the projectID = 0, use the indexMenu instead. */
-        $this->project->setMenu($this->projects, $projectID);
+        /* Set the menu. If the executionID = 0, use the indexMenu instead. */
+        $this->execution->setMenu($this->executions, $executionID);
 
-        echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        echo $this->fetch('personnel', 'whitelist', "objectID=$executionID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
     /**
      * Adding users to the white list.
      *
-     * @param  int     $projectID
+     * @param  int     $executionID
      * @param  int     $deptID
      * @access public
      * @return void
      */
-    public function addWhitelist($projectID = 0, $deptID = 0)
+    public function addWhitelist($executionID = 0, $deptID = 0)
     {
-        /* use first project if projectID does not exist. */
-        if(!isset($this->projects[$projectID])) $projectID = key($this->projects);
+        /* use first execution if executionID does not exist. */
+        if(!isset($this->executions[$executionID])) $executionID = key($this->executions);
 
-        /* Set the menu. If the projectID = 0, use the indexMenu instead. */
-        $this->project->setMenu($this->projects, $projectID);
+        /* Set the menu. If the executionID = 0, use the indexMenu instead. */
+        $this->execution->setMenu($this->executions, $executionID);
 
-        echo $this->fetch('personnel', 'addWhitelist', "objectID=$projectID&dept=$deptID&objectType=sprint&module=project");
+        echo $this->fetch('personnel', 'addWhitelist', "objectID=$executionID&dept=$deptID&objectType=sprint&module=execution");
     }
 
     /*
@@ -2683,7 +2686,7 @@ class project extends control
     }
 
     /**
-     * Export project.
+     * Export execution.
      *
      * @param  string $status
      * @param  int    $productID
@@ -2695,40 +2698,40 @@ class project extends control
     {
         if($_POST)
         {
-            $projectLang   = $this->lang->project;
-            $projectConfig = $this->config->project;
+            $executionLang   = $this->lang->execution;
+            $executionConfig = $this->config->execution;
 
             /* Create field lists. */
-            $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $projectConfig->list->exportFields);
+            $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $executionConfig->list->exportFields);
             foreach($fields as $key => $fieldName)
             {
                 $fieldName = trim($fieldName);
-                $fields[$fieldName] = zget($projectLang, $fieldName);
+                $fields[$fieldName] = zget($executionLang, $fieldName);
                 unset($fields[$key]);
             }
 
-            $projectStats = $this->project->getExecutionStats($this->session->PRJ, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
+            $executionStats = $this->execution->getStats($this->session->project, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
             $users        = $this->loadModel('user')->getPairs('noletter');
-            foreach($projectStats as $i => $project)
+            foreach($executionStats as $i => $execution)
             {
-                $project->PM            = zget($users, $project->PM);
-                $project->status        = isset($project->delay) ? $projectLang->delayed : $this->processStatus('project', $project);
-                $project->totalEstimate = $project->hours->totalEstimate;
-                $project->totalConsumed = $project->hours->totalConsumed;
-                $project->totalLeft     = $project->hours->totalLeft;
-                $project->progress      = $project->hours->progress . '%';
+                $execution->PM            = zget($users, $execution->PM);
+                $execution->status        = isset($execution->delay) ? $executionLang->delayed : $this->processStatus('execution', $execution);
+                $execution->totalEstimate = $execution->hours->totalEstimate;
+                $execution->totalConsumed = $execution->hours->totalConsumed;
+                $execution->totalLeft     = $execution->hours->totalLeft;
+                $execution->progress      = $execution->hours->progress . '%';
 
                 if($this->post->exportType == 'selected')
                 {
                     $checkedItem = $this->cookie->checkedItem;
-                    if(strpos(",$checkedItem,", ",{$project->id},") === false) unset($projectStats[$i]);
+                    if(strpos(",$checkedItem,", ",{$execution->id},") === false) unset($executionStats[$i]);
                 }
             }
-            if(isset($this->config->bizVersion)) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats);
+            if(isset($this->config->bizVersion)) list($fields, $executionStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $executionStats);
 
             $this->post->set('fields', $fields);
-            $this->post->set('rows', $projectStats);
-            $this->post->set('kind', 'project');
+            $this->post->set('rows', $executionStats);
+            $this->post->set('kind', 'execution');
             $this->fetch('file', 'export2' . $this->post->fileType, $_POST);
         }
 
@@ -2738,70 +2741,70 @@ class project extends control
     /**
      * Doc for compatible.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function doc($projectID)
+    public function doc($executionID)
     {
-        $this->locate($this->createLink('doc', 'objectLibs', "type=project&objectID=$projectID&from=project"));
+        $this->locate($this->createLink('doc', 'objectLibs', "type=execution&objectID=$executionID&from=execution"));
     }
 
     /**
      * Kanban setting.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function ajaxKanbanSetting($projectID)
+    public function ajaxKanbanSetting($executionID)
     {
         if($_POST)
         {
             $this->loadModel('setting');
             $data = fixer::input('post')->get();
-            if(common::hasPriv('project', 'kanbanHideCols'))
+            if(common::hasPriv('execution', 'kanbanHideCols'))
             {
                 $allCols = $data->allCols;
-                $this->setting->setItem("system.project.kanbanSetting.allCols", $allCols);
+                $this->setting->setItem("system.execution.kanbanSetting.allCols", $allCols);
             }
-            if(common::hasPriv('project', 'kanbanColsColor')) $this->setting->setItem("system.project.kanbanSetting.colorList", json_encode($data->colorList));
+            if(common::hasPriv('execution', 'kanbanColsColor')) $this->setting->setItem("system.execution.kanbanSetting.colorList", json_encode($data->colorList));
 
             die(js::reload('parent.parent'));
         }
 
         $this->app->loadLang('task');
 
-        $this->view->setting   = $this->project->getKanbanSetting();
-        $this->view->projectID = $projectID;
+        $this->view->setting   = $this->execution->getKanbanSetting();
+        $this->view->executionID = $executionID;
         $this->display();
     }
 
     /**
      * Ajax reset kanban setting
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $confirm
      * @access public
      * @return void
      */
-    public function ajaxResetKanban($projectID, $confirm = 'no')
+    public function ajaxResetKanban($executionID, $confirm = 'no')
     {
-        if($confirm != 'yes') die(js::confirm($this->lang->kanbanSetting->noticeReset, inlink('ajaxResetKanban', "projectID=$projectID&confirm=yes")));
+        if($confirm != 'yes') die(js::confirm($this->lang->kanbanSetting->noticeReset, inlink('ajaxResetKanban', "executionID=$executionID&confirm=yes")));
 
         $this->loadModel('setting');
 
-        if(common::hasPriv('project', 'kanbanHideCols') and isset($this->config->project->kanbanSetting->allCols))
+        if(common::hasPriv('execution', 'kanbanHideCols') and isset($this->config->execution->kanbanSetting->allCols))
         {
-            $allCols = json_decode($this->config->project->kanbanSetting->allCols, true);
-            unset($allCols[$projectID]);
-            $this->setting->setItem("system.project.kanbanSetting.allCols", json_encode($allCols));
+            $allCols = json_decode($this->config->execution->kanbanSetting->allCols, true);
+            unset($allCols[$executionID]);
+            $this->setting->setItem("system.execution.kanbanSetting.allCols", json_encode($allCols));
         }
 
         $account = $this->app->user->account;
-        $this->setting->deleteItems("owner={$account}&module=project&section=kanbanSetting&key=showOption");
+        $this->setting->deleteItems("owner={$account}&module=execution&section=kanbanSetting&key=showOption");
 
-        if(common::hasPriv('project', 'kanbanColsColor')) $this->setting->deleteItems("owner=system&module=project&section=kanbanSetting&key=colorList");
+        if(common::hasPriv('execution', 'kanbanColsColor')) $this->setting->deleteItems("owner=system&module=execution&section=kanbanSetting&key=colorList");
 
         die(js::reload('parent.parent'));
     }
@@ -2809,17 +2812,17 @@ class project extends control
     /**
      * Import stories by plan.
      *
-     * @param int $projectID
+     * @param int $executionID
      * @param int $planID
      *
      * @access public
      * @return void
      */
-    public function importPlanStories($projectID, $planID)
+    public function importPlanStories($executionID, $planID)
     {
         $planStories = $planProducts = array();
         $planStory   = $this->loadModel('story')->getPlanStories($planID);
-        $project     = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+        $execution     = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         $count = 0;
         if(!empty($planStory))
@@ -2835,18 +2838,18 @@ class project extends control
                 $planProducts[$story->id] = $story->product;
             }
             $planStories = array_keys($planStory);
-            $this->project->linkStory($projectID, $planStories, $planProducts);
-            if($projectID != $this->session->PRJ) $this->project->linkStory($this->session->PRJ, $planStories, $planProducts);
+            $this->execution->linkStory($executionID, $planStories, $planProducts);
+            if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $planStories, $planProducts);
         }
 
-        $moduleName = 'project';
-        $param      = "projectID=$projectID";
-        if($project->type == 'project')
+        $moduleName = 'execution';
+        $param      = "executionID=$executionID";
+        if($execution->type == 'execution')
         {
-            $moduleName = 'projectstory';
+            $moduleName = 'executionstory';
             $param      = "productID={$_SESSION['product']}";
         }
-        if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate($this->createLink($moduleName, 'story', $param));
+        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, 'story', $param));
         die(js::locate(helper::createLink($moduleName, 'story', $param), 'parent'));
     }
 
@@ -2881,7 +2884,7 @@ class project extends control
         $this->view->cases      = $cases;
         $this->view->story      = $story;
         $this->view->users      = $users;
-        $this->view->projects   = $this->loadModel('project')->getExecutionPairs($this->session->PRJ, 'all', 'nocode');
+        $this->view->executions   = $this->loadModel('execution')->getPairs($this->session->project, 'all', 'nocode');
         $this->view->actions    = $this->loadModel('action')->getList('story', $storyID);
         $this->view->modulePath = $modulePath;
         $this->view->version    = $version == 0 ? $story->version : $version;
@@ -2925,10 +2928,10 @@ class project extends control
         /* Update action. */
         if($task->assignedTo == $this->app->user->account) $this->loadModel('action')->read('task', $taskID);
 
-        $project = $this->project->getById($task->project);
+        $execution = $this->execution->getById($task->execution);
 
         $this->view->task    = $task;
-        $this->view->project = $project;
+        $this->view->execution = $execution;
         $this->view->actions = $this->loadModel('action')->getList('task', $taskID);
         $this->view->users   = $this->loadModel('user')->getPairs('noletter');
         $this->display();
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index d462ea4123..11b7297dd5 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -98,6 +98,10 @@ $lang->execution->endList[93]  = '3 Months';
 $lang->execution->endList[186] = '6 Months';
 $lang->execution->endList[365] = '1 Year';
 
+$lang->execution->lifeTimeList['short'] = "Short-Term";
+$lang->execution->lifeTimeList['long']  = "Long-Term";
+$lang->execution->lifeTimeList['ops']   = "DevOps";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'User';
 $lang->team->role       = 'Role';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index c0c58cf8cb..264d28a006 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * The project module zh-cn file of ZenTaoMS.
+ * The execution module zh-cn file of ZenTaoMS.
  *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: zh-cn.php 5094 2013-07-10 08:46:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
@@ -98,6 +98,10 @@ $lang->execution->endList[93]  = '三个月';
 $lang->execution->endList[186] = '半年';
 $lang->execution->endList[365] = '一年';
 
+$lang->execution->lifeTimeList['short'] = "短期";
+$lang->execution->lifeTimeList['long']  = "长期";
+$lang->execution->lifeTimeList['ops']   = "运维";
+
 $lang->team = new stdclass();
 $lang->team->account    = '用户';
 $lang->team->role       = '角色';
diff --git a/module/execution/model.php b/module/execution/model.php
index bcdcf4cce0..6fc6150e59 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * The model file of project module of ZenTaoPMS.
+ * The model file of execution module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: model.php 5118 2013-07-12 07:41:41Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
@@ -19,17 +19,17 @@ class executionModel extends model
     /**
      * Check the privilege.
      *
-     * @param  object    $project
+     * @param  int    $executionID
      * @access public
      * @return bool
      */
-    public function checkPriv($projectID)
+    public function checkPriv($executionID)
     {
-        if(empty($projectID)) return false;
+        if(empty($executionID)) return false;
 
         /* If is admin, return true. */
         if($this->app->user->admin) return true;
-        return (strpos(",{$this->app->user->view->sprints},", ",{$projectID},") !== false);
+        return (strpos(",{$this->app->user->view->sprints},", ",{$executionID},") !== false);
     }
 
     /**
@@ -40,12 +40,12 @@ class executionModel extends model
      */
     public function accessDenied()
     {
-        echo(js::alert($this->lang->project->accessDenied));
+        echo(js::alert($this->lang->execution->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('project', 'index')));
+        if(!$this->server->http_referer) die(js::locate(helper::createLink('execution', 'index')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('project', 'index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('execution', 'index')));
 
         die(js::locate('back'));
     }
@@ -53,108 +53,108 @@ class executionModel extends model
     /**
      * Set menu.
      *
-     * @param  array  $projects
-     * @param  int    $projectID
+     * @param  array  $executions
+     * @param  int    $executionID
      * @param  int    $buildID
      * @param  string $extra
      * @access public
      * @return bool
      */
-    public function setMenu($projects, $projectID, $buildID = 0, $extra = '')
+    public function setMenu($executions, $executionID, $buildID = 0, $extra = '')
     {
-        $project = $this->getByID($this->session->PRJ);
-        if(empty($projects))
+        $execution = $this->getByID($this->session->project);
+        if(empty($executions))
         {
-            if($project->model == 'waterfall')
+            if($execution->model == 'waterfall')
             {
-                if(($this->app->moduleName == 'programplan' && $this->app->methodName != 'create') || $this->app->moduleName == 'project') die(js::locate(helper::createLink('programplan', 'create', "projectID=$project->id")));
+                if(($this->app->moduleName == 'programplan' && $this->app->methodName != 'create') || $this->app->moduleName == 'execution') die(js::locate(helper::createLink('programplan', 'create', "executionID=$execution->id")));
             }
             else
             {
-                if($this->app->moduleName == 'project' && $this->app->methodName != 'create') die(js::locate(helper::createLink('project', 'create')));
+                if($this->app->moduleName == 'execution' && $this->app->methodName != 'create') die(js::locate(helper::createLink('execution', 'create')));
             }
         }
 
-        if(!$projectID and $this->session->project) $projectID = $this->session->project;
+        if(!$executionID and $this->session->project) $executionID = $this->session->project;
 
-        $project   = $this->getById($projectID);
+        $execution   = $this->getById($executionID);
         $isProgram = false;
-        if(!empty($project))
+        if(!empty($execution))
         {
-            $isProgram = $project->model;
-            $project   = $isProgram ? $project : $this->getByID($project->parent);
+            $isProgram = $execution->model;
+            $execution   = $isProgram ? $execution : $this->getByID($execution->parent);
         }
 
         if($isProgram)
         {
-            $projectID = $this->session->project;
-            if(!$projectID or !in_array($projectID, array_keys($projects))) $projectID = key($projects);
+            $executionID = $this->session->project;
+            if(!$executionID or !in_array($executionID, array_keys($executions))) $executionID = key($executions);
         }
 
-        $this->session->set('project', $projectID);
+        $this->session->set('execution', $executionID);
 
         $products = $this->loadModel('product')->getPairs();
 
         /* Unset story, bug, build and testtask if type is ops. */
-        if($project and $project->lifetime == 'ops')
+        if($execution and $execution->lifetime == 'ops')
         {
-            unset($this->lang->project->menu->story);
-            unset($this->lang->project->menu->qa);
-            unset($this->lang->project->subMenu->qa->bug);
-            unset($this->lang->project->subMenu->qa->build);
-            unset($this->lang->project->subMenu->qa->testtask);
+            unset($this->lang->execution->menu->story);
+            unset($this->lang->execution->menu->qa);
+            unset($this->lang->execution->subMenu->qa->bug);
+            unset($this->lang->execution->subMenu->qa->build);
+            unset($this->lang->execution->subMenu->qa->testtask);
         }
 
-        /* Hide story and qa menu when project is story or design type. */
-        if($project and ($project->attribute == 'story' || $project->attribute == 'design'))
+        /* Hide story and qa menu when execution is story or design type. */
+        if($execution and ($execution->attribute == 'story' || $execution->attribute == 'design'))
         {
-            unset($this->lang->project->menu->story);
-            unset($this->lang->project->menu->qa);
+            unset($this->lang->execution->menu->story);
+            unset($this->lang->execution->menu->qa);
         }
 
-        if($projects and (!isset($projects[$projectID]) or !$this->checkPriv($projectID))) $this->accessDenied();
+        if($executions and (!isset($executions[$executionID]) or !$this->checkPriv($executionID))) $this->accessDenied();
 
         $moduleName = $this->app->getModuleName();
         $methodName = $this->app->getMethodName();
 
-        if($this->cookie->projectMode == 'noclosed' and ($project->status == 'done' or $project->status == 'closed'))
+        if($this->cookie->executionMode == 'noclosed' and ($execution->status == 'done' or $execution->status == 'closed'))
         {
-            setcookie('projectMode', 'all');
-            $this->cookie->projectMode = 'all';
+            setcookie('executionMode', 'all');
+            $this->cookie->executionMode = 'all';
         }
 
-        /* Set project module page nav. */
-        $label = $this->lang->project->index;
-        if($methodName == 'all') $label = $this->lang->project->allProjects;
-        if($methodName == 'create' and $moduleName == 'project') $label = $this->lang->project->create;
+        /* Set execution module page nav. */
+        $label = $this->lang->execution->index;
+        if($methodName == 'all') $label = $this->lang->execution->allExecutions;
+        if($methodName == 'create' and $moduleName == 'execution') $label = $this->lang->execution->create;
 
-        $projectIndex = $this->select($projects, $projectID, null, $moduleName, $methodName, $extra);
-        if($this->config->systemMode == 'new') $this->lang->modulePageNav = $projectIndex;
+        $executionIndex = $this->select($executions, $executionID, null, $moduleName, $methodName, $extra);
+        if($this->config->systemMode == 'new') $this->lang->modulePageNav = $executionIndex;
 
-        foreach($this->lang->project->menu as $key => $menu)
+        foreach($this->lang->execution->menu as $key => $menu)
         {
-            common::setMenuVars($this->lang->project->menu, $key, $projectID);
+            common::setMenuVars($this->lang->execution->menu, $key, $executionID);
 
-            if(isset($this->lang->project->subMenu->$key))
+            if(isset($this->lang->execution->subMenu->$key))
             {
-                $projectSubMenu = $this->lang->project->subMenu->$key;
-                $subMenu = common::createSubMenu($this->lang->project->subMenu->$key, $projectID);
+                $executionSubMenu = $this->lang->execution->subMenu->$key;
+                $subMenu = common::createSubMenu($this->lang->execution->subMenu->$key, $executionID);
 
                 if(!empty($subMenu))
                 {
                     foreach($subMenu as $menuKey => $menu)
                     {
-                        $itemMenu = zget($projectSubMenu, $menuKey, '');
+                        $itemMenu = zget($executionSubMenu, $menuKey, '');
                         $isActive['method']    = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method']));
                         $isActive['alias']     = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false));
                         $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false);
                         if($isActive['method'] or $isActive['alias'] or $isActive['subModule'])
                         {
-                            $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
+                            $this->lang->execution->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link);
                             break;
                         }
                     }
-                    $this->lang->project->menu->{$key}['subMenu'] = $subMenu;
+                    $this->lang->execution->menu->{$key}['subMenu'] = $subMenu;
                 }
             }
         }
@@ -163,10 +163,10 @@ class executionModel extends model
     }
 
     /**
-     * Create the select code of projects.
+     * Create the select code of executions.
      *
-     * @param  array     $projects
-     * @param  int       $projectID
+     * @param  array     $executions
+     * @param  int       $executionID
      * @param  int       $buildID
      * @param  string    $currentModule
      * @param  string    $currentMethod
@@ -174,85 +174,85 @@ class executionModel extends model
      * @access public
      * @return string
      */
-    public function select($projects, $projectID, $buildID, $currentModule, $currentMethod, $extra = '')
+    public function select($executions, $executionID, $buildID, $currentModule, $currentMethod, $extra = '')
     {
-        if(!$projects) return false;
+        if(!$executions) return false;
 
-        if(!$projectID) return;
+        if(!$executionID) return;
 
         $isMobile = $this->app->viewType == 'mhtml';
 
-        setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
-        $currentProject = $this->getById($projectID);
+        setCookie("lastExecution", $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+        $currentExecution = $this->getById($executionID);
 
         if($this->config->systemMode == 'new')
         {
-            if(isset($currentProject->type) and $currentProject->type == 'program') return;
+            if(isset($currentExecution->type) and $currentExecution->type == 'program') return;
 
-            if(isset($currentProject->project)) $project = $this->loadModel('program')->getPRJByID($currentProject->project);
+            if(isset($currentExecution->execution)) $execution = $this->loadModel('execution')->getByID($currentExecution->execution);
 
-            if(isset($project) and $project->model == 'waterfall')
+            if(isset($execution) and $execution->model == 'waterfall')
             {
-                $productID = $this->loadModel('product')->getProductIDByProject($currentProject->id);
+                $productID = $this->loadModel('product')->getProductIDByExecution($currentExecution->id);
                 $productName = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name');
-                $currentProject->name = $productName . '/' . $currentProject->name;
+                $currentExecution->name = $productName . '/' . $currentExecution->name;
             }
         }
 
-        $dropMenuLink = helper::createLink('project', 'ajaxGetDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod&extra=$extra");
-        $currentProjectName = '';
-        if(isset($currentProject->name)) $currentProjectName = $currentProject->name;
+        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "objectID=$executionID&module=$currentModule&method=$currentMethod&extra=$extra");
+        $currentExecutionName = '';
+        if(isset($currentExecution->name)) $currentExecutionName = $currentExecution->name;
 
         if($this->config->systemMode == 'classic')
         {
-            $this->session->set('moreProjectLink', $this->app->getURI(true));
-            $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentProjectName}'><span class='text'><i class='icon icon-sprint'></i> {$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+            $this->session->set('moreExecutionLink', $this->app->getURI(true));
+            $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-sprint'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
             $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-            $output .= "</div></div>"; 
+            $output .= "</div></div>";
 
-            $this->lang->project->switcherMenu = $output;
+            $this->lang->execution->switcherMenu = $output;
         }
 
-        $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProjectName}'><span class='text'><i class='icon icon-{$this->lang->icons[$currentProject->type]}'></i> {$currentProjectName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-{$this->lang->icons[$currentExecution->type]}'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
         $output .= "</div></div></div>";
-        if($isMobile) $output  = "<a id='currentItem' href=\"javascript:showSearchMenu('project', '$projectID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentProject->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
+        if($isMobile) $output  = "<a id='currentItem' href=\"javascript:showSearchMenu('execution', '$executionID', '$currentModule', '$currentMethod', '$extra')\"><span class='text'>{$currentExecution->name}</span> <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
 
         return $output;
     }
 
     /**
-     * Get project tree menu.
+     * Get execution tree menu.
      *
      * @access public
      * @return void
      */
     public function tree()
     {
-        $products     = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
+        $products     = $this->loadModel('product')->getPairs('nocode', $this->session->project);
         $productGroup = $this->getProductGroupList();
-        $projectTree  = "<ul class='tree tree-lines'>";
-        foreach($productGroup as $productID => $projects)
+        $executionTree  = "<ul class='tree tree-lines'>";
+        foreach($productGroup as $productID => $executions)
         {
             if(!isset($products[$productID]) and $productID != '')  continue;
-            if(!isset($products[$productID]) and !count($projects)) continue;
+            if(!isset($products[$productID]) and !count($executions)) continue;
 
-            $productName  = isset($products[$productID]) ? $products[$productID] : $this->lang->project->noProduct;
+            $productName  = isset($products[$productID]) ? $products[$productID] : $this->lang->execution->noProduct;
 
-            $projectTree .= "<li>$productName<ul>";
+            $executionTree .= "<li>$productName<ul>";
 
-            foreach($projects as $project)
+            foreach($executions as $execution)
             {
-                if($project->status != 'done' or $project->status != 'closed')
+                if($execution->status != 'done' or $execution->status != 'closed')
                 {
-                    $projectTree .= "<li>" . html::a(inlink('task', "projectID=$project->id"), $project->name, '', "id='project$project->id'") . "</li>";
+                    $executionTree .= "<li>" . html::a(inlink('task', "executionID=$execution->id"), $execution->name, '', "id='execution$execution->id'") . "</li>";
                 }
             }
 
             $hasDone = false;
-            foreach($projects as $project)
+            foreach($executions as $execution)
             {
-                if($project->status == 'done' or $project->status == 'closed')
+                if($execution->status == 'done' or $execution->status == 'closed')
                 {
                     $hasDone = true;
                     break;
@@ -260,27 +260,27 @@ class executionModel extends model
             }
             if($hasDone)
             {
-                $projectTree .= "<li>{$this->lang->project->selectGroup->done}<ul>";
-                foreach($projects as $project)
+                $executionTree .= "<li>{$this->lang->execution->selectGroup->done}<ul>";
+                foreach($executions as $execution)
                 {
-                    if($project->status == 'done' or $project->status == 'closed')
+                    if($execution->status == 'done' or $execution->status == 'closed')
                     {
-                        $projectTree .= "<li>" . html::a(inlink('task', "projectID=$project->id"), $project->name, '', "id='project$project->id'") . "</li>";
+                        $executionTree .= "<li>" . html::a(inlink('task', "executionID=$execution->id"), $execution->name, '', "id='execution$execution->id'") . "</li>";
                     }
                 }
-                $projectTree .= "</ul></li>";
+                $executionTree .= "</ul></li>";
             }
 
-            $projectTree .= "</ul></li>";
+            $executionTree .= "</ul></li>";
         }
 
-        $projectTree .= "</ul>";
+        $executionTree .= "</ul>";
 
-        return $projectTree;
+        return $executionTree;
     }
 
     /**
-     * Save the project id user last visited to session.
+     * Save the execution id user last visited to session.
      *
      * @param  int   $executionID
      * @param  array $executions
@@ -290,49 +290,49 @@ class executionModel extends model
     public function saveState($executionID, $executions)
     {
         /* When the cookie and session do not exist, get it from the database. */
-        if(empty($executionID) && isset($this->config->project->lastExecution) && isset($executions[$this->config->project->lastExecution]))
+        if(empty($executionID) && isset($this->config->execution->lastExecution) && isset($executions[$this->config->execution->lastExecution]))
         {
-            $this->session->set('project', $this->config->project->lastExecution);
+            $this->session->set('execution', $this->config->execution->lastExecution);
             return $this->session->project;
         }
 
-        if($executionID > 0) $this->session->set('project', (int)$executionID);
-        if($executionID == 0 and $this->cookie->lastProject) 
+        if($executionID > 0) $this->session->set('execution', (int)$executionID);
+        if($executionID == 0 and $this->cookie->lastExecution)
         {
-            /* Project link is project-task. */
-            $executionID = (int)$this->cookie->lastProject;
+            /* Execution link is execution-task. */
+            $executionID = (int)$this->cookie->lastExecution;
             $executionID = in_array($executionID, array_keys($executions)) ? $executionID : key($executions);
-            $this->session->set('project', $executionID);
+            $this->session->set('execution', $executionID);
         }
-        if($executionID == 0 and $this->session->project == '') $this->session->set('project', key($executions));
+        if($executionID == 0 and $this->session->project == '') $this->session->set('execution', key($executions));
         if(!isset($executions[$this->session->project]))
         {
-            $this->session->set('project', key($executions));
+            $this->session->set('execution', key($executions));
             if($executionID && strpos(",{$this->app->user->view->sprints},", ",{$this->session->project},") === false) $this->accessDenied();
         }
         return $this->session->project;
     }
 
     /**
-     * Create a project.
+     * Create a execution.
      *
-     * @param int $copyProjectID
+     * @param int $copyExecutionID
      *
      * @access public
      * @return bool|int
      */
-    public function create($copyProjectID = '')
+    public function create($copyExecutionID = '')
     {
-        $this->lang->project->team = $this->lang->project->teamname;
+        $this->lang->execution->team = $this->lang->execution->teamname;
 
-        /* Determine whether to add a sprint or a stage according to the model of the project. */
-        $project    = $this->getByID($this->session->PRJ);
-        $sprintType = $this->config->systemMode == 'new' ? zget($this->config->project->modelList, $project->model, '') : 'sprint';
+        /* Determine whether to add a sprint or a stage according to the model of the execution. */
+        $execution    = $this->getByID($this->session->project);
+        $sprintType = $this->config->systemMode == 'new' ? zget($this->config->execution->modelList, $execution->model, '') : 'sprint';
 
-        /* If the project model is a stage, determine whether the product is linked. */
+        /* If the execution model is a stage, determine whether the product is linked. */
         if($sprintType == 'stage' and empty($this->post->products[0]))
         {
-            dao::$errors['message'][] = $this->lang->project->noLinkProduct;
+            dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
             return false;
         }
 
@@ -345,12 +345,12 @@ class executionModel extends model
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
             ->setDefault('team', substr($this->post->name,0, 30))
-            ->setIF($this->config->systemMode == 'new', 'project', $this->session->PRJ)
-            ->setIF($this->config->systemMode == 'new', 'parent', $this->session->PRJ)
+            ->setIF($this->config->systemMode == 'new', 'execution', $this->session->project)
+            ->setIF($this->config->systemMode == 'new', 'parent', $this->session->project)
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->join('whitelist', ',')
             ->add('type', $sprintType)
-            ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)
+            ->stripTags($this->config->execution->editor->create['id'], $this->config->allowedTags)
             ->remove('products, workDays, delta, branch, uid, plans')
             ->get();
 
@@ -364,10 +364,10 @@ class executionModel extends model
             if(!empty($sprint->realBegan) and !empty($sprint->realEnd)) $sprint->realDuration = $this->loadModel('programplan')->getDuration($sprint->realBegan, $sprint->realEnd);
         }
 
-        $sprint = $this->loadModel('file')->processImgURL($sprint, $this->config->project->editor->create['id'], $this->post->uid);
-        $this->dao->insert(TABLE_PROJECT)->data($sprint)
+        $sprint = $this->loadModel('file')->processImgURL($sprint, $this->config->execution->editor->create['id'], $this->post->uid);
+        $this->dao->insert(TABLE_EXECUTION)->data($sprint)
             ->autoCheck($skipFields = 'begin,end')
-            ->batchcheck($this->config->project->create->requiredFields, 'notempty')
+            ->batchcheck($this->config->execution->create->requiredFields, 'notempty')
             ->checkIF($sprint->begin != '', 'begin', 'date')
             ->checkIF($sprint->end != '', 'end', 'date')
             ->checkIF($sprint->end != '', 'end', 'gt', $sprint->begin)
@@ -377,25 +377,25 @@ class executionModel extends model
         /* Add the creater to the team. */
         if(!dao::isError())
         {
-            $projectID     = $this->dao->lastInsertId();
+            $executionID     = $this->dao->lastInsertId();
             $today         = helper::today();
             $creatorExists = false;
 
             /* Save order. */
-            $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($projectID * 5)->where('id')->eq($projectID)->exec();
-            $this->file->updateObjectID($this->post->uid, $projectID, 'project');
+            $this->dao->update(TABLE_EXECUTION)->set('`order`')->eq($executionID * 5)->where('id')->eq($executionID)->exec();
+            $this->file->updateObjectID($this->post->uid, $executionID, 'execution');
 
             /* Update the path. */
-            if(isset($this->config->maxVersion)) $this->loadModel('programplan')->setTreePath($projectID);
+            if(isset($this->config->maxVersion)) $this->loadModel('programplan')->setTreePath($executionID);
 
-            /* Copy team of project. */
-            if($copyProjectID != '')
+            /* Copy team of execution. */
+            if($copyExecutionID != '')
             {
-                $members = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($copyProjectID)->andWhere('type')->eq('project')->fetchAll();
+                $members = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($copyExecutionID)->andWhere('type')->eq('execution')->fetchAll();
                 foreach($members as $member)
                 {
                     unset($member->id);
-                    $member->root = $projectID;
+                    $member->root = $executionID;
                     $member->join = $today;
                     $member->days = $sprint->days;
                     $member->type = $sprintType;
@@ -405,73 +405,73 @@ class executionModel extends model
             }
 
             /* Add the creator to team. */
-            if($copyProjectID == '' or !$creatorExists)
+            if($copyExecutionID == '' or !$creatorExists)
             {
                 $this->app->loadLang('user');
                 $member = new stdclass();
-                $member->root    = $projectID;
+                $member->root    = $executionID;
                 $member->account = $this->app->user->account;
                 $member->role    = $this->lang->user->roleList[$this->app->user->role];
                 $member->join    = $today;
                 $member->type    = $sprintType;
                 $member->days    = $sprint->days;
-                $member->hours   = $this->config->project->defaultWorkhours;
+                $member->hours   = $this->config->execution->defaultWorkhours;
                 $this->dao->insert(TABLE_TEAM)->data($member)->exec();
 
-                $this->addProjectMembers($this->session->PRJ, array($member));
+                $this->addExecutionMembers($this->session->project, array($member));
             }
 
             /* Create doc lib. */
             $this->app->loadLang('doc');
             $lib = new stdclass();
-            $lib->project = $projectID;
-            $lib->name    = $this->lang->doclib->main['project'];
-            $lib->type    = 'project';
+            $lib->execution = $executionID;
+            $lib->name    = $this->lang->doclib->main['execution'];
+            $lib->type    = 'execution';
             $lib->main    = '1';
             $lib->acl     = 'default';
             $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();
 
             $whitelist = explode(',', $sprint->whitelist);
-            $this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $projectID);
-            if($sprint->acl != 'open') $this->updateUserView($projectID);
+            $this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $executionID);
+            if($sprint->acl != 'open') $this->updateUserView($executionID);
 
-            if(!dao::isError()) $this->loadModel('score')->create('program', 'createguide', $projectID);
-            return $projectID;
+            if(!dao::isError()) $this->loadModel('score')->create('program', 'createguide', $executionID);
+            return $executionID;
         }
     }
 
     /**
-     * Update a project.
+     * Update a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array|bool
      */
-    public function update($projectID)
+    public function update($executionID)
     {
-        /* Convert projectID format and get oldProject. */
-        $projectID  = (int)$projectID;
-        $oldProject = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
+        /* Convert executionID format and get oldExecution. */
+        $executionID  = (int)$executionID;
+        $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         /* Judgment of required items. */
         if($this->post->code == '')
         {
-            dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->project->code);
+            dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
             return false;
         }
 
-        if($oldProject->type == 'stage' and empty($this->post->products[0]))
+        if($oldExecution->type == 'stage' and empty($this->post->products[0]))
         {
-            dao::$errors['message'][] = $this->lang->project->noLinkProduct;
+            dao::$errors['message'][] = $this->lang->execution->noLinkProduct;
             return false;
         }
 
         /* Get team and language item. */
-        $team = $this->getTeamMemberPairs($projectID);
-        $this->lang->project->team = $this->lang->project->teamname;
+        $team = $this->getTeamMemberPairs($executionID);
+        $this->lang->execution->team = $this->lang->execution->teamname;
 
         /* Get the data from the post. */
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
             ->setIF(helper::isZeroDate($this->post->begin), 'begin', '')
@@ -479,53 +479,53 @@ class executionModel extends model
             ->setIF($this->post->acl != 'custom', 'whitelist', '')
             ->setDefault('team', $this->post->name)
             ->join('whitelist', ',')
-            ->stripTags($this->config->project->editor->edit['id'], $this->config->allowedTags)
+            ->stripTags($this->config->execution->editor->edit['id'], $this->config->allowedTags)
             ->remove('products, branch, uid, plans')
             ->get();
 
         /* Child stage inherits parent stage permissions. */
-        if(!isset($project->acl)) $project->acl = $oldProject->acl;
-        if($project->acl == 'open') $project->whitelist = '';
+        if(!isset($execution->acl)) $execution->acl = $oldExecution->acl;
+        if($execution->acl == 'open') $execution->whitelist = '';
 
-        $project = $this->loadModel('file')->processImgURL($project, $this->config->project->editor->edit['id'], $this->post->uid);
+        $execution = $this->loadModel('file')->processImgURL($execution, $this->config->execution->editor->edit['id'], $this->post->uid);
 
         /* Check the workload format and total. */
-        if(!empty($project->percent)) $this->checkWorkload('update', $project->percent, $oldProject);
+        if(!empty($execution->percent)) $this->checkWorkload('update', $execution->percent, $oldExecution);
 
         /* Set planDuration and realDuration. */
         if(isset($this->config->maxVersion))
         {
-            $project->planDuration = $this->loadModel('programplan')->getDuration($project->begin, $project->end);
-            if(!empty($project->realBegan) and !empty($project->realEnd)) $project->realDuration = $this->loadModel('programplan')->getDuration($project->realBegan, $project->realEnd);
+            $execution->planDuration = $this->loadModel('programplan')->getDuration($execution->begin, $execution->end);
+            if(!empty($execution->realBegan) and !empty($execution->realEnd)) $execution->realDuration = $this->loadModel('programplan')->getDuration($execution->realBegan, $execution->realEnd);
         }
 
         /* Update data. */
-        $this->dao->update(TABLE_PROJECT)->data($project)
+        $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck($skipFields = 'begin,end')
-            ->batchcheck($this->config->project->edit->requiredFields, 'notempty')
-            ->checkIF($project->begin != '', 'begin', 'date')
-            ->checkIF($project->end != '', 'end', 'date')
-            ->checkIF($project->end != '', 'end', 'gt', $project->begin)
-            ->check('code', 'unique', "id!=$projectID and deleted='0'")
-            ->where('id')->eq($projectID)
+            ->batchcheck($this->config->execution->edit->requiredFields, 'notempty')
+            ->checkIF($execution->begin != '', 'begin', 'date')
+            ->checkIF($execution->end != '', 'end', 'date')
+            ->checkIF($execution->end != '', 'end', 'gt', $execution->begin)
+            ->check('code', 'unique', "id!=$executionID and deleted='0'")
+            ->where('id')->eq($executionID)
             ->limit(1)
             ->exec();
 
         $changedAccounts = array();
-        foreach($project as $fieldName => $value)
+        foreach($execution as $fieldName => $value)
         {
             if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QD' or $fieldName == 'RD' )
             {
                 if(!empty($value) and !isset($team[$value]))
                 {
                     $member = new stdclass();
-                    $member->root    = (int)$projectID;
+                    $member->root    = (int)$executionID;
                     $member->account = $value;
                     $member->join    = helper::today();
-                    $member->role    = $this->lang->project->$fieldName;
-                    $member->days    = zget($project, 'days', 0);
-                    $member->type    = 'project';
-                    $member->hours   = $this->config->project->defaultWorkhours;
+                    $member->role    = $this->lang->execution->$fieldName;
+                    $member->days    = zget($execution, 'days', 0);
+                    $member->type    = 'execution';
+                    $member->hours   = $this->config->execution->defaultWorkhours;
                     $this->dao->replace(TABLE_TEAM)->data($member)->exec();
 
                     $changedAccounts[] = $value;
@@ -533,16 +533,16 @@ class executionModel extends model
             }
         }
 
-        $whitelist = explode(',', $project->whitelist);
-        $this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $projectID);
+        $whitelist = explode(',', $execution->whitelist);
+        $this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $executionID);
 
         /* Fix bug#3074, Update views for team members. */
-        if($project->acl != 'open') $this->updateUserView($projectID, 'sprint', $changedAccounts);
+        if($execution->acl != 'open') $this->updateUserView($executionID, 'sprint', $changedAccounts);
 
         if(!dao::isError())
         {
-            $this->file->updateObjectID($this->post->uid, $projectID, 'project');
-            return common::createChanges($oldProject, $project);
+            $this->file->updateObjectID($this->post->uid, $executionID, 'execution');
+            return common::createChanges($oldExecution, $execution);
         }
     }
 
@@ -556,179 +556,179 @@ class executionModel extends model
     {
         $this->loadModel('user');
 
-        $projects    = array();
+        $executions    = array();
         $allChanges  = array();
         $data        = fixer::input('post')->get();
-        $oldProjects = $this->getExecutionByIdList($this->post->projectIDList);
+        $oldExecutions = $this->getByIdList($this->post->executionIDList);
         $nameList    = array();
         $codeList    = array();
-        foreach($data->projectIDList as $projectID)
+        foreach($data->executionIDList as $executionID)
         {
-            $projectName = $data->names[$projectID];
-            $projectCode = $data->codes[$projectID];
+            $executionName = $data->names[$executionID];
+            $executionCode = $data->codes[$executionID];
 
-            $projectID = (int)$projectID;
-            $projects[$projectID] = new stdClass();
-            $projects[$projectID]->name           = $projectName;
-            $projects[$projectID]->code           = $projectCode;
-            $projects[$projectID]->PM             = $data->PMs[$projectID];
-            $projects[$projectID]->PO             = $data->POs[$projectID];
-            $projects[$projectID]->QD             = $data->QDs[$projectID];
-            $projects[$projectID]->RD             = $data->RDs[$projectID];
-            $projects[$projectID]->lifetime       = $data->lifetimes[$projectID];
-            $projects[$projectID]->attribute      = $data->attributes[$projectID];
-            $projects[$projectID]->status         = $data->statuses[$projectID];
-            $projects[$projectID]->begin          = $data->begins[$projectID];
-            $projects[$projectID]->end            = $data->ends[$projectID];
-            $projects[$projectID]->team           = $data->teams[$projectID];
-            $projects[$projectID]->desc           = htmlspecialchars_decode($data->descs[$projectID]);
-            $projects[$projectID]->days           = $data->dayses[$projectID];
-            $projects[$projectID]->order          = $data->orders[$projectID];
-            $projects[$projectID]->lastEditedBy   = $this->app->user->account;
-            $projects[$projectID]->lastEditedDate = helper::now();
+            $executionID = (int)$executionID;
+            $executions[$executionID] = new stdClass();
+            $executions[$executionID]->name           = $executionName;
+            $executions[$executionID]->code           = $executionCode;
+            $executions[$executionID]->PM             = $data->PMs[$executionID];
+            $executions[$executionID]->PO             = $data->POs[$executionID];
+            $executions[$executionID]->QD             = $data->QDs[$executionID];
+            $executions[$executionID]->RD             = $data->RDs[$executionID];
+            $executions[$executionID]->lifetime       = $data->lifetimes[$executionID];
+            $executions[$executionID]->attribute      = $data->attributes[$executionID];
+            $executions[$executionID]->status         = $data->statuses[$executionID];
+            $executions[$executionID]->begin          = $data->begins[$executionID];
+            $executions[$executionID]->end            = $data->ends[$executionID];
+            $executions[$executionID]->team           = $data->teams[$executionID];
+            $executions[$executionID]->desc           = htmlspecialchars_decode($data->descs[$executionID]);
+            $executions[$executionID]->days           = $data->dayses[$executionID];
+            $executions[$executionID]->order          = $data->orders[$executionID];
+            $executions[$executionID]->lastEditedBy   = $this->app->user->account;
+            $executions[$executionID]->lastEditedDate = helper::now();
 
-            /* Check unique name for edited projects. */
-            if(isset($nameList[$projectName])) dao::$errors['name'][] = 'project#' . $projectID .  sprintf($this->lang->error->unique, $this->lang->project->name, $projectName);
-            $nameList[$projectName] = $projectName;
+            /* Check unique name for edited executions. */
+            if(isset($nameList[$executionName])) dao::$errors['name'][] = 'execution#' . $executionID .  sprintf($this->lang->error->unique, $this->lang->execution->name, $executionName);
+            $nameList[$executionName] = $executionName;
 
-            /* Check unique code for edited projects. */
-            if(isset($codeList[$projectCode])) dao::$errors['code'][] = 'project#' . $projectID .  sprintf($this->lang->error->unique, $this->lang->project->code, $projectCode);
-            $codeList[$projectCode] = $projectCode;
+            /* Check unique code for edited executions. */
+            if(isset($codeList[$executionCode])) dao::$errors['code'][] = 'execution#' . $executionID .  sprintf($this->lang->error->unique, $this->lang->execution->code, $executionCode);
+            $codeList[$executionCode] = $executionCode;
         }
         if(dao::isError()) die(js::error(dao::getError()));
 
-        foreach($projects as $projectID => $project)
+        foreach($executions as $executionID => $execution)
         {
-            $oldProject = $oldProjects[$projectID];
-            $team       = $this->getTeamMemberPairs($projectID);
+            $oldExecution = $oldExecutions[$executionID];
+            $team       = $this->getTeamMemberPairs($executionID);
 
-            $this->dao->update(TABLE_PROJECT)->data($project)
+            $this->dao->update(TABLE_EXECUTION)->data($execution)
                 ->autoCheck($skipFields = 'begin,end')
-                ->batchcheck($this->config->project->edit->requiredFields, 'notempty')
-                ->checkIF($project->begin != '', 'begin', 'date')
-                ->checkIF($project->end != '', 'end', 'date')
-                ->checkIF($project->end != '', 'end', 'gt', $project->begin)
-                ->check('code', 'unique', "id NOT " . helper::dbIN($data->projectIDList) . " and deleted='0'")
-                ->where('id')->eq($projectID)
+                ->batchcheck($this->config->execution->edit->requiredFields, 'notempty')
+                ->checkIF($execution->begin != '', 'begin', 'date')
+                ->checkIF($execution->end != '', 'end', 'date')
+                ->checkIF($execution->end != '', 'end', 'gt', $execution->begin)
+                ->check('code', 'unique', "id NOT " . helper::dbIN($data->executionIDList) . " and deleted='0'")
+                ->where('id')->eq($executionID)
                 ->limit(1)
                 ->exec();
-            if(dao::isError()) die(js::error('project#' . $projectID . dao::getError(true)));
+            if(dao::isError()) die(js::error('execution#' . $executionID . dao::getError(true)));
 
             $changedAccounts = array();
-            foreach($project as $fieldName => $value)
+            foreach($execution as $fieldName => $value)
             {
                 if($fieldName == 'PO' or $fieldName == 'PM' or $fieldName == 'QD' or $fieldName == 'RD' )
                 {
                     if(!empty($value) and !isset($team[$value]))
                     {
                         $member = new stdClass();
-                        $member->root    = (int)$projectID;
-                        $member->type    = 'project';
+                        $member->root    = (int)$executionID;
+                        $member->type    = 'execution';
                         $member->account = $value;
                         $member->join    = helper::today();
-                        $member->role    = $this->lang->project->$fieldName;
+                        $member->role    = $this->lang->execution->$fieldName;
                         $member->days    = 0;
-                        $member->hours   = $this->config->project->defaultWorkhours;
+                        $member->hours   = $this->config->execution->defaultWorkhours;
                         $this->dao->replace(TABLE_TEAM)->data($member)->exec();
 
                         $changedAccounts[] = $value;
                     }
                 }
             }
-            if(!empty($changedAccounts)) $this->updateUserView($projectID, 'sprint', $changedAccounts);
+            if(!empty($changedAccounts)) $this->updateUserView($executionID, 'sprint', $changedAccounts);
 
-            $allChanges[$projectID] = common::createChanges($oldProject, $project);
+            $allChanges[$executionID] = common::createChanges($oldExecution, $execution);
         }
         $this->fixOrder();
         return $allChanges;
     }
 
     /**
-     * Start project.
+     * Start execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array
      */
-    public function start($projectID)
+    public function start($executionID)
     {
-        $oldProject = $this->getById($projectID);
+        $oldExecution = $this->getById($executionID);
         $now        = helper::now();
 
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->add('realBegan', $now)
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
             ->remove('comment')->get();
 
-        $this->dao->update(TABLE_PROJECT)->data($project)->autoCheck()->where('id')->eq((int)$projectID)->exec();
+        $this->dao->update(TABLE_EXECUTION)->data($execution)->autoCheck()->where('id')->eq((int)$executionID)->exec();
 
-        if(!dao::isError()) return common::createChanges($oldProject, $project);
+        if(!dao::isError()) return common::createChanges($oldExecution, $execution);
     }
 
     /**
-     * Put project off.
+     * Put execution off.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function putoff($projectID)
+    public function putoff($executionID)
     {
-        $oldProject = $this->getById($projectID);
+        $oldExecution = $this->getById($executionID);
         $now        = helper::now();
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
             ->remove('comment')
             ->get();
 
-        $this->dao->update(TABLE_PROJECT)->data($project)
+        $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck()
-            ->where('id')->eq((int)$projectID)
+            ->where('id')->eq((int)$executionID)
             ->exec();
 
-        if(!dao::isError()) return common::createChanges($oldProject, $project);
+        if(!dao::isError()) return common::createChanges($oldExecution, $execution);
     }
 
     /**
-     * Suspend project.
+     * Suspend execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function suspend($projectID)
+    public function suspend($executionID)
     {
-        $oldProject = $this->getById($projectID);
+        $oldExecution = $this->getById($executionID);
         $now        = helper::now();
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->setDefault('status', 'suspended')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
             ->remove('comment')->get();
 
-        $this->dao->update(TABLE_PROJECT)->data($project)
+        $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck()
-            ->where('id')->eq((int)$projectID)
+            ->where('id')->eq((int)$executionID)
             ->exec();
 
-        if(!dao::isError()) return common::createChanges($oldProject, $project);
+        if(!dao::isError()) return common::createChanges($oldExecution, $execution);
     }
 
     /**
-     * Activate project.
+     * Activate execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function activate($projectID)
+    public function activate($executionID)
     {
-        $oldProject = $this->getById($projectID);
+        $oldExecution = $this->getById($executionID);
         $now        = helper::now();
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
@@ -737,65 +737,65 @@ class executionModel extends model
 
         if(!$this->post->readjustTime)
         {
-            unset($project->begin);
-            unset($project->end);
+            unset($execution->begin);
+            unset($execution->end);
         }
 
-        $this->dao->update(TABLE_PROJECT)->data($project)
+        $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck()
-            ->where('id')->eq((int)$projectID)
+            ->where('id')->eq((int)$executionID)
             ->exec();
 
         /* Readjust task. */
         if($this->post->readjustTime and $this->post->readjustTask)
         {
-            $beginTimeStamp = strtotime($project->begin);
+            $beginTimeStamp = strtotime($execution->begin);
             $tasks = $this->dao->select('id,estStarted,deadline,status')->from(TABLE_TASK)
                 ->where('deadline')->ne('0000-00-00')
                 ->andWhere('status')->in('wait,doing')
-                ->andWhere('project')->eq($projectID)
+                ->andWhere('execution')->eq($executionID)
                 ->fetchAll();
             foreach($tasks as $task)
             {
                 if($task->status == 'wait' and !helper::isZeroDate($task->estStarted))
                 {
                     $taskDays   = helper::diffDate($task->deadline, $task->estStarted);
-                    $taskOffset = helper::diffDate($task->estStarted, $oldProject->begin);
+                    $taskOffset = helper::diffDate($task->estStarted, $oldExecution->begin);
 
                     $estStartedTimeStamp = $beginTimeStamp + $taskOffset * 24 * 3600;
                     $estStarted = date('Y-m-d', $estStartedTimeStamp);
                     $deadline   = date('Y-m-d', $estStartedTimeStamp + $taskDays * 24 * 3600);
 
-                    if($estStarted > $project->end) $estStarted = $project->end;
-                    if($deadline > $project->end)   $deadline   = $project->end;
+                    if($estStarted > $execution->end) $estStarted = $execution->end;
+                    if($deadline > $execution->end)   $deadline   = $execution->end;
                     $this->dao->update(TABLE_TASK)->set('estStarted')->eq($estStarted)->set('deadline')->eq($deadline)->where('id')->eq($task->id)->exec();
                 }
                 else
                 {
-                    $taskOffset = helper::diffDate($task->deadline, $oldProject->begin);
+                    $taskOffset = helper::diffDate($task->deadline, $oldExecution->begin);
                     $deadline   = date('Y-m-d', $beginTimeStamp + $taskOffset * 24 * 3600);
 
-                    if($deadline > $project->end) $deadline = $project->end;
+                    if($deadline > $execution->end) $deadline = $execution->end;
                     $this->dao->update(TABLE_TASK)->set('deadline')->eq($deadline)->where('id')->eq($task->id)->exec();
                 }
             }
         }
 
-        if(!dao::isError()) return common::createChanges($oldProject, $project);
+        if(!dao::isError()) return common::createChanges($oldExecution, $execution);
     }
 
     /**
-     * Close project.
+     * Close execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array
      */
-    public function close($projectID)
+    public function close($executionID)
     {
-        $oldProject = $this->getById($projectID);
+        $oldExecution = $this->getById($executionID);
         $now        = helper::now();
-        $project = fixer::input('post')
+        $execution = fixer::input('post')
             ->setDefault('status', 'closed')
             ->setDefault('closedBy', $this->app->user->account)
             ->setDefault('closedDate', $now)
@@ -804,14 +804,14 @@ class executionModel extends model
             ->remove('comment')
             ->get();
 
-        $this->dao->update(TABLE_PROJECT)->data($project)
+        $this->dao->update(TABLE_EXECUTION)->data($execution)
             ->autoCheck()
-            ->where('id')->eq((int)$projectID)
+            ->where('id')->eq((int)$executionID)
             ->exec();
         if(!dao::isError())
         {
-            $this->loadModel('score')->create('project', 'close', $oldProject);
-            return common::createChanges($oldProject, $project);
+            $this->loadModel('score')->create('execution', 'close', $oldExecution);
+            return common::createChanges($oldExecution, $execution);
         }
     }
 
@@ -820,11 +820,11 @@ class executionModel extends model
      *
      * @param  string $type create|update
      * @param  int    $percent
-     * @param  object $oldProject
+     * @param  object $oldExecution
      * @access public
      * @return bool
      */
-    public function checkWorkload($type = '', $percent = 0, $oldProject = '')
+    public function checkWorkload($type = '', $percent = 0, $oldExecution = '')
     {
         if(!preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $percent))
         {
@@ -833,10 +833,10 @@ class executionModel extends model
         }
 
         /* The total workload of the first stage should not exceed 100%. */
-        if($type == 'create' or $oldProject->grade == 1)
+        if($type == 'create' or $oldExecution->grade == 1)
         {
             $oldPercentTotal = $this->dao->select('SUM(t2.percent) as total')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
                 ->where('t1.product')->eq($this->post->products[0])
                 ->andWhere('t2.type')->eq('stage')
                 ->andWhere('t2.grade')->eq(1)
@@ -844,31 +844,31 @@ class executionModel extends model
                 ->fetch('total');
 
             if($type == 'create') $percentTotal = $percent + $oldPercentTotal;
-            if(!empty($oldProject) and $oldProject->grade == 1) $percentTotal = $oldPercentTotal - $oldProject->percent + $this->post->percent;
+            if(!empty($oldExecution) and $oldExecution->grade == 1) $percentTotal = $oldPercentTotal - $oldExecution->percent + $this->post->percent;
 
             if($percentTotal >100)
             {
-                dao::$errors['percent'] = sprintf($this->lang->project->workloadTotal, $oldPercentTotal . '%');
+                dao::$errors['percent'] = sprintf($this->lang->execution->workloadTotal, $oldPercentTotal . '%');
                 return false;
             }
         }
 
-        if($type == 'update' and $oldProject->grade == 2)
+        if($type == 'update' and $oldExecution->grade == 2)
         {
-            $parentPlan           = $this->loadModel('programPlan')->getByID($oldProject->parent);
-            $childrenTotalPercent = $this->dao->select('SUM(percent) as total')->from(TABLE_PROJECT)->where('parent')->eq($oldProject->parent)->andWhere('deleted')->eq(0)->fetch('total');
-            $childrenTotalPercent = $childrenTotalPercent - $oldProject->percent + $this->post->percent;
+            $parentPlan           = $this->loadModel('programPlan')->getByID($oldExecution->parent);
+            $childrenTotalPercent = $this->dao->select('SUM(percent) as total')->from(TABLE_EXECUTION)->where('parent')->eq($oldExecution->parent)->andWhere('deleted')->eq(0)->fetch('total');
+            $childrenTotalPercent = $childrenTotalPercent - $oldExecution->percent + $this->post->percent;
 
             if($childrenTotalPercent > 100)
             {
-                dao::$errors['parent'] = sprintf($this->lang->project->workloadTotal, $childrenTotalPercent . '%');
+                dao::$errors['parent'] = sprintf($this->lang->execution->workloadTotal, $childrenTotalPercent . '%');
                 return false;
             }
         }
     }
 
     /**
-     * Get execution pairs.
+     * Get project pairs.
      *
      * @param  int    $projectID
      * @param  string $type all|sprint|stage|kanban
@@ -876,21 +876,21 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionPairs($projectID = 0, $type = 'all', $mode = '')
+    public function getPairs($projectID = 0, $type = 'all', $mode = '')
     {
-        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProjectPairs();
+        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionPairs();
 
-        $mode   .= $this->cookie->projectMode;
-        $orderBy = $this->config->project->orderBy;
+        $mode   .= $this->cookie->executionMode;
+        $orderBy = $this->config->execution->orderBy;
         if($projectID)
         {
-            $projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('model');
-            $orderBy = $projectModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'begin_desc';
+            $executionModel = $this->dao->select('model')->from(TABLE_EXECUTION)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('model');
+            $orderBy = $executionModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'begin_desc';
 
-            /* Waterfall project, when all phases are closed, in reverse order of date. */
-            if($projectModel == 'waterfall')
+            /* Waterfall execution, when all phases are closed, in reverse order of date. */
+            if($executionModel == 'waterfall')
             {
-                $summary = $this->dao->select('count(id) as executions, sum(IF(INSTR("closed", status) < 1, 0, 1)) as closedExecutions')->from(TABLE_PROJECT)->where('project')->eq($projectID)->andWhere('deleted')->eq('0')->fetch();
+                $summary = $this->dao->select('count(id) as executions, sum(IF(INSTR("closed", status) < 1, 0, 1)) as closedExecutions')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->andWhere('deleted')->eq('0')->fetch();
                 if($summary->executions == $summary->closedExecutions) $orderBy = 'sortStatus_asc,begin_desc,id_asc';
             }
         }
@@ -915,7 +915,7 @@ class executionModel extends model
 
         if(strpos($mode, 'empty') !== false) $pairs[0] = '';
 
-        /* If the pairs is empty, to make sure there's an project in the pairs. */
+        /* If the pairs is empty, to make sure there's an execution in the pairs. */
         if(empty($pairs) and isset($executions[0]))
         {
             $firstExecution = $executions[0];
@@ -932,13 +932,13 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionByIdList($executionIdList = array())
+    public function getByIdList($executionIdList = array())
     {
         return $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->in($executionIdList)->fetchAll('id');
     }
 
     /**
-     * Get execution lists.
+     * Get project lists.
      *
      * @param  int    $projectID
      * @param  string $type    all|sprint|stage|kanban
@@ -949,14 +949,14 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionList($projectID = 0, $type = 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0)
+    public function getList($projectID = 0, $type = 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0)
     {
         if($status == 'involved') return $this->getInvolvedExecutionList($projectID, $status, $limit, $productID, $branch);
 
         if($productID != 0)
         {
             return $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
                 ->where('t1.product')->eq($productID)
                 ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
                 ->beginIF($type == 'all')->andWhere('t2.type')->in('sprint,stage,kanban')->fi()
@@ -972,7 +972,7 @@ class executionModel extends model
         }
         else
         {
-            return $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)
+            return $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_EXECUTION)
                 ->where('deleted')->eq(0)
                 ->beginIF($type == 'all')->andWhere('type')->in('sprint,stage,kanban')->fi()
                 ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
@@ -1002,7 +1002,7 @@ class executionModel extends model
         if($productID != 0)
         {
             return $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
                 ->leftJoin(TABLE_TEAM)->alias('t3')->on('t3.root=t2.id')
                 ->where('t1.product')->eq($productID)
                 ->andWhere('t2.deleted')->eq(0)
@@ -1019,7 +1019,7 @@ class executionModel extends model
         }
         else
         {
-            return $this->dao->select('t1.*, IF(INSTR(" done,closed", t1.status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)->alias('t1')
+            return $this->dao->select('t1.*, IF(INSTR(" done,closed", t1.status) < 2, 0, 1) AS isDone')->from(TABLE_EXECUTION)->alias('t1')
                 ->leftJoin(TABLE_TEAM)->alias('t2')->on('t2.root=t1.id')
                 ->where('t1.deleted')->eq(0)
                 ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
@@ -1042,7 +1042,7 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionIdList($projectID, $status = 'all')
+    public function getIdList($projectID, $status = 'all')
     {
         return $this->dao->select('id')->from(TABLE_EXECUTION)
             ->where('deleted')->eq('0')
@@ -1063,9 +1063,9 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionsByProject($projectID, $status = 'all', $limit = 0, $pairs = false)
+    public function getByProject($projectID, $status = 'all', $limit = 0, $pairs = false)
     {
-        $project = $this->loadModel('program')->getPRJByID($projectID);
+        $project = $this->loadModel('project')->getByID($projectID);
         $orderBy = (isset($project->model) and $project->model == 'waterfall') ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
 
         $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
@@ -1082,13 +1082,13 @@ class executionModel extends model
         if(isset($project->model) and $project->model == 'waterfall')
         {
             $executionList = array();
-            $executionProducts = $this->dao->select('t1.project,t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            $executionProducts = $this->dao->select('t1.execution,t1.product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                 ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
                 ->where('project')->in(array_keys($executions))
                 ->andWhere('t2.deleted')->eq(0)
                 ->fetchPairs();
 
-            $products = $this->loadModel('product')->getProductPairsByProject($projectID);
+            $products = $this->loadModel('product')->getProductPairsByExecution($projectID);
 
             foreach($executions as $id => $execution)
             {
@@ -1130,7 +1130,7 @@ class executionModel extends model
     }
 
     /**
-     * Get execution stats.
+     * Get project stats.
      *
      * @param  int     $projectID
      * @param  string  $status
@@ -1141,7 +1141,7 @@ class executionModel extends model
      * @access public
      * @return void
      */
-    public function getExecutionStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null)
+    public function getStats($projectID = 0, $status = 'undone', $productID = 0, $branch = 0, $itemCounts = 30, $orderBy = 'id_asc', $pager = null)
     {
         if(empty($productID))
         {
@@ -1158,7 +1158,7 @@ class executionModel extends model
         else
         {
             $executions = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
                 ->where('t1.product')->eq($productID)
                 ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
                 ->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()
@@ -1174,12 +1174,12 @@ class executionModel extends model
         $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
 
         /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */
-        $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason')
+        $tasks = $this->dao->select('id, execution, estimate, consumed, `left`, status, closedReason')
             ->from(TABLE_TASK)
-            ->where('project')->in(array_keys($executions))
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('parent')->lt(1)
             ->andWhere('deleted')->eq(0)
-            ->fetchGroup('project', 'id');
+            ->fetchGroup('execution', 'id');
 
         /* Compute totalEstimate, totalConsumed, totalLeft. */
         foreach($tasks as $executionID => $executionTasks)
@@ -1208,16 +1208,16 @@ class executionModel extends model
         }
 
         /* Get burndown charts datas. */
-        $burns = $this->dao->select('project, date AS name, `left` AS value')
+        $burns = $this->dao->select('execution, date AS name, `left` AS value')
             ->from(TABLE_BURN)
-            ->where('project')->in(array_keys($executions))
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('task')->eq(0)
             ->orderBy('date desc')
-            ->fetchGroup('project', 'name');
+            ->fetchGroup('execution', 'name');
 
         foreach($burns as $executionID => $executionBurns)
         {
-            /* If projectBurns > $itemCounts, split it, else call processBurnData() to pad burns. */
+            /* If executionBurns > $itemCounts, split it, else call processBurnData() to pad burns. */
             $begin = $executions[$executionID]->begin;
             $end   = $executions[$executionID]->end;
             if(helper::isZeroDate($begin)) $begin = $executions[$executionID]->openedDate;
@@ -1227,7 +1227,7 @@ class executionModel extends model
             foreach($executionBurns as $executionBurn)
             {
                 $executionBurn->name = substr($executionBurn->name, 5);
-                unset($executionBurn->project);
+                unset($executionBurn->execution);
             }
 
             ksort($executionBurns);
@@ -1262,8 +1262,8 @@ class executionModel extends model
         }
 
         /* In the case of the waterfall model, calculate the sub-stage. */
-        $project = $this->loadModel('program')->getPRJById($this->session->PRJ);
-        if($project and $project->model == 'waterfall')
+        $execution = $this->loadModel('execution')->getById($this->session->project);
+        if($execution and $execution->model == 'waterfall')
         {
             foreach($parents as $id => $execution)
             {
@@ -1287,35 +1287,35 @@ class executionModel extends model
      * @access public
      * @return void
      */
-    public function getExecutionLink($module, $method, $extra)
+    public function getLink($module, $method, $extra)
     {
         $link = '';
         if($module == 'task' and ($method == 'view' || $method == 'edit' || $method == 'batchedit'))
         {
-            $module = 'project';
+            $module = 'execution';
             $method = 'task';
         }
         if($module == 'build' and ($method == 'edit' || $method= 'view'))
         {
-            $module = 'project';
+            $module = 'execution';
             $method = 'build';
         }
 
-        if($module == 'project' and $method == 'create') return;
+        if($module == 'execution' and $method == 'create') return;
         if($extra != '')
         {
-            $link = helper::createLink($module, $method, "projectID=%s&type=$extra");
+            $link = helper::createLink($module, $method, "executionID=%s&type=$extra");
         }
-        elseif($module == 'project' && ($method == 'index' or $method == 'all'))
+        elseif($module == 'execution' && ($method == 'index' or $method == 'all'))
         {
-            $link = helper::createLink($module, 'task', "projectID=%s");
+            $link = helper::createLink($module, 'task', "executionID=%s");
         }
         else
         {
-            $link = helper::createLink($module, $method, "projectID=%s");
+            $link = helper::createLink($module, $method, "executionID=%s");
         }
 
-        if($module == 'doc') $link = helper::createLink('doc', 'objectLibs', "type=project&objectID=%s&from=project");
+        if($module == 'doc') $link = helper::createLink('doc', 'objectLibs', "type=execution&objectID=%s&from=execution");
         return $link;
     }
 
@@ -1326,10 +1326,10 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionBranches($executionID)
+    public function getBranches($executionID)
     {
         $productBranchPairs = $this->dao->select('product, branch')->from(TABLE_PROJECTPRODUCT)
-            ->where('project')->eq($executionID)
+            ->where('execution')->eq($executionID)
             ->fetchPairs();
         $branches = $this->loadModel('branch')->getByProducts(array_keys($productBranchPairs));
         foreach($productBranchPairs as $product => $branch)
@@ -1346,7 +1346,7 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionTree($executionID)
+    public function getTree($executionID)
     {
         $fullTrees = $this->loadModel('tree')->getTaskStructure($executionID, 0);
         array_unshift($fullTrees, array('id' => 0, 'name' => '/', 'type' => 'task', 'actions' => false, 'root' => $executionID));
@@ -1377,13 +1377,13 @@ class executionModel extends model
      */
     public function getRelatedExecutions($executionID)
     {
-        $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchAll('product');
+        $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('execution')->eq((int)$executionID)->fetchAll('product');
         // $products   = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->fetchAll('product');
         if(!$products) return array();
         $products = array_keys($products);
         return $this->dao->select('t1.id, t1.name')->from(TABLE_EXECUTION)->alias('t1')
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')
-            ->on('t1.id = t2.project')
+            ->on('t1.id = t2.execution')
             ->where('t2.product')->in($products)
             ->andWhere('t1.id')->ne((int)$executionID)
             ->andWhere('t1.deleted')->eq(0)
@@ -1422,19 +1422,19 @@ class executionModel extends model
             ->orderBy('root asc')
             ->fetchPairs('root', 'root');
 
-        $_SESSION['limitedProjects'] = join(',', $executions);
+        $_SESSION['limitedExecutions'] = join(',', $executions);
     }
 
     /**
-     * Get projects lists grouped by product.
+     * Get executions lists grouped by product.
      *
      * @access public
      * @return array
      */
     public function getProductGroupList()
     {
-        $list = $this->dao->select('t1.id, t1.name,t1.status, t2.product')->from(TABLE_PROJECT)->alias('t1')
-            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
+        $list = $this->dao->select('t1.id, t1.name,t1.status, t2.product')->from(TABLE_EXECUTION)->alias('t1')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.execution')
             ->where('t1.deleted')->eq(0)
             ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
             ->fetchGroup('product');
@@ -1442,11 +1442,11 @@ class executionModel extends model
         $noProducts = array();
         foreach($list as $id => $product)
         {
-            foreach($product as $ID => $project)
+            foreach($product as $ID => $execution)
             {
-                if(!$project->product)
+                if(!$execution->product)
                 {
-                    if($this->checkPriv($project->id)) $noProducts[] = $project;
+                    if($this->checkPriv($execution->id)) $noProducts[] = $execution;
                     unset($list[$id][$ID]);
                 }
             }
@@ -1461,8 +1461,8 @@ class executionModel extends model
      * Get tasks.
      *
      * @param  int    $productID
-     * @param  int    $projectID
-     * @param  array  $projects
+     * @param  int    $executionID
+     * @param  array  $executions
      * @param  string $browseType
      * @param  int    $queryID
      * @param  int    $moduleID
@@ -1471,7 +1471,7 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getTasks($productID, $projectID, $projects, $browseType, $queryID, $moduleID, $sort, $pager)
+    public function getTasks($productID, $executionID, $executions, $browseType, $queryID, $moduleID, $sort, $pager)
     {
         $this->loadModel('task');
 
@@ -1483,20 +1483,20 @@ class executionModel extends model
             if(($this->session->taskBrowseType) and ($this->session->taskBrowseType != 'bysearch')) $browseType = $this->session->taskBrowseType;
         }
 
-        $this->session->set('taskWithChildren', in_array($browseType, array('unclosed', 'byproject', 'all', 'bysearch')) ? false : true);
+        $this->session->set('taskWithChildren', in_array($browseType, array('unclosed', 'byexecution', 'all', 'bysearch')) ? false : true);
 
         /* Get tasks. */
         $tasks = array();
         if($browseType != "bysearch")
         {
-            $queryStatus = $browseType == 'byproject' ? 'all' : $browseType;
+            $queryStatus = $browseType == 'byexecution' ? 'all' : $browseType;
             if($queryStatus == 'unclosed')
             {
                 $queryStatus = $this->lang->task->statusList;
                 unset($queryStatus['closed']);
                 $queryStatus = array_keys($queryStatus);
             }
-            $tasks = $this->task->getProjectTasks($projectID, $productID, $queryStatus, $modules, $sort, $pager);
+            $tasks = $this->task->getExecutionTasks($executionID, $productID, $queryStatus, $modules, $sort, $pager);
         }
         else
         {
@@ -1521,10 +1521,10 @@ class executionModel extends model
             if(strpos($this->session->taskQuery, "deleted =") === false)   $this->session->set('taskQuery', $this->session->taskQuery . " AND deleted = '0'");
 
             $taskQuery = $this->session->taskQuery;
-            /* Limit current project when no project. */
-            if(strpos($taskQuery, "`project` =") === false) $taskQuery = $taskQuery . " AND `project` = $projectID";
-            $projectQuery = "`project` " . helper::dbIN(array_keys($projects));
-            $taskQuery    = str_replace("`project` = 'all'", $projectQuery, $taskQuery); // Search all project.
+            /* Limit current execution when no execution. */
+            if(strpos($taskQuery, "`execution` =") === false) $taskQuery = $taskQuery . " AND `execution` = $executionID";
+            $executionQuery = "`execution` " . helper::dbIN(array_keys($executions));
+            $taskQuery    = str_replace("`execution` = 'all'", $executionQuery, $taskQuery); // Search all execution.
             $this->session->set('taskQueryCondition', $taskQuery);
             $this->session->set('taskOnlyCondition', true);
             $this->session->set('taskOrderBy', $sort);
@@ -1539,23 +1539,23 @@ class executionModel extends model
     /**
      * Get the execution by ID.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  bool   $setImgSize
      * @access public
      * @return object
      */
-    public function getById($projectID, $setImgSize = false)
+    public function getByID($executionID, $setImgSize = false)
     {
-        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProject();
+        if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecution();
 
-        $project = $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
-        if(!$project) return false;
+        $execution = $this->dao->findById((int)$executionID)->from(TABLE_EXECUTION)->fetch();
+        if(!$execution) return false;
 
-        /* Judge whether the project is delayed. */
-        if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
+        /* Judge whether the execution is delayed. */
+        if($execution->status != 'done' and $execution->status != 'closed' and $execution->status != 'suspended')
         {
-            $delay = helper::diffDate(helper::today(), $project->end);
-            if($delay > 0) $project->delay = $delay;
+            $delay = helper::diffDate(helper::today(), $execution->end);
+            if($delay > 0) $execution->delay = $delay;
         }
 
         $total = $this->dao->select('
@@ -1563,55 +1563,41 @@ class executionModel extends model
             ROUND(SUM(consumed), 2) AS totalConsumed,
             ROUND(SUM(`left`), 2) AS totalLeft')
             ->from(TABLE_TASK)
-            ->where('project')->eq((int)$projectID)
+            ->where('execution')->eq((int)$executionID)
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->fetch();
         $closedTotalLeft = $this->dao->select('ROUND(SUM(`left`), 2) AS totalLeft')->from(TABLE_TASK)
-            ->where('project')->eq((int)$projectID)
+            ->where('execution')->eq((int)$executionID)
             ->andWhere('deleted')->eq(0)
             ->andWhere('parent')->lt(1)
             ->andWhere('status')->in('closed,cancel')
             ->fetch('totalLeft');
 
-        $project->days          = $project->days ? $project->days : '';
-        $project->totalHours    = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('root')->eq($project->id)->andWhere('type')->eq('project')->fetch('totalHours');
-        $project->totalEstimate = round($total->totalEstimate, 1);
-        $project->totalConsumed = round($total->totalConsumed, 1);
-        $project->totalLeft     = round($total->totalLeft - $closedTotalLeft, 1);
+        $execution->days          = $execution->days ? $execution->days : '';
+        $execution->totalHours    = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('root')->eq($execution->id)->andWhere('type')->eq('execution')->fetch('totalHours');
+        $execution->totalEstimate = round($total->totalEstimate, 1);
+        $execution->totalConsumed = round($total->totalConsumed, 1);
+        $execution->totalLeft     = round($total->totalLeft - $closedTotalLeft, 1);
 
-        $project = $this->loadModel('file')->replaceImgURL($project, 'desc');
-        if($setImgSize) $project->desc = $this->file->setImgSize($project->desc);
+        $execution = $this->loadModel('file')->replaceImgURL($execution, 'desc');
+        if($setImgSize) $execution->desc = $this->file->setImgSize($execution->desc);
 
-        return $project;
+        return $execution;
     }
 
     /**
-     * Get the execution by ID.
+     * Get the default managers for a execution from it's related products.
      *
      * @param  int    $executionID
      * @access public
      * @return object
      */
-    public function getExecutionById($executionID = 0)
-    {
-        /* TODO: The getbyid method queries too much information that is not actually needed. */
-        if(empty($executionID)) return array();
-        return $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
-    }
-
-    /**
-     * Get the default managers for a project from it's related products.
-     *
-     * @param  int    $projectID
-     * @access public
-     * @return object
-     */
-    public function getDefaultManagers($projectID)
+    public function getDefaultManagers($executionID)
     {
         $managers = $this->dao->select('PO,QD,RD')->from(TABLE_PRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product')
-            ->where('t2.project')->eq($projectID)
+            ->where('t2.execution')->eq($executionID)
             ->fetch();
         if($managers) return $managers;
 
@@ -1623,23 +1609,23 @@ class executionModel extends model
     }
 
     /**
-     * Get products of a project.
+     * Get products of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array
      */
-    public function getProducts($projectID, $withBranch = true)
+    public function getProducts($executionID, $withBranch = true)
     {
         if(defined('TUTORIAL'))
         {
             if(!$withBranch) return $this->loadModel('tutorial')->getProductPairs();
-            return $this->loadModel('tutorial')->getProjectProducts();
+            return $this->loadModel('tutorial')->getExecutionProducts();
         }
         $query = $this->dao->select('t2.id, t2.name, t2.type, t1.branch, t1.plan')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')
             ->on('t1.product = t2.id')
-            ->where('t1.project')->eq((int)$projectID)
+            ->where('t1.execution')->eq((int)$executionID)
             ->andWhere('t2.deleted')->eq(0);
         if(!$withBranch) return $query->fetchPairs('id', 'name');
         return $query->fetchAll('id');
@@ -1648,15 +1634,15 @@ class executionModel extends model
     /**
      * Get ordered executions.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $status
      * @param  int    $num
      * @access public
      * @return array
      */
-    public function getOrderedExecutions($projectID, $status, $num = 0)
+    public function getOrderedExecutions($executionID, $status, $num = 0)
     {
-        $executionList = $this->getExecutionList($projectID, 'all', $status);
+        $executionList = $this->getList($executionID, 'all', $status);
         if(empty($executionIdList)) return $executionList;
 
         $executions = $mineExecutions = $otherExecutions = $closedExecutions = array();
@@ -1694,7 +1680,7 @@ class executionModel extends model
      * @access public
      * @return void
      */
-    public function buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, $type = 'projectStory')
+    public function buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, $type = 'executionStory')
     {
         $branchPairs  = array();
         $productType  = 'normal';
@@ -1724,15 +1710,15 @@ class executionModel extends model
         }
 
         /* Build search form. */
-        if($type == 'projectStory') 
+        if($type == 'executionStory')
         {
-            $this->config->product->search['module'] = 'projectStory';
+            $this->config->product->search['module'] = 'executionStory';
         }
 
         $this->config->product->search['fields']['title'] = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->title);
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
-        $this->config->product->search['params']['product']['values'] = $productPairs + array('all' => $this->lang->product->allProductsOfProject);
+        $this->config->product->search['params']['product']['values'] = $productPairs + array('all' => $this->lang->product->allProductsOfExecution);
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts($products);
         $this->config->product->search['params']['module']['values'] = $modules;
         unset($this->lang->story->statusList['draft']);
@@ -1759,7 +1745,7 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionsToImport($executionIds, $type)
+    public function getToImport($executionIds, $type)
     {
         $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
             ->where('id')->in($executionIds)
@@ -1776,23 +1762,23 @@ class executionModel extends model
     }
 
     /**
-     * Update products of a project.
+     * Update products of a execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  array  $products
      * @access public
      * @return void
      */
-    public function updateProducts($projectID, $products = '')
+    public function updateProducts($executionID, $products = '')
     {
         $this->loadModel('user');
         $products           = isset($_POST['products']) ? $_POST['products'] : $products;
-        $oldProjectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$projectID)->fetchGroup('product', 'branch');
-        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$projectID)->exec();
-        $members = array_keys($this->getTeamMembers($projectID));
+        $oldExecutionProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('execution')->eq((int)$executionID)->fetchGroup('product', 'branch');
+        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('execution')->eq((int)$executionID)->exec();
+        $members = array_keys($this->getTeamMembers($executionID));
         if(empty($products))
         {
-            $this->user->updateUserView(array_keys($oldProjectProducts), 'product', $members);
+            $this->user->updateUserView(array_keys($oldExecutionProducts), 'product', $members);
             return true;
         }
 
@@ -1807,14 +1793,14 @@ class executionModel extends model
 
             $oldPlan = 0;
             $branch  = isset($branches[$i]) ? $branches[$i] : 0;
-            if(isset($oldProjectProducts[$productID][$branch]))
+            if(isset($oldExecutionProducts[$productID][$branch]))
             {
-                $oldProjectProduct = $oldProjectProducts[$productID][$branch];
-                $oldPlan           = $oldProjectProduct->plan;
+                $oldExecutionProduct = $oldExecutionProducts[$productID][$branch];
+                $oldPlan           = $oldExecutionProduct->plan;
             }
 
             $data = new stdclass();
-            $data->project = $projectID;
+            $data->execution = $executionID;
             $data->product = $productID;
             $data->branch  = $branch;
             $data->plan    = isset($plans[$productID]) ? $plans[$productID] : $oldPlan;
@@ -1822,11 +1808,11 @@ class executionModel extends model
             $existedProducts[$productID] = true;
         }
 
-        /* Delete the execution linked products that is not linked with the project. */
-        $executions = $this->dao->select('id')->from(TABLE_PROJECT)->where('project')->eq((int)$projectID)->fetchPairs('id');
-        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->in($executions)->andWhere('product')->notin($products)->exec();
+        /* Delete the execution linked products that is not linked with the execution. */
+        $executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('execution')->eq((int)$executionID)->fetchPairs('id');
+        $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('execution')->in($executions)->andWhere('product')->notin($products)->exec();
 
-        $oldProductKeys = array_keys($oldProjectProducts);
+        $oldProductKeys = array_keys($oldExecutionProducts);
         $needUpdate = array_merge(array_diff($oldProductKeys, $products), array_diff($products, $oldProductKeys));
         if($needUpdate) $this->user->updateUserView($needUpdate, 'product', $members);
     }
@@ -1834,22 +1820,22 @@ class executionModel extends model
     /**
      * Get tasks can be imported.
      *
-     * @param  int    $toProject
+     * @param  int    $toExecution
      * @param  array  $branches
      * @access public
      * @return array
      */
-    public function getTasks2Imported($toProject, $branches)
+    public function getTasks2Imported($toExecution, $branches)
     {
-        $products   = $this->getProducts($toProject);
+        $products   = $this->getProducts($toExecution);
         if(empty($products)) return array();
 
-        $project    = $this->getById($toProject);
-        $executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+        $execution    = $this->getById($toExecution);
+        $executions = $this->dao->select('t1.product, t1.execution')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
             ->where('t1.product')->in(array_keys($products))
-            ->andWhere('t2.project')->eq($project->project)
-            ->fetchGroup('project');
+            ->andWhere('t2.execution')->eq($execution->execution)
+            ->fetchGroup('execution');
         $branches = str_replace(',', "','", $branches);
 
         $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')->from(TABLE_TASK)->alias('t1')
@@ -1858,32 +1844,32 @@ class executionModel extends model
             ->where('t1.status')->in('wait,doing,pause,cancel')
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t1.parent')->lt(1)
-            ->andWhere('t1.project')->in(array_keys($executions))
+            ->andWhere('t1.execution')->in(array_keys($executions))
             ->andWhere("(t1.story = 0 OR (t2.branch in ('0','" . join("','", $branches) . "') and t2.product " . helper::dbIN(array_keys($branches)) . "))")
-            ->fetchGroup('project', 'id');
+            ->fetchGroup('execution', 'id');
         return $tasks;
     }
 
     /**
      * Import tasks.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function importTask($projectID)
+    public function importTask($executionID)
     {
         $this->loadModel('task');
 
-        $tasks = $this->dao->select('id,project,assignedTo,story,consumed,status')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
+        $tasks = $this->dao->select('id,execution,assignedTo,story,consumed,status')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
         foreach($tasks as $task)
         {
-            /* Save the assignedToes and stories, should linked to project. */
-            $assignedToes[$task->assignedTo] = $task->project;
+            /* Save the assignedToes and stories, should linked to execution. */
+            $assignedToes[$task->assignedTo] = $task->execution;
             $stories[$task->story]           = $task->story;
 
             $data = new stdclass();
-            $data->project = $projectID;
+            $data->execution = $executionID;
             $data->status  = $task->consumed > 0 ? 'doing' : 'wait';
 
             if($task->status == 'cancel')
@@ -1897,62 +1883,62 @@ class executionModel extends model
             unset($data->status);
             $this->dao->update(TABLE_TASK)->data($data)->where('parent')->eq($task->id)->exec();
 
-            $this->loadModel('action')->create('task', $task->id, 'moved', '', $task->project);
+            $this->loadModel('action')->create('task', $task->id, 'moved', '', $task->execution);
         }
 
         /* Remove empty story. */
         unset($stories[0]);
 
-        /* Add members to project team. */
-        $teamMembers = $this->getTeamMemberPairs($projectID);
-        foreach($assignedToes as $account => $preProjectID)
+        /* Add members to execution team. */
+        $teamMembers = $this->getTeamMemberPairs($executionID);
+        foreach($assignedToes as $account => $preExecutionID)
         {
             if(!isset($teamMembers[$account]))
             {
                 $role = $this->dao->select('*')->from(TABLE_TEAM)
-                    ->where('root')->eq($preProjectID)
-                    ->andWhere('type')->eq('project')
+                    ->where('root')->eq($preExecutionID)
+                    ->andWhere('type')->eq('execution')
                     ->andWhere('account')->eq($account)
                     ->fetch();
 
-                $role->root = $projectID;
+                $role->root = $executionID;
                 $role->join = helper::today();
                 $this->dao->replace(TABLE_TEAM)->data($role)->exec();
             }
         }
 
         /* Link stories. */
-        $projectStories = $this->loadModel('story')->getProjectStoryPairs($projectID);
-        $lastOrder      = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->limit(1)->fetch('order');
+        $executionStories = $this->loadModel('story')->getExecutionStoryPairs($executionID);
+        $lastOrder      = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order_desc')->limit(1)->fetch('order');
         foreach($stories as $storyID)
         {
-            if(!isset($projectStories[$storyID]))
+            if(!isset($executionStories[$storyID]))
             {
-                $story = $this->dao->findById($storyID)->fields("$projectID as project, id as story, product, version")->from(TABLE_STORY)->fetch();
+                $story = $this->dao->findById($storyID)->fields("$executionID as execution, id as story, product, version")->from(TABLE_STORY)->fetch();
                 $story->order = ++$lastOrder;
                 $this->dao->insert(TABLE_PROJECTSTORY)->data($story)->exec();
-                $this->action->create('story', $storyID, 'linked2project', '', $projectID);
+                $this->action->create('story', $storyID, 'linked2execution', '', $executionID);
             }
         }
     }
 
     /**
-     * Stat story, task, bug data for project.
+     * Stat story, task, bug data for execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function statRelatedData($projectID)
+    public function statRelatedData($executionID)
     {
         $storyCount = $this->dao->select('count(t2.story) as storyCount')->from(TABLE_STORY)->alias('t1')
             ->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id = t2.story')
-            ->where('t2.project')->eq($projectID)
+            ->where('t2.execution')->eq($executionID)
             ->andWhere('t1.deleted')->eq(0)
             ->fetch('storyCount');
 
-        $taskCount = $this->dao->select('count(id) as taskCount')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('taskCount');
-        $bugCount  = $this->dao->select('count(id) as bugCount')->from(TABLE_BUG)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('bugCount');
+        $taskCount = $this->dao->select('count(id) as taskCount')->from(TABLE_TASK)->where('execution')->eq($executionID)->andWhere('deleted')->eq(0)->fetch('taskCount');
+        $bugCount  = $this->dao->select('count(id) as bugCount')->from(TABLE_BUG)->where('execution')->eq($executionID)->andWhere('deleted')->eq(0)->fetch('bugCount');
 
         $statData = new stdclass();
         $statData->storyCount = $storyCount;
@@ -1965,11 +1951,11 @@ class executionModel extends model
     /**
      * Import task from Bug.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function importBug($projectID)
+    public function importBug($executionID)
     {
         $this->loadModel('bug');
         $this->loadModel('task');
@@ -1977,12 +1963,12 @@ class executionModel extends model
 
         $now = helper::now();
 
-        $showAllModule = isset($this->config->project->task->allModule) ? $this->config->project->task->allModule : '';
-        $modules       = $this->loadModel('tree')->getTaskOptionMenu($projectID, 0, 0, $showAllModule ? 'allModule' : '');
+        $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
+        $modules       = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
 
-        $project        = $this->getByID($projectID);
+        $execution        = $this->getByID($executionID);
         $requiredFields = ',' . $this->config->task->create->requiredFields . ',';
-        if($project->type == 'ops') $requiredFields = str_replace(',story,', ',', $requiredFields);
+        if($execution->type == 'ops') $requiredFields = str_replace(',story,', ',', $requiredFields);
         $requiredFields = trim($requiredFields, ',');
 
         $bugToTasks = fixer::input('post')->get();
@@ -1994,8 +1980,8 @@ class executionModel extends model
 
             $task = new stdClass();
             $task->bug          = $bug;
-            $task->PRJ          = $this->session->PRJ;
-            $task->project      = $projectID;
+            $task->PRJ          = $this->session->project;
+            $task->execution      = $executionID;
             $task->story        = $bug->story;
             $task->storyVersion = $bug->storyVersion;
             $task->module       = isset($modules[$bug->module]) ? $bug->module : 0;
@@ -2111,19 +2097,19 @@ class executionModel extends model
     /**
      * Update childs.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function updateChilds($projectID)
+    public function updateChilds($executionID)
     {
-        $sql = "UPDATE " . TABLE_PROJECT . " SET parent = 0 WHERE parent = '$projectID'";
+        $sql = "UPDATE " . TABLE_PROJECT . " SET parent = 0 WHERE parent = '$executionID'";
         $this->dbh->exec($sql);
         if(!isset($_POST['childs'])) return;
         $childs = array_unique($_POST['childs']);
-        foreach($childs as $childProjectID)
+        foreach($childs as $childExecutionID)
         {
-            $sql = "UPDATE " . TABLE_PROJECT . " SET parent = '$projectID' WHERE id = '$childProjectID'";
+            $sql = "UPDATE " . TABLE_PROJECT . " SET parent = '$executionID' WHERE id = '$childExecutionID'";
             $this->dbh->query($sql);
         }
     }
@@ -2131,14 +2117,14 @@ class executionModel extends model
     /**
      * Link story.
      *
-     * @param int   $projectID
+     * @param int   $executionID
      * @param array $stories
      * @param array $products
      *
      * @access public
      * @return bool
      */
-    public function linkStory($projectID, $stories = array(), $products = array())
+    public function linkStory($executionID, $stories = array(), $products = array())
     {
         if(empty($stories)) $stories = $this->post->stories;
         if(empty($stories)) return false;
@@ -2146,7 +2132,7 @@ class executionModel extends model
 
         $this->loadModel('action');
         $versions      = $this->loadModel('story')->getVersions($stories);
-        $linkedStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order_desc')->fetchPairs('story', 'order');
+        $linkedStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order_desc')->fetchPairs('story', 'order');
         $lastOrder     = reset($linkedStories);
         $statusPairs   = $this->dao->select('id, status')->from(TABLE_STORY)->where('id')->in(array_values($stories))->fetchPairs();
         foreach($stories as $key => $storyID)
@@ -2155,29 +2141,29 @@ class executionModel extends model
             if(isset($linkedStories[$storyID])) continue;
 
             $data = new stdclass();
-            $data->project = $projectID;
+            $data->execution = $executionID;
             $data->product = (int)$products[$storyID];
             $data->story   = $storyID;
             $data->version = $versions[$storyID];
             $data->order   = ++$lastOrder;
             $this->dao->insert(TABLE_PROJECTSTORY)->data($data)->exec();
             $this->story->setStage($storyID);
-            $action = $projectID == $this->session->PRJ ? 'linked2prj' : 'linked2project';
-            $this->action->create('story', $storyID, $action, '', $projectID);
+            $action = $executionID == $this->session->project ? 'linked2prj' : 'linked2execution';
+            $this->action->create('story', $storyID, $action, '', $executionID);
         }
     }
 
     /**
-     * Link all stories by project.
+     * Link all stories by execution.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function linkStories($projectID)
+    public function linkStories($executionID)
     {
         $plans = $this->dao->select('plan,product')->from(TABLE_PROJECTPRODUCT)
-            ->where('project')->eq($projectID)
+            ->where('execution')->eq($executionID)
             ->fetchPairs('plan', 'product');
 
         $planStories  = array();
@@ -2205,42 +2191,42 @@ class executionModel extends model
                 }
             }
         }
-        $this->linkStory($projectID, $planStories, $planProducts);
-        $this->linkStory($this->session->PRJ, $planStories, $planProducts);
-        if($count != 0) echo js::alert(sprintf($this->lang->project->haveDraft, $count)) . js::locate(helper::createLink('project', 'create', "productID=&projectID=$projectID"));
+        $this->linkStory($executionID, $planStories, $planProducts);
+        $this->linkStory($this->session->project, $planStories, $planProducts);
+        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate(helper::createLink('execution', 'create', "productID=&executionID=$executionID"));
     }
 
     /**
      * Unlink story.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  int    $storyID
      * @access public
      * @return void
      */
-    public function unlinkStory($projectID, $storyID)
+    public function unlinkStory($executionID, $storyID)
     {
-        $project = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
-        if($project->type == 'project')
+        $execution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
+        if($execution->type == 'execution')
         {
-            $executions       = $this->dao->select('*')->from(TABLE_PROJECT)->where('parent')->eq($projectID)->fetchAll('id');
-            $executionStories = $this->dao->select('project,story')->from(TABLE_PROJECTSTORY)->where('story')->eq($storyID)->andWhere('project')->in(array_keys($executions))->fetchAll();
-            if(!empty($executionStories)) die(js::alert($this->lang->project->notAllowedUnlinkStory));
+            $executions       = $this->dao->select('*')->from(TABLE_EXECUTION)->where('parent')->eq($executionID)->fetchAll('id');
+            $executionStories = $this->dao->select('execution,story')->from(TABLE_PROJECTSTORY)->where('story')->eq($storyID)->andWhere('execution')->in(array_keys($executions))->fetchAll();
+            if(!empty($executionStories)) die(js::alert($this->lang->execution->notAllowedUnlinkStory));
         }
-        $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->andWhere('story')->eq($storyID)->limit(1)->exec();
+        $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->andWhere('story')->eq($storyID)->limit(1)->exec();
 
         $order   = 1;
-        $stories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($projectID)->orderBy('order')->fetchAll();
-        foreach($stories as $projectstory)
+        $stories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order')->fetchAll();
+        foreach($stories as $executionstory)
         {
-            if($projectstory->order != $order) $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('project')->eq($projectID)->andWhere('story')->eq($projectstory->story)->exec();
+            if($executionstory->order != $order) $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('execution')->eq($executionID)->andWhere('story')->eq($executionstory->story)->exec();
             $order++;
         }
 
         $this->loadModel('story')->setStage($storyID);
-        $this->loadModel('action')->create('story', $storyID, 'unlinkedfromproject', '', $projectID);
+        $this->loadModel('action')->create('story', $storyID, 'unlinkedfromexecution', '', $executionID);
 
-        $tasks = $this->dao->select('id')->from(TABLE_TASK)->where('story')->eq($storyID)->andWhere('project')->eq($projectID)->andWhere('status')->in('wait,doing')->fetchPairs('id');
+        $tasks = $this->dao->select('id')->from(TABLE_TASK)->where('story')->eq($storyID)->andWhere('execution')->eq($executionID)->andWhere('status')->in('wait,doing')->fetchPairs('id');
         foreach($tasks as $taskID)
         {
             if(empty($taskID)) continue;
@@ -2253,21 +2239,21 @@ class executionModel extends model
     /**
      * Get team members.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array
      */
-    public function getTeamMembers($projectID)
+    public function getTeamMembers($executionID)
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembers();
 
-        $project = $this->getByID($projectID);
-        $type    = $this->config->systemMode == 'new' ? $project->type : 'project';
-        if(empty($project)) return array();
+        $execution = $this->getByID($executionID);
+        $type    = $this->config->systemMode == 'new' ? $execution->type : 'execution';
+        if(empty($execution)) return array();
 
         return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, t2.id as userID, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
-            ->where('t1.root')->eq((int)$projectID)
+            ->where('t1.root')->eq((int)$executionID)
             ->andWhere('t1.type')->eq($type)
             ->andWhere('t2.deleted')->eq('0')
             ->fetchAll('account');
@@ -2276,25 +2262,25 @@ class executionModel extends model
     /**
      * Get team members in pair.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $params
      * @param  string $usersToAppended
      * @access public
      * @return array
      */
-    public function getTeamMemberPairs($projectID, $params = '', $usersToAppended = '')
+    public function getTeamMemberPairs($executionID, $params = '', $usersToAppended = '')
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
         $this->app->loadConfig('user');
 
-        $project = $this->getByID($projectID);
-        if(empty($project)) return array();
+        $execution = $this->getByID($executionID);
+        if(empty($execution)) return array();
 
         $keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
         $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
-            ->where('t1.root')->eq((int)$projectID)
-            ->andWhere('t1.type')->eq($project->type)
+            ->where('t1.root')->eq((int)$executionID)
+            ->andWhere('t1.type')->eq($execution->type)
             ->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted))
             ->andWhere('t2.deleted')->eq(0)
             ->fi()
@@ -2340,19 +2326,19 @@ class executionModel extends model
      * Get teams which can be imported.
      *
      * @param  string $account
-     * @param  int    $currentProject
+     * @param  int    $currentExecution
      * @access public
      * @return array
      */
-    public function getTeams2Import($account, $currentProject)
+    public function getTeams2Import($account, $currentExecution)
     {
-        $project = $this->dao->findById($currentProject)->from(TABLE_PROJECT)->fetch();
-        return $this->dao->select('t1.root, t2.name as projectName')
+        $execution = $this->dao->findById($currentExecution)->from(TABLE_EXECUTION)->fetch();
+        return $this->dao->select('t1.root, t2.name as executionName')
             ->from(TABLE_TEAM)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root = t2.id')
             ->where('t1.account')->eq($account)
-            ->andWhere('t1.root')->ne($currentProject)
-            ->andWhere('t1.type')->eq($project->type)
+            ->andWhere('t1.root')->ne($currentExecution)
+            ->andWhere('t1.type')->eq($execution->type)
             ->andWhere('t2.deleted')->eq('0')
             ->groupBy('t1.root')
             ->orderBy('t1.root DESC')
@@ -2360,21 +2346,21 @@ class executionModel extends model
     }
 
     /**
-     * Get members of a project who can be imported.
+     * Get members of a execution who can be imported.
      *
-     * @param  int    $project
+     * @param  int    $execution
      * @param  array  $currentMembers
      * @access public
      * @return array
      */
-    public function getMembers2Import($project, $currentMembers)
+    public function getMembers2Import($execution, $currentMembers)
     {
-        if($project == 0) return array();
+        if($execution == 0) return array();
 
         return $this->dao->select('account, role, hours')
             ->from(TABLE_TEAM)
-            ->where('root')->eq($project)
-            ->andWhere('type')->eq('project')
+            ->where('root')->eq($execution)
+            ->andWhere('type')->eq('execution')
             ->andWhere('account')->notIN($currentMembers)
             ->fetchAll('account');
     }
@@ -2382,23 +2368,23 @@ class executionModel extends model
     /**
      * Manage team members.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function manageMembers($projectID)
+    public function manageMembers($executionID)
     {
-        $project = $this->getByID($projectID);
+        $execution = $this->getByID($executionID);
         $data    = (array)fixer::input('post')->get();
 
         extract($data);
-        $projectType = $project->type;
+        $executionType = $execution->type;
         $accounts    = array_unique($accounts);
         $limited     = array_values($limited);
-        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq($projectType)->fetchPairs();
-        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq($projectType)->exec();
+        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->fetchPairs();
+        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$executionID)->andWhere('type')->eq($executionType)->exec();
 
-        $projectMember = array();
+        $executionMember = array();
         foreach($accounts as $key => $account)
         {
             if(empty($account)) continue;
@@ -2409,12 +2395,12 @@ class executionModel extends model
             $member->hours   = $hours[$key];
             $member->limited = $limited[$key];
 
-            $member->root    = (int)$projectID;
+            $member->root    = (int)$executionID;
             $member->account = $account;
             $member->join    = isset($oldJoin[$account]) ? $oldJoin[$account] : helper::today();
-            $member->type    = $projectType;
+            $member->type    = $executionType;
 
-            $projectMember[$account] = $member;
+            $executionMember[$account] = $member;
             $this->dao->insert(TABLE_TEAM)->data($member)->exec();
         }
 
@@ -2424,21 +2410,21 @@ class executionModel extends model
         $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
         $changedAccounts = array_unique($changedAccounts);
 
-        if($projectType == 'project')
+        if($executionType == 'execution')
         {
-            $childSprints   = $this->dao->select('id')->from(TABLE_PROJECT)->where('project')->eq($project->id)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
-            $linkedProducts = $this->loadModel('product')->getProductPairsByProject($project->id);
+            $childSprints   = $this->dao->select('id')->from(TABLE_EXECUTION)->where('execution')->eq($execution->id)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
+            $linkedProducts = $this->loadModel('product')->getProductPairsByExecution($execution->id);
 
-            $this->loadModel('user')->updateUserView(array($projectID), 'project', $changedAccounts);
+            $this->loadModel('user')->updateUserView(array($executionID), 'execution', $changedAccounts);
             if(!empty($childSprints))   $this->user->updateUserView($childSprints, 'sprint', $changedAccounts);
             if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
         }
 
-        /* Add iteration or phase team members to the project team. */
-        if($projectType == 'stage' || $projectType == 'sprint')
+        /* Add iteration or phase team members to the execution team. */
+        if($executionType == 'stage' || $executionType == 'sprint')
         {
-            $this->addProjectMembers($project->project, $projectMember);
-            if($project->acl != 'open') $this->updateUserView($projectID, 'sprint', $changedAccounts);
+            $this->addExecutionMembers($execution->execution, $executionMember);
+            if($execution->acl != 'open') $this->updateUserView($executionID, 'sprint', $changedAccounts);
         }
     }
 
@@ -2450,10 +2436,10 @@ class executionModel extends model
      * @access public
      * @return void
      */
-    public function addProjectMembers($projectID = 0, $members = array())
+    public function addExecutionMembers($executionID = 0, $members = array())
     {
-        $projectType = 'project';
-        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
+        $executionType = 'execution';
+        $oldJoin     = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq($executionType)->fetchPairs();
 
         $accounts = array();
         foreach($members as $account => $member)
@@ -2461,8 +2447,8 @@ class executionModel extends model
             if(isset($oldJoin[$member->account])) continue;
 
             $accounts[]   = $member->account;
-            $member->root = $projectID;
-            $member->type = $projectType;
+            $member->root = $executionID;
+            $member->type = $executionType;
             $this->dao->insert(TABLE_TEAM)->data($member)->exec();
         }
 
@@ -2472,8 +2458,8 @@ class executionModel extends model
         $changedAccounts = array_merge($changedAccounts, array_diff($oldAccounts, $accounts));
         $changedAccounts = array_unique($changedAccounts);
 
-        $this->loadModel('user')->updateUserView($projectID, $projectType, $changedAccounts);
-        $linkedProducts = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $this->loadModel('user')->updateUserView($executionID, $executionType, $changedAccounts);
+        $linkedProducts = $this->loadModel('product')->getProductPairsByExecution($executionID);
         if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', $changedAccounts);
     }
 
@@ -2491,27 +2477,27 @@ class executionModel extends model
         $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$sprintID)->andWhere('type')->eq($sprint->type)->andWhere('account')->eq($account)->exec();
         $this->updateUserView($sprintID, 'sprint', array($account));
 
-        /* Remove team members from the sprint or stage, and determine whether to remove team members from the project. */
+        /* Remove team members from the sprint or stage, and determine whether to remove team members from the execution. */
         if($sprint->type == 'stage' || $sprint->type == 'sprint')
         {
-            $teamMember = $this->dao->select('t1.id, t2.account')->from(TABLE_PROJECT)->alias('t1')
+            $teamMember = $this->dao->select('t1.id, t2.account')->from(TABLE_EXECUTION)->alias('t1')
                 ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id = t2.root')
-                ->where('t1.project')->eq($sprint->project)
+                ->where('t1.execution')->eq($sprint->execution)
                 ->andWhere('t1.type')->eq($sprint->type)
                 ->andWhere('t2.account')->eq($account)
                 ->fetch();
             if(empty($teamMember))
             {
-                $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($sprint->project)->andWhere('type')->eq('project')->andWhere('account')->eq($account)->exec();
-                $this->loadModel('user')->updateUserView($sprint->project, 'project', array($account));
-                $linkedProducts = $this->loadModel('product')->getProductPairsByProject($sprint->project);
+                $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($sprint->execution)->andWhere('type')->eq('execution')->andWhere('account')->eq($account)->exec();
+                $this->loadModel('user')->updateUserView($sprint->execution, 'execution', array($account));
+                $linkedProducts = $this->loadModel('product')->getProductPairsByExecution($sprint->execution);
                 if(!empty($linkedProducts)) $this->user->updateUserView(array_keys($linkedProducts), 'product', array($account));
             }
         }
     }
 
     /**
-     * Compute burn of a project.
+     * Compute burn of a execution.
      *
      * @access public
      * @return array
@@ -2521,64 +2507,64 @@ class executionModel extends model
         $today = helper::today();
         $burns = array();
 
-        $projects = $this->dao->select('id, code')->from(TABLE_PROJECT)
+        $executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
             ->where("end")->ge($today)
             ->andWhere('type')->ne('ops')
             ->andWhere('status')->notin('done,closed,suspended')
             ->fetchPairs();
-        if(!$projects) return $burns;
+        if(!$executions) return $burns;
 
-        $burns = $this->dao->select("project, '$today' AS date, sum(estimate) AS `estimate`, sum(`left`) AS `left`, SUM(consumed) AS `consumed`")
+        $burns = $this->dao->select("execution, '$today' AS date, sum(estimate) AS `estimate`, sum(`left`) AS `left`, SUM(consumed) AS `consumed`")
             ->from(TABLE_TASK)
-            ->where('project')->in(array_keys($projects))
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('deleted')->eq('0')
             ->andWhere('parent')->ge('0')
             ->andWhere('status')->ne('cancel')
-            ->groupBy('project')
-            ->fetchAll('project');
-        $closedLefts = $this->dao->select("project, sum(`left`) AS `left`")->from(TABLE_TASK)
-            ->where('project')->in(array_keys($projects))
+            ->groupBy('execution')
+            ->fetchAll('execution');
+        $closedLefts = $this->dao->select("execution, sum(`left`) AS `left`")->from(TABLE_TASK)
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('deleted')->eq('0')
             ->andWhere('parent')->ge('0')
             ->andWhere('status')->eq('closed')
-            ->groupBy('project')
-            ->fetchAll('project');
-        $finishedEstimates = $this->dao->select("project, sum(`estimate`) AS `estimate`")->from(TABLE_TASK)
-            ->where('project')->in(array_keys($projects))
+            ->groupBy('execution')
+            ->fetchAll('execution');
+        $finishedEstimates = $this->dao->select("execution, sum(`estimate`) AS `estimate`")->from(TABLE_TASK)
+            ->where('execution')->in(array_keys($executions))
             ->andWhere('deleted')->eq('0')
             ->andWhere('parent')->ge('0')
             ->andWhere('status')->eq('done')
             ->orWhere('status')->eq('closed')
-            ->groupBy('project')
-            ->fetchAll('project');
-        $storyPoints = $this->dao->select('t1.project, sum(t2.estimate) AS `storyPoint`')->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->groupBy('execution')
+            ->fetchAll('execution');
+        $storyPoints = $this->dao->select('t1.execution, sum(t2.estimate) AS `storyPoint`')->from(TABLE_PROJECTSTORY)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t2.product = t3.id')
-            ->where('t1.project')->in(array_keys($projects))
+            ->where('t1.execution')->in(array_keys($executions))
             ->andWhere('t2.deleted')->eq(0)
             ->andWhere('t2.status')->ne('closed')
-            ->andWhere('t2.stage')->in('wait,planned,projected,developing')
-            ->groupBy('project')
-            ->fetchAll('project');
+            ->andWhere('t2.stage')->in('wait,planned,executioned,developing')
+            ->groupBy('execution')
+            ->fetchAll('execution');
 
-        foreach($burns as $projectID => $burn)
+        foreach($burns as $executionID => $burn)
         {
-            if(isset($closedLefts[$projectID]))
+            if(isset($closedLefts[$executionID]))
             {
-                $closedLeft  = $closedLefts[$projectID];
+                $closedLeft  = $closedLefts[$executionID];
                 $burn->left -= (int)$closedLeft->left;
             }
 
-            if(isset($finishedEstimates[$projectID]))
+            if(isset($finishedEstimates[$executionID]))
             {
-                $finishedEstimate = $finishedEstimates[$projectID];
+                $finishedEstimate = $finishedEstimates[$executionID];
                 $burn->estimate  -= (int)$finishedEstimate->estimate;
             }
 
-            if(isset($storyPoints[$projectID])) $burn->storyPoint = $storyPoints[$projectID]->storyPoint;
+            if(isset($storyPoints[$executionID])) $burn->storyPoint = $storyPoints[$executionID]->storyPoint;
 
             $this->dao->replace(TABLE_BURN)->data($burn)->exec();
-            $burn->projectName = $projects[$burn->project];
+            $burn->executionName = $executions[$burn->execution];
         }
         return $burns;
     }
@@ -2586,19 +2572,19 @@ class executionModel extends model
     /**
      * Fix burn for first day.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return void
      */
-    public function fixFirst($projectID)
+    public function fixFirst($executionID)
     {
-        $project  = $this->getById($projectID);
-        $burn     = $this->dao->select('*')->from(TABLE_BURN)->where('project')->eq($projectID)->andWhere('task')->eq(0)->andWhere('date')->eq($project->begin)->fetch();
+        $execution  = $this->getById($executionID);
+        $burn     = $this->dao->select('*')->from(TABLE_BURN)->where('execution')->eq($executionID)->andWhere('task')->eq(0)->andWhere('date')->eq($execution->begin)->fetch();
         $withLeft = $this->post->withLeft ? $this->post->withLeft : 0;
 
         $data = fixer::input('post')
-            ->add('project', $projectID)
-            ->add('date', $project->begin)
+            ->add('execution', $executionID)
+            ->add('date', $execution->begin)
             ->add('left', $withLeft ? $this->post->estimate : $burn->left)
             ->add('consumed', empty($burn) ? 0 : $burn->consumed)
             ->remove('withLeft')
@@ -2611,25 +2597,25 @@ class executionModel extends model
     /**
      * Get burn data for flot
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $burnBy
      * @access public
      * @return array
      */
-    public function getBurnDataFlot($projectID = 0, $burnBy = '')
+    public function getBurnDataFlot($executionID = 0, $burnBy = '')
     {
-        /* Get project and burn counts. */
-        $project    = $this->getById($projectID);
+        /* Get execution and burn counts. */
+        $execution    = $this->getById($executionID);
 
         /* If the burnCounts > $itemCounts, get the latest $itemCounts records. */
-        $sets = $this->dao->select("date AS name, `$burnBy` AS value, `$burnBy`")->from(TABLE_BURN)->where('project')->eq((int)$projectID)->andWhere('task')->eq(0)->orderBy('date DESC')->fetchAll('name');
+        $sets = $this->dao->select("date AS name, `$burnBy` AS value, `$burnBy`")->from(TABLE_BURN)->where('execution')->eq((int)$executionID)->andWhere('task')->eq(0)->orderBy('date DESC')->fetchAll('name');
 
         $count    = 0;
         $burnData = array();
         foreach($sets as $date => $set)
         {
-            if($date < $project->begin) continue;
-            if($date > $project->end) continue;
+            if($date < $execution->begin) continue;
+            if($date > $execution->end) continue;
 
             $burnData[$date] = $set;
             $count++;
@@ -2765,17 +2751,17 @@ class executionModel extends model
     }
 
     /**
-     * Get bugs by search in project.
+     * Get bugs by search in execution.
      *
      * @param  array     $products
-     * @param  int       $projectID
+     * @param  int       $executionID
      * @param  string    $sql
      * @param  object    $pager
      * @param  string    $orderBy
      * @access public
      * @return mixed
      */
-    public function getSearchBugs($products, $projectID, $sql, $pager, $orderBy)
+    public function getSearchBugs($products, $executionID, $sql, $pager, $orderBy)
     {
         return $this->dao->select('*')->from(TABLE_BUG)
             ->where($sql)
@@ -2783,7 +2769,7 @@ class executionModel extends model
             ->andWhere('toTask')->eq(0)
             ->andWhere('tostory')->eq(0)
             ->beginIF(!empty($products))->andWhere('product')->in(array_keys($products))->fi()
-            ->beginIF(empty($products))->andWhere('project')->eq($projectID)->fi()
+            ->beginIF(empty($products))->andWhere('execution')->eq($executionID)->fi()
             ->andWhere('deleted')->eq(0)
             ->orderBy($orderBy)
             ->page($pager)
@@ -2791,7 +2777,7 @@ class executionModel extends model
     }
 
     /**
-     * Get the summary of project.
+     * Get the summary of execution.
      *
      * @param  array    $tasks
      * @access public
@@ -2826,26 +2812,26 @@ class executionModel extends model
             $taskSum ++;
         }
 
-        return sprintf($this->lang->project->taskSummary, $taskSum, $statusWait, $statusDoing, round($totalEstimate, 1), round($totalConsumed, 1), round($totalLeft, 1));
+        return sprintf($this->lang->execution->taskSummary, $taskSum, $statusWait, $statusDoing, round($totalEstimate, 1), round($totalConsumed, 1), round($totalLeft, 1));
     }
 
     /**
      * Judge an action is clickable or not.
      *
-     * @param  object    $project
+     * @param  object    $execution
      * @param  string    $action
      * @access public
      * @return bool
      */
-    public static function isClickable($project, $action)
+    public static function isClickable($execution, $action)
     {
         $action = strtolower($action);
 
-        if($action == 'start')    return $project->status == 'wait';
-        if($action == 'close')    return $project->status != 'closed';
-        if($action == 'suspend')  return $project->status == 'wait' or $project->status == 'doing';
-        if($action == 'putoff')   return $project->status == 'wait' or $project->status == 'doing';
-        if($action == 'activate') return $project->status == 'suspended' or $project->status == 'closed';
+        if($action == 'start')    return $execution->status == 'wait';
+        if($action == 'close')    return $execution->status != 'closed';
+        if($action == 'suspend')  return $execution->status == 'wait' or $execution->status == 'doing';
+        if($action == 'putoff')   return $execution->status == 'wait' or $execution->status == 'doing';
+        if($action == 'activate') return $execution->status == 'suspended' or $execution->status == 'closed';
 
         return true;
     }
@@ -2864,10 +2850,10 @@ class executionModel extends model
     public function getDateList($begin, $end, $type, $interval = '', $format = 'm/d/Y')
     {
         $this->app->loadClass('date', true);
-        $dateList = date::getDateList($begin, $end, $format, $type, $this->config->project->weekend);
+        $dateList = date::getDateList($begin, $end, $format, $type, $this->config->execution->weekend);
         $days     = count($dateList);
 
-        if(!$interval) $interval = floor(count($dateList) / $this->config->project->maxBurnDay);
+        if(!$interval) $interval = floor(count($dateList) / $this->config->execution->maxBurnDay);
 
         /* Remove date by interval. */
         if($interval)
@@ -2893,13 +2879,13 @@ class executionModel extends model
     /**
      * Get total estimate.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return float
      */
-    public function getTotalEstimate($projectID)
+    public function getTotalEstimate($executionID)
     {
-        $estimate = $this->dao->select('SUM(estimate) as estimate')->from(TABLE_TASK)->where('deleted')->eq('0')->andWhere('project')->eq($projectID)->fetch('estimate');
+        $estimate = $this->dao->select('SUM(estimate) as estimate')->from(TABLE_TASK)->where('deleted')->eq('0')->andWhere('execution')->eq($executionID)->fetch('estimate');
         return round($estimate);
     }
 
@@ -2911,15 +2897,15 @@ class executionModel extends model
      */
     public function fixOrder()
     {
-        $projects = $this->dao->select('id,`order`')->from(TABLE_PROJECT)->orderBy('order')->fetchPairs('id', 'order');
+        $executions = $this->dao->select('id,`order`')->from(TABLE_EXECUTION)->orderBy('order')->fetchPairs('id', 'order');
 
         $i = 0;
-        foreach($projects as $id => $order)
+        foreach($executions as $id => $order)
         {
             $i++;
             $newOrder = $i * 5;
             if($order == $newOrder) continue;
-            $this->dao->update(TABLE_PROJECT)->set('`order`')->eq($newOrder)->where('id')->eq($id)->exec();
+            $this->dao->update(TABLE_EXECUTION)->set('`order`')->eq($newOrder)->where('id')->eq($id)->exec();
         }
     }
 
@@ -2977,11 +2963,11 @@ class executionModel extends model
             }
         }
 
-        $this->config->bug->search['module']    = 'projectBug';
+        $this->config->bug->search['module']    = 'executionBug';
         $this->config->bug->search['actionURL'] = $actionURL;
         $this->config->bug->search['queryID']   = $queryID;
-        unset($this->config->bug->search['fields']['project']);
-        $this->config->bug->search['params']['product']['values']       = $productPairs + array('all' => $this->lang->product->allProductsOfProject);
+        unset($this->config->bug->search['fields']['execution']);
+        $this->config->bug->search['params']['product']['values']       = $productPairs + array('all' => $this->lang->product->allProductsOfExecution);
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts($products);
         $this->config->bug->search['params']['module']['values']        = $modules;
         $this->config->bug->search['params']['openedBuild']['values']   = $builds;
@@ -3004,42 +2990,42 @@ class executionModel extends model
     /**
      * Build task search form.
      *
-     * @param  int    $projectID
-     * @param  array  $projects
+     * @param  int    $executionID
+     * @param  array  $executions
      * @param  int    $queryID
      * @param  string $actionURL
      * @access public
      * @return void
      */
-    public function buildTaskSearchForm($projectID, $projects, $queryID, $actionURL)
+    public function buildTaskSearchForm($executionID, $executions, $queryID, $actionURL)
     {
-        $this->config->project->search['actionURL'] = $actionURL;
-        $this->config->project->search['queryID']   = $queryID;
-        $this->config->project->search['params']['project']['values'] = array(''=>'', $projectID => $projects[$projectID], 'all' => $this->lang->project->allProject);
+        $this->config->execution->search['actionURL'] = $actionURL;
+        $this->config->execution->search['queryID']   = $queryID;
+        $this->config->execution->search['params']['execution']['values'] = array(''=>'', $executionID => $executions[$executionID], 'all' => $this->lang->execution->allExecution);
 
-        $showAllModule = isset($this->config->project->task->allModule) ? $this->config->project->task->allModule : '';
-        $this->config->project->search['params']['module']['values']  = $this->loadModel('tree')->getTaskOptionMenu($projectID, 0, 0, $showAllModule ? 'allModule' : '');
+        $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
+        $this->config->execution->search['params']['module']['values']  = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
 
-        $this->loadModel('search')->setSearchParams($this->config->project->search);
+        $this->loadModel('search')->setSearchParams($this->config->execution->search);
     }
 
     /**
-     * Build project build search form.
+     * Build execution build search form.
      *
      * @param  array  $products
      * @param  int    $queryID
      * @param  string $actionURL
-     * @param  string $type execution|project
+     * @param  string $type execution|execution
      * @access public
      * @return void
      */
-    public function buildProjectBuildSearchForm($products, $queryID, $actionURL, $type = 'execution')
+    public function buildExecutionBuildSearchForm($products, $queryID, $actionURL, $type = 'execution')
     {
         $this->loadModel('build');
 
         /* Set search param. */
         if($type == 'execution') $this->config->build->search['module'] = 'executionBuild';
-        if($type == 'project')   $this->config->build->search['module'] = 'projectBuild';
+        if($type == 'execution')   $this->config->build->search['module'] = 'executionBuild';
         $this->config->build->search['actionURL'] = $actionURL;
         $this->config->build->search['queryID']   = $queryID;
         $this->config->build->search['params']['product']['values'] = $products;
@@ -3050,19 +3036,19 @@ class executionModel extends model
     /**
      * Get Kanban tasks
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  string $orderBy
      * @param  object $pager
      * @access public
      * @return void
      */
-    public function getKanbanTasks($projectID, $orderBy = 'status_asc, id_desc', $pager = null)
+    public function getKanbanTasks($executionID, $orderBy = 'status_asc, id_desc', $pager = null)
     {
         $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')
             ->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
             ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account')
-            ->where('t1.project')->eq((int)$projectID)
+            ->where('t1.execution')->eq((int)$executionID)
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t1.parent')->ge(0)
             ->orderBy($orderBy)
@@ -3149,29 +3135,29 @@ class executionModel extends model
     /**
      * Save Kanban Data.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  array  $kanbanDatas
      * @access public
      * @return void
      */
-    public function saveKanbanData($projectID, $kanbanDatas)
+    public function saveKanbanData($executionID, $kanbanDatas)
     {
         $data = array();
         foreach($kanbanDatas as $type => $kanbanData) $data[$type] = array_keys($kanbanData);
-        $this->loadModel('setting')->setItem("null.project.kanban.project$projectID", json_encode($data));
+        $this->loadModel('setting')->setItem("null.execution.kanban.execution$executionID", json_encode($data));
 
     }
 
     /**
      * Get Prev Kanban.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return array
      */
-    public function getPrevKanban($projectID)
+    public function getPrevKanban($executionID)
     {
-        $prevKanbans = $this->loadModel('setting')->getItem("owner=null&module=project&section=kanban&key=project$projectID");
+        $prevKanbans = $this->loadModel('setting')->getItem("owner=null&module=execution&section=kanban&key=execution$executionID");
         return json_decode($prevKanbans, true);
     }
 
@@ -3185,9 +3171,9 @@ class executionModel extends model
     {
         $allCols    = '1';
         $showOption = '0';
-        if(isset($this->config->project->kanbanSetting->allCols)) $allCols = $this->config->project->kanbanSetting->allCols;
+        if(isset($this->config->execution->kanbanSetting->allCols)) $allCols = $this->config->execution->kanbanSetting->allCols;
 
-        $colorList = $this->config->project->kanbanSetting->colorList;
+        $colorList = $this->config->execution->kanbanSetting->colorList;
         if(!is_array($colorList)) $colorList = json_decode($colorList, true);
 
         $kanbanSetting = new stdclass();
@@ -3308,19 +3294,19 @@ class executionModel extends model
     /**
      * Build burn data.
      *
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @param  array  $dateList
      * @param  string $type
      * @param  string $burnBy
      * @access public
      * @return array
      */
-    public function buildBurnData($projectID, $dateList, $type, $burnBy = 'left')
+    public function buildBurnData($executionID, $dateList, $type, $burnBy = 'left')
     {
         $this->loadModel('report');
         $burnBy = $burnBy ? $burnBy : 'left';
 
-        $sets          = $this->getBurnDataFlot($projectID, $burnBy);
+        $sets          = $this->getBurnDataFlot($executionID, $burnBy);
         $limitJSON     = '[]';
         $baselineJSON  = '[]';
 
@@ -3342,11 +3328,11 @@ class executionModel extends model
     /**
      * Fill tasks in tree.
      * @param  object $tree
-     * @param  int    $projectID
+     * @param  int    $executionID
      * @access public
      * @return object
      */
-    public function fillTasksInTree($node, $projectID)
+    public function fillTasksInTree($node, $executionID)
     {
         $node = (object)$node;
         static $storyGroups, $taskGroups;
@@ -3354,7 +3340,7 @@ class executionModel extends model
         {
             $stories = $this->dao->select('t2.*, t1.version as taskVersion')->from(TABLE_PROJECTSTORY)->alias('t1')
                 ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
-                ->where('t1.project')->eq((int)$projectID)
+                ->where('t1.execution')->eq((int)$executionID)
                 ->andWhere('t2.deleted')->eq(0)
                 ->orderBy('t1.`order`_desc')
                 ->fetchAll();
@@ -3364,13 +3350,13 @@ class executionModel extends model
         if(empty($taskGroups))
         {
             $tasks = $this->dao->select('*')->from(TABLE_TASK)
-                ->where('project')->eq((int)$projectID)
+                ->where('execution')->eq((int)$executionID)
                 ->andWhere('deleted')->eq(0)
                 ->andWhere('parent')->lt(1)
                 ->orderBy('id_desc')
                 ->fetchAll();
             $childTasks = $this->dao->select('*')->from(TABLE_TASK)
-                ->where('project')->eq((int)$projectID)
+                ->where('execution')->eq((int)$executionID)
                 ->andWhere('deleted')->eq(0)
                 ->andWhere('parent')->ne(0)
                 ->orderBy('id_desc')
@@ -3390,7 +3376,7 @@ class executionModel extends model
         {
             foreach($node->children as $i => $child)
             {
-                $subNode = $this->fillTasksInTree($child, $projectID);
+                $subNode = $this->fillTasksInTree($child, $executionID);
                 /* Remove no children node. */
                 if($subNode->type != 'story' and $subNode->type != 'task' and empty($subNode->children))
                 {
@@ -3422,8 +3408,8 @@ class executionModel extends model
                 $storyItem->storyId       = $story->id;
                 $storyItem->openedBy      = $users[$story->openedBy];
                 $storyItem->assignedTo    = zget($users, $story->assignedTo);
-                $storyItem->url           = helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=project&param=$projectID");
-                $storyItem->taskCreateUrl = helper::createLink('task', 'batchCreate', "projectID={$projectID}&story={$story->id}");
+                $storyItem->url           = helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$executionID");
+                $storyItem->taskCreateUrl = helper::createLink('task', 'batchCreate', "executionID={$executionID}&story={$story->id}");
 
                 $storyTasks = isset($taskGroups[$node->id][$story->id]) ? $taskGroups[$node->id][$story->id] : array();
                 if(!empty($storyTasks))
@@ -3512,7 +3498,7 @@ class executionModel extends model
             $taskItem->storyChanged = $story and $story->status == 'active' and $story->version > $story->taskVersion;
 
             $buttons  = '';
-            $buttons .= common::buildIconButton('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+            $buttons .= common::buildIconButton('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
             $buttons .= common::buildIconButton('task', 'start',    "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
             $buttons .= common::buildIconButton('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
             if(isset($task->children)) $taskItem->children = $this->formatTasksForTree($task->children);
@@ -3573,7 +3559,7 @@ class executionModel extends model
                     $html .= "<a class='tree-toggle'><span class='title' title='{$tree->name}'>" . $tree->name . '</span></a>';
                     break;
                 case 'task':
-                    $link = helper::createLink('project', 'treeTask', "taskID={$tree->id}");
+                    $link = helper::createLink('execution', 'treeTask', "taskID={$tree->id}");
                     $html .= '<li class="item-task">';
                     $html .= '<a class="tree-link" href="' . $link . '"><span class="label label-type">' . ($tree->parent > 0 ? $this->lang->task->children : $this->lang->task->common) . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span><span class="label label-id">' . $tree->id . '</span></a>';
                     break;
@@ -3584,7 +3570,7 @@ class executionModel extends model
                     break;
                 case 'story':
                     $this->app->loadLang('story');
-                    $link = helper::createLink('project', 'treeStory', "storyID={$tree->storyId}");
+                    $link = helper::createLink('execution', 'treeStory', "storyID={$tree->storyId}");
                     $html .= '<li class="item-story">';
                     $html .= '<a class="tree-link" href="' . $link . '"><span class="label label-type">' . $this->lang->story->common . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span><span class="label label-id">' . $tree->storyId . '</span></a>';
                     break;
@@ -3606,18 +3592,18 @@ class executionModel extends model
     }
 
     /**
-     * Update user view of project and it's product.
+     * Update user view of execution and it's product.
      *
-     * @param  int|array $projectID
+     * @param  int|array $executionID
      * @param  string    $objectType
      * @param  array     $users
      * @access public
      * @return void
      */
-    public function updateUserView($projectID, $objectType = 'sprint', $users = array())
+    public function updateUserView($executionID, $objectType = 'sprint', $users = array())
     {
-        $this->loadModel('user')->updateUserView($projectID, $objectType, $users);
-        $products = $this->getProducts($projectID, $withBranch = false);
+        $this->loadModel('user')->updateUserView($executionID, $objectType, $users);
+        $products = $this->getProducts($executionID, $withBranch = false);
         if(!empty($products)) $this->user->updateUserView(array_keys($products), 'product', $users);
     }
 
@@ -3629,37 +3615,37 @@ class executionModel extends model
      */
     public function getRecentExecutions()
     {
-        $isView = (empty($this->app->user->view->sprints) || empty($this->app->user->view->projects)) ? false : true;
+        $isView = (empty($this->app->user->view->sprints) || empty($this->app->user->view->executions)) ? false : true;
         if(!$this->app->user->admin && $isView === false) return array();
 
-        $executions = $this->dao->select('t1.id,t1.project,t1.code,t1.name,t1.type')->from(TABLE_PROJECT)->alias('t1')
+        $executions = $this->dao->select('t1.id,t1.execution,t1.code,t1.name,t1.type')->from(TABLE_EXECUTION)->alias('t1')
             ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
             ->where('t1.type')->in('stage,sprint')
             ->andWhere('t2.account')->eq($this->app->user->account)
             ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.project')->in($this->app->user->view->projects)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->executions)->fi()
             ->andWhere('t1.status')->ne('closed')
             ->andWhere('t1.deleted')->eq('0')
-            ->orderBy('project_desc, id_desc')
+            ->orderBy('execution_desc, id_desc')
             ->fetchAll();
 
-        /* Get the project or product to which the execution belongs. */
-        $projectIdList = array();
+        /* Get the execution or product to which the execution belongs. */
+        $executionIdList = array();
         $stageIdList   = array();
         foreach($executions as $execution)
         {
             if($execution->type == 'stage') $stageIdList[$execution->id] = $execution->id;
-            $projectIdList[$execution->project] = $execution->project;
+            $executionIdList[$execution->execution] = $execution->execution;
         }
-        $projectPairs = $this->loadModel('program')->getPRJPairsByIdList($projectIdList);
+        $executionPairs = $this->loadModel('execution')->getPairsByIdList($executionIdList);
         $productPairs = $this->getStageLinkProductPairs($stageIdList);
 
-        $recentExecutions = isset($this->config->project->recentExecutions) ? explode(',', $this->config->project->recentExecutions) : array();
+        $recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array();
         $allExecution     = array('recent' => array(), 'mine' => array());
         foreach($executions as $execution)
         {
-            if($execution->type == 'stage')  $execution->name = zget($projectPairs, $execution->project) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name;
-            if($execution->type == 'sprint') $execution->name = zget($projectPairs, $execution->project) . '/' . $execution->name;
+            if($execution->type == 'stage')  $execution->name = zget($executionPairs, $execution->execution) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name;
+            if($execution->type == 'sprint') $execution->name = zget($executionPairs, $execution->execution) . '/' . $execution->name;
             if(in_array($execution->id, $recentExecutions))
             {
                 $index = array_search($execution->id, $recentExecutions);
@@ -3682,10 +3668,10 @@ class executionModel extends model
      */
     public function getStageLinkProductPairs($stageIdList = array())
     {
-        $productpairs = $this->dao->select('t1.project, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+        $productpairs = $this->dao->select('t1.execution, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->where('t1.project')->in($stageIdList)
-            ->fetchPairs('project', 'name');
+            ->where('t1.execution')->in($stageIdList)
+            ->fetchPairs('execution', 'name');
         return $productpairs;
     }
 }
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 4121312d4e..e125cef99e 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -1,23 +1,23 @@
 <?php
 /**
- * The create view of project module of ZenTaoPMS.
+ * The create view of execution module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
  * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     project
+ * @package     execution
  * @version     $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
 ?>
 <?php if(isset($tips)):?>
-<?php $defaultURL = $this-> createLink('project', 'task', 'projectID=' . $projectID);?>
+<?php $defaultURL = $this-> createLink('execution', 'task', 'executionID=' . $executionID);?>
 <?php include '../../common/view/header.lite.html.php';?>
 <body>
   <div class='modal-dialog mw-500px' id='tipsModal'>
     <div class='modal-header'>
       <a href='<?php echo $defaultURL;?>' class='close'><i class="icon icon-close"></i></a>
-      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->tips;?></h4>
+      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->tips;?></h4>
     </div>
     <div class='modal-body'>
     <?php echo $tips;?>
@@ -31,57 +31,57 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<?php js::set('weekend', $config->project->weekend);?>
-<?php js::set('holders', $lang->project->placeholder);?>
-<?php js::set('errorSameProducts', $lang->project->errorSameProducts);?>
+<?php js::set('weekend', $config->execution->weekend);?>
+<?php js::set('holders', $lang->execution->placeholder);?>
+<?php js::set('errorSameProducts', $lang->execution->errorSameProducts);?>
 <?php js::set('productID', empty($productID) ? 0 : $productID);?>
 <?php js::set('isStage', $isStage);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
-      <h2><?php echo $lang->project->create;?></h2>
+      <h2><?php echo $lang->execution->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->project->copy;?></button>
+        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . $lang->execution->copy;?></button>
       </div>
     </div>
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
         <tr>
-          <th class='w-120px'><?php echo $lang->project->name;?></th>
+          <th class='w-120px'><?php echo $lang->execution->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->code;?></th>
+          <th><?php echo $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->dateRange;?></th>
+          <th><?php echo $lang->execution->dateRange;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('begin', (isset($plan) && !empty($plan->begin) ? $plan->begin : date('Y-m-d')), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "' required");?>
-              <span class='input-group-addon'><?php echo $lang->project->to;?></span>
-              <?php echo html::input('end', (isset($plan) && !empty($plan->end) ? $plan->end : ''), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "' required");?>
+              <?php echo html::input('begin', (isset($plan) && !empty($plan->begin) ? $plan->begin : date('Y-m-d')), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->execution->begin . "' required");?>
+              <span class='input-group-addon'><?php echo $lang->execution->to;?></span>
+              <?php echo html::input('end', (isset($plan) && !empty($plan->end) ? $plan->end : ''), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->execution->end . "' required");?>
             </div>
           </td>
-          <td colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
+          <td colspan='2'><?php echo html::radio('delta', $lang->execution->endList , '', "onclick='computeEndDate(this.value)'");?></td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->days;?></th>
+          <th><?php echo $lang->execution->days;?></th>
           <td>
             <div class='input-group'>
               <?php echo html::input('days', (isset($plan) && !empty($plan->begin) ? helper::workDays($plan->begin, $plan->end) : ''), "class='form-control'");?>
-              <span class='input-group-addon'><?php echo $lang->project->day;?></span>
+              <span class='input-group-addon'><?php echo $lang->execution->day;?></span>
             </div>
           </td><td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->teamname;?></th>
+          <th><?php echo $lang->execution->teamname;?></th>
           <td><?php echo html::input('team', $team, "class='form-control'");?></td><td></td><td></td>
         </tr>
         <?php if(!$isSprint):?>
         <tr>
-          <th><?php echo $lang->project->type;?></th>
+          <th><?php echo $lang->execution->type;?></th>
           <td>
           <?php
           if($isStage)
@@ -90,11 +90,11 @@
           }
           else
           {
-              echo html::select('lifetime', $lang->program->PRJLifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'");
+              echo html::select('lifetime', $lang->execution->lifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'");
           }
           ?>
           </td>
-          <td class='muted' colspan='2'><div id='lifeTimeTips'><?php echo $lang->project->typeDesc;?></div></td>
+          <td class='muted' colspan='2'><div id='lifeTimeTips'><?php echo $lang->execution->typeDesc;?></div></td>
         </tr>
         <?php endif;?>
         <?php if($isStage):?>
@@ -109,14 +109,14 @@
         </tr>
         <?php endif;?>
         <tr class='hide'>
-          <th><?php echo $lang->project->status;?></th>
+          <th><?php echo $lang->execution->status;?></th>
           <td><?php echo html::hidden('status', 'wait');?></td>
           <td></td>
           <td></td>
         </tr>
         <?php $this->printExtendFields('', 'table', 'columns=3');?>
         <tr>
-          <th><?php echo $lang->project->manageProducts;?></th>
+          <th><?php echo $lang->execution->manageProducts;?></th>
           <td class='text-left' id="<?php echo $isStage ? '' : 'productsBox';?>" colspan="3">
             <div class='row'>
               <?php $i = 0;?>
@@ -141,13 +141,13 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->linkPlan;?></th>
+          <th><?php echo $lang->execution->linkPlan;?></th>
           <td colspan="3" id="plansBox">
             <div class='row'>
               <?php if(isset($plan) && !empty($plan->begin)):?>
               <div class="col-sm-4" id="plan0"><?php echo html::select("plans[" . $plan->product . "]", $productPlan, $plan->id, "class='form-control chosen'");?></div>
               <?php js::set('currentPlanID', $plan->id)?>
-              <?php elseif($copyProjectID):?>
+              <?php elseif($copyExecutionID):?>
               <?php $i = 0;?>
               <?php foreach($products as $product):?>
               <?php $plans = zget($productPlans, $product->id, array(0 => ''));?>
@@ -162,15 +162,15 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->desc;?></th>
+          <th><?php echo $lang->execution->desc;?></th>
           <td colspan='3'>
-            <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=project&link=desc');?>
+            <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=execution&link=desc');?>
             <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
           </td>
         </tr>
         <tr>
-          <th><?php echo $lang->project->acl;?></th>
-          <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>
+          <th><?php echo $lang->execution->acl;?></th>
+          <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->execution->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>
         </tr>
         <tr class="hidden" id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
@@ -193,20 +193,20 @@
   <div class='modal-dialog mw-900px'>
     <div class='modal-header'>
       <button type='button' class='close' data-dismiss='modal'><i class="icon icon-close"></i></button>
-      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->project->copyTitle;?></h4>
+      <h4 class='modal-title' id='myModalLabel'><?php echo $lang->execution->copyTitle;?></h4>
     </div>
     <div class='modal-body'>
-      <?php if(count($projects) == 1):?>
+      <?php if(count($executions) == 1):?>
       <div class='alert with-icon'>
         <i class='icon-exclamation-sign'></i>
-        <div class='content'><?php echo $lang->project->copyNoProject;?></div>
+        <div class='content'><?php echo $lang->execution->copyNoProject;?></div>
       </div>
       <?php else:?>
       <div id='copyProjects' class='row'>
-      <?php foreach ($projects as $id => $name):?>
+      <?php foreach ($executions as $id => $name):?>
       <?php if(empty($id)):?>
       <?php if($copyProjectID != 0):?>
-      <div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='' class='cancel'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->project->cancelCopy;?></a></div>
+      <div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='' class='cancel'><?php echo html::icon($lang->icons['cancel']) . ' ' . $lang->execution->cancelCopy;?></a></div>
       <?php endif;?>
       <?php else: ?>
       <div class='col-md-4 col-sm-6'><a href='javascript:;' data-id='<?php echo $id;?>' class='nobr <?php echo ($copyProjectID == $id) ? ' active' : '';?>'><?php echo html::icon($lang->icons[$iconObject], 'text-muted') . ' ' . $name;?></a></div>
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index c206565a50..fca4a004d0 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -140,13 +140,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "CMMI";
 
-$lang->project->categoryList['single']   = "Single product";
-$lang->project->categoryList['multiple'] = "Multiple products";
-
-$lang->project->lifeTimeList['short'] = "Short-Term";
-$lang->project->lifeTimeList['long']  = "Long-Term";
-$lang->project->lifeTimeList['ops']   = "DevOps";
-
 $lang->project->featureBar['all']       = 'All';
 $lang->project->featureBar['doing']     = 'Going';
 $lang->project->featureBar['wait']      = 'Waiting';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 5ba24d130c..8c76aa409c 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -140,13 +140,6 @@ $lang->project->currencySymbol['SGD'] = 'S$';
 $lang->project->modelList['scrum']     = "Scrum";
 $lang->project->modelList['waterfall'] = "瀑布";
 
-$lang->project->categoryList['single']   = "单产品项目";
-$lang->project->categoryList['multiple'] = "多产品项目";
-
-$lang->project->lifeTimeList['short'] = "短期";
-$lang->project->lifeTimeList['long']  = "长期";
-$lang->project->lifeTimeList['ops']   = "运维";
-
 $lang->project->featureBar['all']       = '所有';
 $lang->project->featureBar['doing']     = '进行中';
 $lang->project->featureBar['wait']      = '未开始';
diff --git a/module/project/model.php b/module/project/model.php
index 52bcb0e81a..5be20b3b5f 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -201,11 +201,10 @@ class projectModel extends model
      * @access public
      * @return array
      */
-    public function getInfo($status = 'undone', $itemCounts = 30, $orderBy = 'order_desc', $pager = null)
+    public function getInfoList($status = 'undone', $itemCounts = 30, $orderBy = 'order_desc', $pager = null)
     {
         /* Init vars. */
-        $this->loadModel('project');
-        $projects = $this->getList(0, $status, 0, $orderBy, $pager);
+        $projects = $this->loadModel('program')->getProjectList(0, $status, 0, $orderBy, $pager);
         if(empty($projects)) return array();
 
         $projectIdList = array_keys($projects);
@@ -222,11 +221,12 @@ class projectModel extends model
             ->fetchAll('PRJ');
 
         $this->app->loadClass('pager', $static = true);
+        $this->loadModel('execution');
         foreach($projects as $projectID => $project)
         {
             $orderBy = $project->model == 'waterfall' ? 'id_asc' : 'id_desc';
             $pager   = $project->model == 'waterfall' ? null : new pager(0, 1, 1);
-            $project->executions = $this->project->getExecutionStats($projectID, 'undone', 0, 0, 30, $orderBy, $pager);
+            $project->executions = $this->execution->getStats($projectID, 'undone', 0, 0, 30, $orderBy, $pager);
             $project->teamCount  = isset($teams[$projectID]) ? $teams[$projectID]->count : 0;
             $project->estimate   = isset($estimates[$projectID]) ? round($estimates[$projectID]->estimate, 2) : 0;
             $project->parentName = $this->getParentName($project->parent);
@@ -262,7 +262,7 @@ class projectModel extends model
      * @access public
      * @return array
      */
-    public function getOverview($queryType = 'byStatus', $param = 'all', $orderBy = 'id_desc', $limit = 15)
+    public function getOverviewList($queryType = 'byStatus', $param = 'all', $orderBy = 'id_desc', $limit = 15)
     {
         $queryType = strtolower($queryType);
         $projects = $this->dao->select('*')->from(TABLE_PROJECT)