diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index ca886fb535bf..d41fa6eea073 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -54,7 +54,7 @@
  *      $loader->register();
  * ```
  *
- * @see \CodeIgniter\Autoloader\AutoloaderTest
+ * @see AutoloaderTest
  */
 class Autoloader
 {
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 11aa56edc4f7..54a7db8a3e13 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -15,7 +15,7 @@
  * Allows loading non-class files in a namespaced manner.
  * Works with Helpers, Views, etc.
  *
- * @see \CodeIgniter\Autoloader\FileLocatorTest
+ * @see FileLocatorTest
  */
 class FileLocator
 {
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 9a50e4038184..b844f44d0ff1 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -34,7 +34,7 @@
  * an argument of "0".
  * These have been flagged to ignore for code coverage purposes.
  *
- * @see \CodeIgniter\CLI\CLITest
+ * @see CLITest
  */
 class CLI
 {
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index adcf9aaeca8b..6124127ecbf5 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -19,7 +19,7 @@
 /**
  * Console
  *
- * @see \CodeIgniter\CLI\ConsoleTest
+ * @see ConsoleTest
  */
 class Console
 {
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 6402b002866d..0a248541a29e 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -19,7 +19,7 @@
 /**
  * A factory for loading the desired
  *
- * @see \CodeIgniter\Cache\CacheFactoryTest
+ * @see CacheFactoryTest
  */
 class CacheFactory
 {
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index 061a4a661b8a..a583d3c78c84 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -20,7 +20,7 @@
 /**
  * Base class for cache handling
  *
- * @see \CodeIgniter\Cache\Handlers\BaseHandlerTest
+ * @see BaseHandlerTest
  */
 abstract class BaseHandler implements CacheInterface
 {
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index d2d4fb068bba..9cf5bd8e8bb7 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -16,7 +16,7 @@
 /**
  * Dummy cache handler
  *
- * @see \CodeIgniter\Cache\Handlers\DummyHandlerTest
+ * @see DummyHandlerTest
  */
 class DummyHandler extends BaseHandler
 {
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 0a39c3610ba0..688b7f70ad4d 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -19,7 +19,7 @@
 /**
  * File system cache handler
  *
- * @see \CodeIgniter\Cache\Handlers\FileHandlerTest
+ * @see FileHandlerTest
  */
 class FileHandler extends BaseHandler
 {
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index e8658906392a..2279bf8e3545 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -21,7 +21,7 @@
 /**
  * Mamcached cache handler
  *
- * @see \CodeIgniter\Cache\Handlers\MemcachedHandlerTest
+ * @see MemcachedHandlerTest
  */
 class MemcachedHandler extends BaseHandler
 {
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 986d083ebc69..a9b89fcc54ed 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -21,7 +21,7 @@
 /**
  * Predis cache handler
  *
- * @see \CodeIgniter\Cache\Handlers\PredisHandlerTest
+ * @see PredisHandlerTest
  */
 class PredisHandler extends BaseHandler
 {
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 953de2dc20be..11584c91a8db 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -20,7 +20,7 @@
 /**
  * Redis cache handler
  *
- * @see \CodeIgniter\Cache\Handlers\RedisHandlerTest
+ * @see RedisHandlerTest
  */
 class RedisHandler extends BaseHandler
 {
diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php
index 3f66284a6cf5..a46ebf4e8c7a 100644
--- a/system/Cache/ResponseCache.php
+++ b/system/Cache/ResponseCache.php
@@ -20,7 +20,7 @@
 /**
  * Web Page Caching
  *
- * @see \CodeIgniter\Cache\ResponseCacheTest
+ * @see ResponseCacheTest
  */
 final class ResponseCache
 {
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8299bfafa992..53cb68c1b63b 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -47,7 +47,7 @@
  * request, route it to a controller, and send back the response.
  * Of course, there are variations to that flow, but this is the brains.
  *
- * @see \CodeIgniter\CodeIgniterTest
+ * @see CodeIgniterTest
  */
 class CodeIgniter
 {
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index af3cbacf772c..18ff3ed4e5fe 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -18,7 +18,7 @@
 /**
  * Displays a list of all migrations and whether they've been run or not.
  *
- * @see \CodeIgniter\Commands\Database\MigrateStatusTest
+ * @see MigrateStatusTest
  */
 class MigrateStatus extends BaseCommand
 {
diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 4c8f1bfd3865..e0b9007cb8e5 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -19,7 +19,7 @@
 /**
  * Get table data if it exists in the database.
  *
- * @see \CodeIgniter\Commands\Database\ShowTableInfoTest
+ * @see ShowTableInfoTest
  */
 class ShowTableInfo extends BaseCommand
 {
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index 71461933c5a0..7bc9401ee041 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -21,7 +21,7 @@
  * full server path. Helps you to verify that you have
  * the namespaces setup correctly.
  *
- * @see \CodeIgniter\Commands\Utilities\NamespacesTest
+ * @see NamespacesTest
  */
 class Namespaces extends BaseCommand
 {
diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php
index cc45608f21e8..ab197014e7ac 100644
--- a/system/Commands/Utilities/Routes/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php
@@ -14,7 +14,7 @@
 /**
  * Collects data for auto route listing.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\AutoRouteCollectorTest
+ * @see AutoRouteCollectorTest
  */
 final class AutoRouteCollector
 {
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
index 18a158cffa4f..79c45368ef55 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
@@ -17,7 +17,7 @@
 /**
  * Collects data for Auto Routing Improved.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollectorTest
+ * @see AutoRouteCollectorTest
  */
 final class AutoRouteCollector
 {
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
index a077633f7011..5372aa951a4e 100644
--- a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -18,7 +18,7 @@
 /**
  * Reads a controller and returns a list of auto route listing.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\ControllerMethodReaderTest
+ * @see ControllerMethodReaderTest
  */
 final class ControllerMethodReader
 {
diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
index 3982c454a78e..957a3b74eb5a 100644
--- a/system/Commands/Utilities/Routes/ControllerFinder.php
+++ b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -17,7 +17,7 @@
 /**
  * Finds all controllers in a namespace for auto route listing.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\ControllerFinderTest
+ * @see ControllerFinderTest
  */
 final class ControllerFinder
 {
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 31bcde12dfb8..8fda3f25444a 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -17,7 +17,7 @@
 /**
  * Reads a controller and returns a list of auto route listing.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\ControllerMethodReaderTest
+ * @see ControllerMethodReaderTest
  */
 final class ControllerMethodReader
 {
diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
index 01d228a41704..9cd28cfad4ee 100644
--- a/system/Commands/Utilities/Routes/FilterCollector.php
+++ b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -20,7 +20,7 @@
 /**
  * Collects filters for a route.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\FilterCollectorTest
+ * @see FilterCollectorTest
  */
 final class FilterCollector
 {
diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
index 2e5da617e795..962643e37e97 100644
--- a/system/Commands/Utilities/Routes/FilterFinder.php
+++ b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -21,7 +21,7 @@
 /**
  * Finds filters.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\FilterFinderTest
+ * @see FilterFinderTest
  */
 final class FilterFinder
 {
diff --git a/system/Commands/Utilities/Routes/SampleURIGenerator.php b/system/Commands/Utilities/Routes/SampleURIGenerator.php
index 43d1934438bb..841a060b677c 100644
--- a/system/Commands/Utilities/Routes/SampleURIGenerator.php
+++ b/system/Commands/Utilities/Routes/SampleURIGenerator.php
@@ -18,7 +18,7 @@
 /**
  * Generate a sample URI path from route key regex.
  *
- * @see \CodeIgniter\Commands\Utilities\Routes\SampleURIGeneratorTest
+ * @see SampleURIGeneratorTest
  */
 final class SampleURIGenerator
 {
diff --git a/system/Common.php b/system/Common.php
index 690fa3fc5b6a..fe09732600ed 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -537,7 +537,7 @@ function force_https(
      * that version is yet to be released. This function will therefore
      * be just temporary, but would probably be kept for a few years.
      *
-     * @see   http://www.hardened-php.net/suhosin/
+     * @see http://www.hardened-php.net/suhosin/
      *
      * @param string $functionName Function to check for
      *
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 5dd6cde2ad02..20ad957d29e3 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -28,7 +28,7 @@
  * These can be set within the .env file.
  *
  * @phpstan-consistent-constructor
- * @see \CodeIgniter\Config\BaseConfigTest
+ * @see BaseConfigTest
  */
 class BaseConfig
 {
diff --git a/system/Config/Config.php b/system/Config/Config.php
index 90a6b7cadef5..c37c2d571d2d 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -13,7 +13,7 @@
 
 /**
  * @deprecated Use CodeIgniter\Config\Factories::config()
- * @see \CodeIgniter\Config\ConfigTest
+ * @see ConfigTest
  */
 class Config
 {
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 05ecab900c3e..2eb9fbbe0245 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -16,7 +16,7 @@
 /**
  * Environment-specific configuration
  *
- * @see \CodeIgniter\Config\DotEnvTest
+ * @see DotEnvTest
  */
 class DotEnv
 {
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index c86bfd95cc5d..8eabddba1f4c 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -26,7 +26,7 @@
  *
  * @method static BaseConfig|null config(...$arguments)
  * @method static Model|null      models(string $alias, array $options = [], ?ConnectionInterface &$conn = null)
- * @see \CodeIgniter\Config\FactoriesTest
+ * @see FactoriesTest
  */
 class Factories
 {
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 5ffb9e049c46..b9f626ce66a3 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -104,7 +104,7 @@
  *
  * @see http://blog.ircmaxell.com/2015/11/simple-easy-risk-and-change.html
  * @see http://www.infoq.com/presentations/Simple-Made-Easy
- * @see \CodeIgniter\Config\ServicesTest
+ * @see ServicesTest
  */
 class Services extends BaseService
 {
diff --git a/system/Controller.php b/system/Controller.php
index a28a7a59f460..4b826c133076 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -23,7 +23,7 @@
 /**
  * Class Controller
  *
- * @see \CodeIgniter\ControllerTest
+ * @see ControllerTest
  */
 class Controller
 {
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 69e40017bb65..5e44d25b7751 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -39,7 +39,7 @@
  * ```
  *
  * @template-implements ArrayAccess<string, bool|int|string>
