diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index b40b2a3ef9..a9cdded03a 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -94,7 +94,7 @@ function loadProductBuilds(productID)
 }
 
 /**
- * Load project related bugs and taskes.
+ * Load project related bugs and tasks.
  * 
  * @param  int    $projectID 
  * @access public
@@ -117,7 +117,7 @@ function loadProjectRelated(projectID)
 }
 
 /**
- * Load project taskes.
+ * Load project tasks.
  * 
  * @param  int    $projectID 
  * @access public
diff --git a/module/project/control.php b/module/project/control.php
index 891410701f..ccda5199d2 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -118,7 +118,7 @@ class project extends control
         $this->view->position[]    = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
         $this->view->position[]    = $this->lang->project->task;
 
-        /* Load pager and get taskes. */
+        /* Load pager and get tasks. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
         $tasks = $this->loadModel('task')->getProjectTasks($projectID, $status, $orderBy, $pager);
@@ -136,7 +136,7 @@ class project extends control
     }
 
     /**
-     * Browse taskes in group.
+     * Browse tasks in group.
      * 
      * @param  int    $projectID 
      * @param  string $groupBy    the field to group by
@@ -157,7 +157,7 @@ class project extends control
         $this->view->position[]      = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
         $this->view->position[]      = $this->lang->project->task;
 
-        /* Get taskes and group them. */
+        /* Get tasks and group them. */
         $tasks       = $this->loadModel('task')->getProjectTasks($projectID, $status = 'all', $groupBy);
         $groupBy     = strtolower(str_replace('`', '', $groupBy));
         $taskLang    = $this->lang->task;
@@ -197,7 +197,7 @@ class project extends control
     }
 
     /**
-     * Import taskes undoned from other projects.
+     * Import tasks undoned from other projects.
      * 
      * @param  int    $projectID 
      * @access public
diff --git a/module/project/model.php b/module/project/model.php
index 3d6adfa88f..c277f2374f 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -359,7 +359,7 @@ class projectModel extends model
     }
 
     /**
-     * Import taskes.
+     * Import tasks.
      * 
      * @param  int    $projectID 
      * @access public
@@ -369,7 +369,7 @@ class projectModel extends model
     {
         $tasks = $this->dao->select('id, project, assignedTo, story, consumed')->from(TABLE_TASK)->where('id')->in($this->post->tasks)->fetchAll('id');
 
-        /* Update taskes. */
+        /* Update tasks. */
         foreach($tasks as $task)
         {
             /* Save the assignedToes and stories, should linked to project. */
diff --git a/module/search/control.php b/module/search/control.php
index 560e5e14ad..092e4dfcb1 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -75,7 +75,7 @@ class search extends control
     }
 
     /**
-     * Create a select page of stories or taskes.
+     * Create a select page of stories or tasks.
      * 
      * @param  int    $productID 
      * @param  int    $projectID 
diff --git a/module/story/model.php b/module/story/model.php
index 28c7a07a17..02dcbc5769 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -370,7 +370,7 @@ class storyModel extends model
             return true;
         }
 
-        /* Search related taskes. */
+        /* Search related tasks. */
         $tasks = $this->dao->select('type,status')->from(TABLE_TASK)
             ->where('project')->in($projects)
             ->andWhere('story')->eq($storyID)
@@ -378,7 +378,7 @@ class storyModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('type');
 
-        /* No taskes, then the stage is projected. */
+        /* No tasks, then the stage is projected. */
         if(!$tasks)
         {
             $this->dao->update(TABLE_STORY)->set('stage')->eq('projected')->where('id')->eq((int)$storyID)->exec();
diff --git a/module/task/model.php b/module/task/model.php
index f0eaca4119..f9482400c1 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -176,7 +176,7 @@ class taskModel extends model
     }
 
     /**
-     * Get project taskes paris.1
+     * Get project tasks pairs.
      * 
      * @param  int    $projectID 
      * @param  string $status
@@ -267,7 +267,7 @@ class taskModel extends model
     }
 
     /**
-     * Get counts of some stories's taskes.
+     * Get counts of some stories' tasks.
      * 
      * @param  array  $stories 
      * @param  int    $projectID 
@@ -288,7 +288,7 @@ class taskModel extends model
     }
 
     /**
-     * Batch process taskes.
+     * Batch process tasks.
      * 
      * @param  int    $tasks 
      * @access private
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 0eef072f85..695dc83d65 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -38,7 +38,7 @@ class testtask extends control
     }
 
     /**
-     * Browse test taskes. 
+     * Browse test tasks. 
      * 
      * @param  int    $productID 
      * @param  string $orderBy 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index e8fbacfb31..e88b2508a9 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -49,7 +49,7 @@ class testtaskModel extends model
     }
 
     /**
-     * Get test taskes of a product.
+     * Get test tasks of a product.
      * 
      * @param  int    $productID 
      * @param  string $orderBy