diff --git a/.travis.yml b/.travis.yml
index 7c9776c..23a03c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,9 @@ matrix:
     - php: 7.2
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true RUN_PHPSTAN=true IGNORE_PLATFORMS=false
     - php: 7.3
-      env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=true
+      env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=false
+    - php: 7.4
+      env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=false
     - php: nightly
       env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=true
   allow_failures:
diff --git a/benchmark/http-create-from-components.php b/benchmark/http-create-from-components.php
index 07b4e28..c774b8f 100644
--- a/benchmark/http-create-from-components.php
+++ b/benchmark/http-create-from-components.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -13,6 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 require __DIR__.'/../vendor/autoload.php';
 
 $components = [
diff --git a/src/AbstractUri.php b/src/AbstractUri.php
index e344a54..9e0160d 100644
--- a/src/AbstractUri.php
+++ b/src/AbstractUri.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -22,6 +22,7 @@
 use League\Uri\Interfaces\Uri as DeprecatedLeagueUriInterface;
 use UnexpectedValueException;
 use function array_keys;
+use function class_alias;
 use function defined;
 use function explode;
 use function filter_var;
@@ -1142,3 +1143,5 @@ public function __get(string $property)
         throw new BadMethodCallException(sprintf('"%s" is an undefined or inaccessible property', $property));
     }
 }
+
+class_alias(AbstractUri::class, League\Schemes\AbstractUri::class);
diff --git a/src/Data.php b/src/Data.php
index 6f72599..f16a3b9 100644
--- a/src/Data.php
+++ b/src/Data.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -21,6 +21,7 @@
 use function array_filter;
 use function base64_decode;
 use function base64_encode;
+use function class_alias;
 use function count;
 use function explode;
 use function file_exists;
@@ -172,3 +173,5 @@ public static function createFromPath(string $path): self
         );
     }
 }
+
+class_alias(Data::class, League\Schemes\Data::class);
diff --git a/src/Factory.php b/src/Factory.php
index a78fb2c..497911b 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/src/File.php b/src/File.php
index 8585460..df9fee1 100644
--- a/src/File.php
+++ b/src/File.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -19,6 +19,7 @@
 namespace League\Uri;
 
 use function array_map;
+use function class_alias;
 use function explode;
 use function implode;
 use function in_array;
@@ -136,3 +137,5 @@ public static function createFromWindowsPath(string $uri = ''): self
         return new static(null, null, null, null, null, $uri);
     }
 }
+
+class_alias(File::class, League\Schemes\File::class);
diff --git a/src/Ftp.php b/src/Ftp.php
index 29df669..08bc5c3 100644
--- a/src/Ftp.php
+++ b/src/Ftp.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -18,6 +18,8 @@
 
 namespace League\Uri;
 
+use function class_alias;
+
 /**
  * Immutable Value object representing a FTP Uri.
  *
@@ -58,3 +60,5 @@ protected function isValidUri(): bool
             && !('' != $this->scheme && null === $this->host);
     }
 }
+
+class_alias(Ftp::class, League\Schemes\Ftp::class);
diff --git a/src/Http.php b/src/Http.php
index 18b9d36..e24eb50 100644
--- a/src/Http.php
+++ b/src/Http.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -21,6 +21,7 @@
 use Psr\Http\Message\UriInterface as Psr7UriInterface;
 
 use function base64_decode;
+use function class_alias;
 use function explode;
 use function filter_var;
 use function preg_match;
@@ -197,3 +198,5 @@ protected static function fetchRequestUri(array $server): array
         return [$server['PHP_SELF'], $server['QUERY_STRING']];
     }
 }
+
+class_alias(Http::class, League\Schemes\Http::class);
diff --git a/src/Schemes/AbstractUri.php b/src/Schemes/AbstractUri.php
index 35a23a0..96c72a1 100644
--- a/src/Schemes/AbstractUri.php
+++ b/src/Schemes/AbstractUri.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\AbstractUri::class);
+class_exists(\League\Uri\AbstractUri::class);
+if (!class_exists(AbstractUri::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\AbstractUri}
+     */
+    class AbstractUri
+    {
+    }
+}
diff --git a/src/Schemes/Data.php b/src/Schemes/Data.php
index ffb5818..92dcf51 100644
--- a/src/Schemes/Data.php
+++ b/src/Schemes/Data.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\Data::class);
+class_exists(\League\Uri\Data::class);
+if (!class_exists(Data::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\Data}
+     */
+    class Data
+    {
+    }
+}
diff --git a/src/Schemes/File.php b/src/Schemes/File.php
index 19d3138..040069b 100644
--- a/src/Schemes/File.php
+++ b/src/Schemes/File.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\File::class);
+class_exists(\League\Uri\File::class);
+if (!class_exists(File::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\File}
+     */
+    class File
+    {
+    }
+}
diff --git a/src/Schemes/Ftp.php b/src/Schemes/Ftp.php
index e329aa2..97d8c3d 100644
--- a/src/Schemes/Ftp.php
+++ b/src/Schemes/Ftp.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\Ftp::class);
+class_exists(\League\Uri\Ftp::class);
+if (!class_exists(Ftp::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\Ftp}
+     */
+    class Ftp
+    {
+    }
+}
diff --git a/src/Schemes/Http.php b/src/Schemes/Http.php
index d38800c..91500f7 100644
--- a/src/Schemes/Http.php
+++ b/src/Schemes/Http.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\Http::class);
+class_exists(\League\Uri\Http::class);
+if (!class_exists(Http::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\Http}
+     */
+    class Http
+    {
+    }
+}
diff --git a/src/Schemes/Uri.php b/src/Schemes/Uri.php
index ec715f9..67b0c65 100644
--- a/src/Schemes/Uri.php
+++ b/src/Schemes/Uri.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -19,3 +19,11 @@
 use function class_exists;
 
 class_exists(\League\Uri\Uri::class);
