diff --git a/Message/Http/HttpRequest.php b/Message/Http/HttpRequest.php
index eb646b5be..bdc55d6e0 100644
--- a/Message/Http/HttpRequest.php
+++ b/Message/Http/HttpRequest.php
@@ -17,7 +17,7 @@ namespace phpOMS\Message\Http;
 use phpOMS\Localization\Localization;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Router\RouteVerb;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 use phpOMS\Uri\UriFactory;
 use phpOMS\Uri\UriInterface;
 
@@ -123,7 +123,7 @@ final class HttpRequest extends RequestAbstract
      */
     private function initCurrentRequest() : void
     {
-        $this->uri   = Http::fromCurrent();
+        $this->uri   = HttpUri::fromCurrent();
         $this->data  = $_GET ?? [];
         $this->files = $_FILES ?? [];
         $this->header->getL11n()->setLanguage($this->getRequestLanguage());
diff --git a/System/File/Ftp/Directory.php b/System/File/Ftp/Directory.php
index e97606672..e68b60627 100644
--- a/System/File/Ftp/Directory.php
+++ b/System/File/Ftp/Directory.php
@@ -19,7 +19,7 @@ use phpOMS\System\File\DirectoryInterface;
 use phpOMS\System\File\FileUtils;
 use phpOMS\System\File\Local\Directory as LocalDirectory;
 use phpOMS\System\File\PathException;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * Filesystem class.
@@ -44,13 +44,13 @@ class Directory extends FileAbstract implements FtpContainerInterface, Directory
     /**
      * Create ftp connection.
      *
-     * @param HTTP $http Uri
+     * @param HttpUri $http Uri
      *
      * @return mixed
      *
      * @since 1.0.0
      */
-    public static function ftpConnect(Http $http)
+    public static function ftpConnect(HttpUri $http)
     {
         $con = \ftp_connect($http->getHost(), $http->getPort());
 
diff --git a/System/File/Ftp/File.php b/System/File/Ftp/File.php
index 6d64e924a..7de858db5 100644
--- a/System/File/Ftp/File.php
+++ b/System/File/Ftp/File.php
@@ -20,7 +20,7 @@ use phpOMS\System\File\FileInterface;
 use phpOMS\System\File\Local\Directory as LocalDirectory;
 use phpOMS\System\File\Local\File as LocalFile;
 use phpOMS\System\File\PathException;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * Filesystem class.
@@ -47,10 +47,10 @@ class File extends FileAbstract implements FileInterface
     /**
      * Ftp connection uri.
      *
-     * @var Http
+     * @var HttpUri
      * @since 1.0.0
      */
-    private Http $uri;
+    private HttpUri $uri;
 
     /**
      * Create ftp connection
@@ -61,20 +61,20 @@ class File extends FileAbstract implements FileInterface
      */
     public function __construct(string $path)
     {
-        $this->uri = new Http($path);
+        $this->uri = new HttpUri($path);
         $this->con = self::ftpConnect($this->uri);
     }
 
     /**
      * Create ftp connection.
      *
-     * @param HTTP $http Uri
+     * @param HttpUri $http Uri
      *
      * @return mixed
      *
      * @since 1.0.0
      */
-    public static function ftpConnect(Http $http)
+    public static function ftpConnect(HttpUri $http)
     {
         $con = \ftp_connect($http->getHost(), $http->getPort());
 
diff --git a/Uri/Http.php b/Uri/HttpUri.php
similarity index 98%
rename from Uri/Http.php
rename to Uri/HttpUri.php
index 5d4e955bd..5e3040051 100644
--- a/Uri/Http.php
+++ b/Uri/HttpUri.php
@@ -28,7 +28,7 @@ use phpOMS\Utils\StringUtils;
  *
  * @SuppressWarnings(PHPMD.Superglobals)
  */
-final class Http implements UriInterface
+final class HttpUri implements UriInterface
 {
     /**
      * Root path.
@@ -227,7 +227,7 @@ final class Http implements UriInterface
     /**
      * Create uri from current url
      *
-     * @return Http Returns the current uri
+     * @return HttpUri Returns the current uri
      *
      * @since 1.0.0
      */
diff --git a/Utils/Converter/Currency.php b/Utils/Converter/Currency.php
index 2282dd15e..2959b375a 100644
--- a/Utils/Converter/Currency.php
+++ b/Utils/Converter/Currency.php
@@ -18,7 +18,7 @@ use phpOMS\Localization\ISO4217CharEnum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\Rest;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * Currency converter.
@@ -98,7 +98,7 @@ final class Currency
     public static function getEcbEuroRates() : array
     {
         if (empty(self::$ecbCurrencies)) {
-            $request = new HttpRequest(new Http('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'));
+            $request = new HttpRequest(new HttpUri('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'));
             $request->setMethod(RequestMethod::GET);
 
             try {
diff --git a/tests/Dispatcher/DispatcherTest.php b/tests/Dispatcher/DispatcherTest.php
index b51c6fc50..5824348a7 100644
--- a/tests/Dispatcher/DispatcherTest.php
+++ b/tests/Dispatcher/DispatcherTest.php
@@ -20,7 +20,7 @@ use phpOMS\Localization\Localization;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Router\WebRouter;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 require_once __DIR__ . '/../Autoloader.php';
 
@@ -63,7 +63,7 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     function($req, $resp, $data = null) { return true; },
-                    new HttpRequest(new Http(''), $localization),
+                    new HttpRequest(new HttpUri(''), $localization),
                     new HttpResponse($localization)
                 )
             )
@@ -91,7 +91,7 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     'phpOMS\tests\Dispatcher\TestController:testFunction',
-                    new HttpRequest(new Http(''), $localization),
+                    new HttpRequest(new HttpUri(''), $localization),
                     new HttpResponse($localization)
                 )
             )
@@ -111,7 +111,7 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     ['dest' => 'phpOMS\tests\Dispatcher\TestController:testFunction'],
-                    new HttpRequest(new Http(''), $localization),
+                    new HttpRequest(new HttpUri(''), $localization),
                     new HttpResponse($localization)
                 )
             )
@@ -139,7 +139,7 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     'phpOMS\tests\Dispatcher\TestController::testFunctionStatic',
-                    new HttpRequest(new Http(''), $localization),
+                    new HttpRequest(new HttpUri(''), $localization),
                     new HttpResponse($localization)
                 )
             )
