diff --git a/Config/phpcs.xml b/Config/phpcs.xml
index 6ba463d..e71175c 100755
--- a/Config/phpcs.xml
+++ b/Config/phpcs.xml
@@ -199,7 +199,7 @@
     <properties>
         <property name="ignoreNewlines" value="true"/>
     </properties>
-    <exclude-pattern>*Http.js</exclude-pattern><!-- Regex false positive -->
+    <exclude-pattern>*HttpUri.js</exclude-pattern><!-- Regex false positive -->
 </rule>
 <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
 <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
diff --git a/Config/reportLang.php b/Config/reportLang.php
index 38f2e33..05ce778 100644
--- a/Config/reportLang.php
+++ b/Config/reportLang.php
@@ -1679,25 +1679,25 @@ return [
     'phpOMS\tests\System\SystemUtilsTest:testRAM' => ['description' => 'Test if it is possible to get information about the available RAM and usage', 'type' => 'framework'],
     'phpOMS\tests\System\SystemUtilsTest:testCPUUsage' => ['description' => 'Test if it is possible to get information about the CPU usage', 'type' => 'framework'],
 
-    'phpOMS\tests\Uri\HttpTest' => ['description' => 'Http uri / url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testDefault' => ['description' => 'The http url has the expected default values after initialization', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testValidator' => ['description' => 'A url can be validated', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testSchemaInputOutput' => ['description' => 'The url schema can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testHostInputOutput' => ['description' => 'The host can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testUsernameInputOutput' => ['description' => 'The username can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testPasswordInputOutput' => ['description' => 'The password can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testBaseInputOutput' => ['description' => 'The base can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testStringify' => ['description' => 'The url can be turned into a string', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testAuthorityInputOutput' => ['description' => 'The authority can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testUserinfoInputOutput' => ['description' => 'The user info can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testRootPathInputOutput' => ['description' => 'The root path can be set and returned', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testPathOffsetInputOutput' => ['description' => 'The path offset can be set and returned', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testSubdmonain' => ['description' => 'The subdomain can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testQueryData' => ['description' => 'The query data can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testFragment' => ['description' => 'The fragment data can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testPathData' => ['description' => 'The path data can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testRouteInputOutput' => ['description' => 'The route can be parsed correctly from a url', 'type' => 'framework'],
-    'phpOMS\tests\Uri\HttpTest:testInvalidUri' => ['description' => 'A invalid uri cannot get parsed', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest' => ['description' => 'Http uri / url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testDefault' => ['description' => 'The http url has the expected default values after initialization', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testValidator' => ['description' => 'A url can be validated', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testSchemaInputOutput' => ['description' => 'The url schema can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testHostInputOutput' => ['description' => 'The host can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testUsernameInputOutput' => ['description' => 'The username can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testPasswordInputOutput' => ['description' => 'The password can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testBaseInputOutput' => ['description' => 'The base can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testStringify' => ['description' => 'The url can be turned into a string', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testAuthorityInputOutput' => ['description' => 'The authority can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testUserinfoInputOutput' => ['description' => 'The user info can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testRootPathInputOutput' => ['description' => 'The root path can be set and returned', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testPathOffsetInputOutput' => ['description' => 'The path offset can be set and returned', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testSubdmonain' => ['description' => 'The subdomain can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testQueryData' => ['description' => 'The query data can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testFragment' => ['description' => 'The fragment data can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testPathData' => ['description' => 'The path data can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testRouteInputOutput' => ['description' => 'The route can be parsed correctly from a url', 'type' => 'framework'],
+    'phpOMS\tests\Uri\HttpUriTest:testInvalidUri' => ['description' => 'A invalid uri cannot get parsed', 'type' => 'framework'],
 
     'phpOMS\tests\Uri\ArgumentTest' => ['description' => 'Argument uri / uri', 'type' => 'framework'],
     'phpOMS\tests\Uri\ArgumentTest:testDefault' => ['description' => 'The argument uri has the expected default values after initialization', 'type' => 'framework'],
diff --git a/minimumSetup.php b/minimumSetup.php
index 6a8a3b6..0fc64bc 100644
--- a/minimumSetup.php
+++ b/minimumSetup.php
@@ -15,7 +15,7 @@ use Install\WebApplication;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\HttpResponse;
-use phpOMS\Uri\Http;
+use phpOMS\Uri\HttpUri;
 
 $config   = [
     'db'       => [
@@ -132,7 +132,7 @@ $db->exec('CREATE DATABASE IF NOT EXISTS ' . $config['db']['core']['masters']['a
 $db = null;
 
 $response = new HttpResponse();
-$request  = new HttpRequest(new Http(''));
+$request  = new HttpRequest(new HttpUri(''));
 $request->setMethod(RequestMethod::POST);
 
 $request->setData('dbhost', $config['db']['core']['masters']['admin']['host']);