diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
similarity index 94%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
index 68218e86b3..72ecac5550 100644
--- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php
+++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\HttpFoundation\Session\Storage;
+namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
 /**
  * MemcacheSessionStorage.
  *
  * @author Drak <drak@zikula.org>
  */
-class MemcacheSessionStorage extends AbstractSessionStorage implements \SessionHandlerInterface
+class MemcacheSessionHandler implements \SessionHandlerInterface
 {
     /**
      * Memcache driver.
@@ -68,8 +68,6 @@ class MemcacheSessionStorage extends AbstractSessionStorage implements \SessionH
         $this->prefix = isset($memcacheOptions['prefix']) ? $memcacheOptions['prefix'] : 'sf2s';
 
         $this->memcacheOptions = $memcacheOptions;
-
-        parent::__construct($options);
     }
 
     protected function addServer(array $server)
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandler.php
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
similarity index 100%
rename from src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php
rename to src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php