@@ -163,7 +163,7 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
                         'phpOMS\tests\Dispatcher\TestController:testFunction',
                         'phpOMS\tests\Dispatcher\TestController::testFunctionStatic',
                     ],
-                    new HttpRequest(new Http(''), $localization),
+                    new HttpRequest(new HttpUri(''), $localization),
                     new HttpResponse($localization)
                 )
             )
diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php
index 00320258b..9a19143ba 100644
--- a/tests/Message/Http/HttpRequestTest.php
+++ b/tests/Message/Http/HttpRequestTest.php
@@ -20,7 +20,7 @@ use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\OSType;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Router\RouteVerb;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\Message\Http\RequestTest: HttpRequest wrapper for http requests
@@ -67,7 +67,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testOSInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setOS(OSType::WINDOWS_XP);
         self::assertEquals(OSType::WINDOWS_XP, $request->getOS());
@@ -80,7 +80,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testBrowserTypeInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setOS(OSType::WINDOWS_XP);
         self::assertEquals(OSType::WINDOWS_XP, $request->getOS());
@@ -97,7 +97,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequestMethodInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setMethod(RequestMethod::PUT);
         self::assertEquals(RequestMethod::PUT, $request->getMethod());
@@ -111,7 +111,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequestMethodToRouteVerb() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setMethod(RequestMethod::PUT);
         self::assertEquals(RouteVerb::PUT, $request->getRouteVerb());
@@ -130,7 +130,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testConstructInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertEquals('http://www.google.com/test/path', $request->__toString());
     }
