diff --git a/module/productplan/control.php b/module/productplan/control.php
index 1e687b3003..8daf9e83b6 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -260,7 +260,7 @@ class productplan extends control
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         $this->commonAction($plan->product, $plan->branch);
-        $products = $this->product->getPairs('', $this->session->PRJ);
+        $products = $this->product->getProductsByProject($this->session->PRJ);
 
         $bugPager   = new pager(0, $recPerPage, $type == 'bug' ? $pageID : 1);
         $storyPager = new pager(0, $recPerPage, $type == 'story' ? $pageID : 1);
@@ -361,7 +361,7 @@ class productplan extends control
         $this->loadModel('tree');
         $plan = $this->productplan->getByID($planID);
         $this->commonAction($plan->product, $plan->branch);
-        $products = $this->product->getPairs('', $this->session->PRJ);
+        $products = $this->product->getProductsByProject($this->session->PRJ);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -499,7 +499,7 @@ class productplan extends control
         $this->loadModel('bug');
         $plan = $this->productplan->getByID($planID);
         $this->commonAction($plan->product, $plan->branch);
-        $products  = $this->product->getPairs('nocode', $this->session->PRJ);
+        $products = $this->product->getProductsByProject($this->session->PRJ);
         $productID = $plan->product;
         $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
 
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 61716d7de9..e41499344c 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -111,7 +111,7 @@ class testsuiteModel extends model
     {
         $suite = fixer::input('post')
             ->stripTags($this->config->testsuite->editor->create['id'], $this->config->allowedTags)
-            ->add('program', $this->session->PRJ)
+            ->add('PRJ', $this->session->PRJ)
             ->add('product', (int)$productID)
             ->add('addedBy', $this->app->user->account)
             ->add('addedDate', helper::now())
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 8d71b6a369..29d0ca418f 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -159,7 +159,7 @@ class testtaskModel extends model
     {
         $task = fixer::input('post')
             ->setDefault('build', '')
-            ->setDefault('program', $this->session->PRJ)
+            ->setDefault('PRJ', $this->session->PRJ)
             ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')
             ->remove('uid,contactListMenu')