diff --git a/admin/starter/tests/_support/Libraries/ConfigReader.php b/admin/starter/tests/_support/Libraries/ConfigReader.php
index 40d057acbe22..0bb4a8fcf598 100644
--- a/admin/starter/tests/_support/Libraries/ConfigReader.php
+++ b/admin/starter/tests/_support/Libraries/ConfigReader.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Support\Libraries;
 
+use Config\App;
+
 /**
  * Class ConfigReader
  *
@@ -9,7 +11,7 @@
  * loading external values. Used to read actual local values from
  * a config file.
  */
-class ConfigReader extends \Config\App
+class ConfigReader extends App
 {
     public function __construct()
     {
diff --git a/preload.php b/preload.php
index 0b453122345e..86322d5e7137 100644
--- a/preload.php
+++ b/preload.php
@@ -9,6 +9,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * Sample file for Preloading
@@ -69,10 +72,10 @@ public function __construct()
 
     private function loadAutoloader(): void
     {
-        $paths = new Config\Paths();
+        $paths = new Paths();
         require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php';
 
-        CodeIgniter\Boot::preload($paths);
+        Boot::preload($paths);
     }
 
     /**
diff --git a/public/index.php b/public/index.php
index eb7f5c988838..a0a20db43dbf 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,8 @@
 <?php
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * CHECK PHP VERSION
@@ -48,9 +51,9 @@
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootWeb($paths));
+exit(Boot::bootWeb($paths));
diff --git a/spark b/spark
index 856dc3f8a227..e7871ea8e682 100755
--- a/spark
+++ b/spark
@@ -10,6 +10,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  * --------------------------------------------------------------------
  * CODEIGNITER COMMAND-LINE TOOLS
@@ -76,9 +79,9 @@ chdir(FCPATH);
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootSpark($paths));
+exit(Boot::bootSpark($paths));
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 8179c1a8e631..0768f62915bb 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -1,21 +1,24 @@
 <?php declare(strict_types=1);
+use CodeIgniter\Debug\Toolbar;
+use CodeIgniter\View\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
+ * @var 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 Parser  $parser
  */
 ?>
 <style>
diff --git a/tests/system/Config/fixtures/RegistrarConfig.php b/tests/system/Config/fixtures/RegistrarConfig.php
index 4f6e1b493eed..c2ea35927228 100644
--- a/tests/system/Config/fixtures/RegistrarConfig.php
+++ b/tests/system/Config/fixtures/RegistrarConfig.php
@@ -11,7 +11,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class RegistrarConfig extends CodeIgniter\Config\BaseConfig
+use CodeIgniter\Config\BaseConfig;
+
+class RegistrarConfig extends BaseConfig
 {
     public $foo = 'bar';
     public $bar = [
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index 44edece08e8d..9c34d8561a3c 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -11,7 +11,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class SimpleConfig extends CodeIgniter\Config\BaseConfig
+use CodeIgniter\Config\BaseConfig;
+
+class SimpleConfig extends BaseConfig
 {
     public $QZERO;
     public $QZEROSTR;