@@ -142,7 +142,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testHashingInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->createRequestHashs(0);
         self::assertEquals([
@@ -160,7 +160,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertEquals('value', $request->getData('key'));
@@ -175,7 +175,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testOverwrite() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertTrue($request->setData('key', 'value2', true));
@@ -189,7 +189,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidOverwrite() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertFalse($request->setData('key', 'value2'));
@@ -203,9 +203,9 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testUriInputOutput() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'), $l11n = new Localization());
 
-        $request->setUri(new Http('http://www.google.com/test/path2'));
+        $request->setUri(new HttpUri('http://www.google.com/test/path2'));
         self::assertEquals('http://www.google.com/test/path2', $request->__toString());
     }
 
@@ -216,7 +216,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataJsonRead() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         $data = [
             1, 2, 3,
@@ -235,7 +235,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testEmptyDataJsonRead() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         self::assertEquals([], $request->getDataJson('def'));
     }
@@ -247,7 +247,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataJsonRead() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         $data = [
             1, 2, 3,
@@ -266,7 +266,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataList() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         $data = [
             1, 2, 3,
@@ -284,7 +284,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testEmptyDataList() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         self::assertEquals([], $request->getDataList('def'));
     }
@@ -296,7 +296,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataLike() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         $data = 'this is a test';
 
@@ -312,7 +312,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataLikeMatch() : void
     {
-        $request = new HttpRequest(new Http(''));
+        $request = new HttpRequest(new HttpUri(''));
 
         $data = 'this is a test';
 
@@ -328,7 +328,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testToString() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'));
         self::assertEquals('http://www.google.com/test/path', $request->__toString());
     }
 
@@ -339,7 +339,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testToStringData() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'));
 
         $request->setData('test', 'data');
         $request->setData('test2', 3);
@@ -353,7 +353,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testToStringGetData() : void
     {
-        $request = new HttpRequest(new Http('http://www.google.com/test/path?test=var'));
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path?test=var'));
         self::assertEquals('http://www.google.com/test/path?test=var', $request->__toString());
 
         $request->setData('test', 'data');
@@ -368,7 +368,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
      */
     public function testRestRequest() : void
     {
-        $request = new HttpRequest(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
+        $request = new HttpRequest(new HttpUri('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
         $request->setMethod(RequestMethod::GET);
 
         self::assertEquals(
@@ -386,7 +386,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
     {
         self::expectException(\OutOfRangeException::class);
 
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'));
         $request->isHttps(-1);
     }
 
@@ -399,7 +399,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase
     {
         self::expectException(\Exception::class);
 
-        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new HttpUri('http://www.google.com/test/path'));
         $request->setMethod('failure');
         $request->getRouteVerb();
     }
diff --git a/tests/Message/Http/RestTest.php b/tests/Message/Http/RestTest.php
index a431b0918..3b81c7d8c 100644
--- a/tests/Message/Http/RestTest.php
+++ b/tests/Message/Http/RestTest.php
@@ -17,7 +17,7 @@ namespace phpOMS\tests\Message\Http;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\Rest;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\Message\Http\RestTest: Rest request wrapper
@@ -33,7 +33,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequest() : void
     {
-        $request = new HttpRequest(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
+        $request = new HttpRequest(new HttpUri('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
         $request->setMethod(RequestMethod::GET);
 
         self::assertEquals(
@@ -49,7 +49,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testPost() : void
     {
-        $request = new HttpRequest(new Http('http://httpbin.org/post'));
+        $request = new HttpRequest(new HttpUri('http://httpbin.org/post'));
         $request->setMethod(RequestMethod::POST);
         self::assertTrue($request->setData('pdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata']);
@@ -62,7 +62,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testPut() : void
     {
-        $request = new HttpRequest(new Http('http://httpbin.org/put'));
+        $request = new HttpRequest(new HttpUri('http://httpbin.org/put'));
         $request->setMethod(RequestMethod::PUT);
         self::assertTrue($request->setData('pdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata']);
@@ -75,7 +75,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDelete() : void
     {
-        $request = new HttpRequest(new Http('http://httpbin.org/delete'));
+        $request = new HttpRequest(new HttpUri('http://httpbin.org/delete'));
         $request->setMethod(RequestMethod::DELETE);
         self::assertTrue($request->setData('ddata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['ddata']);
@@ -88,7 +88,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testGet() : void
     {
-        $request = new HttpRequest(new Http('http://httpbin.org/get'));
+        $request = new HttpRequest(new HttpUri('http://httpbin.org/get'));
         $request->setMethod(RequestMethod::GET);
         self::assertTrue($request->setData('gdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['args']['gdata']);
diff --git a/tests/Module/ModuleAbstractTest.php b/tests/Module/ModuleAbstractTest.php
index 6837128ce..c73f5d927 100644
--- a/tests/Module/ModuleAbstractTest.php
+++ b/tests/Module/ModuleAbstractTest.php
@@ -19,7 +19,7 @@ require_once __DIR__ . '/../Autoloader.php';
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\ModuleAbstract;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\Module\ModuleAbstractTest: Abstract module
@@ -119,7 +119,7 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
      */
     public function testFillJson() : void
     {
-        $request  = new HttpRequest(new Http(''));
+        $request  = new HttpRequest(new HttpUri(''));
         $response = new HttpResponse();
 
         $this->module->fillJson($request, $response, 'OK', 'Test Title', 'Test Message!', [1, 'test string', 'bool' => true]);
@@ -142,7 +142,7 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
      */
     public function testFillJsonRaw() : void
     {
-        $request  = new HttpRequest(new Http(''));
+        $request  = new HttpRequest(new HttpUri(''));
         $response = new HttpResponse();
 
         $this->module->fillJsonRaw($request, $response, [1, 'test string', 'bool' => true]);
diff --git a/tests/Module/ModuleManagerTest.php b/tests/Module/ModuleManagerTest.php
index 20cc8a479..f1e402714 100644
--- a/tests/Module/ModuleManagerTest.php
+++ b/tests/Module/ModuleManagerTest.php
@@ -19,7 +19,7 @@ use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Module\ModuleManager;
 use phpOMS\Router\WebRouter;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 require_once __DIR__ . '/../Autoloader.php';
 
@@ -179,7 +179,7 @@ class ModuleManagerTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequestLoad() : void
     {
-        $request = new HttpRequest(new Http('http://127.0.0.1/en/backend/testmodule'));
+        $request = new HttpRequest(new HttpUri('http://127.0.0.1/en/backend/testmodule'));
         $request->createRequestHashs(2);
 
         $loaded = $this->moduleManager->getUriLoad($request);
diff --git a/tests/Router/WebRouterTest.php b/tests/Router/WebRouterTest.php
index 7ed37f8d4..4be07fe71 100644
--- a/tests/Router/WebRouterTest.php
+++ b/tests/Router/WebRouterTest.php
@@ -23,7 +23,7 @@ use phpOMS\Autoloader;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Router\RouteVerb;
 use phpOMS\Router\WebRouter;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 require_once __DIR__ . '/../Autoloader.php';
 
@@ -50,7 +50,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
     {
         self::assertEmpty(
             $this->router->route(
-                (new HttpRequest(new Http('')))->getUri()->getRoute()
+                (new HttpRequest(new HttpUri('')))->getUri()->getRoute()
             )
         );
     }
@@ -88,7 +88,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backend/admin/settings/general/something?test')
+                    new HttpUri('http://test.com/backend/admin/settings/general/something?test')
                 ))->getUri()->getRoute()
             )
         );
@@ -107,7 +107,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backend/admin/settings/general/something?test')
+                    new HttpUri('http://test.com/backend/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::PUT)
         );
     }
@@ -123,7 +123,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backends/admin/settings/general/something?test')
+                    new HttpUri('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute()
             )
         );
@@ -133,7 +133,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => 'Controller:test']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backends/admin/settings/general/something?test')
+                    new HttpUri('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::ANY)
         );
 
@@ -141,7 +141,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => 'Controller:test']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backends/admin/settings/general/something?test')
+                    new HttpUri('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::SET)
         );
 
@@ -149,7 +149,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => 'Controller:test']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backends/admin/settings/general/something?test')))->getUri()->getRoute(), null, RouteVerb::GET)
+                    new HttpUri('http://test.com/backends/admin/settings/general/something?test')))->getUri()->getRoute(), null, RouteVerb::GET)
         );
     }
 
@@ -166,7 +166,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [['dest' => '\Modules\Admin\Controller:viewCsrf']],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backend/admin/settings/csrf/something?test')
+                    new HttpUri('http://test.com/backend/admin/settings/csrf/something?test')
                 ))->getUri()->getRoute(),
                 'csrf_string'
             )
@@ -186,7 +186,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
             [],
             $this->router->route(
                 (new HttpRequest(
-                    new Http('http://test.com/backend/admin/settings/csrf/something?test')
+                    new HttpUri('http://test.com/backend/admin/settings/csrf/something?test')
                 ))->getUri()->getRoute()
             )
         );
@@ -222,7 +222,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new HttpRequest(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                (new HttpRequest(new HttpUri('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
                 null,
                 RouteVerb::GET,
                 null,
@@ -286,7 +286,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertNotEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new HttpRequest(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                (new HttpRequest(new HttpUri('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
                 null,
                 RouteVerb::GET,
                 null,
diff --git a/tests/System/File/Ftp/DirectoryTest.php b/tests/System/File/Ftp/DirectoryTest.php
index 56095bbff..48291814b 100644
--- a/tests/System/File/Ftp/DirectoryTest.php
+++ b/tests/System/File/Ftp/DirectoryTest.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace phpOMS\tests\System\File\Ftp;
 
 use phpOMS\System\File\Ftp\Directory;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\System\File\Ftp\DirectoryTest: Directory handler for a ftp server
@@ -31,7 +31,7 @@ class DirectoryTest extends \PHPUnit\Framework\TestCase
     protected function setUp() : void
     {
         if ($this->con === null) {
-            $this->con = Directory::ftpConnect(new Http(self::BASE));
+            $this->con = Directory::ftpConnect(new HttpUri(self::BASE));
         }
 
         if ($this->con === false) {
diff --git a/tests/System/File/Ftp/FileTest.php b/tests/System/File/Ftp/FileTest.php
index ba17f99fc..26cc7db84 100644
--- a/tests/System/File/Ftp/FileTest.php
+++ b/tests/System/File/Ftp/FileTest.php
@@ -17,7 +17,7 @@ namespace phpOMS\tests\System\File\Ftp;
 use phpOMS\System\File\ContentPutMode;
 use phpOMS\System\File\Ftp\Directory;
 use phpOMS\System\File\Ftp\File;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
  * @testdox phpOMS\tests\System\File\Ftp\FileTest: File handler for a ftp server
@@ -33,7 +33,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected function setUp() : void
     {
         if ($this->con === null) {
-            $this->con = File::ftpConnect(new Http(self::BASE));
+            $this->con = File::ftpConnect(new HttpUri(self::BASE));
         }
 
         if ($this->con === false) {
diff --git a/tests/Uri/HttpTest.php b/tests/Uri/HttpUriTest.php
similarity index 65%
rename from tests/Uri/HttpTest.php
rename to tests/Uri/HttpUriTest.php
index 3bfc845c3..af75b9d42 100644
--- a/tests/Uri/HttpTest.php
+++ b/tests/Uri/HttpUriTest.php
@@ -16,36 +16,36 @@ namespace phpOMS\tests\Uri;
 
 require_once __DIR__ . '/../Autoloader.php';
 
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 /**
- * @testdox phpOMS\tests\Uri\HttpTest: Http uri / url
+ * @testdox phpOMS\tests\Uri\HttpUriTest: Http uri / url
  *
  * @internal
  */
-class HttpTest extends \PHPUnit\Framework\TestCase
+class HttpUriTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @testdox A url can be validated
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testValidator() : void
     {
-        self::assertTrue(Http::isValid('http://www.google.de'));
-        self::assertTrue(Http::isValid('http://google.de'));
-        self::assertTrue(Http::isValid('https://google.de'));
-        self::assertFalse(Http::isValid('https:/google.de'));
+        self::assertTrue(HttpUri::isValid('http://www.google.de'));
+        self::assertTrue(HttpUri::isValid('http://google.de'));
+        self::assertTrue(HttpUri::isValid('https://google.de'));
+        self::assertFalse(HttpUri::isValid('https:/google.de'));
     }
 
     /**
      * @testdox The http url has the expected default values after initialization
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testDefault() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('', $obj->getPass());
         self::assertEquals('', $obj->getUser());
@@ -57,108 +57,108 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The url schema can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testSchemaInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('https', $obj->getScheme());
     }
 
     /**
      * @testdox The host can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testHostInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('www.google.com', $obj->getHost());
     }
 
     /**
      * @testdox The username can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testUsernameInputOutput() : void
     {
-        $obj = new Http('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('username', $obj->getUser());
     }
 
     /**
      * @testdox The password can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testPasswordInputOutput() : void
     {
-        $obj = new Http('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('password', $obj->getPass());
     }
 
     /**
      * @testdox The base can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testBaseInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('https://www.google.com', $obj->getBase());
     }
 
     /**
      * @testdox The url can be turned into a string
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testStringify() : void
     {
-        $obj = new Http($uri = 'https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri($uri = 'https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals($uri, $obj->__toString());
     }
 
     /**
      * @testdox The authority can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testAuthorityInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('www.google.com:80', $obj->getAuthority());
     }
 
     /**
      * @testdox The user info can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testUserinfoInputOutput() : void
     {
-        $obj = new Http('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://username:password@google.com/test/path.php?para1=abc&para2=2#frag');
 
         self::assertEquals('username:password', $obj->getUserInfo());
     }
 
     /**
      * @testdox The root path can be set and returned
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testRootPathInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         $obj->setRootPath('a');
         self::assertEquals('a', $obj->getRootPath());
@@ -166,12 +166,12 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The path offset can be set and returned
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testPathOffsetInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
 
         $obj->setPathOffset(2);
         self::assertEquals(2, $obj->getPathOffset());
@@ -179,29 +179,29 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The subdomain can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testSubdmonain() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('www', $obj->getSubdomain());
 
-        $obj = new Http('https://google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('', $obj->getSubdomain());
 
-        $obj = new Http('https://test.www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://test.www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('test.www', $obj->getSubdomain());
     }
 
     /**
      * @testdox The query data can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testQueryData() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('para1=abc&para2=2', $obj->getQuery());
         self::assertEquals(['para1' => 'abc', 'para2' => '2'], $obj->getQueryArray());
         self::assertEquals('2', $obj->getQuery('para2'));
@@ -209,23 +209,23 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The fragment data can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testFragment() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('frag', $obj->getFragment());
     }
 
     /**
      * @testdox The path data can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testPathData() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('/test/path', $obj->getPath());
         self::assertEquals('/test/path?para1=abc&para2=2', $obj->getRoute());
         self::assertEquals('test', $obj->getPathElement(0));
@@ -233,23 +233,23 @@ class HttpTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The route can be parsed correctly from a url
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testRouteInputOutput() : void
     {
-        $obj = new Http('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
+        $obj = new HttpUri('https://www.google.com/test/path.php?para1=abc&para2=2#frag');
         self::assertEquals('/test/path?para1=abc&para2=2', $obj->getRoute());
     }
 
     /**
      * @testdox A invalid uri cannot get parsed
-     * @covers phpOMS\Uri\Http
+     * @covers phpOMS\Uri\HttpUri
      * @group framework
      */
     public function testInvalidUri() : void
     {
-        $obj = new Http('http:///03*l.2/test?abc=d');
+        $obj = new HttpUri('http:///03*l.2/test?abc=d');
 
         self::assertEquals('', $obj->getPath());
         self::assertEquals('', $obj->getPass());
diff --git a/tests/Uri/UriFactoryTest.php b/tests/Uri/UriFactoryTest.php
index be02c327b..145fd8e9c 100644
--- a/tests/Uri/UriFactoryTest.php
+++ b/tests/Uri/UriFactoryTest.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace phpOMS\tests\Uri;
 
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 use phpOMS\Uri\UriFactory;
 
 require_once __DIR__ . '/../Autoloader.php';
@@ -186,7 +186,7 @@ class UriFactoryTest extends \PHPUnit\Framework\TestCase
     {
         $uri = 'http://www.test-uri.com/path/here?id=123&ab=c#fragi';
 
-        UriFactory::setupUriBuilder(new Http($uri));
+        UriFactory::setupUriBuilder(new HttpUri($uri));
 
         self::assertEquals($uri, UriFactory::build('{/base}{/rootPath}{/}?id={?id}&ab={?ab}#{#}'));
         self::assertEquals($uri, UriFactory::build('{/scheme}://{/host}{/rootPath}{/}?id={?id}&ab={?ab}#{#}'));
diff --git a/tests/Views/ViewTest.php b/tests/Views/ViewTest.php
index c331811bd..03dec9ec3 100644
--- a/tests/Views/ViewTest.php
+++ b/tests/Views/ViewTest.php
@@ -22,7 +22,7 @@ use phpOMS\Localization\L11nManager;
 use phpOMS\Localization\Localization;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 use phpOMS\Views\View;
 use phpOMS\Views\ViewAbstract;
 
@@ -59,7 +59,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        $view = new View($this->app->l11nManager, new HttpRequest(new Http('')), new HttpResponse(new Localization()));
+        $view = new View($this->app->l11nManager, new HttpRequest(new HttpUri('')), new HttpResponse(new Localization()));
 
         self::assertEmpty($view->getTemplate());
         self::assertEmpty($view->getViews());
@@ -78,7 +78,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetText() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
         $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
 
         $expected = [
@@ -102,7 +102,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetHtml() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
         $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
 
         $expected = [
@@ -126,7 +126,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataInputOutput() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         $view->setData('key', 'value');
         self::assertEquals('value', $view->getData('key'));
@@ -139,7 +139,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataAdd() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertTrue($view->addData('key2', 'valu2'));
         self::assertEquals('valu2', $view->getData('key2'));
@@ -152,7 +152,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataOverwrite() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         $view->addData('key2', 'valu2');
         self::assertFalse($view->addData('key2', 'valu3'));
@@ -166,7 +166,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         $view->addData('key2', 'valu2');
         self::assertTrue($view->removeData('key2'));
@@ -179,7 +179,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertFalse($view->removeData('key3'));
     }
@@ -191,7 +191,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetRequest() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertEquals($request, $view->getRequest());
         self::assertEquals($response, $view->getResponse());
@@ -204,7 +204,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetResponse() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertEquals($response, $view->getResponse());
     }
@@ -216,7 +216,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testPrintHtml() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertEquals('&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;', $view->printHtml('<a href="test">Test</a>'));
         self::assertEquals('&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;', ViewAbstract::html('<a href="test">Test</a>'));
@@ -229,7 +229,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testViewInputOutput() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         $tView = new View($this->app->l11nManager, $request, $response);
         self::assertTrue($view->addView('test', $tView));
@@ -244,7 +244,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidViewGet() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertFalse($view->getView('test'));
     }
@@ -256,7 +256,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testViewRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         $tView = new View($this->app->l11nManager, $request, $response);
         $view->addView('test', $tView);
@@ -270,7 +270,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidViewRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new HttpUri('')), $response = new HttpResponse());
 
         self::assertFalse($view->removeView('test'));
     }