diff --git a/module/execution/control.php b/module/execution/control.php
index f08c6ed378..92a51ab52a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -282,7 +282,7 @@ class execution extends control
 
         /* Get tasks and group them. */
         if(empty($groupBy))$groupBy = 'story';
-        if(($groupBy == 'story') and ($execution->type == 'ops'))$groupBy = 'status';
+        if(($groupBy == 'story') and ($execution->lifetime == 'ops')) $groupBy = 'status';
         $sort        = common::appendOrder($groupBy);
         $tasks       = $this->loadModel('task')->getExecutionTasks($executionID, $productID = 0, $status = 'all', $modules = 0, $sort);
         $groupBy     = str_replace('`', '', $groupBy);
@@ -2657,6 +2657,7 @@ class execution extends control
             unset($this->lang->kanban->type['story']);
             unset($this->lang->kanban->type['bug']);
             unset($this->lang->kanban->type['all']);
+            unset($this->lang->kanban->group->task['story']);
         }
 
         if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 87dc3aa96f..6a976a3da3 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -103,7 +103,7 @@
               <?php foreach($lang->execution->groups as $key => $value):?>
               <?php
               if(empty($key)) continue;
-              if($execution->type == 'ops' && $key == 'story') continue;
+              if($execution->lifetime == 'ops' && $key == 'story') continue;
               $active = $key == $groupBy ? "class='active'" : '';
               echo "<li $active>"; common::printLink('execution', 'groupTask', "execution=$executionID&groupBy=$key", $value); echo '</li>';
               ?>
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index bf70233621..36056b17a2 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -62,7 +62,7 @@ body {margin-bottom: 25px;}
     common::sortFeatureMenu();
     foreach(customModel::getFeatureMenu('execution', 'task') as $menuItem)
     {
-        if($execution->type == 'ops' && $menuItem->name == 'needconfirm') continue;
+        if($execution->lifetime == 'ops' && $menuItem->name == 'needconfirm') continue;
         if(isset($menuItem->hidden)) continue;
         $menuType = $menuItem->name;
         if($menuType == 'QUERY')
@@ -215,7 +215,7 @@ body {margin-bottom: 25px;}
       if($useDatatable) include '../../common/view/datatable.html.php';
 
       $customFields = $this->datatable->getSetting('execution');
-      if($execution->type == 'ops')
+      if($execution->lifetime == 'ops')
       {
           foreach($customFields as $id => $customField)
           {
diff --git a/module/execution/view/taskheader.html.php b/module/execution/view/taskheader.html.php
index e7c2eea834..78dc5503ef 100644
--- a/module/execution/view/taskheader.html.php
+++ b/module/execution/view/taskheader.html.php
@@ -28,7 +28,7 @@
 
     foreach(customModel::getFeatureMenu('execution', 'task') as $menuItem)
     {
-        if($execution->type == 'ops' && $menuItem->name == 'needconfirm') continue;
+        if($execution->lifetime == 'ops' && $menuItem->name == 'needconfirm') continue;
         if(isset($menuItem->hidden)) continue;
         $menuType = $menuItem->name;
         if(strpos($menuType, 'QUERY') === 0)
@@ -74,7 +74,7 @@
     foreach ($lang->execution->groups as $key => $value)
     {
         if($key == '') continue;
-        if($execution->type == 'ops' && $key == 'story') continue;
+        if($execution->lifetime == 'ops' && $key == 'story') continue;
         echo '<li' . ($key == $groupBy ? " class='active'" : '') . '>';
         common::printLink('execution', 'groupTask', "execution=$executionID&groupBy=$key", $value);
     }
diff --git a/module/execution/view/treetask.html.php b/module/execution/view/treetask.html.php
index 287204f2ee..0d8a9b57c4 100644
--- a/module/execution/view/treetask.html.php
+++ b/module/execution/view/treetask.html.php
@@ -45,7 +45,7 @@
     <?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
   </div>
 </div>
-<?php if($execution->type != 'ops'):?>
+<?php if($execution->lifetime != 'ops'):?>
 <?php if($task->fromBug != 0):?>
 <div class="detail" open>
   <div class="detail-title"><?php echo $lang->bug->steps;?></div>
diff --git a/module/task/control.php b/module/task/control.php
index 6c544a5e84..62dcdb2d99 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -2118,7 +2118,7 @@ class task extends control
     {
         $execution       = $this->execution->getById($executionID);
         $allExportFields = $this->config->task->exportFields;
-        if($execution->type == 'ops') $allExportFields = str_replace(' story,', '', $allExportFields);
+        if($execution->lifetime == 'ops') $allExportFields = str_replace(' story,', '', $allExportFields);
 
         if($_POST)
         {
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 8c3d842b11..de015521ce 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -127,7 +127,7 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
             </div>
           </td>
         </tr>
-        <?php if($execution->type != 'ops'):?>
+        <?php if($execution->lifetime != 'ops'):?>
         <tr id='testStoryBox' class='hidden'>
           <th><?php echo $lang->task->selectTestStory;?></th>
           <td colspan='3'>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 54763f1ee8..45ea694f7f 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -118,7 +118,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
                   </div>
                 </td>
               </tr>
-              <?php if($execution->type != 'ops'):?>
+              <?php if($execution->lifetime != 'ops'):?>
               <tr>
                 <th><?php echo $lang->task->story;?></th>
                 <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, "class='form-control chosen' data-drop_direction='down' data-max_drop_width='0'");?></span></td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 02602474db..a851e0de0b 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -60,7 +60,7 @@
           <?php echo !empty($task->desc) ? $task->desc : "<div class='text-center text-muted'>" . $lang->noData . '</div>';?>
         </div>
       </div>
-      <?php if($execution->type != 'ops'):?>
+      <?php if($execution->lifetime != 'ops'):?>
       <?php if($task->fromBug != 0):?>
       <div class="detail">
         <div class="detail-title"><?php echo $lang->bug->steps;?></div>
@@ -227,7 +227,7 @@
                   ?>
                   <td title='<?php echo $moduleTitle?>'><?php echo $printModule?></td>
                 </tr>
-                <?php if($execution->type != 'ops'):?>
+                <?php if($execution->lifetime != 'ops'):?>
                 <tr class='nofixed'>
                   <th><?php echo $lang->task->story;?></th>
                   <td>