diff --git a/application/config/session.php b/application/config/session.php
index 12ccb6ffc..6969dadbc 100644
--- a/application/config/session.php
+++ b/application/config/session.php
@@ -12,7 +12,7 @@ return array(
 	| Since HTTP is stateless, sessions are used to maintain "state" across
 	| multiple requests from the same user of your application.
 	|
-	| Supported Drivers: 'cookie', 'file', 'db', 'memcached', 'apc'.
+	| Supported Drivers: 'cookie', 'file', 'database', 'memcached', 'apc'.
 	|
 	*/
 
@@ -25,7 +25,7 @@ return array(
 	|
 	| The database table on which the session should be stored. 
 	|
-	| This option is only relevant when using the "db" session driver.
+	| This option is only relevant when using the "database" session driver.
 	|
 	*/
 
diff --git a/laravel/database/connector/callback.php b/laravel/database/connector/callback.php
index 9fc85a81a..19c08078e 100644
--- a/laravel/database/connector/callback.php
+++ b/laravel/database/connector/callback.php
@@ -1,6 +1,6 @@
-<?php namespace Laravel\DB\Connector;
+<?php namespace Laravel\Database\Connector;
 
-use Laravel\DB\Connector;
+use Laravel\Database\Connector;
 
 class Callback extends Connector {
 
diff --git a/laravel/database/connector/factory.php b/laravel/database/connector/factory.php
index 9683da96b..b238ed9a0 100644
--- a/laravel/database/connector/factory.php
+++ b/laravel/database/connector/factory.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel\DB\Connector;
+<?php namespace Laravel\Database\Connector;
 
 class Factory {
 
diff --git a/laravel/database/connector/mysql.php b/laravel/database/connector/mysql.php
index e4380aa0f..0647eea62 100644
--- a/laravel/database/connector/mysql.php
+++ b/laravel/database/connector/mysql.php
@@ -1,6 +1,6 @@
-<?php namespace Laravel\DB\Connector;
+<?php namespace Laravel\Database\Connector;
 
-use Laravel\DB\Connector;
+use Laravel\Database\Connector;
 
 class MySQL extends Connector {
 
diff --git a/laravel/database/connector/postgres.php b/laravel/database/connector/postgres.php
index f10d0adbf..6e445cbc0 100644
--- a/laravel/database/connector/postgres.php
+++ b/laravel/database/connector/postgres.php
@@ -1,6 +1,6 @@
-<?php namespace Laravel\DB\Connector;
+<?php namespace Laravel\Database\Connector;
 
-use Laravel\DB\Connector;
+use Laravel\Database\Connector;
 
 class Postgres extends Connector {
 
diff --git a/laravel/database/connector/sqlite.php b/laravel/database/connector/sqlite.php
index 8f0cb34fa..300ab6580 100644
--- a/laravel/database/connector/sqlite.php
+++ b/laravel/database/connector/sqlite.php
@@ -1,6 +1,6 @@
-<?php namespace Laravel\DB\Connector;
+<?php namespace Laravel\Database\Connector;
 
-use Laravel\DB\Connector;
+use Laravel\Database\Connector;
 
 class SQLite extends Connector {
 
diff --git a/laravel/laravel.php b/laravel/laravel.php
index 3fe3a2bf6..349d8ac8b 100644
--- a/laravel/laravel.php
+++ b/laravel/laravel.php
@@ -23,7 +23,7 @@ unset($laravel, $application, $config, $packages, $public, $storage);
 define('CACHE_PATH',      STORAGE_PATH.'cache/');
 define('CONFIG_PATH',     APP_PATH.'config/');
 define('CONTROLLER_PATH', APP_PATH.'controllers/');
-define('DATABASE_PATH',   STORAGE_PATH.'db/');
+define('DATABASE_PATH',   STORAGE_PATH.'database/');
 define('LANG_PATH',       APP_PATH.'language/');
 define('SCRIPT_PATH',     PUBLIC_PATH.'js/');
 define('SESSION_PATH',    STORAGE_PATH.'sessions/');
diff --git a/laravel/validation/validator.php b/laravel/validation/validator.php
index 5d94b680f..f737d62ec 100644
--- a/laravel/validation/validator.php
+++ b/laravel/validation/validator.php
@@ -1,7 +1,7 @@
 <?php namespace Laravel\Validation;
 
 use Laravel\Lang;
-use Laravel\DB\Manager as DB;
+use Laravel\Database\Manager as DB;
 
 class Validator {
 
@@ -541,10 +541,10 @@ class Validator {
 	/**
 	 * Set the database connection that should be used by the validator.
 	 *
-	 * @param  DB\Connection  $connection
+	 * @param  Database\Connection  $connection
 	 * @return Validator
 	 */
-	public function connection(DB\Connection $connection)
+	public function connection(Database\Connection $connection)
 	{
 		$this->connection = $connection;
 		return $this;
diff --git a/storage/db/.gitignore b/storage/database/.gitignore
similarity index 100%
rename from storage/db/.gitignore
rename to storage/database/.gitignore