diff --git a/lib/Doctrine/Task/GenerateModelsFromDb.php b/lib/Doctrine/Task/GenerateModelsDb.php
similarity index 91%
rename from lib/Doctrine/Task/GenerateModelsFromDb.php
rename to lib/Doctrine/Task/GenerateModelsDb.php
index 1524a3fe9..b7337dffd 100644
--- a/lib/Doctrine/Task/GenerateModelsFromDb.php
+++ b/lib/Doctrine/Task/GenerateModelsDb.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateModelsFromDb.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateModelsDb.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_GenerateModelsFromDb
+ * Doctrine_Task_GenerateModelsDb
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateModelsFromDb extends Doctrine_Task
+class Doctrine_Task_GenerateModelsDb extends Doctrine_Task
 {
     public $description          =   'Generates your Doctrine_Record definitions from your existing database connections.',
            $requiredArguments    =   array('models_path'    =>  'Specify path to your Doctrine_Record definitions.'),
@@ -42,4 +42,4 @@ class Doctrine_Task_GenerateModelsFromDb extends Doctrine_Task
         
         $this->dispatcher->notify('Generated models successfully from databases');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/Doctrine/Task/GenerateModelsFromYaml.php b/lib/Doctrine/Task/GenerateModelsYaml.php
similarity index 91%
rename from lib/Doctrine/Task/GenerateModelsFromYaml.php
rename to lib/Doctrine/Task/GenerateModelsYaml.php
index eb6aa4602..11cf3c787 100644
--- a/lib/Doctrine/Task/GenerateModelsFromYaml.php
+++ b/lib/Doctrine/Task/GenerateModelsYaml.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: GenerateModelsFromYaml.php 2761 2007-10-07 23:42:29Z zYne $
+ *  $Id: GenerateModelsYaml.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_GenerateModelsFromYaml
+ * Doctrine_Task_GenerateModelsYaml
  *
  * @package     Doctrine
  * @subpackage  Task
@@ -30,7 +30,7 @@
  * @version     $Revision: 2761 $
  * @author      Jonathan H. Wage <jwage@mac.com>
  */
-class Doctrine_Task_GenerateModelsFromYaml extends Doctrine_Task
+class Doctrine_Task_GenerateModelsYaml extends Doctrine_Task
 {
     public $description          =   'Generates your Doctrine_Record definitions from a Yaml schema file',
            $requiredArguments    =   array('yaml_schema_path'   =>  'Specify the complete directory path to your yaml schema files.',
@@ -43,4 +43,4 @@ class Doctrine_Task_GenerateModelsFromYaml extends Doctrine_Task
         
         $this->notify('Generated models successfully from YAML schema');
     }
-}
\ No newline at end of file
+}
diff --git a/package.xml b/package.xml
index e5e55d163..82ec9ff8f 100644
--- a/package.xml
+++ b/package.xml
@@ -12,8 +12,8 @@
  </lead>
  <date>2007-10-22</date>
  <version>
-  <release>0.1.0-DEV</release>
-  <api>0.1.0-DEV</api>
+  <release>0.1.0</release>
+  <api>0.1.0</api>
  </version>
  <stability>
   <release>beta</release>
diff --git a/tools/sandbox/config.php.dist b/tools/sandbox/config.php.dist
index 730c31381..9be27f73d 100644
--- a/tools/sandbox/config.php.dist
+++ b/tools/sandbox/config.php.dist
@@ -35,7 +35,7 @@
  */
 
 define('SANDBOX_PATH', dirname(__FILE__));
-define('DOCTRINE_PATH', dirname(SANDBOX_PATH) . DIRECTORY_SEPARATOR . 'lib');
+define('DOCTRINE_PATH', dirname(dirname(SANDBOX_PATH)) . DIRECTORY_SEPARATOR . 'lib');
 define('DATA_FIXTURES_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'fixtures');
 define('MODELS_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'models');
 define('MIGRATIONS_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'migrations');
@@ -49,4 +49,4 @@ require_once(DOCTRINE_PATH . DIRECTORY_SEPARATOR . 'Doctrine.php');
 spl_autoload_register(array('Doctrine', 'autoload'));
 
 $pdo = new PDO(DSN);
-Doctrine_Manager::connection($pdo, 'sandbox');
\ No newline at end of file
+Doctrine_Manager::connection($pdo, 'sandbox');