- * @see \CodeIgniter\Cookie\CookieTest
+ * @see CookieTest
  */
 class Cookie implements ArrayAccess, CloneableCookieInterface
 {
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index d893a4add116..ac330857d4f6 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -21,7 +21,7 @@
  * The CookieStore object represents an immutable collection of `Cookie` value objects.
  *
  * @implements IteratorAggregate<string, Cookie>
- * @see \CodeIgniter\Cookie\CookieStoreTest
+ * @see CookieStoreTest
  */
 class CookieStore implements Countable, IteratorAggregate
 {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 1116d3966439..d9f960dcd1cc 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -50,7 +50,7 @@
  * @template TResult
  *
  * @implements ConnectionInterface<TConnection, TResult>
- * @see \CodeIgniter\Database\BaseConnectionTest
+ * @see BaseConnectionTest
  */
 abstract class BaseConnection implements ConnectionInterface
 {
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 92556c6d8fef..239682d2db27 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -18,7 +18,7 @@
 /**
  * Class Config
  *
- * @see \CodeIgniter\Database\ConfigTest
+ * @see ConfigTest
  */
 class Config extends BaseConfig
 {
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index 76a30e6c1d30..cb98e09b144a 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -19,7 +19,7 @@
  * @deprecated Use CodeIgniter\Config\Factories::models()
  *
  * @codeCoverageIgnore
- * @see \CodeIgniter\Database\ModelFactoryTest
+ * @see ModelFactoryTest
  */
 class ModelFactory
 {
diff --git a/system/Database/RawSql.php b/system/Database/RawSql.php
index efa97d30736c..00e2ed4b0366 100644
--- a/system/Database/RawSql.php
+++ b/system/Database/RawSql.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Database;
 
 /**
- * @see \CodeIgniter\Database\RawSqlTest
+ * @see RawSqlTest
  */
 class RawSql
 {
diff --git a/system/Debug/ExceptionHandler.php b/system/Debug/ExceptionHandler.php
index 63449888ffb5..71c43909eccb 100644
--- a/system/Debug/ExceptionHandler.php
+++ b/system/Debug/ExceptionHandler.php
@@ -21,7 +21,7 @@
 use Throwable;
 
 /**
- * @see \CodeIgniter\Debug\ExceptionHandlerTest
+ * @see ExceptionHandlerTest
  */
 final class ExceptionHandler extends BaseExceptionHandler implements ExceptionHandlerInterface
 {
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 1f5a5b52f03b..ac67136e805c 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -28,7 +28,7 @@
 /**
  * Exceptions manager
  *
- * @see \CodeIgniter\Debug\ExceptionsTest
+ * @see ExceptionsTest
  */
 class Exceptions
 {
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 45c0bf865c8e..8d39400592cc 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -19,7 +19,7 @@
  * Provides a simple way to measure the amount of time
  * that elapses between two points.
  *
- * @see \CodeIgniter\Debug\TimerTest
+ * @see TimerTest
  */
 class Timer
 {
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 5b5614ad3b9c..f61389761ac2 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -18,7 +18,7 @@
 /**
  * Collector for the Database tab of the Debug Toolbar.
  *
- * @see \CodeIgniter\Debug\Toolbar\Collectors\DatabaseTest
+ * @see DatabaseTest
  */
 class Database extends BaseCollector
 {
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index fcf06e16f54a..6cb4ed519dc3 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -16,7 +16,7 @@
 /**
  * History collector
  *
- * @see \CodeIgniter\Debug\Toolbar\Collectors\HistoryTest
+ * @see HistoryTest
  */
 class History extends BaseCollector
 {
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index aadf72ee19ad..3652a536443c 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @var \CodeIgniter\Debug\Toolbar $this
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var string                     $url
- * @var string                     $method
- * @var bool                       $isAJAX
- * @var int                        $startTime
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var float                      $segmentDuration
- * @var int                        $segmentCount
- * @var string                     $CI_VERSION
- * @var array                      $collectors
- * @var array                      $vars
- * @var array                      $styles
- * @var \CodeIgniter\View\Parser   $parser
+ * @var CodeIgniter\Debug\Toolbar $this
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var string                    $url
+ * @var string                    $method
+ * @var bool                      $isAJAX
+ * @var int                       $startTime
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var float                     $segmentDuration
+ * @var int                       $segmentCount
+ * @var string                    $CI_VERSION
+ * @var array                     $collectors
+ * @var array                     $vars
+ * @var array                     $styles
+ * @var CodeIgniter\View\Parser   $parser
  */
 ?>
 <style>
diff --git a/system/Email/Email.php b/system/Email/Email.php
index d18b40ff7cef..eb10df5c1e2a 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -21,7 +21,7 @@
  *
  * Permits email to be sent using Mail, Sendmail, or SMTP.
  *
- * @see \CodeIgniter\Email\EmailTest
+ * @see EmailTest
  */
 class Email
 {
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index 113703d55649..555fabc6f57a 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -21,7 +21,7 @@
  * This class determines the driver, cipher, and mode to use, and then
  * initializes the appropriate encryption handler.
  *
- * @see \CodeIgniter\Encryption\EncryptionTest
+ * @see EncryptionTest
  */
 class Encryption
 {
diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php
index 0d8f10758b3c..186d86693bda 100644
--- a/system/Encryption/Handlers/OpenSSLHandler.php
+++ b/system/Encryption/Handlers/OpenSSLHandler.php
@@ -16,7 +16,7 @@
 /**
  * Encryption handling for OpenSSL library
  *
- * @see \CodeIgniter\Encryption\Handlers\OpenSSLHandlerTest
+ * @see OpenSSLHandlerTest
  */
 class OpenSSLHandler extends BaseHandler
 {
diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
index c483dfe90c3a..d37ceec0b6ea 100644
--- a/system/Encryption/Handlers/SodiumHandler.php
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -17,7 +17,7 @@
  * SodiumHandler uses libsodium in encryption.
  *
  * @see https://github.com/jedisct1/libsodium/issues/392
- * @see \CodeIgniter\Encryption\Handlers\SodiumHandlerTest
+ * @see SodiumHandlerTest
  */
 class SodiumHandler extends BaseHandler
 {
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 0e751b684843..ede04d0aff86 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -34,7 +34,7 @@
 /**
  * Entity encapsulation, for use with CodeIgniter\Model
  *
- * @see \CodeIgniter\Entity\EntityTest
+ * @see EntityTest
  */
 class Entity implements JsonSerializable
 {
diff --git a/system/Events/Events.php b/system/Events/Events.php
index b240dc29e1ca..51c49b3910b9 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -17,7 +17,7 @@
 /**
  * Events
  *
- * @see \CodeIgniter\Events\EventsTest
+ * @see EventsTest
  */
 class Events
 {
diff --git a/system/Files/File.php b/system/Files/File.php
index 4e4ee388047e..fee4a3e1fe8e 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -21,7 +21,7 @@
 /**
  * Wrapper for PHP's built-in SplFileInfo, with goodies.
  *
- * @see \CodeIgniter\Files\FileTest
+ * @see FileTest
  */
 class File extends SplFileInfo
 {
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index 87f987eb8f1e..dce723a97fef 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -25,7 +25,7 @@
  * filtering, and ordering them.
  *
  * @template-implements IteratorAggregate<int, File>
- * @see \CodeIgniter\Files\FileCollectionTest
+ * @see FileCollectionTest
  */
 class FileCollection implements Countable, IteratorAggregate
 {
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 23e6e2540eca..121fa01770d6 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -24,7 +24,7 @@
  * This filter is not intended to be used from the command line.
  *
  * @codeCoverageIgnore
- * @see \CodeIgniter\Filters\CSRFTest
+ * @see CSRFTest
  */
 class CSRF implements FilterInterface
 {
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index 75662d841ade..473fab7f0baf 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -18,7 +18,7 @@
 /**
  * Debug toolbar filter
  *
- * @see \CodeIgniter\Filters\DebugToolbarTest
+ * @see DebugToolbarTest
  */
 class DebugToolbar implements FilterInterface
 {
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 18001b103844..c995020626b0 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -22,7 +22,7 @@
 /**
  * Filters
  *
- * @see \CodeIgniter\Filters\FiltersTest
+ * @see FiltersTest
  */
 class Filters
 {
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index e30e90f8d9fd..f275474d17ce 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -20,7 +20,7 @@
 /**
  * Honeypot filter
  *
- * @see \CodeIgniter\Filters\HoneypotTest
+ * @see HoneypotTest
  */
 class Honeypot implements FilterInterface
 {
diff --git a/system/Filters/InvalidChars.php b/system/Filters/InvalidChars.php
index 93124fdb4e9f..ea8e8cd420e3 100644
--- a/system/Filters/InvalidChars.php
+++ b/system/Filters/InvalidChars.php
@@ -24,7 +24,7 @@
  *   - invalid UTF-8 characters
  *   - control characters except line break and tab code
  *
- * @see \CodeIgniter\Filters\InvalidCharsTest
+ * @see InvalidCharsTest
  */
 class InvalidChars implements FilterInterface
 {
diff --git a/system/Filters/SecureHeaders.php b/system/Filters/SecureHeaders.php
index 952926b95714..dd8f28a4d1ed 100644
--- a/system/Filters/SecureHeaders.php
+++ b/system/Filters/SecureHeaders.php
@@ -17,7 +17,7 @@
 /**
  * Add Common Security Headers
  *
- * @see \CodeIgniter\Filters\SecureHeadersTest
+ * @see SecureHeadersTest
  */
 class SecureHeaders implements FilterInterface
 {
diff --git a/system/Format/Format.php b/system/Format/Format.php
index 6b4eb73f1f3a..c1be79e7deb8 100644
--- a/system/Format/Format.php
+++ b/system/Format/Format.php
@@ -17,7 +17,7 @@
 /**
  * The Format class is a convenient place to create Formatters.
  *
- * @see \CodeIgniter\Format\FormatTest
+ * @see FormatTest
  */
 class Format
 {
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
index 3e708e9fa6b7..0349c4085e6d 100644
--- a/system/Format/JSONFormatter.php
+++ b/system/Format/JSONFormatter.php
@@ -17,7 +17,7 @@
 /**
  * JSON data formatter
  *
- * @see \CodeIgniter\Format\JSONFormatterTest
+ * @see JSONFormatterTest
  */
 class JSONFormatter implements FormatterInterface
 {
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index 51b3003e974e..d429f657094f 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -18,7 +18,7 @@
 /**
  * XML data formatter
  *
- * @see \CodeIgniter\Format\XMLFormatterTest
+ * @see XMLFormatterTest
  */
 class XMLFormatter implements FormatterInterface
 {
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 01823dbfc4c5..f78c21cbf20b 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -26,7 +26,7 @@
  *
  * http://fuelphp.com
  *
- * @see \CodeIgniter\HTTP\CLIRequestTest
+ * @see CLIRequestTest
  */
 class CLIRequest extends Request
 {
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 500b425d2dc5..5bced785b3e4 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -19,7 +19,7 @@
 /**
  * A lightweight HTTP client for sending synchronous HTTP requests via cURL.
  *
- * @see \CodeIgniter\HTTP\CURLRequestTest
+ * @see CURLRequestTest
  */
 class CURLRequest extends OutgoingRequest
 {
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index f4970bf7c544..758aceb5f21d 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -22,7 +22,7 @@
  * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
  * @see http://content-security-policy.com/
  * @see https://www.owasp.org/index.php/Content_Security_Policy
- * @see \CodeIgniter\HTTP\ContentSecurityPolicyTest
+ * @see ContentSecurityPolicyTest
  */
 class ContentSecurityPolicy
 {
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index 14dc3fec1421..2bbed95815d8 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -19,7 +19,7 @@
 /**
  * HTTP response when a download is requested.
  *
- * @see \CodeIgniter\HTTP\DownloadResponseTest
+ * @see DownloadResponseTest
  */
 class DownloadResponse extends Response
 {
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 124381ec33bb..6db8222ab8a3 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -19,7 +19,7 @@
  *
  * Provides easy access to uploaded files for a request.
  *
- * @see \CodeIgniter\HTTP\Files\FileCollectionTest
+ * @see FileCollectionTest
  */
 class FileCollection
 {
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 67c6cb0636d3..2f25a9055987 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -16,7 +16,7 @@
  *
  * Represents a single HTTP header.
  *
- * @see \CodeIgniter\HTTP\HeaderTest
+ * @see HeaderTest
  */
 class Header
 {
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 8bc246f7956d..95998fc6b769 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -43,7 +43,7 @@
  * - Upload files, if any (as represented by $_FILES)
  * - Deserialized body binds (generally from $_POST)
  *
- * @see \CodeIgniter\HTTP\IncomingRequestTest
+ * @see IncomingRequestTest
  */
 class IncomingRequest extends Request
 {
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 9d0b517778a4..cc731ec4b7e1 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -14,7 +14,7 @@
 /**
  * An HTTP message
  *
- * @see \CodeIgniter\HTTP\MessageTest
+ * @see MessageTest
  */
 class Message implements MessageInterface
 {
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 9c903908695f..73c88f5be075 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -21,7 +21,7 @@
  * server wants.
  *
  * @see http://tools.ietf.org/html/rfc7231#section-5.3
- * @see \CodeIgniter\HTTP\NegotiateTest
+ * @see NegotiateTest
  */
 class Negotiate
 {
diff --git a/system/HTTP/OutgoingRequest.php b/system/HTTP/OutgoingRequest.php
index 698cde263bc1..afe80305d30c 100644
--- a/system/HTTP/OutgoingRequest.php
+++ b/system/HTTP/OutgoingRequest.php
@@ -14,7 +14,7 @@
 /**
  * Representation of an outgoing, client-side request.
  *
- * @see \CodeIgniter\HTTP\OutgoingRequestTest
+ * @see OutgoingRequestTest
  */
 class OutgoingRequest extends Message implements OutgoingRequestInterface
 {
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index d6f234ca9f68..24faefd0d6c6 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -18,7 +18,7 @@
 /**
  * Handle a redirect response
  *
- * @see \CodeIgniter\HTTP\RedirectResponseTest
+ * @see RedirectResponseTest
  */
 class RedirectResponse extends Response
 {
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index afb0b22ad5d0..670ea0fca121 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -17,7 +17,7 @@
 /**
  * Representation of an incoming, server-side HTTP request.
  *
- * @see \CodeIgniter\HTTP\RequestTest
+ * @see RequestTest
  */
 class Request extends OutgoingRequest implements RequestInterface
 {
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index bc37e7418632..da3f4e31aa2b 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -29,7 +29,7 @@
  * - Headers
  * - Message body
  *
- * @see \CodeIgniter\HTTP\ResponseTest
+ * @see ResponseTest
  */
 class Response extends Message implements ResponseInterface
 {
diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php
index 6d56507314e7..038f6a4edf5e 100644
--- a/system/HTTP/SiteURI.php
+++ b/system/HTTP/SiteURI.php
@@ -19,7 +19,7 @@
 /**
  * URI for the application site
  *
- * @see \CodeIgniter\HTTP\SiteURITest
+ * @see SiteURITest
  */
 class SiteURI extends URI
 {
diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php
index 36b9d705b28c..574c61d0052d 100644
--- a/system/HTTP/SiteURIFactory.php
+++ b/system/HTTP/SiteURIFactory.php
@@ -20,7 +20,7 @@
  *
  * This class also updates superglobal $_SERVER and $_GET.
  *
- * @see \CodeIgniter\HTTP\SiteURIFactoryTest
+ * @see SiteURIFactoryTest
  */
 final class SiteURIFactory
 {
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 5bec38013bf2..489ac2acf30c 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -19,7 +19,7 @@
 /**
  * Abstraction for a uniform resource identifier (URI).
  *
- * @see \CodeIgniter\HTTP\URITest
+ * @see URITest
  */
 class URI
 {
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 2294b02a2b48..2fcb5b355fae 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -16,7 +16,7 @@
 /**
  * Abstraction for an HTTP user agent
  *
- * @see \CodeIgniter\HTTP\UserAgentTest
+ * @see UserAgentTest
  */
 class UserAgent
 {
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index de8fb6146a63..e479389f9721 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -36,7 +36,7 @@
      *
      * @return void
      *
-     * @see \CodeIgniter\HTTP\Response::setCookie()
+     * @see CodeIgniter\HTTP\Response::setCookie()
      */
     function set_cookie(
         $name,
@@ -65,7 +65,7 @@ function set_cookie(
      *
      * @return array|string|null
      *
-     * @see \CodeIgniter\HTTP\IncomingRequest::getCookie()
+     * @see CodeIgniter\HTTP\IncomingRequest::getCookie()
      */
     function get_cookie($index, bool $xssClean = false, ?string $prefix = '')
     {
@@ -93,7 +93,7 @@ function get_cookie($index, bool $xssClean = false, ?string $prefix = '')
      *
      * @return void
      *
-     * @see \CodeIgniter\HTTP\Response::deleteCookie()
+     * @see CodeIgniter\HTTP\Response::deleteCookie()
      */
     function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
     {
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index c0998c475bbc..0a67f5e221c4 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -20,7 +20,7 @@
 /**
  * class Honeypot
  *
- * @see \CodeIgniter\Honeypot\HoneypotTest
+ * @see HoneypotTest
  */
 class Honeypot
 {
diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php
index ba8d2bfbb891..82249172a6d3 100644
--- a/system/HotReloader/DirectoryHasher.php
+++ b/system/HotReloader/DirectoryHasher.php
@@ -19,7 +19,7 @@
 
 /**
  * @internal
- * @see \CodeIgniter\HotReloader\DirectoryHasherTest
+ * @see DirectoryHasherTest
  */
 final class DirectoryHasher
 {
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index f01718aac6e0..1f3ca9639777 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -36,7 +36,7 @@
  * @property string $weekOfYear  read-only
  * @property string $year        read-only
  *
- * @see \CodeIgniter\I18n\TimeTest
+ * @see TimeTest
  */
 class Time extends DateTimeImmutable
 {
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index c797a422d8c7..ff3c2b202e83 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -17,7 +17,7 @@
 /**
  * Class TimeDifference
  *
- * @see \CodeIgniter\I18n\TimeDifferenceTest
+ * @see TimeDifferenceTest
  */
 class TimeDifference
 {
diff --git a/system/I18n/TimeLegacy.php b/system/I18n/TimeLegacy.php
index 35523e322475..3f3810d4e6b4 100644
--- a/system/I18n/TimeLegacy.php
+++ b/system/I18n/TimeLegacy.php
@@ -38,7 +38,7 @@
  * @property string $year        read-only
  *
  * @deprecated Use Time instead.
- * @see \CodeIgniter\I18n\TimeLegacyTest
+ * @see TimeLegacyTest
  */
 class TimeLegacy extends DateTime
 {
diff --git a/system/Images/Image.php b/system/Images/Image.php
index 291ad002a6f2..735c8e666498 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -17,7 +17,7 @@
 /**
  * Encapsulation of an Image file
  *
- * @see \CodeIgniter\Images\ImageTest
+ * @see ImageTest
  */
 class Image extends File
 {
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 8633f8a2dd9c..d6126e2b8f2c 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -20,7 +20,7 @@
  *
  * Locale-based, built on top of PHP internationalization.
  *
- * @see \CodeIgniter\Language\LanguageTest
+ * @see LanguageTest
  */
 class Language
 {
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index b04d6f69238c..dc70b16e3efc 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -21,7 +21,7 @@
  * Requires the ChromeLogger extension installed in your browser.
  *
  * @see https://craig.is/writing/chrome-logger
- * @see \CodeIgniter\Log\Handlers\ChromeLoggerHandlerTest
+ * @see ChromeLoggerHandlerTest
  */
 class ChromeLoggerHandler extends BaseHandler
 {
diff --git a/system/Log/Handlers/ErrorlogHandler.php b/system/Log/Handlers/ErrorlogHandler.php
index d9f3fc4e0a20..6d86c587c471 100644
--- a/system/Log/Handlers/ErrorlogHandler.php
+++ b/system/Log/Handlers/ErrorlogHandler.php
@@ -16,7 +16,7 @@
 /**
  * Log handler that writes to PHP's `error_log()`
  *
- * @see \CodeIgniter\Log\Handlers\ErrorlogHandlerTest
+ * @see ErrorlogHandlerTest
  */
 class ErrorlogHandler extends BaseHandler
 {
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 88e384781a70..958582053696 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -17,7 +17,7 @@
 /**
  * Log error messages to file system
  *
- * @see \CodeIgniter\Log\Handlers\FileHandlerTest
+ * @see FileHandlerTest
  */
 class FileHandler extends BaseHandler
 {
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index e5f482cb63d2..0af5ed94e013 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -29,7 +29,7 @@
  * can be made by implementors is that if an Exception instance is given
  * to produce a stack trace, it MUST be in a key named "exception".
  *
- * @see \CodeIgniter\Log\LoggerTest
+ * @see LoggerTest
  */
 class Logger implements LoggerInterface
 {
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index d9de5faab401..c4b89628583d 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -25,7 +25,7 @@
  * to determine the current page. This class can support multiple
  * paginations on a single page.
  *
- * @see \CodeIgniter\Pager\PagerTest
+ * @see PagerTest
  */
 class Pager implements PagerInterface
 {
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 9e6d2950caf0..e8901ac02116 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -20,7 +20,7 @@
  * and is used to get the link information and provide utility
  * methods needed to work with pagination.
  *
- * @see \CodeIgniter\Pager\PagerRendererTest
+ * @see PagerRendererTest
  */
 class PagerRenderer
 {
diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php
index accfdd716695..68a6bb95f70a 100644
--- a/system/Publisher/ContentReplacer.php
+++ b/system/Publisher/ContentReplacer.php
@@ -16,7 +16,7 @@
 /**
  * Replace Text Content
  *
- * @see \CodeIgniter\Publisher\ContentReplacerTest
+ * @see ContentReplacerTest
  */
 class ContentReplacer
 {
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index 03ba4d314613..6216fb0463b0 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -17,7 +17,7 @@
 /**
  * An extendable controller to provide a RESTful API for a resource.
  *
- * @see \CodeIgniter\RESTful\ResourceControllerTest
+ * @see ResourceControllerTest
  */
 class ResourceController extends BaseResource
 {
diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php
index 8c39bd8a0050..aa125c421056 100644
--- a/system/RESTful/ResourcePresenter.php
+++ b/system/RESTful/ResourcePresenter.php
@@ -16,7 +16,7 @@
 /**
  * An extendable controller to help provide a UI for a resource.
  *
- * @see \CodeIgniter\RESTful\ResourcePresenterTest
+ * @see ResourcePresenterTest
  */
 class ResourcePresenter extends BaseResource
 {
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index a86e92f0161a..ad8713b5c133 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -20,7 +20,7 @@
 /**
  * New Secure Router for Auto-Routing
  *
- * @see \CodeIgniter\Router\AutoRouterImprovedTest
+ * @see AutoRouterImprovedTest
  */
 final class AutoRouterImproved implements AutoRouterInterface
 {
diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php
index 4fdbbb02597b..7a5a38e643b8 100644
--- a/system/Router/DefinedRouteCollector.php
+++ b/system/Router/DefinedRouteCollector.php
@@ -17,7 +17,7 @@
 /**
  * Collect all defined routes for display.
  *
- * @see \CodeIgniter\Router\DefinedRouteCollectorTest
+ * @see DefinedRouteCollectorTest
  */
 final class DefinedRouteCollector
 {
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 4407c1076f3d..cc6b14012dfe 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -22,7 +22,7 @@
 
 /**
  * @todo Implement nested resource routing (See CakePHP)
- * @see \CodeIgniter\Router\RouteCollectionTest
+ * @see RouteCollectionTest
  */
 class RouteCollection implements RouteCollectionInterface
 {
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 723c292cb931..8b65914b792f 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -22,7 +22,7 @@
 /**
  * Request router.
  *
- * @see \CodeIgniter\Router\RouterTest
+ * @see RouterTest
  */
 class Router implements RouterInterface
 {
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 4ba665639f36..d1c854bf18c1 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -31,7 +31,7 @@
  * Provides methods that help protect your site against
  * Cross-Site Request Forgery attacks.
  *
- * @see \CodeIgniter\Security\SecurityTest
+ * @see SecurityTest
  */
 class Security implements SecurityInterface
 {
diff --git a/system/Session/Handlers/Database/MySQLiHandler.php b/system/Session/Handlers/Database/MySQLiHandler.php
index 380041aab67b..25c083467db9 100644
--- a/system/Session/Handlers/Database/MySQLiHandler.php
+++ b/system/Session/Handlers/Database/MySQLiHandler.php
@@ -16,7 +16,7 @@
 /**
  * Session handler for MySQLi
  *
- * @see \CodeIgniter\Session\Handlers\Database\MySQLiHandlerTest
+ * @see MySQLiHandlerTest
  */
 class MySQLiHandler extends DatabaseHandler
 {
diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
index 0c140fea70c3..14d81241b82c 100644
--- a/system/Session/Handlers/Database/PostgreHandler.php
+++ b/system/Session/Handlers/Database/PostgreHandler.php
@@ -18,7 +18,7 @@
 /**
  * Session handler for Postgre
  *
- * @see \CodeIgniter\Session\Handlers\Database\PostgreHandlerTest
+ * @see PostgreHandlerTest
  */
 class PostgreHandler extends DatabaseHandler
 {
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 7dfe5898d78f..eb0d25d5ace2 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -26,7 +26,7 @@
  * variables in app/config/App.php
  *
  * @property string $session_id
- * @see \CodeIgniter\Session\SessionTest
+ * @see SessionTest
  */
 class Session implements SessionInterface
 {
diff --git a/system/Superglobals.php b/system/Superglobals.php
index c4386353315b..9bc57c846ab9 100644
--- a/system/Superglobals.php
+++ b/system/Superglobals.php
@@ -15,7 +15,7 @@
  * Superglobals manipulation.
  *
  * @internal
- * @see \CodeIgniter\SuperglobalsTest
+ * @see SuperglobalsTest
  */
 final class Superglobals
 {
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index a14183eeea92..3f3c2fd7ad90 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -20,7 +20,7 @@
 /**
  * Load a response into a DOMDocument for testing assertions based on that
  *
- * @see \CodeIgniter\Test\DOMParserTest
+ * @see DOMParserTest
  */
 class DOMParser
 {
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 3a28f281d127..4657be61fcc2 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -26,7 +26,7 @@
  * Bridge class for using Faker to create example data based on
  * model specifications.
  *
- * @see \CodeIgniter\Test\FabricatorTest
+ * @see FabricatorTest
  */
 class Fabricator
 {
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index 240f5c6d95b5..8ff17b35f8a5 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Log\Logger;
 
 /**
- * @see \CodeIgniter\Test\TestLoggerTest
+ * @see TestLoggerTest
  */
 class TestLogger extends Logger
 {
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 956b32188ac8..2a8fa74d2eaa 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -31,7 +31,7 @@
  * @internal
  *
  * @mixin DOMParser
- * @see \CodeIgniter\Test\TestResponseTest
+ * @see TestResponseTest
  */
 class TestResponse extends TestCase
 {
diff --git a/system/ThirdParty/Escaper/Escaper.php b/system/ThirdParty/Escaper/Escaper.php
index d6a02e14c9be..c4964cb55e4a 100644
--- a/system/ThirdParty/Escaper/Escaper.php
+++ b/system/ThirdParty/Escaper/Escaper.php
@@ -157,9 +157,21 @@ public function __construct(?string $encoding = null)
         $this->htmlSpecialCharsFlags = ENT_QUOTES | ENT_SUBSTITUTE;
 
         // set matcher callbacks
-        $this->htmlAttrMatcher = [$this, 'htmlAttrMatcher'];
-        $this->jsMatcher       = [$this, 'jsMatcher'];
-        $this->cssMatcher      = [$this, 'cssMatcher'];
+        $this->htmlAttrMatcher =
+            /** @param array<array-key, string> $matches */
+            function (array $matches): string {
+                return $this->htmlAttrMatcher($matches);
+            };
+        $this->jsMatcher       =
+            /** @param array<array-key, string> $matches */
+            function (array $matches): string {
+                return $this->jsMatcher($matches);
+            };
+        $this->cssMatcher      =
+            /** @param array<array-key, string> $matches */
+            function (array $matches): string {
+                return $this->cssMatcher($matches);
+            };
     }
 
     /**
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index fd763cd52e86..f3d8c72f5c47 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -16,7 +16,7 @@
 /**
  * Typography Class
  *
- * @see \CodeIgniter\Typography\TypographyTest
+ * @see TypographyTest
  */
 class Typography
 {
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 61f59d7bfe86..e453cc4ca244 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -17,7 +17,7 @@
  * Provides validation methods for common credit-card inputs.
  *
  * @see http://en.wikipedia.org/wiki/Credit_card_number
- * @see \CodeIgniter\Validation\CreditCardRulesTest
+ * @see CreditCardRulesTest
  */
 class CreditCardRules
 {
diff --git a/system/Validation/DotArrayFilter.php b/system/Validation/DotArrayFilter.php
index 4f696886451d..03e9db476b22 100644
--- a/system/Validation/DotArrayFilter.php
+++ b/system/Validation/DotArrayFilter.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Validation;
 
 /**
- * @see \CodeIgniter\Validation\DotArrayFilterTest
+ * @see DotArrayFilterTest
  */
 final class DotArrayFilter
 {
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index ce0ed8140d42..8682a518c8de 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -21,7 +21,7 @@
 /**
  * File validation rules
  *
- * @see \CodeIgniter\Validation\FileRulesTest
+ * @see FileRulesTest
  */
 class FileRules
 {
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 88775d14de8f..6de13c849872 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -16,7 +16,7 @@
 /**
  * Format validation Rules.
  *
- * @see \CodeIgniter\Validation\FormatRulesTest
+ * @see FormatRulesTest
  */
 class FormatRules
 {
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 6481a45b4e00..2e7156ac6e58 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -17,7 +17,7 @@
 /**
  * Validation Rules.
  *
- * @see \CodeIgniter\Validation\RulesTest
+ * @see RulesTest
  */
 class Rules
 {
diff --git a/system/Validation/StrictRules/CreditCardRules.php b/system/Validation/StrictRules/CreditCardRules.php
index 2ceacdc6fc37..7684c4683027 100644
--- a/system/Validation/StrictRules/CreditCardRules.php
+++ b/system/Validation/StrictRules/CreditCardRules.php
@@ -21,7 +21,7 @@
  * Provides validation methods for common credit-card inputs.
  *
  * @see http://en.wikipedia.org/wiki/Credit_card_number
- * @see \CodeIgniter\Validation\StrictRules\CreditCardRulesTest
+ * @see CreditCardRulesTest
  */
 class CreditCardRules
 {
diff --git a/system/Validation/StrictRules/FileRules.php b/system/Validation/StrictRules/FileRules.php
index e86b84e99bfe..0daee2c0dcdc 100644
--- a/system/Validation/StrictRules/FileRules.php
+++ b/system/Validation/StrictRules/FileRules.php
@@ -18,7 +18,7 @@
 /**
  * File validation rules
  *
- * @see \CodeIgniter\Validation\StrictRules\FileRulesTest
+ * @see FileRulesTest
  */
 class FileRules extends NonStrictFileRules
 {
diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index c186a75b2694..6f742137f826 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -18,7 +18,7 @@
 /**
  * Format validation Rules.
  *
- * @see \CodeIgniter\Validation\StrictRules\FormatRulesTest
+ * @see FormatRulesTest
  */
 class FormatRules
 {
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 70d081975a62..3fd2e54f756b 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -19,7 +19,7 @@
 /**
  * Validation Rules.
  *
- * @see \CodeIgniter\Validation\StrictRules\RulesTest
+ * @see RulesTest
  */
 class Rules
 {
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 6e71aadb23f3..52a77f8c9cdb 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -26,7 +26,7 @@
 /**
  * Validator
  *
- * @see \CodeIgniter\Validation\ValidationTest
+ * @see ValidationTest
  */
 class Validation implements ValidationInterface
 {
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 141ceaf32f01..5e07ed7e788b 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -44,7 +44,7 @@
  *             function method(array $params=null)
  *         }
  *
- * @see \CodeIgniter\View\CellTest
+ * @see CellTest
  */
 class Cell
 {
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 8410ef969fca..d91ce552dd80 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -23,7 +23,7 @@
  * @phpstan-type parser_callable (callable(mixed): mixed)
  * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  *
- * @see \CodeIgniter\View\ParserTest
+ * @see ParserTest
  */
 class Parser extends View
 {
diff --git a/system/View/Table.php b/system/View/Table.php
index 9a259c8beafa..1bfc2b4fcbd6 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -18,7 +18,7 @@
  *
  * Lets you create tables manually or from database result objects, or arrays.
  *
- * @see \CodeIgniter\View\TableTest
+ * @see TableTest
  */
 class Table
 {
diff --git a/system/View/View.php b/system/View/View.php
index 9d84e969da5b..219788cd5968 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -24,7 +24,7 @@
 /**
  * Class View
  *
- * @see \CodeIgniter\View\ViewTest
+ * @see ViewTest
  */
 class View implements RendererInterface
 {
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 0efecd2e50ac..9360352f4900 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -177,7 +177,7 @@ public function testAutoRouteFindsControllerWithSubfolder(): void
             = $router->getRoute('subfolder/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
         $this->assertSame([
@@ -195,7 +195,7 @@ public function testAutoRouteFindsControllerWithSubSubfolder()
             = $router->getRoute('subfolder/sub/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/Sub/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Sub\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -209,7 +209,7 @@ public function testAutoRouteFindsDashedSubfolder(): void
 
         $this->assertSame('Dash_folder/', $directory);
         $this->assertSame(
-            '\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
+            '\\' . Controllers\Dash_folder\Mycontroller::class,
             $controller
         );
         $this->assertSame('getSomemethod', $method);
@@ -281,7 +281,7 @@ public function testAutoRouteFallbackToDefaultControllerOneParam()
             = $router->getRoute('subfolder/15', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15'], $params);
         $this->assertSame([
@@ -299,7 +299,7 @@ public function testAutoRouteFallbackToDefaultControllerTwoParams()
             = $router->getRoute('subfolder/15/20', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15', '20'], $params);
         $this->assertSame([
@@ -317,7 +317,7 @@ public function testAutoRouteFallbackToDefaultControllerNoParams()
             = $router->getRoute('subfolder', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
         $this->assertSame([
diff --git a/user_guide_src/source/models/entities/018.php b/user_guide_src/source/models/entities/018.php
index dc793bb8de81..2bb8750affe1 100644
--- a/user_guide_src/source/models/entities/018.php
+++ b/user_guide_src/source/models/entities/018.php
@@ -13,7 +13,7 @@ class MyEntity extends Entity
 
     // Bind the type to the handler
     protected $castHandlers = [
-        'base64' => \App\Entities\Cast\CastBase64::class,
+        'base64' => Cast\CastBase64::class,
     ];
 }