diff --git a/lib/Doctrine/Task/BuildAll.php b/lib/Doctrine/Task/BuildAll.php
index 3991b423c..6c1a780be 100644
--- a/lib/Doctrine/Task/BuildAll.php
+++ b/lib/Doctrine/Task/BuildAll.php
@@ -43,7 +43,7 @@ class Doctrine_Task_BuildAll extends Doctrine_Task
     {
         parent::__construct($dispatcher);
         
-        $this->models = new Doctrine_Task_GenerateModelsFromYaml($this->dispatcher);
+        $this->models = new Doctrine_Task_GenerateModelsYaml($this->dispatcher);
         $this->createDb = new Doctrine_Task_CreateDb($this->dispatcher);
         $this->tables = new Doctrine_Task_CreateTables($this->dispatcher);
         
diff --git a/lib/Doctrine/Task/GenerateMigrationsFromDb.php b/lib/Doctrine/Task/GenerateMigrationsFromDb.php
index 832b70c20..8deee96c1 100644
--- a/lib/Doctrine/Task/GenerateMigrationsFromDb.php
+++ b/lib/Doctrine/Task/GenerateMigrationsFromDb.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateMigrationsFromDb.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateMigrationsDb.php 2761 2007-10-07 23:42:29Z zYne $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Task_GenerateMigrationsFromDb
+ * Doctrine_Task_GenerateMigrationsDb
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateMigrationsFromDb extends Doctrine_Task
+class Doctrine_Task_GenerateMigrationsDb extends Doctrine_Task
 {
     public $description          =   'Generate migration classes for an existing database',
            $requiredArguments    =   array('migrations_path' => 'Specify the complete path to your migration classes folder.'),
diff --git a/lib/Doctrine/Task/GenerateMigrationsFromModels.php b/lib/Doctrine/Task/GenerateMigrationsFromModels.php
index 1e28f0a97..453b16bcc 100644
--- a/lib/Doctrine/Task/GenerateMigrationsFromModels.php
+++ b/lib/Doctrine/Task/GenerateMigrationsFromModels.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateMigrationsFromModels.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateMigrationsModels.php 2761 2007-10-07 23:42:29Z zYne $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Task_GenerateMigrationsFromModels
+ * Doctrine_Task_GenerateMigrationsModels
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateMigrationsFromModels extends Doctrine_Task
+class Doctrine_Task_GenerateMigrationsModels extends Doctrine_Task
 {
     public $description          =   'Generate migration classes for an existing set of models',
            $requiredArguments    =   array('migrations_path' => 'Specify the path to your migration classes folder.',
diff --git a/lib/Doctrine/Task/GenerateYamlFromDb.php b/lib/Doctrine/Task/GenerateYamlFromDb.php
index 846459808..6fe96c87e 100644
--- a/lib/Doctrine/Task/GenerateYamlFromDb.php
+++ b/lib/Doctrine/Task/GenerateYamlFromDb.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateYamlFromDb.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateYamlDb.php 2761 2007-10-07 23:42:29Z zYne $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Task_GenerateYamlFromDb
+ * Doctrine_Task_GenerateYamlDb
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateYamlFromDb extends Doctrine_Task
+class Doctrine_Task_GenerateYamlDb extends Doctrine_Task
 {
     public $description          =   'Generates a Yaml schema file from an existing database',
            $requiredArguments    =   array('yaml_schema_path'   =>  'Specify the path to your yaml schema files.'),
diff --git a/lib/Doctrine/Task/GenerateYamlFromModels.php b/lib/Doctrine/Task/GenerateYamlFromModels.php
index 81f33c1a2..8367a6648 100644
--- a/lib/Doctrine/Task/GenerateYamlFromModels.php
+++ b/lib/Doctrine/Task/GenerateYamlFromModels.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateYamlFromModels.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateYamlModels.php 2761 2007-10-07 23:42:29Z zYne $
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Task_GenerateYamlFromModels
+ * Doctrine_Task_GenerateFromModels
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateYamlFromModels extends Doctrine_Task
+class Doctrine_Task_GenerateFromModels extends Doctrine_Task
 {
     public $description          =   'Generates a Yaml schema file from existing Doctrine_Record definitions',
            $requiredArguments    =   array('yaml_schema_path'   =>  'Specify the complete directory path to your yaml schema files.',