+if (!class_exists(Uri::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\Uri}
+     */
+    class Uri
+    {
+    }
+}
diff --git a/src/Schemes/UriException.php b/src/Schemes/UriException.php
index 0a67735..9b34443 100644
--- a/src/Schemes/UriException.php
+++ b/src/Schemes/UriException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\UriException::class);
+class_exists(\League\Uri\UriException::class);
+if (!class_exists(UriException::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\UriException}
+     */
+    class UriException
+    {
+    }
+}
diff --git a/src/Schemes/Ws.php b/src/Schemes/Ws.php
index 4e254de..95a5999 100644
--- a/src/Schemes/Ws.php
+++ b/src/Schemes/Ws.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -16,7 +16,14 @@
 
 namespace League\Uri\Schemes;
 
-use League\Uri;
 use function class_exists;
 
-class_exists(Uri\Ws::class);
+class_exists(\League\Uri\Ws::class);
+if (!class_exists(Ws::class)) {
+    /**
+     * @deprecated use instead {@link League\Uri\Ws}
+     */
+    class Ws
+    {
+    }
+}
diff --git a/src/Schemes/deprecated.php b/src/Schemes/deprecated.php
deleted file mode 100644
index e6addd0..0000000
--- a/src/Schemes/deprecated.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * League.Uri (http://uri.thephpleague.com).
- *
- * @package    League\Uri
- * @subpackage League\Uri\Schemes
- * @author     Ignace Nyamagana Butera <nyamsprod@gmail.com>
- * @license    https://github.com/thephpleague/uri-schemes/blob/master/LICENSE (MIT License)
- * @version    1.2.1
- * @link       https://github.com/thephpleague/uri-schemes
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace League\Uri\Schemes;
-
-use League\Uri as LeagueUri;
-use function class_alias;
-use function class_exists;
-
-class_alias(LeagueUri\AbstractUri::class, AbstractUri::class);
-if (!class_exists(AbstractUri::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\AbstractUri}
-     */
-    class AbstractUri
-    {
-    }
-}
-
-class_alias(LeagueUri\Data::class, Data::class);
-if (!class_exists(Data::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\Data}
-     */
-    class Data
-    {
-    }
-}
-
-class_alias(LeagueUri\File::class, File::class);
-if (!class_exists(File::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\File}
-     */
-    class File
-    {
-    }
-}
-
-class_alias(LeagueUri\Ftp::class, Ftp::class);
-if (!class_exists(Ftp::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\Ftp}
-     */
-    class Ftp
-    {
-    }
-}
-
-class_alias(LeagueUri\Http::class, Http::class);
-if (!class_exists(Http::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\Http}
-     */
-    class Http
-    {
-    }
-}
-
-class_alias(LeagueUri\Uri::class, Uri::class);
-if (!class_exists(Uri::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\Uri}
-     */
-    class Uri
-    {
-    }
-}
-
-class_alias(LeagueUri\UriException::class, UriException::class);
-if (!class_exists(UriException::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\UriException}
-     */
-    class UriException
-    {
-    }
-}
-
-class_alias(LeagueUri\Ws::class, Ws::class);
-if (!class_exists(Ws::class)) {
-    /**
-     * @deprecated use instead {@link LeagueUri\Ws}
-     */
-    class Ws
-    {
-    }
-}
diff --git a/src/Uri.php b/src/Uri.php
index 52f463e..d85528d 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -18,6 +18,8 @@
 
 namespace League\Uri;
 
+use function class_alias;
+
 /**
  * Immutable Value object representing a RFC3986 Uri.
  *
@@ -41,3 +43,5 @@ protected function isValidUri(): bool
         return true;
     }
 }
+
+class_alias(Uri::class, League\Uri\Schemes\Uri::class);
diff --git a/src/UriException.php b/src/UriException.php
index c4f7bd5..68b4019 100644
--- a/src/UriException.php
+++ b/src/UriException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -18,6 +18,8 @@
 
 namespace League\Uri;
 
+use function class_alias;
+
 /**
  * Base Exception class for League Uri Schemes.
  *
@@ -28,3 +30,5 @@
 class UriException extends Exception
 {
 }
+
+class_alias(UriException::class, League\Uri\Schemes\UriException::class);
diff --git a/src/Ws.php b/src/Ws.php
index 4ff73e7..3531b9a 100644
--- a/src/Ws.php
+++ b/src/Ws.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -18,6 +18,8 @@
 
 namespace League\Uri;
 
+use function class_alias;
+
 /**
  * Immutable Value object representing a Ws(s) Uri.
  *
@@ -73,3 +75,5 @@ protected static function filterPort($port)
         return $port;
     }
 }
+
+class_alias(Ws::class, League\Uri\Schemes\Ws::class);
diff --git a/src/functions.php b/src/functions.php
index 9cfd04a..4c9d46a 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -25,8 +25,8 @@
  * Create a new URI optionally according to
  * a base URI object.
  *
- * @see Uri\Factory::__construct
- * @see Uri\Factory::create
+ * @see \League\Uri\Factory::__construct
+ * @see \League\Uri\Factory::create
  *
  * @param  null|mixed                                                 $base_uri
  * @return Psr7UriInterface|DeprecatedLeagueUriInterface|UriInterface
diff --git a/src/functions_include.php b/src/functions_include.php
index ea9b31d..107f672 100644
--- a/src/functions_include.php
+++ b/src/functions_include.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 if (!function_exists('League\Uri\create')) {
     require __DIR__.'/functions.php';
-    require __DIR__.'/Schemes/deprecated.php';
 }
diff --git a/tests/DataTest.php b/tests/DataTest.php
index ea5f097..bd8b0ad 100644
--- a/tests/DataTest.php
+++ b/tests/DataTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index a881ddd..ae63c38 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/tests/FileTest.php b/tests/FileTest.php
index d285750..9ae4f49 100644
--- a/tests/FileTest.php
+++ b/tests/FileTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/tests/FtpTest.php b/tests/FtpTest.php
index 3550197..4299281 100644
--- a/tests/FtpTest.php
+++ b/tests/FtpTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/tests/HttpTest.php b/tests/HttpTest.php
index a1c2e3d..3736385 100644
--- a/tests/HttpTest.php
+++ b/tests/HttpTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
diff --git a/tests/UriTest.php b/tests/UriTest.php
index 6be44f5..ef3904a 100644
--- a/tests/UriTest.php
+++ b/tests/UriTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes
@@ -28,7 +28,7 @@
 
 /**
  * @group uri
- * @coversDefaultClass League\Uri\Schemes\AbstractUri
+ * @coversDefaultClass \League\Uri\AbstractUri
  */
 class UriTest extends TestCase
 {
diff --git a/tests/WsTest.php b/tests/WsTest.php
index 6f5ca7a..3f69a4f 100644
--- a/tests/WsTest.php
+++ b/tests/WsTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * League.Uri (http://uri.thephpleague.com).
+ * League.Uri (http://uri.thephpleague.com)
  *
  * @package    League\Uri
  * @subpackage League\Uri\Schemes