diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php
index 372b4c94cb..fda573f2aa 100644
--- a/module/block/view/recentprogramblock.html.php
+++ b/module/block/view/recentprogramblock.html.php
@@ -37,7 +37,7 @@
       <div class='panel-heading'>
         <?php $parentName = $program->parentName ? $program->parentName . '/' : '';?>
         <strong class='program-name' title='<?php echo $parentName . $program->name;?>'> <?php echo html::a($this->createLink('program', 'index', "programID=$program->id", '', '', $program->id), $parentName . $program->name);?> </strong>
-        <?php if($program->template === 'waterfall'): ?>
+        <?php if($program->model === 'waterfall'): ?>
         <span class='program-type-label label label-warning label-outline'><?php echo $lang->program->waterfall; ?></span>
         <?php else: ?>
         <span class='program-type-label label label-info label-outline'><?php echo $lang->program->scrum; ?></span>
@@ -64,7 +64,7 @@
           <span><i class='icon icon-clock'></i> <?php printf($lang->program->hoursUnit, $program->estimate); ?></span>
           <span><i class='icon icon-cost'></i> <?php echo $program->budget . '' . zget($lang->program->unitList, $program->budgetUnit);?></span>
         </div>
-        <?php if($program->template === 'waterfall'): ?>
+        <?php if($program->model === 'waterfall'): ?>
         <div class='program-detail program-stages'>
           <p class='text-muted'><?php echo $lang->program->ongoingStage; ?></p>
           <?php
diff --git a/module/program/control.php b/module/program/control.php
index 50ea08f05a..a9478d5964 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -78,8 +78,8 @@ class program extends control
         $this->view->orderBy     = $orderBy;
         $this->view->pager       = $pager;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter');
-        $this->view->title       = $this->lang->program->browse;
-        $this->view->position[]  = $this->lang->program->browse;
+        $this->view->title       = $this->lang->program->PGMBrowse;
+        $this->view->position[]  = $this->lang->program->PGMBrowse;
         $this->view->programType = $programType;
         $this->display();
     }
diff --git a/module/program/model.php b/module/program/model.php
index 8b78640eb4..3fb5611d16 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -208,7 +208,7 @@ class programModel extends model
 
         foreach($programs as $programID => $program)
         {
-            $orderBy = $program->template == 'waterfall' ? 'id_asc' : 'id_desc';
+            $orderBy = $program->model == 'waterfall' ? 'id_asc' : 'id_desc';
             $program->projects   = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
             $program->teamCount  = isset($teams[$programID]) ? $teams[$programID]->count : 0;
             $program->estimate   = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 33deb7229a..a61d26caff 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -7,8 +7,8 @@
         <th class='c-id w-80px'>
           <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
         </th>
-        <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->program->code);?></th>
-        <th class='table-nest-title'><?php common::printOrderLink('name', $orderBy, $vars, $lang->program->name);?></th>
+        <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->program->PGMCode);?></th>
+        <th class='table-nest-title'><?php common::printOrderLink('name', $orderBy, $vars, $lang->program->PGMName);?></th>
         <th class='w-80px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
         <th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->program->begin);?></th>
         <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->program->end);?></th>
diff --git a/module/program/view/pgmbrowse.html.php b/module/program/view/pgmbrowse.html.php
index 69e9c0d862..832b9819d0 100644
--- a/module/program/view/pgmbrowse.html.php
+++ b/module/program/view/pgmbrowse.html.php
@@ -40,7 +40,7 @@
 <div id='mainContent' class='main-row'>
   <?php if(empty($programs)):?>
   <div class="table-empty-tip">
-    <p><span class="text-muted"><?php echo $lang->program->noProgram;?></span> <?php common::printLink('program', 'createguide', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info' data-toggle=modal");?></p>
+    <p><span class="text-muted"><?php echo $lang->program->noPGM;?></span> <?php common::printLink('program', 'createguide', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info' data-toggle=modal");?></p>
   </div>
   <?php else:?>
   <div class='main-col'>
diff --git a/module/weekly/model.php b/module/weekly/model.php
index 1276719d86..3b543ee072 100644
--- a/module/weekly/model.php
+++ b/module/weekly/model.php
@@ -79,7 +79,7 @@ class weeklyModel extends model
         return $this->dao->select('*')
             ->from(TABLE_WEEKLYREPORT)
             ->where('weekStart')->eq($monday)
-            ->andWhere('program')->eq($program)
+            ->andWhere('PRJ')->eq($program)
             ->fetch();
     }