diff --git a/system/cache.php b/system/cache.php
index fe2d2dc1..4bdd1185 100644
--- a/system/cache.php
+++ b/system/cache.php
@@ -37,15 +37,15 @@ class Cache {
 			switch ($driver)
 			{
 				case 'file':
-					static::$drivers[$driver] = new Cache\Driver\File;
+					static::$drivers[$driver] = new Cache\File;
 					break;
 
 				case 'memcached':
-					static::$drivers[$driver] = new Cache\Driver\Memcached;
+					static::$drivers[$driver] = new Cache\Memcached;
 					break;
 
 				case 'apc':
-					static::$drivers[$driver] = new Cache\Driver\APC;
+					static::$drivers[$driver] = new Cache\APC;
 					break;
 
 				default:
diff --git a/system/session.php b/system/session.php
index 464aea4a..74904032 100644
--- a/system/session.php
+++ b/system/session.php
@@ -28,19 +28,19 @@ class Session {
 			switch (Config::get('session.driver'))
 			{
 				case 'file':
-					static::$driver = new Session\Driver\File;
+					static::$driver = new Session\File;
 					break;
 
 				case 'db':
-					static::$driver = new Session\Driver\DB;
+					static::$driver = new Session\DB;
 					break;
 
 				case 'memcached':
-					static::$driver = new Session\Driver\Memcached;
+					static::$driver = new Session\Memcached;
 					break;
 
 				case 'apc':
-					static::$driver = new Session\Driver\APC;
+					static::$driver = new Session\APC;
 					break;
 
 				default: