diff --git a/manual/codes/Basic Components - Manager - Opening a new connection.php b/manual/codes/Basic Components - Manager - Opening a new connection.php
index b28d9a936..225c07dab 100644
--- a/manual/codes/Basic Components - Manager - Opening a new connection.php	
+++ b/manual/codes/Basic Components - Manager - Opening a new connection.php	
@@ -9,10 +9,10 @@ $manager = Doctrine_Manager::getInstance();
 $dbh     = new PDO("dsn","username","password");
 $conn = $manager->openConnection();
 
-// or if you want to use Doctrine Doctrine_DB and its 
+// or if you want to use Doctrine Doctrine_Db and its 
 // performance monitoring capabilities
 
 $dsn     = "schema://username:password@dsn/dbname";
-$dbh     = Doctrine_DB::getConnection($dsn);
+$dbh     = Doctrine_Db::getConnection($dsn);
 $conn = $manager->openConnection();
 ?>
diff --git a/manual/codes/Runtime classes - Doctrine_Session.php b/manual/codes/Runtime classes - Doctrine_Session.php
index f2885f5dc..dccfa2d05 100644
--- a/manual/codes/Runtime classes - Doctrine_Session.php	
+++ b/manual/codes/Runtime classes - Doctrine_Session.php	
@@ -1,5 +1,5 @@
 <?php
-$sess = $manager->openConnection(Doctrine_DB::getConnection("schema://username:password@hostname/database"));
+$sess = $manager->openConnection(Doctrine_Db::getConnection("schema://username:password@hostname/database"));
 
 // get connection state:
 switch($sess):
diff --git a/manual/docs/Coding standards - Naming Conventions - Interfaces.php b/manual/docs/Coding standards - Naming Conventions - Interfaces.php
index 5ef9578fc..173f59c13 100644
--- a/manual/docs/Coding standards - Naming Conventions - Interfaces.php	
+++ b/manual/docs/Coding standards - Naming Conventions - Interfaces.php	
@@ -3,7 +3,7 @@
 (unless the interface is approved not to contain it such as Doctrine_Overloadable). Some examples:
 <br \><br \>
 
-Doctrine_DB_EventListener_Interface   <br \>
+Doctrine_Db_EventListener_Interface   <br \>
 <br \>
 Doctrine_EventListener_Interface  <br \>
 </ul>
diff --git a/tests/UnitTestCase.php b/tests/UnitTestCase.php
index 2aee59097..347239448 100644
--- a/tests/UnitTestCase.php
+++ b/tests/UnitTestCase.php
@@ -70,7 +70,7 @@ class Doctrine_UnitTestCase extends UnitTestCase {
 
             $this->manager->setAttribute(Doctrine::ATTR_LISTENER, $this->listener);
         } else {
-            //$this->dbh     = Doctrine_DB::getConnection();
+            //$this->dbh     = Doctrine_Db::getConnection();
             $this->dbh       = Doctrine_Db2::getConnection("sqlite::memory:");
             //$this->dbh      = new PDO("sqlite::memory:");