diff --git a/thirdparty/phing/BuildEvent.php b/thirdparty/phing/BuildEvent.php
index de30b9734..6738fcdd6 100644
--- a/thirdparty/phing/BuildEvent.php
+++ b/thirdparty/phing/BuildEvent.php
@@ -57,7 +57,7 @@ class BuildEvent extends EventObject {
     /**
      *  A reference to the task
      *
-     *  @var Task
+     *  @var PhingTask
      */
     protected $task;
 
diff --git a/thirdparty/phing/Task.php b/thirdparty/phing/PhingTask.php
similarity index 98%
rename from thirdparty/phing/Task.php
rename to thirdparty/phing/PhingTask.php
index 774d8c012..924bbcbb1 100644
--- a/thirdparty/phing/Task.php
+++ b/thirdparty/phing/PhingTask.php
@@ -28,12 +28,12 @@ include_once 'phing/RuntimeConfigurable.php';
  * Use {@link Project#createTask} to register a new Task.
  *
  * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright © 2001,2002 THYRELL. All rights reserved
+ * @copyright © 2001,2002 THYRELL. All rights reserved
  * @version   $Revision: 1.11 $
  * @see       Project#createTask()
  * @package   phing
  */
-abstract class Task extends ProjectComponent {
+abstract class PhingTask extends ProjectComponent {
 
     /** owning Target object */
     protected $target;
diff --git a/thirdparty/phing/UnknownElement.php b/thirdparty/phing/UnknownElement.php
index 0042380f4..244e10926 100644
--- a/thirdparty/phing/UnknownElement.php
+++ b/thirdparty/phing/UnknownElement.php
@@ -171,7 +171,7 @@ class UnknownElement extends TaskPhing {
      * @param UnknownElement $ue The unknwon element to create a task from
      * @param RuntimeConfigurable $w The wrapper object
      * @param boolean $onTopLevel Whether to treat this task as if it is top-level.
-     * @return Task The freshly created task
+     * @return PhingTask The freshly created task
      */
     protected function makeTask(UnknownElement $ue, RuntimeConfigurable $w, $onTopLevel = false) {
 
diff --git a/thirdparty/phing/parser/TaskHandler.php b/thirdparty/phing/parser/TaskHandler.php
index 8c6f104c1..5f6f6ad80 100644
--- a/thirdparty/phing/parser/TaskHandler.php
+++ b/thirdparty/phing/parser/TaskHandler.php
@@ -29,7 +29,7 @@ include_once 'phing/UnknownElement.php';
  * initialized on the fly.
  *
  * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright © 2001,2002 THYRELL. All rights reserved
+ * @copyright © 2001,2002 THYRELL. All rights reserved
  * @version   $Revision: 1.10 $
  * @package   phing.parser
  */
@@ -52,7 +52,7 @@ class TaskHandler extends AbstractHandler {
     /**
      * Reference to the task object that represents the currently parsed
      * target.
-     * @var Task
+     * @var PhingTask
      */
     private $task;
 	
diff --git a/thirdparty/phing/tasks/system/SequentialTask.php b/thirdparty/phing/tasks/system/SequentialTask.php
index 1307d46f6..cbc0229e4 100644
--- a/thirdparty/phing/tasks/system/SequentialTask.php
+++ b/thirdparty/phing/tasks/system/SequentialTask.php
@@ -39,7 +39,7 @@ class SequentialTask extends TaskPhing implements TaskContainer {
 
     /**
      * Add a nested task to Sequential.
-     * @param Task $nestedTask  Nested task to execute Sequential
+     * @param PhingTask $nestedTask  Nested task to execute Sequential
      */
     public function addTask(TaskPhing $nestedTask) {
         $this->nestedTasks[] = $nestedTask;
diff --git a/thirdparty/phing/util/SourceFileScanner.php b/thirdparty/phing/util/SourceFileScanner.php
index 0c0380422..d737157cf 100644
--- a/thirdparty/phing/util/SourceFileScanner.php
+++ b/thirdparty/phing/util/SourceFileScanner.php
@@ -37,7 +37,7 @@ class SourceFileScanner {
     private $task;
 
     /**
-     * @param task The task we should log messages through
+     * @param PhingTask The task we should log messages through
      */
     function __construct($task) {
         $this->task = $task;