diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 81910df6990c5ae7d5bd9b59d85c17e21e78b0e0..ae2c5e8546b96b3a33c5f5bb5d7ce938fc819dad 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -24,7 +24,7 @@
 
 namespace OC\AppFramework\DependencyInjection;
 
-use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http;
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Http\Dispatcher;
 use OC\AppFramework\Core\API;
diff --git a/lib/private/appframework/http/http.php b/lib/private/appframework/http.php
similarity index 98%
rename from lib/private/appframework/http/http.php
rename to lib/private/appframework/http.php
index e00dc9cdc4a2514a34e13e958cd904fd8e858952..41fc0db6b3829d2090101fc743949f9efd0d85c1 100644
--- a/lib/private/appframework/http/http.php
+++ b/lib/private/appframework/http.php
@@ -22,10 +22,11 @@
  */
 
 
-namespace OC\AppFramework\Http;
+namespace OC\AppFramework;
 
+use OCP\AppFramework\Http as BaseHttp;
 
-class Http extends \OCP\AppFramework\Http\Http{
+class Http extends BaseHttp {
 
 	private $server;
 	private $protocolVersion;
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index 51283fd64e7cb73f2f91a522a85d5995e608df8f..a2afb53f0fab86ef0e005e96652372bbfa616a36 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -25,6 +25,7 @@
 namespace OC\AppFramework\Http;
 
 use \OC\AppFramework\Middleware\MiddlewareDispatcher;
+use \OC\AppFramework\Http;
 use OCP\AppFramework\Controller;
 
 
diff --git a/lib/private/appframework/http/redirectresponse.php b/lib/private/appframework/http/redirectresponse.php
index 688447f16180c2943a704cad0c95009d1d627841..c4e21059480706e9c9d8565a6a04ec115d237d97 100644
--- a/lib/private/appframework/http/redirectresponse.php
+++ b/lib/private/appframework/http/redirectresponse.php
@@ -24,7 +24,8 @@
 
 namespace OC\AppFramework\Http;
 
-use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\Response,
+	OCP\AppFramework\Http;
 
 
 /**
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index f103a40ee7fcba718b89f9c5e1a4be3224949bca..c3143754823972de64196e383cdd9fd02fe195ba 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -24,7 +24,7 @@
 
 namespace OC\AppFramework\Middleware\Security;
 
-use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http;
 use OC\AppFramework\Http\RedirectResponse;
 use OC\AppFramework\Utility\MethodAnnotationReader;
 use OCP\AppFramework\Middleware;
diff --git a/lib/public/appframework/http/http.php b/lib/public/appframework/http.php
similarity index 98%
rename from lib/public/appframework/http/http.php
rename to lib/public/appframework/http.php
index 9eafe782726ac58d78042a7dc90a439eb30b51aa..c05d8f8e46eecc4127bc7174f9a2aa2b0c898038 100644
--- a/lib/public/appframework/http/http.php
+++ b/lib/public/appframework/http.php
@@ -22,7 +22,7 @@
  */
 
 
-namespace OCP\AppFramework\Http;
+namespace OCP\AppFramework;
 
 
 class Http {
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 085fdbed2f9da300aa400bae218d35dde4176873..fa7d32596e862ce6e867475adab7c739392a7eea 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -24,6 +24,7 @@
 
 namespace OCP\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 /**
  * A renderer for JSON calls
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 5ca389b99467920eaf08ad51efc151fde65d3ffe..54dc860fec21f582e510bc14e281eec491575e34 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -24,6 +24,7 @@
 
 namespace OCP\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 /**
  * Base class for responses. Also used to just send headers.
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 9052fe0781ac8929e27d2b7604ccd9a5afbafe99..6cf0da879ff181c26f26ca7c18e7d620d7abdae8 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -26,7 +26,7 @@ namespace OC\AppFramework\Http;
 
 use OC\AppFramework\Core\API;
 use OC\AppFramework\Middleware\MiddlewareDispatcher;
-
+use OCP\AppFramework\Http;
 //require_once(__DIR__ . "/../classloader.php");
 
 
@@ -53,7 +53,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->http = $this->getMockBuilder(
-			'\OC\AppFramework\Http\Http')
+			'\OC\AppFramework\Http')
 			->disableOriginalConstructor()
 			->getMock();
 
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index 382d511b116449aa0ecda0047db07110ebbd93ad..0bdcee24c995a196b22cab20e692a18790e23b02 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -24,6 +24,7 @@
 
 namespace OC\AppFramework\Http;
 
+use OC\AppFramework\Http;
 
 //require_once(__DIR__ . "/../classloader.php");
 
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index 1946655b0fa54ea6c95ab9cdb3fff6e0fbefe2a9..f82d0c3a6758bb6387628d07c602faa210ea5b4a 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -24,6 +24,7 @@
 
 namespace OC\AppFramework\Http;
 
+use OCP\AppFramework\Http;
 
 //require_once(__DIR__ . "/../classloader.php");
 
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 7e09086f80172d3f4bd0a9245434560347b47363..1a38c38c1e7b8e3567db5913d795a1557c04e890 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -25,7 +25,8 @@
 namespace OC\AppFramework\Http;
 
 
-use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\Response,
+	OCP\AppFramework\Http;
 
 
 class ResponseTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 4bfd725ffd02d797647e2aa606d242101de86dbe..dae6135dc54f574e8ca9cebfa5e1b0fb54c857b2 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -24,7 +24,7 @@
 
 namespace OC\AppFramework\Middleware\Security;
 
-use OC\AppFramework\Http\Http;
+use OC\AppFramework\Http;
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\JSONResponse;