diff --git a/box.json.dist b/box.json.dist
index 3a1cbadc7d2..1e3d29e86da 100644
--- a/box.json.dist
+++ b/box.json.dist
@@ -7,7 +7,6 @@
     "map": [
         {"build/phar-versions.php" : "phar-versions.php"}
     ],
-    "exclude-composer-files": false,
     "files-bin": ["config.xsd"],
     "directories-bin" : [
         "assets",
diff --git a/composer.json b/composer.json
index 3a0a3465c27..ef22ae9470c 100644
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,8 @@
         },
         "optimize-autoloader": true,
         "sort-packages": true,
-        "platform-check": true
+        "platform-check": true,
+        "autoloader-suffix": "Psalm"
     },
     "extra": {
         "branch-alias": {
diff --git a/scoper.inc.php b/scoper.inc.php
index fd949abe620..148f638ebed 100644
--- a/scoper.inc.php
+++ b/scoper.inc.php
@@ -3,6 +3,7 @@
 use Composer\Autoload\ClassLoader;
 
 return [
+    'prefix' => 'PsalmPhar',
     'patchers' => [
         function (string $filePath, string $prefix, string $contents): string {
             //