diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 7cf3ab548..19f39ec48 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -50,7 +50,7 @@ use Icinga\Web\Request;
 use Icinga\Web\View;
 
 use Icinga\Util\DateTimeFactory;
-use Icinga\Session\Session as BaseSession;
+use Icinga\Web\Session\Session as BaseSession;
 use Icinga\Web\Session;
 use Icinga\Util\Translator;
 
diff --git a/library/Icinga/Web/Session.php b/library/Icinga/Web/Session.php
index 02b71ad00..ef7887d61 100644
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@@ -29,8 +29,8 @@
 
 namespace Icinga\Web;
 
-use Icinga\Session\PhpSession;
-use Icinga\Session\Session as BaseSession;
+use Icinga\Web\Session\PhpSession;
+use Icinga\Web\Session\Session as BaseSession;
 use Icinga\Exception\ProgrammingError;
 
 /**
diff --git a/library/Icinga/Session/PhpSession.php b/library/Icinga/Web/Session/PhpSession.php
similarity index 99%
rename from library/Icinga/Session/PhpSession.php
rename to library/Icinga/Web/Session/PhpSession.php
index fc04cc618..86d66b244 100644
--- a/library/Icinga/Session/PhpSession.php
+++ b/library/Icinga/Web/Session/PhpSession.php
@@ -27,7 +27,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Session;
+namespace Icinga\Web\Session;
 
 use Icinga\Logger\Logger;
 use \Icinga\Exception\ConfigurationError;
diff --git a/library/Icinga/Session/Session.php b/library/Icinga/Web/Session/Session.php
similarity index 98%
rename from library/Icinga/Session/Session.php
rename to library/Icinga/Web/Session/Session.php
index 8682fea34..0717601ed 100644
--- a/library/Icinga/Session/Session.php
+++ b/library/Icinga/Web/Session/Session.php
@@ -27,8 +27,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Session;
-
+namespace Icinga\Web\Session;
 
 /**
  * Base class for handling sessions
diff --git a/library/Icinga/Session/SessionNamespace.php b/library/Icinga/Web/Session/SessionNamespace.php
similarity index 99%
rename from library/Icinga/Session/SessionNamespace.php
rename to library/Icinga/Web/Session/SessionNamespace.php
index e169b5093..5b1d74068 100644
--- a/library/Icinga/Session/SessionNamespace.php
+++ b/library/Icinga/Web/Session/SessionNamespace.php
@@ -27,7 +27,7 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Session;
+namespace Icinga\Web\Session;
 
 use \Exception;
 use \ArrayIterator;
diff --git a/test/php/library/Icinga/Authentication/SessionMock.php b/test/php/library/Icinga/Authentication/SessionMock.php
index 5a3856bb9..6fce41700 100644
--- a/test/php/library/Icinga/Authentication/SessionMock.php
+++ b/test/php/library/Icinga/Authentication/SessionMock.php
@@ -32,7 +32,7 @@ namespace Tests\Icinga\Authentication;
 require_once("../../library/Icinga/Session/SessionNamespace.php");
 require_once("../../library/Icinga/Session/Session.php");
 
-use Icinga\Session\Session;
+use Icinga\Web\Session\Session;
 
 class SessionMock extends Session
 {
@@ -72,4 +72,8 @@ class SessionMock extends Session
     public function purge()
     {
     }
+
+    public function refreshId()
+    {
+    }
 }
diff --git a/test/php/library/Icinga/Session/PhpSessionTest.php b/test/php/library/Icinga/Session/PhpSessionTest.php
index 4aefdf887..96ded3dc7 100644
--- a/test/php/library/Icinga/Session/PhpSessionTest.php
+++ b/test/php/library/Icinga/Session/PhpSessionTest.php
@@ -36,14 +36,15 @@ require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCas
 use Icinga\Test\BaseTestCase;
 
 // @codingStandardsIgnoreStart
-require_once BaseTestCase::$libDir . '/Session/Session.php';
-require_once BaseTestCase::$libDir . '/Session/PhpSession.php';
-require_once BaseTestCase::$libDir . '/Application/Logger.php';
+require_once BaseTestCase::$libDir . '/Web/Session/SessionNamespace.php';
+require_once BaseTestCase::$libDir . '/Web/Session/Session.php';
+require_once BaseTestCase::$libDir . '/Web/Session/PhpSession.php';
+require_once BaseTestCase::$libDir . '/Logger/Logger.php';
 require_once BaseTestCase::$libDir . '/Exception/ConfigurationError.php';
 require_once 'Zend/Log.php';
 // @codingStandardsIgnoreEnd
 
-use Icinga\Session\PhpSession;
+use Icinga\Web\Session\PhpSession;
 
 class PhpSessionTest extends BaseTestCase
 {
diff --git a/test/php/library/Icinga/Session/SessionNamespaceTest.php b/test/php/library/Icinga/Session/SessionNamespaceTest.php
index 2671b3994..af269ffe0 100644
--- a/test/php/library/Icinga/Session/SessionNamespaceTest.php
+++ b/test/php/library/Icinga/Session/SessionNamespaceTest.php
@@ -34,11 +34,11 @@ require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCas
 use Icinga\Test\BaseTestCase;
 
 // @codingStandardsIgnoreStart
-require_once BaseTestCase::$libDir . '/Session/SessionNamespace.php';
+require_once BaseTestCase::$libDir . '/Web/Session/SessionNamespace.php';
 // @codingStandardsIgnoreEnd
 
 use \Exception;
-use Icinga\Session\SessionNamespace;
+use Icinga\Web\Session\SessionNamespace;
 
 
 class SessionNamespaceTest extends BaseTestCase