From 2c44a0d6fb78342181a395934f635a704cbe4d2e Mon Sep 17 00:00:00 2001
From: Sami Mazouz <sychocouldy@gmail.com>
Date: Wed, 10 Jan 2024 15:10:41 +0100
Subject: [PATCH] chore: rename `package-manager` to `extension-manager`

---
 ...l => flarum-extension-manager-backend.yml} |   4 +-
 composer.json                                 |   6 +-
 .../.gitattributes                            |   0
 .../.gitignore                                |   0
 .../LICENSE.md                                |   2 +-
 .../README.md                                 |   8 +-
 .../assets/flarum.svg                         |   0
 .../composer.json                             |  14 +--
 .../extend.php                                |  34 +++---
 .../js/.gitignore                             |   0
 .../js/admin.ts                               |   0
 .../components/AuthMethodModal.d.ts           |   0
 .../components/ConfigureAuth.d.ts             |   0
 .../components/ConfigureComposer.d.ts         |   0
 .../components/ConfigureJson.d.ts             |   0
 .../components/ControlSection.d.ts            |   0
 .../components/ExtensionItem.d.ts             |   0
 .../js/dist-typings/components/Installer.d.ts |   0
 .../js/dist-typings/components/Label.d.ts     |   0
 .../dist-typings/components/MajorUpdater.d.ts |   0
 .../dist-typings/components/Pagination.d.ts   |   0
 .../dist-typings/components/QueueSection.d.ts |   0
 .../components/RepositoryModal.d.ts           |   0
 .../dist-typings/components/SettingsPage.d.ts |   0
 .../components/TaskOutputModal.d.ts           |   0
 .../js/dist-typings/components/Updater.d.ts   |   0
 .../dist-typings/components/WhyNotModal.d.ts  |   0
 .../js/dist-typings/index.d.ts                |   0
 .../js/dist-typings/models/Task.d.ts          |   0
 .../states/ControlSectionState.d.ts           |   0
 .../states/PackageManagerState.d.ts           |   0
 .../js/dist-typings/states/QueueState.d.ts    |   0
 .../js/dist-typings/utils/errorHandler.d.ts   |   0
 .../js/dist-typings/utils/humanDuration.d.ts  |   0
 .../js/dist-typings/utils/jumpToQueue.d.ts    |   0
 .../js/dist/admin.js                          |   0
 .../js/dist/admin.js.map                      |   0
 .../js/package.json                           |   2 +-
 .../src/admin/components/AuthMethodModal.tsx  |  22 ++--
 .../js/src/admin/components/ConfigureAuth.tsx |  14 +--
 .../admin/components/ConfigureComposer.tsx    |  28 ++---
 .../js/src/admin/components/ConfigureJson.tsx |   2 +-
 .../src/admin/components/ControlSection.tsx   |   8 +-
 .../js/src/admin/components/ExtensionItem.tsx |  34 +++---
 .../js/src/admin/components/Installer.tsx     |  14 +--
 .../js/src/admin/components/Label.tsx         |   0
 .../js/src/admin/components/MajorUpdater.tsx  |  45 ++++----
 .../js/src/admin/components/Pagination.tsx    |   4 +-
 .../js/src/admin/components/QueueSection.tsx  |  60 +++++-----
 .../src/admin/components/RepositoryModal.tsx  |  16 +--
 .../js/src/admin/components/SettingsPage.tsx  |  12 +-
 .../src/admin/components/TaskOutputModal.tsx  |  12 +-
 .../js/src/admin/components/Updater.tsx       |  50 ++++-----
 .../js/src/admin/components/WhyNotModal.tsx   |   4 +-
 .../js/src/admin/index.tsx                    |  38 +++----
 .../js/src/admin/models/Task.ts               |   0
 .../js/src/admin/shims.d.ts                   |   4 +-
 .../src/admin/states/ControlSectionState.ts   |  40 ++++---
 .../admin/states/ExtensionManagerState.ts}    |   2 +-
 .../js/src/admin/states/QueueState.ts         |  12 +-
 .../js/src/admin/utils/errorHandler.ts        |  10 +-
 .../js/src/admin/utils/humanDuration.ts       |   0
 .../js/src/admin/utils/jumpToQueue.ts         |  16 +++
 .../js/tsconfig.json                          |   0
 .../js/webpack.config.js                      |   0
 extensions/extension-manager/less/admin.less  | 104 ++++++++++++++++++
 .../less/admin/ControlSection.less            |  18 +--
 .../less/admin/Label.less                     |   0
 .../less/admin/QueueSection.less              |   4 +-
 .../less/admin/TaskOutputModal.less           |   0
 .../locale/en.yml                             |   8 +-
 ...000_create_package_manager_tasks_table.php |   2 +-
 ..._column_to_package_manager_tasks_table.php |  28 +++++
 ..._10_000000_rename_to_extension_manager.php |  16 +++
 .../Controller/CheckForUpdatesController.php  |   6 +-
 .../ConfigureComposerController.php           |   8 +-
 .../Api/Controller/GlobalUpdateController.php |   6 +-
 .../Api/Controller/ListTasksController.php    |   8 +-
 .../Api/Controller/MajorUpdateController.php  |   6 +-
 .../Api/Controller/MinorUpdateController.php  |   6 +-
 .../Controller/RemoveExtensionController.php  |   6 +-
 .../Controller/RequireExtensionController.php |   6 +-
 .../Controller/UpdateExtensionController.php  |   6 +-
 .../src/Api/Controller/WhyNotController.php   |   6 +-
 .../src/Api/Serializer/TaskSerializer.php     |   6 +-
 .../src/Command/AbstractActionCommand.php     |   4 +-
 .../src/Command/CheckForUpdates.php           |   4 +-
 .../src/Command/CheckForUpdatesHandler.php    |  14 +--
 .../src/Command/GlobalUpdate.php              |   4 +-
 .../src/Command/GlobalUpdateHandler.php       |   8 +-
 .../src/Command/MajorUpdate.php               |   4 +-
 .../src/Command/MajorUpdateHandler.php        |  16 +--
 .../src/Command/MinorUpdate.php               |   4 +-
 .../src/Command/MinorUpdateHandler.php        |  14 +--
 .../src/Command/RemoveExtension.php           |   4 +-
 .../src/Command/RemoveExtensionHandler.php    |  14 +--
 .../src/Command/RequireExtension.php          |   4 +-
 .../src/Command/RequireExtensionHandler.php   |  14 +--
 .../src/Command/UpdateExtension.php           |   4 +-
 .../src/Command/UpdateExtensionHandler.php    |  14 +--
 .../src/Command/WhyNot.php                    |   4 +-
 .../src/Command/WhyNotHandler.php             |   8 +-
 .../src/Composer/ComposerAdapter.php          |   8 +-
 .../src/Composer/ComposerJson.php             |   4 +-
 .../src/Composer/ComposerOutput.php           |   2 +-
 .../src/ConfigureComposerValidator.php        |   2 +-
 .../src/Event/FlarumUpdated.php               |   2 +-
 .../ComposerCommandFailedException.php        |   2 +-
 .../ComposerRequireFailedException.php        |   2 +-
 .../ComposerUpdateFailedException.php         |   2 +-
 .../src/Exception/ExceptionHandler.php        |   2 +-
 .../ExtensionAlreadyInstalledException.php    |   2 +-
 .../ExtensionNotInstalledException.php        |   2 +-
 ...sionDependencyCannotBeRemovedException.php |   2 +-
 .../Exception/MajorUpdateFailedException.php  |   6 +-
 .../Exception/NoNewMajorVersionException.php  |   2 +-
 .../src/Extension/Event/Installed.php         |   2 +-
 .../src/Extension/Event/Removed.php           |   2 +-
 .../src/Extension/Event/Updated.php           |   2 +-
 .../src/ExtensionManagerServiceProvider.php}  |  14 +--
 .../src/Job/ComposerCommandJob.php            |   8 +-
 .../src/Job/Dispatcher.php                    |  10 +-
 .../src/Job/DispatcherResponse.php            |   2 +-
 .../src/Listener/ClearCacheAfterUpdate.php    |   4 +-
 .../src/Listener/ReCheckForUpdates.php        |  12 +-
 .../src/OutputLogger.php                      |   2 +-
 .../src/RequirePackageValidator.php           |   2 +-
 .../src/Settings/JsonSetting.php              |   2 +-
 .../src/Settings/LastUpdateCheck.php          |   4 +-
 .../src/Settings/LastUpdateRun.php            |   6 +-
 .../src/Support/Util.php                      |   2 +-
 .../src/Task/Task.php                         |   4 +-
 .../src/Task/TaskRepository.php               |   2 +-
 .../src/UpdateExtensionValidator.php          |   2 +-
 .../src/WhyNotValidator.php                   |   2 +-
 .../tests/fixtures/.gitkeep                   |   0
 .../integration/ChangeComposerConfig.php      |   2 +-
 .../tests/integration/DummyExtensions.php     |   2 +-
 .../integration/RefreshComposerSetup.php      |   4 +-
 .../tests/integration/SetupComposer.php       |   2 +-
 .../tests/integration/TestCase.php            |  10 +-
 .../integration/api/CheckForUpdatesTest.php   |  10 +-
 .../integration/api/GlobalUpdateTest.php      |   8 +-
 .../tests/integration/api/MajorUpdateTest.php |  20 ++--
 .../tests/integration/api/MinorUpdateTest.php |  20 ++--
 .../api/extensions/RemoveExtensionTest.php    |  10 +-
 .../api/extensions/RequireExtensionTest.php   |  16 +--
 .../api/extensions/UpdateExtensionTest.php    |  10 +-
 .../tests/integration/setup.php               |   2 +-
 .../tests/phpunit.integration.xml             |   0
 .../tests/phpunit.unit.xml                    |   0
 .../tests/unit/.gitkeep                       |   0
 .../js/src/admin/utils/jumpToQueue.ts         |  16 ---
 extensions/package-manager/less/admin.less    |  58 ----------
 ..._column_to_package_manager_tasks_table.php |  14 ---
 flarum-monorepo.json                          |   4 +-
 phpstan.neon                                  |   4 +-
 157 files changed, 666 insertions(+), 575 deletions(-)
 rename .github/workflows/{flarum-package-manager-backend.yml => flarum-extension-manager-backend.yml} (65%)
 rename extensions/{package-manager => extension-manager}/.gitattributes (100%)
 rename extensions/{package-manager => extension-manager}/.gitignore (100%)
 rename extensions/{package-manager => extension-manager}/LICENSE.md (94%)
 rename extensions/{package-manager => extension-manager}/README.md (50%)
 rename extensions/{package-manager => extension-manager}/assets/flarum.svg (100%)
 rename extensions/{package-manager => extension-manager}/composer.json (85%)
 rename extensions/{package-manager => extension-manager}/extend.php (50%)
 rename extensions/{package-manager => extension-manager}/js/.gitignore (100%)
 rename extensions/{package-manager => extension-manager}/js/admin.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/AuthMethodModal.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/ConfigureAuth.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/ConfigureComposer.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/ConfigureJson.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/ControlSection.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/ExtensionItem.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/Installer.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/Label.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/MajorUpdater.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/Pagination.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/QueueSection.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/RepositoryModal.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/SettingsPage.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/TaskOutputModal.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/Updater.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/components/WhyNotModal.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/index.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/models/Task.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/states/ControlSectionState.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/states/PackageManagerState.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/states/QueueState.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/utils/errorHandler.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/utils/humanDuration.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist-typings/utils/jumpToQueue.d.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/dist/admin.js (100%)
 rename extensions/{package-manager => extension-manager}/js/dist/admin.js.map (100%)
 rename extensions/{package-manager => extension-manager}/js/package.json (96%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/AuthMethodModal.tsx (65%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/ConfigureAuth.tsx (86%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/ConfigureComposer.tsx (69%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/ConfigureJson.tsx (97%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/ControlSection.tsx (76%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/ExtensionItem.tsx (65%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/Installer.tsx (72%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/Label.tsx (100%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/MajorUpdater.tsx (55%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/Pagination.tsx (87%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/QueueSection.tsx (63%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/RepositoryModal.tsx (70%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/SettingsPage.tsx (77%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/TaskOutputModal.tsx (63%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/Updater.tsx (59%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/components/WhyNotModal.tsx (89%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/index.tsx (59%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/models/Task.ts (100%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/shims.d.ts (64%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/states/ControlSectionState.ts (82%)
 rename extensions/{package-manager/js/src/admin/states/PackageManagerState.ts => extension-manager/js/src/admin/states/ExtensionManagerState.ts} (82%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/states/QueueState.ts (81%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/utils/errorHandler.ts (70%)
 rename extensions/{package-manager => extension-manager}/js/src/admin/utils/humanDuration.ts (100%)
 create mode 100644 extensions/extension-manager/js/src/admin/utils/jumpToQueue.ts
 rename extensions/{package-manager => extension-manager}/js/tsconfig.json (100%)
 rename extensions/{package-manager => extension-manager}/js/webpack.config.js (100%)
 create mode 100755 extensions/extension-manager/less/admin.less
 rename extensions/{package-manager => extension-manager}/less/admin/ControlSection.less (88%)
 rename extensions/{package-manager => extension-manager}/less/admin/Label.less (100%)
 rename extensions/{package-manager => extension-manager}/less/admin/QueueSection.less (91%)
 rename extensions/{package-manager => extension-manager}/less/admin/TaskOutputModal.less (100%)
 rename extensions/{package-manager => extension-manager}/locale/en.yml (92%)
 rename extensions/{package-manager => extension-manager}/migrations/2022_02_22_000000_create_package_manager_tasks_table.php (95%)
 create mode 100644 extensions/extension-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php
 create mode 100644 extensions/extension-manager/migrations/2024_01_10_000000_rename_to_extension_manager.php
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/CheckForUpdatesController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/ConfigureComposerController.php (95%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/GlobalUpdateController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/ListTasksController.php (85%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/MajorUpdateController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/MinorUpdateController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/RemoveExtensionController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/RequireExtensionController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/UpdateExtensionController.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Api/Controller/WhyNotController.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Api/Serializer/TaskSerializer.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Command/AbstractActionCommand.php (85%)
 rename extensions/{package-manager => extension-manager}/src/Command/CheckForUpdates.php (86%)
 rename extensions/{package-manager => extension-manager}/src/Command/CheckForUpdatesHandler.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Command/GlobalUpdate.php (86%)
 rename extensions/{package-manager => extension-manager}/src/Command/GlobalUpdateHandler.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Command/MajorUpdate.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Command/MajorUpdateHandler.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Command/MinorUpdate.php (85%)
 rename extensions/{package-manager => extension-manager}/src/Command/MinorUpdateHandler.php (81%)
 rename extensions/{package-manager => extension-manager}/src/Command/RemoveExtension.php (87%)
 rename extensions/{package-manager => extension-manager}/src/Command/RemoveExtensionHandler.php (83%)
 rename extensions/{package-manager => extension-manager}/src/Command/RequireExtension.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Command/RequireExtensionHandler.php (84%)
 rename extensions/{package-manager => extension-manager}/src/Command/UpdateExtension.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Command/UpdateExtensionHandler.php (87%)
 rename extensions/{package-manager => extension-manager}/src/Command/WhyNot.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Command/WhyNotHandler.php (87%)
 rename extensions/{package-manager => extension-manager}/src/Composer/ComposerAdapter.php (91%)
 rename extensions/{package-manager => extension-manager}/src/Composer/ComposerJson.php (96%)
 rename extensions/{package-manager => extension-manager}/src/Composer/ComposerOutput.php (93%)
 rename extensions/{package-manager => extension-manager}/src/ConfigureComposerValidator.php (96%)
 rename extensions/{package-manager => extension-manager}/src/Event/FlarumUpdated.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ComposerCommandFailedException.php (94%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ComposerRequireFailedException.php (97%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ComposerUpdateFailedException.php (85%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ExceptionHandler.php (95%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ExtensionAlreadyInstalledException.php (92%)
 rename extensions/{package-manager => extension-manager}/src/Exception/ExtensionNotInstalledException.php (92%)
 rename extensions/{package-manager => extension-manager}/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Exception/MajorUpdateFailedException.php (91%)
 rename extensions/{package-manager => extension-manager}/src/Exception/NoNewMajorVersionException.php (92%)
 rename extensions/{package-manager => extension-manager}/src/Extension/Event/Installed.php (87%)
 rename extensions/{package-manager => extension-manager}/src/Extension/Event/Removed.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Extension/Event/Updated.php (90%)
 rename extensions/{package-manager/src/PackageManagerServiceProvider.php => extension-manager/src/ExtensionManagerServiceProvider.php} (90%)
 rename extensions/{package-manager => extension-manager}/src/Job/ComposerCommandJob.php (88%)
 rename extensions/{package-manager => extension-manager}/src/Job/Dispatcher.php (89%)
 rename extensions/{package-manager => extension-manager}/src/Job/DispatcherResponse.php (90%)
 rename extensions/{package-manager => extension-manager}/src/Listener/ClearCacheAfterUpdate.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Listener/ReCheckForUpdates.php (83%)
 rename extensions/{package-manager => extension-manager}/src/OutputLogger.php (95%)
 rename extensions/{package-manager => extension-manager}/src/RequirePackageValidator.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Settings/JsonSetting.php (90%)
 rename extensions/{package-manager => extension-manager}/src/Settings/LastUpdateCheck.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Settings/LastUpdateRun.php (93%)
 rename extensions/{package-manager => extension-manager}/src/Support/Util.php (97%)
 rename extensions/{package-manager => extension-manager}/src/Task/Task.php (96%)
 rename extensions/{package-manager => extension-manager}/src/Task/TaskRepository.php (93%)
 rename extensions/{package-manager => extension-manager}/src/UpdateExtensionValidator.php (92%)
 rename extensions/{package-manager => extension-manager}/src/WhyNotValidator.php (93%)
 rename extensions/{package-manager => extension-manager}/tests/fixtures/.gitkeep (100%)
 rename extensions/{package-manager => extension-manager}/tests/integration/ChangeComposerConfig.php (88%)
 rename extensions/{package-manager => extension-manager}/tests/integration/DummyExtensions.php (93%)
 rename extensions/{package-manager => extension-manager}/tests/integration/RefreshComposerSetup.php (92%)
 rename extensions/{package-manager => extension-manager}/tests/integration/SetupComposer.php (96%)
 rename extensions/{package-manager => extension-manager}/tests/integration/TestCase.php (91%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/CheckForUpdatesTest.php (72%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/GlobalUpdateTest.php (65%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/MajorUpdateTest.php (84%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/MinorUpdateTest.php (80%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/extensions/RemoveExtensionTest.php (72%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/extensions/RequireExtensionTest.php (84%)
 rename extensions/{package-manager => extension-manager}/tests/integration/api/extensions/UpdateExtensionTest.php (72%)
 rename extensions/{package-manager => extension-manager}/tests/integration/setup.php (86%)
 rename extensions/{package-manager => extension-manager}/tests/phpunit.integration.xml (100%)
 rename extensions/{package-manager => extension-manager}/tests/phpunit.unit.xml (100%)
 rename extensions/{package-manager => extension-manager}/tests/unit/.gitkeep (100%)
 delete mode 100644 extensions/package-manager/js/src/admin/utils/jumpToQueue.ts
 delete mode 100755 extensions/package-manager/less/admin.less
 delete mode 100644 extensions/package-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php

diff --git a/.github/workflows/flarum-package-manager-backend.yml b/.github/workflows/flarum-extension-manager-backend.yml
similarity index 65%
rename from .github/workflows/flarum-package-manager-backend.yml
rename to .github/workflows/flarum-extension-manager-backend.yml
index 77a12e945cb..426064cf66c 100644
--- a/.github/workflows/flarum-package-manager-backend.yml
+++ b/.github/workflows/flarum-extension-manager-backend.yml
@@ -1,4 +1,4 @@
-name: Package Manager PHP
+name: Extension Manager PHP
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -8,4 +8,4 @@ jobs:
     with:
       enable_backend_testing: false
 
-      backend_directory: ./extensions/package-manager
+      backend_directory: ./extensions/extension-manager
diff --git a/composer.json b/composer.json
index 59644ffbdca..b1bf553115e 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
             "Flarum\\Lock\\": "extensions/lock/src",
             "Flarum\\Mentions\\": "extensions/mentions/src",
             "Flarum\\Nicknames\\": "extensions/nicknames/src",
-            "Flarum\\PackageManager\\": "extensions/package-manager/src",
+            "Flarum\\ExtensionManager\\": "extensions/extension-manager/src",
             "Flarum\\Pusher\\": "extensions/pusher/src",
             "Flarum\\Statistics\\": "extensions/statistics/src",
             "Flarum\\Sticky\\": "extensions/sticky/src",
@@ -74,7 +74,7 @@
         "flarum/markdown": "self.version",
         "flarum/mentions": "self.version",
         "flarum/nicknames": "self.version",
-        "flarum/package-manager": "self.version",
+        "flarum/extension-manager": "self.version",
         "flarum/pusher": "self.version",
         "flarum/statistics": "self.version",
         "flarum/sticky": "self.version",
@@ -165,7 +165,7 @@
             "extensions/markdown",
             "extensions/mentions",
             "extensions/nicknames",
-            "extensions/package-manager",
+            "extensions/extension-manager",
             "extensions/pusher",
             "extensions/statistics",
             "extensions/sticky",
diff --git a/extensions/package-manager/.gitattributes b/extensions/extension-manager/.gitattributes
similarity index 100%
rename from extensions/package-manager/.gitattributes
rename to extensions/extension-manager/.gitattributes
diff --git a/extensions/package-manager/.gitignore b/extensions/extension-manager/.gitignore
similarity index 100%
rename from extensions/package-manager/.gitignore
rename to extensions/extension-manager/.gitignore
diff --git a/extensions/package-manager/LICENSE.md b/extensions/extension-manager/LICENSE.md
similarity index 94%
rename from extensions/package-manager/LICENSE.md
rename to extensions/extension-manager/LICENSE.md
index 71a61da5737..73986f18a2c 100755
--- a/extensions/package-manager/LICENSE.md
+++ b/extensions/extension-manager/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Sami Mazouz
+Copyright (c) 2024 Stichting Flarum (Flarum Foundation)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/extensions/package-manager/README.md b/extensions/extension-manager/README.md
similarity index 50%
rename from extensions/package-manager/README.md
rename to extensions/extension-manager/README.md
index 9716bc0821a..46f1bd0200c 100755
--- a/extensions/package-manager/README.md
+++ b/extensions/extension-manager/README.md
@@ -1,6 +1,6 @@
-# Package Manager
+# Extension Manager
 
-The package manager is a tool that allows you to easily install and manage extensions. It runs [composer](https://getcomposer.org/) under the hood.
+The extension manager is a tool that allows you to easily install and manage extensions. It runs [composer](https://getcomposer.org/) under the hood.
 
 ## Security
 
@@ -10,9 +10,9 @@ This extension is optional and can be removed for those who prefer to manually m
 
 ## Troubleshooting
 
-If you have many extensions installed, you may run into memory issues when using the package manager. If this happens, you can use an asynchronous queue that will run the package manager in the background.
+If you have many extensions installed, you may run into memory issues when using the extension manager. If this happens, you can use an asynchronous queue that will run the extension manager in the background.
 
 * Simple database queue guide: https://discuss.flarum.org/d/28151-database-queue-the-simplest-queue-even-for-shared-hosting
 * (Advanced) Redis queue: https://discuss.flarum.org/d/21873-redis-sessions-cache-queues
 
-You can find detailed logs on the package manager operations in the `storage/logs/composer` directory. Please include the latest log file when reporting issues in the [Flarum support forum](https://discuss.flarum.org/t/support).
+You can find detailed logs on the extension manager operations in the `storage/logs/composer` directory. Please include the latest log file when reporting issues in the [Flarum support forum](https://discuss.flarum.org/t/support).
diff --git a/extensions/package-manager/assets/flarum.svg b/extensions/extension-manager/assets/flarum.svg
similarity index 100%
rename from extensions/package-manager/assets/flarum.svg
rename to extensions/extension-manager/assets/flarum.svg
diff --git a/extensions/package-manager/composer.json b/extensions/extension-manager/composer.json
similarity index 85%
rename from extensions/package-manager/composer.json
rename to extensions/extension-manager/composer.json
index b8e390a3bbc..4abb1a5c5b9 100755
--- a/extensions/package-manager/composer.json
+++ b/extensions/extension-manager/composer.json
@@ -1,6 +1,6 @@
 {
-    "name": "flarum/package-manager",
-    "description": "A Flarum Package Manager.",
+    "name": "flarum/extension-manager",
+    "description": "An extension manager to install, update and remove extension packages from the interface (Wrapper around composer).",
     "keywords": [
         "extensions",
         "composer",
@@ -18,8 +18,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/flarum/package-manager/issues",
-        "source": "https://github.com/flarum/package-manager"
+        "issues": "https://github.com/flarum/framework/issues",
+        "source": "https://github.com/flarum/extension-manager"
     },
     "require": {
         "flarum/core": "^1.8",
@@ -31,7 +31,7 @@
     },
     "extra": {
         "flarum-extension": {
-            "title": "Package Manager",
+            "title": "Extension Manager",
             "icon": {
                 "name": "fas fa-box-open",
                 "backgroundColor": "#117187",
@@ -69,12 +69,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Flarum\\PackageManager\\": "src/"
+            "Flarum\\ExtensionManager\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Flarum\\PackageManager\\Tests\\": "tests/"
+            "Flarum\\ExtensionManager\\Tests\\": "tests/"
         }
     },
     "scripts": {
diff --git a/extensions/package-manager/extend.php b/extensions/extension-manager/extend.php
similarity index 50%
rename from extensions/package-manager/extend.php
rename to extensions/extension-manager/extend.php
index e702889df7b..85a491f66a7 100755
--- a/extensions/package-manager/extend.php
+++ b/extensions/extension-manager/extend.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Flarum\Extend;
 use Flarum\Foundation\Paths;
@@ -17,16 +17,16 @@
 
 return [
     (new Extend\Routes('api'))
-        ->post('/package-manager/extensions', 'package-manager.extensions.require', Api\Controller\RequireExtensionController::class)
-        ->patch('/package-manager/extensions/{id}', 'package-manager.extensions.update', Api\Controller\UpdateExtensionController::class)
-        ->delete('/package-manager/extensions/{id}', 'package-manager.extensions.remove', Api\Controller\RemoveExtensionController::class)
-        ->post('/package-manager/check-for-updates', 'package-manager.check-for-updates', Api\Controller\CheckForUpdatesController::class)
-        ->post('/package-manager/why-not', 'package-manager.why-not', Api\Controller\WhyNotController::class)
-        ->post('/package-manager/minor-update', 'package-manager.minor-update', Api\Controller\MinorUpdateController::class)
-        ->post('/package-manager/major-update', 'package-manager.major-update', Api\Controller\MajorUpdateController::class)
-        ->post('/package-manager/global-update', 'package-manager.global-update', Api\Controller\GlobalUpdateController::class)
-        ->get('/package-manager-tasks', 'package-manager.tasks.index', Api\Controller\ListTasksController::class)
-        ->post('/package-manager/composer', 'package-manager.composer', Api\Controller\ConfigureComposerController::class),
+        ->post('/extension-manager/extensions', 'extension-manager.extensions.require', Api\Controller\RequireExtensionController::class)
+        ->patch('/extension-manager/extensions/{id}', 'extension-manager.extensions.update', Api\Controller\UpdateExtensionController::class)
+        ->delete('/extension-manager/extensions/{id}', 'extension-manager.extensions.remove', Api\Controller\RemoveExtensionController::class)
+        ->post('/extension-manager/check-for-updates', 'extension-manager.check-for-updates', Api\Controller\CheckForUpdatesController::class)
+        ->post('/extension-manager/why-not', 'extension-manager.why-not', Api\Controller\WhyNotController::class)
+        ->post('/extension-manager/minor-update', 'extension-manager.minor-update', Api\Controller\MinorUpdateController::class)
+        ->post('/extension-manager/major-update', 'extension-manager.major-update', Api\Controller\MajorUpdateController::class)
+        ->post('/extension-manager/global-update', 'extension-manager.global-update', Api\Controller\GlobalUpdateController::class)
+        ->get('/extension-manager-tasks', 'extension-manager.tasks.index', Api\Controller\ListTasksController::class)
+        ->post('/extension-manager/composer', 'extension-manager.composer', Api\Controller\ConfigureComposerController::class),
 
     (new Extend\Frontend('admin'))
         ->css(__DIR__.'/less/admin.less')
@@ -34,13 +34,13 @@
         ->content(function (Document $document) {
             $paths = resolve(Paths::class);
 
-            $document->payload['flarum-package-manager.writable_dirs'] = is_writable($paths->vendor)
+            $document->payload['flarum-extension-manager.writable_dirs'] = is_writable($paths->vendor)
                 && is_writable($paths->storage)
                 && (! file_exists($paths->storage.'/.composer') || is_writable($paths->storage.'/.composer'))
                 && is_writable($paths->base.'/composer.json')
                 && is_writable($paths->base.'/composer.lock');
 
-            $document->payload['flarum-package-manager.using_sync_queue'] = resolve(Queue::class) instanceof SyncQueue;
+            $document->payload['flarum-extension-manager.using_sync_queue'] = resolve(Queue::class) instanceof SyncQueue;
         }),
 
     new Extend\Locales(__DIR__.'/locale'),
@@ -48,12 +48,12 @@
     (new Extend\Settings())
         ->default(Settings\LastUpdateCheck::key(), json_encode(Settings\LastUpdateCheck::default()))
         ->default(Settings\LastUpdateRun::key(), json_encode(Settings\LastUpdateRun::default()))
-        ->default('flarum-package-manager.queue_jobs', false)
-        ->default('flarum-package-manager.minimum_stability', 'stable')
-        ->default('flarum-package-manager.task_retention_days', 7),
+        ->default('flarum-extension-manager.queue_jobs', '0')
+        ->default('flarum-extension-manager.minimum_stability', 'stable')
+        ->default('flarum-extension-manager.task_retention_days', 7),
 
     (new Extend\ServiceProvider)
-        ->register(PackageManagerServiceProvider::class),
+        ->register(ExtensionManagerServiceProvider::class),
 
     (new Extend\ErrorHandling)
         ->handler(Exception\ComposerCommandFailedException::class, Exception\ExceptionHandler::class)
diff --git a/extensions/package-manager/js/.gitignore b/extensions/extension-manager/js/.gitignore
similarity index 100%
rename from extensions/package-manager/js/.gitignore
rename to extensions/extension-manager/js/.gitignore
diff --git a/extensions/package-manager/js/admin.ts b/extensions/extension-manager/js/admin.ts
similarity index 100%
rename from extensions/package-manager/js/admin.ts
rename to extensions/extension-manager/js/admin.ts
diff --git a/extensions/package-manager/js/dist-typings/components/AuthMethodModal.d.ts b/extensions/extension-manager/js/dist-typings/components/AuthMethodModal.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/AuthMethodModal.d.ts
rename to extensions/extension-manager/js/dist-typings/components/AuthMethodModal.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/ConfigureAuth.d.ts b/extensions/extension-manager/js/dist-typings/components/ConfigureAuth.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/ConfigureAuth.d.ts
rename to extensions/extension-manager/js/dist-typings/components/ConfigureAuth.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/ConfigureComposer.d.ts b/extensions/extension-manager/js/dist-typings/components/ConfigureComposer.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/ConfigureComposer.d.ts
rename to extensions/extension-manager/js/dist-typings/components/ConfigureComposer.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/ConfigureJson.d.ts b/extensions/extension-manager/js/dist-typings/components/ConfigureJson.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/ConfigureJson.d.ts
rename to extensions/extension-manager/js/dist-typings/components/ConfigureJson.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/ControlSection.d.ts b/extensions/extension-manager/js/dist-typings/components/ControlSection.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/ControlSection.d.ts
rename to extensions/extension-manager/js/dist-typings/components/ControlSection.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/ExtensionItem.d.ts b/extensions/extension-manager/js/dist-typings/components/ExtensionItem.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/ExtensionItem.d.ts
rename to extensions/extension-manager/js/dist-typings/components/ExtensionItem.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/Installer.d.ts b/extensions/extension-manager/js/dist-typings/components/Installer.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/Installer.d.ts
rename to extensions/extension-manager/js/dist-typings/components/Installer.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/Label.d.ts b/extensions/extension-manager/js/dist-typings/components/Label.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/Label.d.ts
rename to extensions/extension-manager/js/dist-typings/components/Label.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/MajorUpdater.d.ts b/extensions/extension-manager/js/dist-typings/components/MajorUpdater.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/MajorUpdater.d.ts
rename to extensions/extension-manager/js/dist-typings/components/MajorUpdater.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/Pagination.d.ts b/extensions/extension-manager/js/dist-typings/components/Pagination.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/Pagination.d.ts
rename to extensions/extension-manager/js/dist-typings/components/Pagination.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/QueueSection.d.ts b/extensions/extension-manager/js/dist-typings/components/QueueSection.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/QueueSection.d.ts
rename to extensions/extension-manager/js/dist-typings/components/QueueSection.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/RepositoryModal.d.ts b/extensions/extension-manager/js/dist-typings/components/RepositoryModal.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/RepositoryModal.d.ts
rename to extensions/extension-manager/js/dist-typings/components/RepositoryModal.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/SettingsPage.d.ts b/extensions/extension-manager/js/dist-typings/components/SettingsPage.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/SettingsPage.d.ts
rename to extensions/extension-manager/js/dist-typings/components/SettingsPage.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/TaskOutputModal.d.ts b/extensions/extension-manager/js/dist-typings/components/TaskOutputModal.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/TaskOutputModal.d.ts
rename to extensions/extension-manager/js/dist-typings/components/TaskOutputModal.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/Updater.d.ts b/extensions/extension-manager/js/dist-typings/components/Updater.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/Updater.d.ts
rename to extensions/extension-manager/js/dist-typings/components/Updater.d.ts
diff --git a/extensions/package-manager/js/dist-typings/components/WhyNotModal.d.ts b/extensions/extension-manager/js/dist-typings/components/WhyNotModal.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/components/WhyNotModal.d.ts
rename to extensions/extension-manager/js/dist-typings/components/WhyNotModal.d.ts
diff --git a/extensions/package-manager/js/dist-typings/index.d.ts b/extensions/extension-manager/js/dist-typings/index.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/index.d.ts
rename to extensions/extension-manager/js/dist-typings/index.d.ts
diff --git a/extensions/package-manager/js/dist-typings/models/Task.d.ts b/extensions/extension-manager/js/dist-typings/models/Task.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/models/Task.d.ts
rename to extensions/extension-manager/js/dist-typings/models/Task.d.ts
diff --git a/extensions/package-manager/js/dist-typings/states/ControlSectionState.d.ts b/extensions/extension-manager/js/dist-typings/states/ControlSectionState.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/states/ControlSectionState.d.ts
rename to extensions/extension-manager/js/dist-typings/states/ControlSectionState.d.ts
diff --git a/extensions/package-manager/js/dist-typings/states/PackageManagerState.d.ts b/extensions/extension-manager/js/dist-typings/states/PackageManagerState.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/states/PackageManagerState.d.ts
rename to extensions/extension-manager/js/dist-typings/states/PackageManagerState.d.ts
diff --git a/extensions/package-manager/js/dist-typings/states/QueueState.d.ts b/extensions/extension-manager/js/dist-typings/states/QueueState.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/states/QueueState.d.ts
rename to extensions/extension-manager/js/dist-typings/states/QueueState.d.ts
diff --git a/extensions/package-manager/js/dist-typings/utils/errorHandler.d.ts b/extensions/extension-manager/js/dist-typings/utils/errorHandler.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/utils/errorHandler.d.ts
rename to extensions/extension-manager/js/dist-typings/utils/errorHandler.d.ts
diff --git a/extensions/package-manager/js/dist-typings/utils/humanDuration.d.ts b/extensions/extension-manager/js/dist-typings/utils/humanDuration.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/utils/humanDuration.d.ts
rename to extensions/extension-manager/js/dist-typings/utils/humanDuration.d.ts
diff --git a/extensions/package-manager/js/dist-typings/utils/jumpToQueue.d.ts b/extensions/extension-manager/js/dist-typings/utils/jumpToQueue.d.ts
similarity index 100%
rename from extensions/package-manager/js/dist-typings/utils/jumpToQueue.d.ts
rename to extensions/extension-manager/js/dist-typings/utils/jumpToQueue.d.ts
diff --git a/extensions/package-manager/js/dist/admin.js b/extensions/extension-manager/js/dist/admin.js
similarity index 100%
rename from extensions/package-manager/js/dist/admin.js
rename to extensions/extension-manager/js/dist/admin.js
diff --git a/extensions/package-manager/js/dist/admin.js.map b/extensions/extension-manager/js/dist/admin.js.map
similarity index 100%
rename from extensions/package-manager/js/dist/admin.js.map
rename to extensions/extension-manager/js/dist/admin.js.map
diff --git a/extensions/package-manager/js/package.json b/extensions/extension-manager/js/package.json
similarity index 96%
rename from extensions/package-manager/js/package.json
rename to extensions/extension-manager/js/package.json
index 84ea77b01b8..ad9661a8b37 100644
--- a/extensions/package-manager/js/package.json
+++ b/extensions/extension-manager/js/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@flarum/package-manager",
+    "name": "@flarum/extension-manager",
     "version": "0.0.0",
     "private": true,
     "prettier": "@flarum/prettier-config",
diff --git a/extensions/package-manager/js/src/admin/components/AuthMethodModal.tsx b/extensions/extension-manager/js/src/admin/components/AuthMethodModal.tsx
similarity index 65%
rename from extensions/package-manager/js/src/admin/components/AuthMethodModal.tsx
rename to extensions/extension-manager/js/src/admin/components/AuthMethodModal.tsx
index 55d1c99fefe..c228002ac55 100644
--- a/extensions/package-manager/js/src/admin/components/AuthMethodModal.tsx
+++ b/extensions/extension-manager/js/src/admin/components/AuthMethodModal.tsx
@@ -32,40 +32,40 @@ export default class AuthMethodModal<CustomAttrs extends IAuthMethodModalAttrs =
 
   title(): Mithril.Children {
     const context = this.attrs.host ? 'edit' : 'add';
-    return app.translator.trans(`flarum-package-manager.admin.auth_config.${context}_label`);
+    return app.translator.trans(`flarum-extension-manager.admin.auth_config.${context}_label`);
   }
 
   content(): Mithril.Children {
     const types = {
-      'github-oauth': app.translator.trans('flarum-package-manager.admin.auth_config.types.github-oauth'),
-      'gitlab-oauth': app.translator.trans('flarum-package-manager.admin.auth_config.types.gitlab-oauth'),
-      'gitlab-token': app.translator.trans('flarum-package-manager.admin.auth_config.types.gitlab-token'),
-      bearer: app.translator.trans('flarum-package-manager.admin.auth_config.types.bearer'),
+      'github-oauth': app.translator.trans('flarum-extension-manager.admin.auth_config.types.github-oauth'),
+      'gitlab-oauth': app.translator.trans('flarum-extension-manager.admin.auth_config.types.gitlab-oauth'),
+      'gitlab-token': app.translator.trans('flarum-extension-manager.admin.auth_config.types.gitlab-token'),
+      bearer: app.translator.trans('flarum-extension-manager.admin.auth_config.types.bearer'),
     };
 
     return (
       <div className="Modal-body">
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.type_label')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.type_label')}</label>
           <Select options={types} value={this.type()} onchange={this.type} />
         </div>
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.host_label')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.host_label')}</label>
           <input
             className="FormControl"
             bidi={this.host}
-            placeholder={app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.host_placeholder')}
+            placeholder={app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.host_placeholder')}
           />
         </div>
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.token_label')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.token_label')}</label>
           <textarea
             className="FormControl"
             oninput={(e: InputEvent) => this.token((e.target as HTMLTextAreaElement).value)}
             rows="6"
             placeholder={
               this.token().startsWith('unchanged:')
-                ? extractText(app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.unchanged_token_placeholder'))
+                ? extractText(app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.unchanged_token_placeholder'))
                 : ''
             }
           >
@@ -74,7 +74,7 @@ export default class AuthMethodModal<CustomAttrs extends IAuthMethodModalAttrs =
         </div>
         <div className="Form-group">
           <Button className="Button Button--primary" onclick={this.submit.bind(this)}>
-            {app.translator.trans('flarum-package-manager.admin.auth_config.add_modal.submit_button')}
+            {app.translator.trans('flarum-extension-manager.admin.auth_config.add_modal.submit_button')}
           </Button>
         </div>
       </div>
diff --git a/extensions/package-manager/js/src/admin/components/ConfigureAuth.tsx b/extensions/extension-manager/js/src/admin/components/ConfigureAuth.tsx
similarity index 86%
rename from extensions/package-manager/js/src/admin/components/ConfigureAuth.tsx
rename to extensions/extension-manager/js/src/admin/components/ConfigureAuth.tsx
index fa486772351..13db2e0ecc7 100644
--- a/extensions/package-manager/js/src/admin/components/ConfigureAuth.tsx
+++ b/extensions/extension-manager/js/src/admin/components/ConfigureAuth.tsx
@@ -9,7 +9,7 @@ export default class ConfigureAuth extends ConfigureJson<IConfigureJson> {
   protected type = 'auth';
 
   title(): Mithril.Children {
-    return app.translator.trans('flarum-package-manager.admin.auth_config.title');
+    return app.translator.trans('flarum-extension-manager.admin.auth_config.title');
   }
 
   className(): string {
@@ -27,14 +27,14 @@ export default class ConfigureAuth extends ConfigureJson<IConfigureJson> {
       });
 
     return (
-      <div className="SettingsGroups-content">
+      <div className="ExtensionManager-SettingsGroups-content">
         {hasAuthSettings ? (
           authSettings.map((type) => {
             const hosts = this.settings[type]();
 
             return (
               <div className="Form-group">
-                <label>{app.translator.trans(`flarum-package-manager.admin.auth_config.types.${type}`)}</label>
+                <label>{app.translator.trans(`flarum-extension-manager.admin.auth_config.types.${type}`)}</label>
                 <div className="ConfigureAuth-hosts">
                   {Object.keys(hosts).map((host) => {
                     const data = hosts[host] as string | Record<string, string>;
@@ -58,9 +58,9 @@ export default class ConfigureAuth extends ConfigureJson<IConfigureJson> {
                         <Button
                           className="Button Button--icon"
                           icon="fas fa-trash"
-                          aria-label={app.translator.trans('flarum-package-manager.admin.auth_config.delete_label')}
+                          aria-label={app.translator.trans('flarum-extension-manager.admin.auth_config.delete_label')}
                           onclick={() => {
-                            if (confirm(extractText(app.translator.trans('flarum-package-manager.admin.auth_config.delete_confirmation')))) {
+                            if (confirm(extractText(app.translator.trans('flarum-extension-manager.admin.auth_config.delete_confirmation')))) {
                               const newType = { ...this.setting(type)() };
                               delete newType[host];
 
@@ -80,7 +80,7 @@ export default class ConfigureAuth extends ConfigureJson<IConfigureJson> {
             );
           })
         ) : (
-          <span className="helpText">{app.translator.trans('flarum-package-manager.admin.auth_config.no_auth_methods_configured')}</span>
+          <span className="helpText">{app.translator.trans('flarum-extension-manager.admin.auth_config.no_auth_methods_configured')}</span>
         )}
       </div>
     );
@@ -99,7 +99,7 @@ export default class ConfigureAuth extends ConfigureJson<IConfigureJson> {
           })
         }
       >
-        {app.translator.trans('flarum-package-manager.admin.auth_config.add_label')}
+        {app.translator.trans('flarum-extension-manager.admin.auth_config.add_label')}
       </Button>
     );
 
diff --git a/extensions/package-manager/js/src/admin/components/ConfigureComposer.tsx b/extensions/extension-manager/js/src/admin/components/ConfigureComposer.tsx
similarity index 69%
rename from extensions/package-manager/js/src/admin/components/ConfigureComposer.tsx
rename to extensions/extension-manager/js/src/admin/components/ConfigureComposer.tsx
index e502a7bb9fd..5757a5045b3 100644
--- a/extensions/package-manager/js/src/admin/components/ConfigureComposer.tsx
+++ b/extensions/extension-manager/js/src/admin/components/ConfigureComposer.tsx
@@ -14,7 +14,7 @@ export default class ConfigureComposer extends ConfigureJson<IConfigureJson> {
   protected type = 'composer';
 
   title(): Mithril.Children {
-    return app.translator.trans('flarum-package-manager.admin.composer.title');
+    return app.translator.trans('flarum-extension-manager.admin.composer.title');
   }
 
   className(): string {
@@ -23,23 +23,23 @@ export default class ConfigureComposer extends ConfigureJson<IConfigureJson> {
 
   content(): Mithril.Children {
     return (
-      <div className="SettingsGroups-content">
+      <div className="ExtensionManager-SettingsGroups-content">
         {this.attrs.buildSettingComponent.call(this, {
           setting: 'minimum-stability',
-          label: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.label'),
-          help: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.help'),
+          label: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.label'),
+          help: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.help'),
           type: 'select',
           options: {
-            stable: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.options.stable'),
-            RC: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.options.rc'),
-            beta: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.options.beta'),
-            alpha: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.options.alpha'),
-            dev: app.translator.trans('flarum-package-manager.admin.composer.minimum_stability.options.dev'),
+            stable: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.options.stable'),
+            RC: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.options.rc'),
+            beta: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.options.beta'),
+            alpha: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.options.alpha'),
+            dev: app.translator.trans('flarum-extension-manager.admin.composer.minimum_stability.options.dev'),
           },
         })}
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.composer.repositories.label')}</label>
-          <div className="helpText">{app.translator.trans('flarum-package-manager.admin.composer.repositories.help')}</div>
+          <label>{app.translator.trans('flarum-extension-manager.admin.composer.repositories.label')}</label>
+          <div className="helpText">{app.translator.trans('flarum-extension-manager.admin.composer.repositories.help')}</div>
           <div className="ConfigureComposer-repositories">
             {Object.keys(this.setting('repositories')() || {}).map((name) => {
               const repository = this.setting('repositories')()[name] as Repository;
@@ -75,9 +75,9 @@ export default class ConfigureComposer extends ConfigureJson<IConfigureJson> {
                   <Button
                     className="Button Button--icon"
                     icon="fas fa-trash"
-                    aria-label={app.translator.trans('flarum-package-manager.admin.composer.delete_repository_label')}
+                    aria-label={app.translator.trans('flarum-extension-manager.admin.composer.delete_repository_label')}
                     onclick={() => {
-                      if (confirm(extractText(app.translator.trans('flarum-package-manager.admin.composer.delete_repository_confirmation')))) {
+                      if (confirm(extractText(app.translator.trans('flarum-extension-manager.admin.composer.delete_repository_confirmation')))) {
                         const repositories = { ...this.setting('repositories')() };
                         delete repositories[name];
 
@@ -99,7 +99,7 @@ export default class ConfigureComposer extends ConfigureJson<IConfigureJson> {
 
     items.push(
       <Button className="Button" onclick={() => app.modal.show(RepositoryModal, { onsubmit: this.onchange.bind(this) })}>
-        {app.translator.trans('flarum-package-manager.admin.composer.add_repository_label')}
+        {app.translator.trans('flarum-extension-manager.admin.composer.add_repository_label')}
       </Button>
     );
 
diff --git a/extensions/package-manager/js/src/admin/components/ConfigureJson.tsx b/extensions/extension-manager/js/src/admin/components/ConfigureJson.tsx
similarity index 97%
rename from extensions/package-manager/js/src/admin/components/ConfigureJson.tsx
rename to extensions/extension-manager/js/src/admin/components/ConfigureJson.tsx
index e15ae82956c..5a2db35a4f6 100644
--- a/extensions/package-manager/js/src/admin/components/ConfigureJson.tsx
+++ b/extensions/extension-manager/js/src/admin/components/ConfigureJson.tsx
@@ -69,7 +69,7 @@ export default abstract class ConfigureJson<CustomAttrs extends IConfigureJson =
     app
       .request({
         method: 'POST',
-        url: app.forum.attribute('apiUrl') + '/package-manager/composer',
+        url: app.forum.attribute('apiUrl') + '/extension-manager/composer',
         body: {
           type: this.type,
           data: readOnly ? null : configuration,
diff --git a/extensions/package-manager/js/src/admin/components/ControlSection.tsx b/extensions/extension-manager/js/src/admin/components/ControlSection.tsx
similarity index 76%
rename from extensions/package-manager/js/src/admin/components/ControlSection.tsx
rename to extensions/extension-manager/js/src/admin/components/ControlSection.tsx
index 946ba1b2733..74518b258ed 100644
--- a/extensions/package-manager/js/src/admin/components/ControlSection.tsx
+++ b/extensions/extension-manager/js/src/admin/components/ControlSection.tsx
@@ -14,14 +14,14 @@ export default class ControlSection extends Component<ComponentAttrs> {
 
   view() {
     return (
-      <div className="ExtensionPage-permissions PackageManager-controlSection">
+      <div className="ExtensionPage-permissions ExtensionManager-controlSection">
         <div className="ExtensionPage-permissions-header">
           <div className="container">
-            <h2 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.control.title')}</h2>
+            <h2 className="ExtensionTitle">{app.translator.trans('flarum-extension-manager.admin.sections.control.title')}</h2>
           </div>
         </div>
         <div className="container">
-          {app.data['flarum-package-manager.writable_dirs'] ? (
+          {app.data['flarum-extension-manager.writable_dirs'] ? (
             <>
               <Installer />
               <Updater />
@@ -29,7 +29,7 @@ export default class ControlSection extends Component<ComponentAttrs> {
           ) : (
             <div className="Form-group">
               <Alert type="warning" dismissible={false}>
-                {app.translator.trans('flarum-package-manager.admin.file_permissions')}
+                {app.translator.trans('flarum-extension-manager.admin.file_permissions')}
               </Alert>
             </div>
           )}
diff --git a/extensions/package-manager/js/src/admin/components/ExtensionItem.tsx b/extensions/extension-manager/js/src/admin/components/ExtensionItem.tsx
similarity index 65%
rename from extensions/package-manager/js/src/admin/components/ExtensionItem.tsx
rename to extensions/extension-manager/js/src/admin/components/ExtensionItem.tsx
index 9d8c2e3f7ea..d5089349a8f 100644
--- a/extensions/package-manager/js/src/admin/components/ExtensionItem.tsx
+++ b/extensions/extension-manager/js/src/admin/components/ExtensionItem.tsx
@@ -35,56 +35,56 @@ export default class ExtensionItem<Attrs extends ExtensionItemAttrs = ExtensionI
     return (
       <div
         className={classList({
-          'PackageManager-extension': true,
-          'PackageManager-extension--core': isCore,
-          'PackageManager-extension--danger': isDanger,
+          'ExtensionManager-extension': true,
+          'ExtensionManager-extension--core': isCore,
+          'ExtensionManager-extension--danger': isDanger,
         })}
       >
-        <div className="PackageManager-extension-icon ExtensionIcon" style={extension.icon}>
+        <div className="ExtensionManager-extension-icon ExtensionIcon" style={extension.icon}>
           {extension.icon ? icon(extension.icon.name) : ''}
         </div>
-        <div className="PackageManager-extension-info">
-          <div className="PackageManager-extension-name">{extension.extra['flarum-extension'].title}</div>
-          <div className="PackageManager-extension-version">
-            <span className="PackageManager-extension-version-current">{this.version(updates['version'])}</span>
+        <div className="ExtensionManager-extension-info">
+          <div className="ExtensionManager-extension-name">{extension.extra['flarum-extension'].title}</div>
+          <div className="ExtensionManager-extension-version">
+            <span className="ExtensionManager-extension-version-current">{this.version(updates['version'])}</span>
             {latestVersion ? (
-              <Label className="PackageManager-extension-version-latest" type={updates['latest-minor'] ? 'success' : 'warning'}>
+              <Label className="ExtensionManager-extension-version-latest" type={updates['latest-minor'] ? 'success' : 'warning'}>
                 {this.version(latestVersion)}
               </Label>
             ) : null}
           </div>
         </div>
-        <div className="PackageManager-extension-controls">
+        <div className="ExtensionManager-extension-controls">
           {onClickUpdate && typeof onClickUpdate === 'function' ? (
-            <Tooltip text={app.translator.trans('flarum-package-manager.admin.extensions.update')}>
+            <Tooltip text={app.translator.trans('flarum-extension-manager.admin.extensions.update')}>
               <Button
                 icon="fas fa-arrow-alt-circle-up"
                 className="Button Button--icon Button--flat"
                 onclick={onClickUpdate}
-                aria-label={app.translator.trans('flarum-package-manager.admin.extensions.update')}
+                aria-label={app.translator.trans('flarum-extension-manager.admin.extensions.update')}
               />
             </Tooltip>
           ) : onClickUpdate ? (
             <Dropdown
               buttonClassName="Button Button--icon Button--flat"
               icon="fas fa-arrow-alt-circle-up"
-              label={app.translator.trans('flarum-package-manager.admin.extensions.update')}
+              label={app.translator.trans('flarum-extension-manager.admin.extensions.update')}
             >
               <Button icon="fas fa-arrow-alt-circle-up" className="Button" onclick={onClickUpdate.soft}>
-                {app.translator.trans('flarum-package-manager.admin.extensions.update_soft_label')}
+                {app.translator.trans('flarum-extension-manager.admin.extensions.update_soft_label')}
               </Button>
               <Button icon="fas fa-arrow-alt-circle-up" className="Button" onclick={onClickUpdate.hard} disabled={!updates['direct-dependency']}>
-                {app.translator.trans('flarum-package-manager.admin.extensions.update_hard_label')}
+                {app.translator.trans('flarum-extension-manager.admin.extensions.update_hard_label')}
               </Button>
             </Dropdown>
           ) : null}
           {whyNotWarning ? (
-            <Tooltip text={app.translator.trans('flarum-package-manager.admin.extensions.check_why_it_failed_updating')}>
+            <Tooltip text={app.translator.trans('flarum-extension-manager.admin.extensions.check_why_it_failed_updating')}>
               <Button
                 icon="fas fa-exclamation-circle"
                 className="Button Button--icon Button--flat Button--danger"
                 onclick={() => app.modal.show(WhyNotModal, { package: extension.name })}
-                aria-label={app.translator.trans('flarum-package-manager.admin.extensions.check_why_it_failed_updating')}
+                aria-label={app.translator.trans('flarum-extension-manager.admin.extensions.check_why_it_failed_updating')}
               />
             </Tooltip>
           ) : null}
diff --git a/extensions/package-manager/js/src/admin/components/Installer.tsx b/extensions/extension-manager/js/src/admin/components/Installer.tsx
similarity index 72%
rename from extensions/package-manager/js/src/admin/components/Installer.tsx
rename to extensions/extension-manager/js/src/admin/components/Installer.tsx
index 4b5ba7b0e69..54b9dfd3b48 100755
--- a/extensions/package-manager/js/src/admin/components/Installer.tsx
+++ b/extensions/extension-manager/js/src/admin/components/Installer.tsx
@@ -19,10 +19,10 @@ export default class Installer extends Component<InstallerAttrs> {
 
   view(): Mithril.Children {
     return (
-      <div className="Form-group PackageManager-installer">
-        <label htmlFor="install-extension">{app.translator.trans('flarum-package-manager.admin.extensions.install')}</label>
+      <div className="Form-group ExtensionManager-installer">
+        <label htmlFor="install-extension">{app.translator.trans('flarum-extension-manager.admin.extensions.install')}</label>
         <p className="helpText">
-          {app.translator.trans('flarum-package-manager.admin.extensions.install_help', {
+          {app.translator.trans('flarum-extension-manager.admin.extensions.install_help', {
             extiverse: <a href="https://extiverse.com">extiverse.com</a>,
             semantic_link: <a href="https://devhints.io/semver" />,
             code: <code />,
@@ -34,10 +34,10 @@ export default class Installer extends Component<InstallerAttrs> {
             className="Button"
             icon="fas fa-download"
             onclick={this.onsubmit.bind(this)}
-            loading={app.packageManager.control.isLoading('extension-install')}
-            disabled={app.packageManager.control.isLoading()}
+            loading={app.extensionManager.control.isLoading('extension-install')}
+            disabled={app.extensionManager.control.hasOperationRunning()}
           >
-            {app.translator.trans('flarum-package-manager.admin.extensions.proceed')}
+            {app.translator.trans('flarum-extension-manager.admin.extensions.proceed')}
           </Button>
         </div>
       </div>
@@ -51,6 +51,6 @@ export default class Installer extends Component<InstallerAttrs> {
   }
 
   onsubmit(): void {
-    app.packageManager.control.requirePackage(this.data());
+    app.extensionManager.control.requirePackage(this.data());
   }
 }
diff --git a/extensions/package-manager/js/src/admin/components/Label.tsx b/extensions/extension-manager/js/src/admin/components/Label.tsx
similarity index 100%
rename from extensions/package-manager/js/src/admin/components/Label.tsx
rename to extensions/extension-manager/js/src/admin/components/Label.tsx
diff --git a/extensions/package-manager/js/src/admin/components/MajorUpdater.tsx b/extensions/extension-manager/js/src/admin/components/MajorUpdater.tsx
similarity index 55%
rename from extensions/package-manager/js/src/admin/components/MajorUpdater.tsx
rename to extensions/extension-manager/js/src/admin/components/MajorUpdater.tsx
index d6226696d21..7c376f3357e 100644
--- a/extensions/package-manager/js/src/admin/components/MajorUpdater.tsx
+++ b/extensions/extension-manager/js/src/admin/components/MajorUpdater.tsx
@@ -30,31 +30,38 @@ export default class MajorUpdater<T extends MajorUpdaterAttrs = MajorUpdaterAttr
     // @todo move Form-group--danger class to core for reuse
     return (
       <div
-        className={classList('Form-group Form-group--danger PackageManager-majorUpdate', {
-          'PackageManager-majorUpdate--failed': this.updateState.status === 'failure',
-          'PackageManager-majorUpdate--incompatibleExtensions': this.updateState.incompatibleExtensions.length,
+        className={classList('Form-group Form-group--danger ExtensionManager-majorUpdate', {
+          'ExtensionManager-majorUpdate--failed': this.updateState.status === 'failure',
+          'ExtensionManager-majorUpdate--incompatibleExtensions': this.updateState.incompatibleExtensions.length,
         })}
       >
-        <img alt="flarum logo" src={app.forum.attribute('baseUrl') + '/assets/extensions/flarum-package-manager/flarum.svg'} />
-        <label>{app.translator.trans('flarum-package-manager.admin.major_updater.title', { version: this.attrs.coreUpdate['latest-major'] })}</label>
-        <p className="helpText">{app.translator.trans('flarum-package-manager.admin.major_updater.description')}</p>
-        <div className="PackageManager-updaterControls">
-          <Tooltip text={app.translator.trans('flarum-package-manager.admin.major_updater.dry_run_help')}>
-            <Button className="Button" icon="fas fa-vial" onclick={this.update.bind(this, true)} disabled={app.packageManager.control.isLoading()}>
-              {app.translator.trans('flarum-package-manager.admin.major_updater.dry_run')}
+        <img alt="flarum logo" src={app.forum.attribute('baseUrl') + '/assets/extensions/flarum-extension-manager/flarum.svg'} />
+        <label>
+          {app.translator.trans('flarum-extension-manager.admin.major_updater.title', { version: this.attrs.coreUpdate['latest-major'] })}
+        </label>
+        <p className="helpText">{app.translator.trans('flarum-extension-manager.admin.major_updater.description')}</p>
+        <div className="ExtensionManager-updaterControls">
+          <Tooltip text={app.translator.trans('flarum-extension-manager.admin.major_updater.dry_run_help')}>
+            <Button
+              className="Button"
+              icon="fas fa-vial"
+              onclick={this.update.bind(this, true)}
+              disabled={app.extensionManager.control.hasOperationRunning()}
+            >
+              {app.translator.trans('flarum-extension-manager.admin.major_updater.dry_run')}
             </Button>
           </Tooltip>
           <Button
             className="Button Button--danger"
             icon="fas fa-play"
             onclick={this.update.bind(this, false)}
-            disabled={app.packageManager.control.isLoading()}
+            disabled={app.extensionManager.control.hasOperationRunning()}
           >
-            {app.translator.trans('flarum-package-manager.admin.major_updater.update')}
+            {app.translator.trans('flarum-extension-manager.admin.major_updater.update')}
           </Button>
         </div>
         {this.updateState.incompatibleExtensions.length ? (
-          <div className="PackageManager-majorUpdate-incompatibleExtensions PackageManager-extensions-grid">
+          <div className="ExtensionManager-majorUpdate-incompatibleExtensions ExtensionManager-extensions-grid">
             {this.updateState.incompatibleExtensions.map((extension: string) => (
               <ExtensionItem
                 extension={app.data.extensions[extension.replace('flarum-', '').replace('flarum-ext-', '').replace('/', '-')]}
@@ -68,20 +75,20 @@ export default class MajorUpdater<T extends MajorUpdaterAttrs = MajorUpdaterAttr
         {this.updateState.status === 'failure' ? (
           <Alert
             type="error"
-            className="PackageManager-majorUpdate-failure"
+            className="ExtensionManager-majorUpdate-failure"
             dismissible={false}
             controls={[
               <Button
-                className="Button Button--text PackageManager-majorUpdate-failure-details"
+                className="Button Button--text ExtensionManager-majorUpdate-failure-details"
                 icon="fas fa-question-circle"
                 onclick={() => app.modal.show(WhyNotModal, { package: 'flarum/core' })}
               >
-                {app.translator.trans('flarum-package-manager.admin.major_updater.failure.why')}
+                {app.translator.trans('flarum-extension-manager.admin.major_updater.failure.why')}
               </Button>,
             ]}
           >
-            <p className="PackageManager-majorUpdate-failure-desc">
-              {app.translator.trans('flarum-package-manager.admin.major_updater.failure.desc')}
+            <p className="ExtensionManager-majorUpdate-failure-desc">
+              {app.translator.trans('flarum-extension-manager.admin.major_updater.failure.desc')}
             </p>
           </Alert>
         ) : null}
@@ -90,6 +97,6 @@ export default class MajorUpdater<T extends MajorUpdaterAttrs = MajorUpdaterAttr
   }
 
   update(dryRun: boolean) {
-    app.packageManager.control.majorUpdate({ dryRun });
+    app.extensionManager.control.majorUpdate({ dryRun });
   }
 }
diff --git a/extensions/package-manager/js/src/admin/components/Pagination.tsx b/extensions/extension-manager/js/src/admin/components/Pagination.tsx
similarity index 87%
rename from extensions/package-manager/js/src/admin/components/Pagination.tsx
rename to extensions/extension-manager/js/src/admin/components/Pagination.tsx
index 90b77281ee0..1a491444e37 100644
--- a/extensions/package-manager/js/src/admin/components/Pagination.tsx
+++ b/extensions/extension-manager/js/src/admin/components/Pagination.tsx
@@ -15,7 +15,7 @@ export default class Pagination extends Component<PaginationAttrs> {
     return (
       <nav className="Pagination UserListPage-gridPagination">
         <Button
-          disabled={!this.attrs.list.hasPrev() || app.packageManager.control.isLoading()}
+          disabled={!this.attrs.list.hasPrev() || app.extensionManager.control.isLoading()}
           title={app.translator.trans('core.admin.users.pagination.back_button')}
           onclick={() => this.attrs.list.prev()}
           icon="fas fa-chevron-left"
@@ -28,7 +28,7 @@ export default class Pagination extends Component<PaginationAttrs> {
           })}
         </span>
         <Button
-          disabled={!this.attrs.list.hasNext() || app.packageManager.control.isLoading()}
+          disabled={!this.attrs.list.hasNext() || app.extensionManager.control.isLoading()}
           title={app.translator.trans('core.admin.users.pagination.next_button')}
           onclick={() => this.attrs.list.next()}
           icon="fas fa-chevron-right"
diff --git a/extensions/package-manager/js/src/admin/components/QueueSection.tsx b/extensions/extension-manager/js/src/admin/components/QueueSection.tsx
similarity index 63%
rename from extensions/package-manager/js/src/admin/components/QueueSection.tsx
rename to extensions/extension-manager/js/src/admin/components/QueueSection.tsx
index 324649e661b..806580288bf 100644
--- a/extensions/package-manager/js/src/admin/components/QueueSection.tsx
+++ b/extensions/extension-manager/js/src/admin/components/QueueSection.tsx
@@ -25,21 +25,21 @@ export default class QueueSection extends Component<{}> {
   oninit(vnode: Mithril.Vnode<{}, this>) {
     super.oninit(vnode);
 
-    app.packageManager.queue.load();
+    app.extensionManager.queue.load();
   }
 
   view() {
     return (
-      <section id="PackageManager-queueSection" className="ExtensionPage-permissions PackageManager-queueSection">
-        <div className="ExtensionPage-permissions-header PackageManager-queueSection-header">
+      <section id="ExtensionManager-queueSection" className="ExtensionPage-permissions ExtensionManager-queueSection">
+        <div className="ExtensionPage-permissions-header ExtensionManager-queueSection-header">
           <div className="container">
-            <h2 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.queue.title')}</h2>
+            <h2 className="ExtensionTitle">{app.translator.trans('flarum-extension-manager.admin.sections.queue.title')}</h2>
             <Button
               className="Button Button--icon"
               icon="fas fa-sync-alt"
-              onclick={() => app.packageManager.queue.load()}
-              aria-label={app.translator.trans('flarum-package-manager.admin.sections.queue.refresh')}
-              disabled={app.packageManager.control.isLoading()}
+              onclick={() => app.extensionManager.queue.load()}
+              aria-label={app.translator.trans('flarum-extension-manager.admin.sections.queue.refresh')}
+              disabled={app.extensionManager.control.isLoading()}
             />
           </div>
         </div>
@@ -54,12 +54,12 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'operation',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.operation')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.operation')),
         content: (task) => (
-          <div className="PackageManager-queueTable-operation">
-            <span className="PackageManager-queueTable-operation-icon">{this.operationIcon(task.operation())}</span>
-            <span className="PackageManager-queueTable-operation-name">
-              {app.translator.trans(`flarum-package-manager.admin.sections.queue.operations.${task.operation()}`)}
+          <div className="ExtensionManager-queueTable-operation">
+            <span className="ExtensionManager-queueTable-operation-icon">{this.operationIcon(task.operation())}</span>
+            <span className="ExtensionManager-queueTable-operation-name">
+              {app.translator.trans(`flarum-extension-manager.admin.sections.queue.operations.${task.operation()}`)}
             </span>
           </div>
         ),
@@ -70,18 +70,18 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'package',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.package')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.package')),
         content: (task) => {
           const extension: Extension | null = app.data.extensions[task.package()?.replace(/(\/flarum-|\/flarum-ext-|\/)/g, '-')];
 
           return extension ? (
-            <Link className="PackageManager-queueTable-package" href={app.route('extension', { id: extension.id })}>
-              <div className="PackageManager-queueTable-package-icon ExtensionIcon" style={extension.icon}>
+            <Link className="ExtensionManager-queueTable-package" href={app.route('extension', { id: extension.id })}>
+              <div className="ExtensionManager-queueTable-package-icon ExtensionIcon" style={extension.icon}>
                 {!!extension.icon && icon(extension.icon.name)}
               </div>
-              <div className="PackageManager-queueTable-package-details">
-                <span className="PackageManager-queueTable-package-title">{extension.extra['flarum-extension'].title}</span>
-                <span className="PackageManager-queueTable-package-name">{task.package()}</span>
+              <div className="ExtensionManager-queueTable-package-details">
+                <span className="ExtensionManager-queueTable-package-title">{extension.extra['flarum-extension'].title}</span>
+                <span className="ExtensionManager-queueTable-package-name">{task.package()}</span>
               </div>
             </Link>
           ) : (
@@ -95,14 +95,14 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'status',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.status')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.status')),
         content: (task) => (
           <>
             <Label
-              className="PackageManager-queueTable-status"
+              className="ExtensionManager-queueTable-status"
               type={{ running: 'neutral', failure: 'error', pending: 'warning', success: 'success' }[task.status()]}
             >
-              {app.translator.trans(`flarum-package-manager.admin.sections.queue.statuses.${task.status()}`)}
+              {app.translator.trans(`flarum-extension-manager.admin.sections.queue.statuses.${task.status()}`)}
             </Label>
             {['pending', 'running'].includes(task.status()) && <LoadingIndicator size="small" display="inline" />}
           </>
@@ -114,10 +114,10 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'elapsedTime',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.elapsed_time')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.elapsed_time')),
         content: (task) =>
           !task.startedAt() || !task.finishedAt() ? (
-            app.translator.trans('flarum-package-manager.admin.sections.queue.task_just_started')
+            app.translator.trans('flarum-extension-manager.admin.sections.queue.task_just_started')
           ) : (
             <Tooltip text={`${dayjs(task.startedAt()).format('LL LTS')}  ${dayjs(task.finishedAt()).format('LL LTS')}`}>
               <span>{humanDuration(task.startedAt(), task.finishedAt())}</span>
@@ -130,7 +130,7 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'memoryUsed',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.peak_memory_used')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.peak_memory_used')),
         content: (task) => <span>{task.peakMemoryUsed()}</span>,
       },
       60
@@ -139,12 +139,12 @@ export default class QueueSection extends Component<{}> {
     items.add(
       'details',
       {
-        label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.details')),
+        label: extractText(app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.details')),
         content: (task) => (
           <Button
             className="Button Button--icon Table-controls-item"
             icon="fas fa-file-alt"
-            aria-label={app.translator.trans('flarum-package-manager.admin.sections.queue.columns.details')}
+            aria-label={app.translator.trans('flarum-extension-manager.admin.sections.queue.columns.details')}
             // @todo fix in core
             // @ts-ignore
             onclick={() => app.modal.show(TaskOutputModal, { task })}
@@ -160,21 +160,21 @@ export default class QueueSection extends Component<{}> {
   }
 
   queueTable() {
-    const tasks = app.packageManager.queue.getItems();
+    const tasks = app.extensionManager.queue.getItems();
 
     if (!tasks) {
       return <LoadingIndicator />;
     }
 
     if (tasks && !tasks.length) {
-      return <h3 className="ExtensionPage-subHeader">{app.translator.trans('flarum-package-manager.admin.sections.queue.none')}</h3>;
+      return <h3 className="ExtensionPage-subHeader">{app.translator.trans('flarum-extension-manager.admin.sections.queue.none')}</h3>;
     }
 
     const columns = this.columns();
 
     return (
       <>
-        <table className="Table PackageManager-queueTable">
+        <table className="Table ExtensionManager-queueTable">
           <thead>
             <tr>
               {columns.toArray().map((item, index) => (
@@ -199,7 +199,7 @@ export default class QueueSection extends Component<{}> {
           </tbody>
         </table>
 
-        <Pagination list={app.packageManager.queue} />
+        <Pagination list={app.extensionManager.queue} />
       </>
     );
   }
diff --git a/extensions/package-manager/js/src/admin/components/RepositoryModal.tsx b/extensions/extension-manager/js/src/admin/components/RepositoryModal.tsx
similarity index 70%
rename from extensions/package-manager/js/src/admin/components/RepositoryModal.tsx
rename to extensions/extension-manager/js/src/admin/components/RepositoryModal.tsx
index 443e483e720..a03c5838297 100644
--- a/extensions/package-manager/js/src/admin/components/RepositoryModal.tsx
+++ b/extensions/extension-manager/js/src/admin/components/RepositoryModal.tsx
@@ -29,24 +29,24 @@ export default class RepositoryModal<CustomAttrs extends IRepositoryModalAttrs =
 
   title(): Mithril.Children {
     const context = this.attrs.repository ? 'edit' : 'add';
-    return app.translator.trans(`flarum-package-manager.admin.composer.${context}_repository_label`);
+    return app.translator.trans(`flarum-extension-manager.admin.composer.${context}_repository_label`);
   }
 
   content(): Mithril.Children {
     const types = {
-      composer: app.translator.trans('flarum-package-manager.admin.composer.repositories.types.composer'),
-      vcs: app.translator.trans('flarum-package-manager.admin.composer.repositories.types.vcs'),
-      path: app.translator.trans('flarum-package-manager.admin.composer.repositories.types.path'),
+      composer: app.translator.trans('flarum-extension-manager.admin.composer.repositories.types.composer'),
+      vcs: app.translator.trans('flarum-extension-manager.admin.composer.repositories.types.vcs'),
+      path: app.translator.trans('flarum-extension-manager.admin.composer.repositories.types.path'),
     };
 
     return (
       <div className="Modal-body">
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.composer.repositories.add_modal.name_label')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.composer.repositories.add_modal.name_label')}</label>
           <input className="FormControl" bidi={this.name} />
         </div>
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.composer.repositories.add_modal.type_label')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.composer.repositories.add_modal.type_label')}</label>
           <Select
             options={types}
             value={this.repository().type}
@@ -54,7 +54,7 @@ export default class RepositoryModal<CustomAttrs extends IRepositoryModalAttrs =
           />
         </div>
         <div className="Form-group">
-          <label>{app.translator.trans('flarum-package-manager.admin.composer.repositories.add_modal.url')}</label>
+          <label>{app.translator.trans('flarum-extension-manager.admin.composer.repositories.add_modal.url')}</label>
           <input
             className="FormControl"
             onchange={(e: Event) => this.repository({ ...this.repository(), url: (e.target as HTMLInputElement).value })}
@@ -63,7 +63,7 @@ export default class RepositoryModal<CustomAttrs extends IRepositoryModalAttrs =
         </div>
         <div className="Form-group">
           <Button className="Button Button--primary" onclick={this.submit.bind(this)}>
-            {app.translator.trans('flarum-package-manager.admin.composer.repositories.add_modal.submit_button')}
+            {app.translator.trans('flarum-extension-manager.admin.composer.repositories.add_modal.submit_button')}
           </Button>
         </div>
       </div>
diff --git a/extensions/package-manager/js/src/admin/components/SettingsPage.tsx b/extensions/extension-manager/js/src/admin/components/SettingsPage.tsx
similarity index 77%
rename from extensions/package-manager/js/src/admin/components/SettingsPage.tsx
rename to extensions/extension-manager/js/src/admin/components/SettingsPage.tsx
index 1c64435f8f5..959611cd171 100644
--- a/extensions/package-manager/js/src/admin/components/SettingsPage.tsx
+++ b/extensions/extension-manager/js/src/admin/components/SettingsPage.tsx
@@ -14,22 +14,22 @@ export default class SettingsPage extends ExtensionPage {
   content() {
     const settings = app.extensionData.getSettings(this.extension.id);
 
-    const warnings = [app.translator.trans('flarum-package-manager.admin.settings.access_warning')];
+    const warnings = [app.translator.trans('flarum-extension-manager.admin.settings.access_warning')];
 
-    if (app.data.debugEnabled) warnings.push(app.translator.trans('flarum-package-manager.admin.settings.debug_mode_warning'));
+    if (app.data.debugEnabled) warnings.push(app.translator.trans('flarum-extension-manager.admin.settings.debug_mode_warning'));
 
     return (
       <div className="ExtensionPage-settings">
         <div className="container">
           <div className="Form-group">
-            <Alert className="PackageManager-primaryWarning" type="warning" dismissible={false}>
+            <Alert className="ExtensionManager-primaryWarning" type="warning" dismissible={false}>
               <ul>{listItems(warnings)}</ul>
             </Alert>
           </div>
           {settings ? (
-            <div className="SettingsGroups">
+            <div className="ExtensionManager-SettingsGroups">
               <div className="Form">
-                <label>{app.translator.trans('flarum-package-manager.admin.settings.title')}</label>
+                <label>{app.translator.trans('flarum-extension-manager.admin.settings.title')}</label>
                 <div className="SettingsGroups-content">{settings.map(this.buildSettingComponent.bind(this))}</div>
                 <div className="Form-group Form--controls">{this.submitButton()}</div>
               </div>
@@ -51,7 +51,7 @@ export default class SettingsPage extends ExtensionPage {
 
     items.add('control', <ControlSection />, 8);
 
-    if (app.data.settings['flarum-package-manager.queue_jobs'] !== '0' && app.data.settings['flarum-package-manager.queue_jobs']) {
+    if (app.data.settings['flarum-extension-manager.queue_jobs'] !== '0' && app.data.settings['flarum-extension-manager.queue_jobs']) {
       items.add('queue', <QueueSection />, 5);
     }
 
diff --git a/extensions/package-manager/js/src/admin/components/TaskOutputModal.tsx b/extensions/extension-manager/js/src/admin/components/TaskOutputModal.tsx
similarity index 63%
rename from extensions/package-manager/js/src/admin/components/TaskOutputModal.tsx
rename to extensions/extension-manager/js/src/admin/components/TaskOutputModal.tsx
index 8922d605f98..a96d322506b 100644
--- a/extensions/package-manager/js/src/admin/components/TaskOutputModal.tsx
+++ b/extensions/extension-manager/js/src/admin/components/TaskOutputModal.tsx
@@ -12,7 +12,7 @@ export default class TaskOutputModal<CustomAttrs extends TaskOutputModalAttrs =
   }
 
   title() {
-    return app.translator.trans(`flarum-package-manager.admin.sections.queue.operations.${this.attrs.task.operation()}`);
+    return app.translator.trans(`flarum-extension-manager.admin.sections.queue.operations.${this.attrs.task.operation()}`);
   }
 
   content() {
@@ -21,24 +21,24 @@ export default class TaskOutputModal<CustomAttrs extends TaskOutputModalAttrs =
         <div className="TaskOutputModal-data">
           {this.attrs.task.status() === 'failure' && (
             <div className="Form-group">
-              <label>{app.translator.trans('flarum-package-manager.admin.sections.queue.output_modal.guessed_cause')}</label>
+              <label>{app.translator.trans('flarum-extension-manager.admin.sections.queue.output_modal.guessed_cause')}</label>
               <div className="FormControl TaskOutputModal-data-guessed-cause">
                 {(this.attrs.task.guessedCause() &&
-                  app.translator.trans('flarum-package-manager.admin.exceptions.guessed_cause.' + this.attrs.task.guessedCause())) ||
-                  app.translator.trans('flarum-package-manager.admin.sections.queue.output_modal.cause_unknown')}
+                  app.translator.trans('flarum-extension-manager.admin.exceptions.guessed_cause.' + this.attrs.task.guessedCause())) ||
+                  app.translator.trans('flarum-extension-manager.admin.sections.queue.output_modal.cause_unknown')}
               </div>
             </div>
           )}
 
           <div className="Form-group">
-            <label>{app.translator.trans('flarum-package-manager.admin.sections.queue.output_modal.command')}</label>
+            <label>{app.translator.trans('flarum-extension-manager.admin.sections.queue.output_modal.command')}</label>
             <div className="FormControl TaskOutputModal-data-command">
               <code>$ composer {this.attrs.task.command()}</code>
             </div>
           </div>
 
           <div className="Form-group">
-            <label>{app.translator.trans('flarum-package-manager.admin.sections.queue.output_modal.output')}</label>
+            <label>{app.translator.trans('flarum-extension-manager.admin.sections.queue.output_modal.output')}</label>
             <div className="FormControl TaskOutputModal-data-output">
               <code>
                 <pre>{this.attrs.task.output()}</pre>
diff --git a/extensions/package-manager/js/src/admin/components/Updater.tsx b/extensions/extension-manager/js/src/admin/components/Updater.tsx
similarity index 59%
rename from extensions/package-manager/js/src/admin/components/Updater.tsx
rename to extensions/extension-manager/js/src/admin/components/Updater.tsx
index e6c35458eb2..bfc47b7d72d 100755
--- a/extensions/package-manager/js/src/admin/components/Updater.tsx
+++ b/extensions/extension-manager/js/src/admin/components/Updater.tsx
@@ -14,30 +14,30 @@ export type UpdaterLoadingTypes = 'check' | 'minor-update' | 'global-update' | '
 
 export default class Updater extends Component<IUpdaterAttrs> {
   view() {
-    const core = app.packageManager.control.coreUpdate;
+    const core = app.extensionManager.control.coreUpdate;
 
     return [
       <div className="Form-group">
-        <label>{app.translator.trans('flarum-package-manager.admin.updater.updater_title')}</label>
-        <p className="helpText">{app.translator.trans('flarum-package-manager.admin.updater.updater_help')}</p>
+        <label>{app.translator.trans('flarum-extension-manager.admin.updater.updater_title')}</label>
+        <p className="helpText">{app.translator.trans('flarum-extension-manager.admin.updater.updater_help')}</p>
         {this.lastUpdateCheckView()}
-        <div className="PackageManager-updaterControls">{this.controlItems().toArray()}</div>
+        <div className="ExtensionManager-updaterControls">{this.controlItems().toArray()}</div>
         {this.availableUpdatesView()}
       </div>,
       core && core.package['latest-major'] ? (
-        <MajorUpdater coreUpdate={core.package} updateState={app.packageManager.control.lastUpdateRun.major} />
+        <MajorUpdater coreUpdate={core.package} updateState={app.extensionManager.control.lastUpdateRun.major} />
       ) : null,
     ];
   }
 
   lastUpdateCheckView() {
     return (
-      (app.packageManager.control.lastUpdateCheck?.checkedAt && (
-        <p className="PackageManager-lastUpdatedAt">
-          <span className="PackageManager-lastUpdatedAt-label">
-            {app.translator.trans('flarum-package-manager.admin.updater.last_update_checked_at')}
+      (app.extensionManager.control.lastUpdateCheck?.checkedAt && (
+        <p className="ExtensionManager-lastUpdatedAt">
+          <span className="ExtensionManager-lastUpdatedAt-label">
+            {app.translator.trans('flarum-extension-manager.admin.updater.last_update_checked_at')}
           </span>
-          <span className="PackageManager-lastUpdatedAt-value">{humanTime(app.packageManager.control.lastUpdateCheck.checkedAt)}</span>
+          <span className="ExtensionManager-lastUpdatedAt-value">{humanTime(app.extensionManager.control.lastUpdateCheck.checkedAt)}</span>
         </p>
       )) ||
       null
@@ -45,11 +45,11 @@ export default class Updater extends Component<IUpdaterAttrs> {
   }
 
   availableUpdatesView() {
-    const state = app.packageManager.control;
+    const state = app.extensionManager.control;
 
-    if (app.packageManager.control.isLoading('check') || app.packageManager.control.isLoading('global-update')) {
+    if (app.extensionManager.control.isLoading('check') || app.extensionManager.control.isLoading('global-update')) {
       return (
-        <div className="PackageManager-extensions">
+        <div className="ExtensionManager-extensions">
           <LoadingIndicator />
         </div>
       );
@@ -59,15 +59,15 @@ export default class Updater extends Component<IUpdaterAttrs> {
 
     if (!(state.extensionUpdates.length || hasMinorCoreUpdate)) {
       return (
-        <div className="PackageManager-extensions">
-          <span className="helpText">{app.translator.trans('flarum-package-manager.admin.updater.up_to_date')}</span>
+        <div className="ExtensionManager-extensions">
+          <span className="helpText">{app.translator.trans('flarum-extension-manager.admin.updater.up_to_date')}</span>
         </div>
       );
     }
 
     return (
-      <div className="PackageManager-extensions">
-        <div className="PackageManager-extensions-grid">
+      <div className="ExtensionManager-extensions">
+        <div className="ExtensionManager-extensions-grid">
           {hasMinorCoreUpdate ? (
             <ExtensionItem
               extension={state.coreUpdate!.extension}
@@ -101,11 +101,11 @@ export default class Updater extends Component<IUpdaterAttrs> {
       <Button
         className="Button"
         icon="fas fa-sync-alt"
-        onclick={() => app.packageManager.control.checkForUpdates()}
-        loading={app.packageManager.control.isLoading('check')}
-        disabled={app.packageManager.control.isLoading()}
+        onclick={() => app.extensionManager.control.checkForUpdates()}
+        loading={app.extensionManager.control.isLoading('check')}
+        disabled={app.extensionManager.control.hasOperationRunning()}
       >
-        {app.translator.trans('flarum-package-manager.admin.updater.check_for_updates')}
+        {app.translator.trans('flarum-extension-manager.admin.updater.check_for_updates')}
       </Button>,
       100
     );
@@ -115,11 +115,11 @@ export default class Updater extends Component<IUpdaterAttrs> {
       <Button
         className="Button"
         icon="fas fa-play"
-        onclick={() => app.packageManager.control.updateGlobally()}
-        loading={app.packageManager.control.isLoading('global-update')}
-        disabled={app.packageManager.control.isLoading()}
+        onclick={() => app.extensionManager.control.updateGlobally()}
+        loading={app.extensionManager.control.isLoading('global-update')}
+        disabled={app.extensionManager.control.hasOperationRunning()}
       >
-        {app.translator.trans('flarum-package-manager.admin.updater.run_global_update')}
+        {app.translator.trans('flarum-extension-manager.admin.updater.run_global_update')}
       </Button>
     );
 
diff --git a/extensions/package-manager/js/src/admin/components/WhyNotModal.tsx b/extensions/extension-manager/js/src/admin/components/WhyNotModal.tsx
similarity index 89%
rename from extensions/package-manager/js/src/admin/components/WhyNotModal.tsx
rename to extensions/extension-manager/js/src/admin/components/WhyNotModal.tsx
index e5c7b009211..f78f658e0ae 100644
--- a/extensions/package-manager/js/src/admin/components/WhyNotModal.tsx
+++ b/extensions/extension-manager/js/src/admin/components/WhyNotModal.tsx
@@ -24,7 +24,7 @@ export default class WhyNotModal<CustomAttrs extends WhyNotModalAttrs = WhyNotMo
   }
 
   title() {
-    return app.translator.trans('flarum-package-manager.admin.why_not_modal.title');
+    return app.translator.trans('flarum-extension-manager.admin.why_not_modal.title');
   }
 
   oncreate(vnode: Mithril.VnodeDOM<CustomAttrs, this>) {
@@ -41,7 +41,7 @@ export default class WhyNotModal<CustomAttrs extends WhyNotModalAttrs = WhyNotMo
     app
       .request<WhyNotResponse>({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/why-not`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/why-not`,
         body: {
           data: {
             package: this.attrs.package,
diff --git a/extensions/package-manager/js/src/admin/index.tsx b/extensions/extension-manager/js/src/admin/index.tsx
similarity index 59%
rename from extensions/package-manager/js/src/admin/index.tsx
rename to extensions/extension-manager/js/src/admin/index.tsx
index 67fe6672b5c..0219c91cefc 100755
--- a/extensions/package-manager/js/src/admin/index.tsx
+++ b/extensions/extension-manager/js/src/admin/index.tsx
@@ -4,32 +4,30 @@ import ExtensionPage from 'flarum/admin/components/ExtensionPage';
 import Button from 'flarum/common/components/Button';
 import LoadingModal from 'flarum/admin/components/LoadingModal';
 import isExtensionEnabled from 'flarum/admin/utils/isExtensionEnabled';
-import Alert from 'flarum/common/components/Alert';
-
 import SettingsPage from './components/SettingsPage';
 import Task from './models/Task';
 import jumpToQueue from './utils/jumpToQueue';
 import extractText from 'flarum/common/utils/extractText';
 import { AsyncBackendResponse } from './shims';
-import PackageManagerState from './states/PackageManagerState';
+import ExtensionManagerState from './states/ExtensionManagerState';
 
-app.initializers.add('flarum-package-manager', (app) => {
-  app.store.models['package-manager-tasks'] = Task;
+app.initializers.add('flarum-extension-manager', (app) => {
+  app.store.models['extension-manager-tasks'] = Task;
 
-  app.packageManager = new PackageManagerState();
+  app.extensionManager = new ExtensionManagerState();
 
-  if (app.data['flarum-package-manager.using_sync_queue']) {
-    app.data.settings['flarum-package-manager.queue_jobs'] = '0';
+  if (app.data['flarum-extension-manager.using_sync_queue']) {
+    app.data.settings['flarum-extension-manager.queue_jobs'] = '0';
   }
 
   app.extensionData
-    .for('flarum-package-manager')
+    .for('flarum-extension-manager')
     .registerSetting({
-      setting: 'flarum-package-manager.queue_jobs',
-      label: app.translator.trans('flarum-package-manager.admin.settings.queue_jobs'),
+      setting: 'flarum-extension-manager.queue_jobs',
+      label: app.translator.trans('flarum-extension-manager.admin.settings.queue_jobs'),
       help: m.trust(
         extractText(
-          app.translator.trans('flarum-package-manager.admin.settings.queue_jobs_help', {
+          app.translator.trans('flarum-extension-manager.admin.settings.queue_jobs_help', {
             basic_impl_link: 'https://discuss.flarum.org/d/28151-database-queue-the-simplest-queue-even-for-shared-hosting',
             adv_impl_link: 'https://discuss.flarum.org/d/21873-redis-sessions-cache-queues',
             php_version: `<strong>${app.data.phpVersion}</strong>`,
@@ -38,18 +36,18 @@ app.initializers.add('flarum-package-manager', (app) => {
         )
       ),
       type: 'boolean',
-      disabled: app.data['flarum-package-manager.using_sync_queue'],
+      disabled: app.data['flarum-extension-manager.using_sync_queue'],
     })
     .registerSetting({
-      setting: 'flarum-package-manager.task_retention_days',
-      label: app.translator.trans('flarum-package-manager.admin.settings.task_retention_days'),
-      help: app.translator.trans('flarum-package-manager.admin.settings.task_retention_days_help'),
+      setting: 'flarum-extension-manager.task_retention_days',
+      label: app.translator.trans('flarum-extension-manager.admin.settings.task_retention_days'),
+      help: app.translator.trans('flarum-extension-manager.admin.settings.task_retention_days_help'),
       type: 'number',
     })
     .registerPage(SettingsPage);
 
   extend(ExtensionPage.prototype, 'topItems', function (items) {
-    if (this.extension.id === 'flarum-package-manager' || isExtensionEnabled(this.extension.id)) {
+    if (this.extension.id === 'flarum-extension-manager' || isExtensionEnabled(this.extension.id)) {
       return;
     }
 
@@ -63,14 +61,14 @@ app.initializers.add('flarum-package-manager', (app) => {
 
           app
             .request<AsyncBackendResponse | null>({
-              url: `${app.forum.attribute('apiUrl')}/package-manager/extensions/${this.extension.id}`,
+              url: `${app.forum.attribute('apiUrl')}/extension-manager/extensions/${this.extension.id}`,
               method: 'DELETE',
             })
             .then((response) => {
               if (response?.processing) {
                 jumpToQueue();
               } else {
-                app.alerts.show({ type: 'success' }, app.translator.trans('flarum-package-manager.admin.extensions.successful_remove'));
+                app.alerts.show({ type: 'success' }, app.translator.trans('flarum-extension-manager.admin.extensions.successful_remove'));
                 window.location = app.forum.attribute('adminUrl');
               }
             })
@@ -79,7 +77,7 @@ app.initializers.add('flarum-package-manager', (app) => {
             });
         }}
       >
-        {app.translator.trans('flarum-package-manager.admin.extensions.remove')}
+        {app.translator.trans('flarum-extension-manager.admin.extensions.remove')}
       </Button>
     );
   });
diff --git a/extensions/package-manager/js/src/admin/models/Task.ts b/extensions/extension-manager/js/src/admin/models/Task.ts
similarity index 100%
rename from extensions/package-manager/js/src/admin/models/Task.ts
rename to extensions/extension-manager/js/src/admin/models/Task.ts
diff --git a/extensions/package-manager/js/src/admin/shims.d.ts b/extensions/extension-manager/js/src/admin/shims.d.ts
similarity index 64%
rename from extensions/package-manager/js/src/admin/shims.d.ts
rename to extensions/extension-manager/js/src/admin/shims.d.ts
index 2a45f961d8f..6089271deb0 100644
--- a/extensions/package-manager/js/src/admin/shims.d.ts
+++ b/extensions/extension-manager/js/src/admin/shims.d.ts
@@ -1,5 +1,5 @@
 import 'dayjs/plugin/relativeTime';
-import PackageManagerState from './states/PackageManagerState';
+import ExtensionManagerState from './states/ExtensionManagerState';
 
 export interface AsyncBackendResponse {
   processing: boolean;
@@ -7,6 +7,6 @@ export interface AsyncBackendResponse {
 
 declare module 'flarum/admin/AdminApplication' {
   export default interface AdminApplication {
-    packageManager: PackageManagerState;
+    extensionManager: ExtensionManagerState;
   }
 }
diff --git a/extensions/package-manager/js/src/admin/states/ControlSectionState.ts b/extensions/extension-manager/js/src/admin/states/ControlSectionState.ts
similarity index 82%
rename from extensions/package-manager/js/src/admin/states/ControlSectionState.ts
rename to extensions/extension-manager/js/src/admin/states/ControlSectionState.ts
index ad676642f54..d0f0c50fb82 100644
--- a/extensions/package-manager/js/src/admin/states/ControlSectionState.ts
+++ b/extensions/extension-manager/js/src/admin/states/ControlSectionState.ts
@@ -61,7 +61,7 @@ export default class ControlSectionState {
   public extensionUpdates!: Extension[];
   public coreUpdate: CoreUpdate | null = null;
   get lastUpdateRun(): LastUpdateRun {
-    const lastUpdateRun = JSON.parse(app.data.settings['flarum-package-manager.last_update_run']) as LastUpdateRun;
+    const lastUpdateRun = JSON.parse(app.data.settings['flarum-extension-manager.last_update_run']) as LastUpdateRun;
 
     lastUpdateRun.limitedPackages = () => [
       ...lastUpdateRun.major.limitedPackages,
@@ -73,7 +73,7 @@ export default class ControlSectionState {
   }
 
   constructor() {
-    this.lastUpdateCheck = JSON.parse(app.data.settings['flarum-package-manager.last_update_check']) as LastUpdateCheck;
+    this.lastUpdateCheck = JSON.parse(app.data.settings['flarum-extension-manager.last_update_check']) as LastUpdateCheck;
     this.extensionUpdates = this.formatExtensionUpdates(this.lastUpdateCheck);
     this.coreUpdate = this.formatCoreUpdate(this.lastUpdateCheck);
   }
@@ -82,18 +82,22 @@ export default class ControlSectionState {
     return (name && this.loading === name) || (!name && this.loading !== null);
   }
 
+  hasOperationRunning(): boolean {
+    return this.isLoading() || app.extensionManager.queue.hasPending();
+  }
+
   setLoading(name: LoadingTypes): void {
     this.loading = name;
   }
 
   requirePackage(data: any) {
-    app.packageManager.control.setLoading('extension-install');
+    app.extensionManager.control.setLoading('extension-install');
     app.modal.show(LoadingModal);
 
     app
       .request<AsyncBackendResponse & { id: number }>({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/extensions`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/extensions`,
         body: {
           data,
         },
@@ -105,7 +109,7 @@ export default class ControlSectionState {
           const extensionId = response.id;
           app.alerts.show(
             { type: 'success' },
-            app.translator.trans('flarum-package-manager.admin.extensions.successful_install', { extension: extensionId })
+            app.translator.trans('flarum-extension-manager.admin.extensions.successful_install', { extension: extensionId })
           );
           window.location.href = `${app.forum.attribute('adminUrl')}#/extension/${extensionId}`;
           window.location.reload();
@@ -124,7 +128,7 @@ export default class ControlSectionState {
     app
       .request<AsyncBackendResponse | LastUpdateCheck>({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/check-for-updates`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/check-for-updates`,
       })
       .then((response) => {
         if ((response as AsyncBackendResponse).processing) {
@@ -144,20 +148,20 @@ export default class ControlSectionState {
   }
 
   updateCoreMinor() {
-    if (confirm(extractText(app.translator.trans('flarum-package-manager.admin.minor_update_confirmation.content')))) {
+    if (confirm(extractText(app.translator.trans('flarum-extension-manager.admin.minor_update_confirmation.content')))) {
       app.modal.show(LoadingModal);
       this.setLoading('minor-update');
 
       app
         .request<AsyncBackendResponse | null>({
           method: 'POST',
-          url: `${app.forum.attribute('apiUrl')}/package-manager/minor-update`,
+          url: `${app.forum.attribute('apiUrl')}/extension-manager/minor-update`,
         })
         .then((response) => {
           if (response?.processing) {
             jumpToQueue();
           } else {
-            app.alerts.show({ type: 'success' }, app.translator.trans('flarum-package-manager.admin.update_successful'));
+            app.alerts.show({ type: 'success' }, app.translator.trans('flarum-extension-manager.admin.update_successful'));
             window.location.reload();
           }
         })
@@ -176,7 +180,7 @@ export default class ControlSectionState {
     app
       .request<AsyncBackendResponse | null>({
         method: 'PATCH',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/extensions/${extension.id}`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/extensions/${extension.id}`,
         body: {
           data: {
             updateMode,
@@ -189,7 +193,7 @@ export default class ControlSectionState {
         } else {
           app.alerts.show(
             { type: 'success' },
-            app.translator.trans('flarum-package-manager.admin.extensions.successful_update', {
+            app.translator.trans('flarum-extension-manager.admin.extensions.successful_update', {
               extension: extension.extra['flarum-extension'].title,
             })
           );
@@ -210,13 +214,13 @@ export default class ControlSectionState {
     app
       .request<AsyncBackendResponse | null>({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/global-update`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/global-update`,
       })
       .then((response) => {
         if (response?.processing) {
           jumpToQueue();
         } else {
-          app.alerts.show({ type: 'success' }, app.translator.trans('flarum-package-manager.admin.updater.global_update_successful'));
+          app.alerts.show({ type: 'success' }, app.translator.trans('flarum-extension-manager.admin.updater.global_update_successful'));
           window.location.reload();
         }
       })
@@ -259,11 +263,11 @@ export default class ControlSectionState {
         version: app.data.settings.version,
         icon: {
           // @ts-ignore
-          backgroundImage: `url(${app.data.resources[0]['attributes']['baseUrl']}/assets/extensions/flarum-package-manager/flarum.svg`,
+          backgroundImage: `url(${app.data.resources[0]['attributes']['baseUrl']}/assets/extensions/flarum-extension-manager/flarum.svg`,
         },
         extra: {
           'flarum-extension': {
-            title: extractText(app.translator.trans('flarum-package-manager.admin.updater.flarum')),
+            title: extractText(app.translator.trans('flarum-extension-manager.admin.updater.flarum')),
           },
         },
       },
@@ -271,14 +275,14 @@ export default class ControlSectionState {
   }
 
   majorUpdate({ dryRun }: { dryRun: boolean }) {
-    app.packageManager.control.setLoading(dryRun ? 'major-update-dry-run' : 'major-update');
+    app.extensionManager.control.setLoading(dryRun ? 'major-update-dry-run' : 'major-update');
     app.modal.show(LoadingModal);
     const updateState = this.lastUpdateRun.major;
 
     app
       .request<AsyncBackendResponse | null>({
         method: 'POST',
-        url: `${app.forum.attribute('apiUrl')}/package-manager/major-update`,
+        url: `${app.forum.attribute('apiUrl')}/extension-manager/major-update`,
         body: {
           data: { dryRun },
         },
@@ -287,7 +291,7 @@ export default class ControlSectionState {
         if (response?.processing) {
           jumpToQueue();
         } else {
-          app.alerts.show({ type: 'success' }, app.translator.trans('flarum-package-manager.admin.update_successful'));
+          app.alerts.show({ type: 'success' }, app.translator.trans('flarum-extension-manager.admin.update_successful'));
           window.location.reload();
         }
       })
diff --git a/extensions/package-manager/js/src/admin/states/PackageManagerState.ts b/extensions/extension-manager/js/src/admin/states/ExtensionManagerState.ts
similarity index 82%
rename from extensions/package-manager/js/src/admin/states/PackageManagerState.ts
rename to extensions/extension-manager/js/src/admin/states/ExtensionManagerState.ts
index ef166b34f17..62073aa718a 100644
--- a/extensions/package-manager/js/src/admin/states/PackageManagerState.ts
+++ b/extensions/extension-manager/js/src/admin/states/ExtensionManagerState.ts
@@ -1,7 +1,7 @@
 import QueueState from './QueueState';
 import ControlSectionState from './ControlSectionState';
 
-export default class PackageManagerState {
+export default class ExtensionManagerState {
   public queue: QueueState = new QueueState();
   public control: ControlSectionState = new ControlSectionState();
 }
diff --git a/extensions/package-manager/js/src/admin/states/QueueState.ts b/extensions/extension-manager/js/src/admin/states/QueueState.ts
similarity index 81%
rename from extensions/package-manager/js/src/admin/states/QueueState.ts
rename to extensions/extension-manager/js/src/admin/states/QueueState.ts
index 9c54ba8e534..a29a484f422 100644
--- a/extensions/package-manager/js/src/admin/states/QueueState.ts
+++ b/extensions/extension-manager/js/src/admin/states/QueueState.ts
@@ -20,7 +20,7 @@ export default class QueueState {
       ...params,
     };
 
-    return app.store.find<Task[]>('package-manager-tasks', params || {}).then((data) => {
+    return app.store.find<Task[]>('extension-manager-tasks', params || {}).then((data) => {
       this.tasks = data;
       this.total = data.payload.meta?.total;
 
@@ -32,12 +32,12 @@ export default class QueueState {
       if (pendingTask) {
         this.pollQueue(actionTaken);
       } else if (actionTaken) {
-        app.packageManager.control.setLoading(null);
+        app.extensionManager.control.setLoading(null);
 
         // Refresh the page
         window.location.reload();
-      } else if (app.packageManager.control.isLoading()) {
-        app.packageManager.control.setLoading(null);
+      } else if (app.extensionManager.control.isLoading()) {
+        app.extensionManager.control.setLoading(null);
       }
 
       return data;
@@ -87,4 +87,8 @@ export default class QueueState {
       this.load({}, actionTaken);
     }, 6000);
   }
+
+  hasPending() {
+    return !!this.tasks?.find((task) => task.status() === 'pending' || task.status() === 'running');
+  }
 }
diff --git a/extensions/package-manager/js/src/admin/utils/errorHandler.ts b/extensions/extension-manager/js/src/admin/utils/errorHandler.ts
similarity index 70%
rename from extensions/package-manager/js/src/admin/utils/errorHandler.ts
rename to extensions/extension-manager/js/src/admin/utils/errorHandler.ts
index 0242753a3f0..e849639f492 100755
--- a/extensions/package-manager/js/src/admin/utils/errorHandler.ts
+++ b/extensions/extension-manager/js/src/admin/utils/errorHandler.ts
@@ -1,7 +1,7 @@
 import app from 'flarum/admin/app';
 
 export default function (e: any) {
-  app.packageManager.control.setLoading(null);
+  app.extensionManager.control.setLoading(null);
 
   const error = e.response.errors[0];
 
@@ -14,20 +14,20 @@ export default function (e: any) {
   switch (error.code) {
     case 'composer_command_failure':
       if (error.guessed_cause) {
-        app.alerts.show({ type: 'error' }, app.translator.trans(`flarum-package-manager.admin.exceptions.guessed_cause.${error.guessed_cause}`));
+        app.alerts.show({ type: 'error' }, app.translator.trans(`flarum-extension-manager.admin.exceptions.guessed_cause.${error.guessed_cause}`));
         app.modal.close();
       } else {
-        app.alerts.show({ type: 'error' }, app.translator.trans('flarum-package-manager.admin.exceptions.composer_command_failure'));
+        app.alerts.show({ type: 'error' }, app.translator.trans('flarum-extension-manager.admin.exceptions.composer_command_failure'));
       }
       break;
 
     case 'extension_already_installed':
-      app.alerts.show({ type: 'error' }, app.translator.trans('flarum-package-manager.admin.exceptions.extension_already_installed'));
+      app.alerts.show({ type: 'error' }, app.translator.trans('flarum-extension-manager.admin.exceptions.extension_already_installed'));
       app.modal.close();
       break;
 
     case 'extension_not_installed':
-      app.alerts.show({ type: 'error' }, app.translator.trans('flarum-package-manager.admin.exceptions.extension_not_installed'));
+      app.alerts.show({ type: 'error' }, app.translator.trans('flarum-extension-manager.admin.exceptions.extension_not_installed'));
       app.modal.close();
   }
 }
diff --git a/extensions/package-manager/js/src/admin/utils/humanDuration.ts b/extensions/extension-manager/js/src/admin/utils/humanDuration.ts
similarity index 100%
rename from extensions/package-manager/js/src/admin/utils/humanDuration.ts
rename to extensions/extension-manager/js/src/admin/utils/humanDuration.ts
diff --git a/extensions/extension-manager/js/src/admin/utils/jumpToQueue.ts b/extensions/extension-manager/js/src/admin/utils/jumpToQueue.ts
new file mode 100644
index 00000000000..5d8a58098fc
--- /dev/null
+++ b/extensions/extension-manager/js/src/admin/utils/jumpToQueue.ts
@@ -0,0 +1,16 @@
+import app from 'flarum/admin/app';
+
+// @ts-ignore
+window.jumpToQueue = jumpToQueue;
+
+export default function jumpToQueue(): void {
+  app.modal.close();
+
+  m.route.set(app.route('extension', { id: 'flarum-extension-manager' }));
+
+  app.extensionManager.queue.load({}, true);
+
+  setTimeout(() => {
+    document.getElementById('ExtensionManager-queueSection')?.scrollIntoView({ block: 'nearest' });
+  }, 200);
+}
diff --git a/extensions/package-manager/js/tsconfig.json b/extensions/extension-manager/js/tsconfig.json
similarity index 100%
rename from extensions/package-manager/js/tsconfig.json
rename to extensions/extension-manager/js/tsconfig.json
diff --git a/extensions/package-manager/js/webpack.config.js b/extensions/extension-manager/js/webpack.config.js
similarity index 100%
rename from extensions/package-manager/js/webpack.config.js
rename to extensions/extension-manager/js/webpack.config.js
diff --git a/extensions/extension-manager/less/admin.less b/extensions/extension-manager/less/admin.less
new file mode 100755
index 00000000000..b348d210afe
--- /dev/null
+++ b/extensions/extension-manager/less/admin.less
@@ -0,0 +1,104 @@
+@import "admin/Label";
+@import "admin/TaskOutputModal";
+@import "admin/QueueSection";
+@import "admin/ControlSection";
+
+.ExtensionManager-controlSection {
+  > .container {
+    padding-bottom: 0;
+  }
+}
+
+.FormControl-container {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px;
+}
+
+.Form-group--danger {
+  border: 2px solid var(--alert-error-bg);
+  border-radius: var(--border-radius);
+  background-color: transparent;
+}
+
+// @TODO add to core
+.Checkbox--switch.disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.Form--controls {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px;
+  margin-top: auto;
+  padding-top: 16px;
+}
+
+.ButtonGroup--full {
+  width: 100%;
+  display: flex;
+
+  > .Button:first-child {
+    flex-grow: 1;
+    text-align: start;
+  }
+}
+
+.ConfigureAuth-hosts, .ConfigureComposer-repositories {
+  > .ButtonGroup {
+    margin-bottom: 8px;
+  }
+}
+
+.flarum-extension-manager-Page .SettingsGroups .Form {
+  max-height: unset;
+}
+
+.ExtensionManager-SettingsGroups {
+  display: flex;
+  column-count: 3;
+  column-gap: 30px;
+  flex-wrap: wrap;
+
+  .Form {
+    min-width: 300px;
+    max-height: 500px;
+    display: inline-grid;
+    padding: 10px 20px;
+    min-height: 20vh;
+    max-width: 400px;
+    grid-template-rows: min-content;
+    border: 1px solid var(--control-bg);
+    border-radius: var(--border-radius);
+    flex: 1 1 160px;
+
+    >label {
+      margin-bottom: 10px;
+    }
+
+    @media (max-width: 1209px) {
+      margin-bottom: 20px;
+    }
+
+    >ol {
+      >li {
+        margin-top: 8px;
+
+        .Button {
+          float: right;
+          visibility: hidden;
+          margin: -8px -16px -8px 16px;
+        }
+      }
+    }
+
+    >label {
+      float: left;
+      font-weight: bold;
+      color: var(--muted-color);
+    }
+  }
+}
diff --git a/extensions/package-manager/less/admin/ControlSection.less b/extensions/extension-manager/less/admin/ControlSection.less
similarity index 88%
rename from extensions/package-manager/less/admin/ControlSection.less
rename to extensions/extension-manager/less/admin/ControlSection.less
index f6b4f6b791a..99273f27154 100644
--- a/extensions/package-manager/less/admin/ControlSection.less
+++ b/extensions/extension-manager/less/admin/ControlSection.less
@@ -1,4 +1,4 @@
-.PackageManager-lastUpdatedAt {
+.ExtensionManager-lastUpdatedAt {
   color: var(--control-color);
 
   &-label {
@@ -6,7 +6,7 @@
   }
 }
 
-.PackageManager-updaterControls {
+.ExtensionManager-updaterControls {
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
@@ -14,7 +14,7 @@
   margin-bottom: 16px;
 }
 
-.PackageManager-extensions {
+.ExtensionManager-extensions {
   width: 100%;
 
   &-grid {
@@ -25,7 +25,7 @@
   }
 }
 
-.PackageManager-extension {
+.ExtensionManager-extension {
   display: flex;
   align-items: center;
   gap: 8px;
@@ -81,7 +81,7 @@
   }
 }
 
-.PackageManager-majorUpdate {
+.ExtensionManager-majorUpdate {
   --space: 16px;
   padding: var(--space);
   display: grid;
@@ -142,7 +142,7 @@
     border-top: 1px solid var(--control-bg);
   }
 
-  .PackageManager-updaterControls {
+  .ExtensionManager-updaterControls {
     margin: 0;
   }
 }
@@ -153,7 +153,7 @@
   }
 }
 
-.PackageManager-installer .FormControl-container {
+.ExtensionManager-installer .FormControl-container {
   max-width: 450px;
 
   .FormControl {
@@ -161,11 +161,11 @@
   }
 }
 
-.PackageManager-controlSection .container {
+.ExtensionManager-controlSection .container {
   max-width: 1030px;
   overflow: visible;
 }
 
-.PackageManager-primaryWarning ul {
+.ExtensionManager-primaryWarning ul {
   margin: 0;
 }
diff --git a/extensions/package-manager/less/admin/Label.less b/extensions/extension-manager/less/admin/Label.less
similarity index 100%
rename from extensions/package-manager/less/admin/Label.less
rename to extensions/extension-manager/less/admin/Label.less
diff --git a/extensions/package-manager/less/admin/QueueSection.less b/extensions/extension-manager/less/admin/QueueSection.less
similarity index 91%
rename from extensions/package-manager/less/admin/QueueSection.less
rename to extensions/extension-manager/less/admin/QueueSection.less
index 60059dfe997..88a2ea2d49f 100644
--- a/extensions/package-manager/less/admin/QueueSection.less
+++ b/extensions/extension-manager/less/admin/QueueSection.less
@@ -1,4 +1,4 @@
-.PackageManager-queueSection {
+.ExtensionManager-queueSection {
   &-header > .container {
     display: flex;
     justify-content: space-between;
@@ -26,7 +26,7 @@
   }
 }
 
-.PackageManager-queueTable {
+.ExtensionManager-queueTable {
   &-package {
     display: flex;
     align-items: center;
diff --git a/extensions/package-manager/less/admin/TaskOutputModal.less b/extensions/extension-manager/less/admin/TaskOutputModal.less
similarity index 100%
rename from extensions/package-manager/less/admin/TaskOutputModal.less
rename to extensions/extension-manager/less/admin/TaskOutputModal.less
diff --git a/extensions/package-manager/locale/en.yml b/extensions/extension-manager/locale/en.yml
similarity index 92%
rename from extensions/package-manager/locale/en.yml
rename to extensions/extension-manager/locale/en.yml
index ec9563b4a49..54d93e731f0 100755
--- a/extensions/package-manager/locale/en.yml
+++ b/extensions/extension-manager/locale/en.yml
@@ -1,4 +1,4 @@
-flarum-package-manager:
+flarum-extension-manager:
   admin:
     auth_config:
       add_label: New authentication method
@@ -81,7 +81,7 @@ flarum-package-manager:
       update_hard_label: Hard update
 
     file_permissions: >
-      The package manager requires read and write permissions on the following files and directories: composer.json, composer.lock, vendor, storage, storage/.composer
+      The extension manager requires read and write permissions on the following files and directories: composer.json, composer.lock, vendor, storage, storage/.composer
 
     major_updater:
       description: >
@@ -136,8 +136,8 @@ flarum-package-manager:
 
     settings:
       title: => core.ref.settings
-      access_warning: Please be careful to who you give access to the admin area, the package manager could be misused by bad actors to install packages that can lead to security breaches.
-      debug_mode_warning: You are running in debug mode, the package manager cannot properly install and update local development packages. Please use the command line interface instead for such purposes.
+      access_warning: Please be careful to who you give access to the admin area, the extension manager could be misused by bad actors to install packages that can lead to security breaches.
+      debug_mode_warning: You are running in debug mode, the extension manager cannot properly install and update local development packages. Please use the command line interface instead for such purposes.
       queue_jobs: Run operations in the background queue
       queue_jobs_help: >
         You can read about a <a href='{basic_impl_link}'>basic queue</a> implementation or a <a href='{adv_impl_link}'>more advanced</a> one.
diff --git a/extensions/package-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php b/extensions/extension-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php
similarity index 95%
rename from extensions/package-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php
rename to extensions/extension-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php
index 1a47853cb9f..b657272cf4d 100755
--- a/extensions/package-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php
+++ b/extensions/extension-manager/migrations/2022_02_22_000000_create_package_manager_tasks_table.php
@@ -10,7 +10,7 @@
 use Flarum\Database\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-return Migration::createTable(
+return Migration::createTableIfNotExists(
     'package_manager_tasks',
     function (Blueprint $table) {
         $table->increments('id');
diff --git a/extensions/extension-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php b/extensions/extension-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php
new file mode 100644
index 00000000000..19b39c0dc90
--- /dev/null
+++ b/extensions/extension-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+
+return [
+    'up' => function (Builder $schema) {
+        $schema->table('package_manager_tasks', function (Blueprint $table) use ($schema) {
+            if (! $schema->hasColumn('package_manager_tasks', 'guessed_cause')) {
+                $table->string('guessed_cause', 255)->nullable()->after('output');
+            }
+        });
+    },
+    'down' => function (Builder $schema) {
+        $schema->table('package_manager_tasks', function (Blueprint $table) use ($schema) {
+            if ($schema->hasColumn('package_manager_tasks', 'guessed_cause')) {
+                $table->dropColumn('guessed_cause');
+            }
+        });
+    }
+];
diff --git a/extensions/extension-manager/migrations/2024_01_10_000000_rename_to_extension_manager.php b/extensions/extension-manager/migrations/2024_01_10_000000_rename_to_extension_manager.php
new file mode 100644
index 00000000000..64f223467fb
--- /dev/null
+++ b/extensions/extension-manager/migrations/2024_01_10_000000_rename_to_extension_manager.php
@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Schema\Builder;
+
+return [
+    'up' => function (Builder $schema) {
+        $schema->rename('package_manager_tasks', 'extension_manager_tasks');
+        $schema->getConnection()->table('migrations')->where('extension', 'flarum-package-manager')->delete();
+    },
+    'down' => function (Builder $schema) {
+        $schema->rename('extension_manager_tasks', 'package_manager_tasks');
+        $schema->getConnection()->table('migrations')->where('extension', 'flarum-extension-manager')->update([
+            'extension' => 'flarum-package-manager',
+        ]);
+    }
+];
diff --git a/extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php b/extensions/extension-manager/src/Api/Controller/CheckForUpdatesController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php
rename to extensions/extension-manager/src/Api/Controller/CheckForUpdatesController.php
index caa3164043e..0a3a1f48192 100755
--- a/extensions/package-manager/src/Api/Controller/CheckForUpdatesController.php
+++ b/extensions/extension-manager/src/Api/Controller/CheckForUpdatesController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\CheckForUpdates;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\CheckForUpdates;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/extensions/package-manager/src/Api/Controller/ConfigureComposerController.php b/extensions/extension-manager/src/Api/Controller/ConfigureComposerController.php
similarity index 95%
rename from extensions/package-manager/src/Api/Controller/ConfigureComposerController.php
rename to extensions/extension-manager/src/Api/Controller/ConfigureComposerController.php
index 179369a8dc6..59b4ae91662 100755
--- a/extensions/package-manager/src/Api/Controller/ConfigureComposerController.php
+++ b/extensions/extension-manager/src/Api/Controller/ConfigureComposerController.php
@@ -7,12 +7,12 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Foundation\Paths;
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\ConfigureComposerValidator;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\ConfigureComposerValidator;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
@@ -111,6 +111,8 @@ protected function composerConfig(ServerRequestInterface $request): array
             $composerJson[$key] = Arr::get($composerJson, $key, Arr::get($default, $key));
         }
 
+        $composerJson = Arr::sortRecursive($composerJson);
+
         return Arr::only($composerJson, $this->configurable);
     }
 
diff --git a/extensions/package-manager/src/Api/Controller/GlobalUpdateController.php b/extensions/extension-manager/src/Api/Controller/GlobalUpdateController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/GlobalUpdateController.php
rename to extensions/extension-manager/src/Api/Controller/GlobalUpdateController.php
index 158618e5d9f..e7f026b7d47 100755
--- a/extensions/package-manager/src/Api/Controller/GlobalUpdateController.php
+++ b/extensions/extension-manager/src/Api/Controller/GlobalUpdateController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\GlobalUpdate;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\GlobalUpdate;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
diff --git a/extensions/package-manager/src/Api/Controller/ListTasksController.php b/extensions/extension-manager/src/Api/Controller/ListTasksController.php
similarity index 85%
rename from extensions/package-manager/src/Api/Controller/ListTasksController.php
rename to extensions/extension-manager/src/Api/Controller/ListTasksController.php
index 71e5644bcf7..c94ad1ed94a 100644
--- a/extensions/package-manager/src/Api/Controller/ListTasksController.php
+++ b/extensions/extension-manager/src/Api/Controller/ListTasksController.php
@@ -7,13 +7,13 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Api\Controller\AbstractListController;
 use Flarum\Http\RequestUtil;
 use Flarum\Http\UrlGenerator;
-use Flarum\PackageManager\Api\Serializer\TaskSerializer;
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Api\Serializer\TaskSerializer;
+use Flarum\ExtensionManager\Task\Task;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
@@ -54,7 +54,7 @@ protected function data(ServerRequestInterface $request, Document $document)
         $document->addMeta('total', (string) $total);
 
         $document->addPaginationLinks(
-            $this->url->to('api')->route('package-manager.tasks.index'),
+            $this->url->to('api')->route('extension-manager.tasks.index'),
             $request->getQueryParams(),
             $offset,
             $limit,
diff --git a/extensions/package-manager/src/Api/Controller/MajorUpdateController.php b/extensions/extension-manager/src/Api/Controller/MajorUpdateController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/MajorUpdateController.php
rename to extensions/extension-manager/src/Api/Controller/MajorUpdateController.php
index a7bf3deb386..a559934af22 100755
--- a/extensions/package-manager/src/Api/Controller/MajorUpdateController.php
+++ b/extensions/extension-manager/src/Api/Controller/MajorUpdateController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\MajorUpdate;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\MajorUpdate;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/extensions/package-manager/src/Api/Controller/MinorUpdateController.php b/extensions/extension-manager/src/Api/Controller/MinorUpdateController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/MinorUpdateController.php
rename to extensions/extension-manager/src/Api/Controller/MinorUpdateController.php
index 50b6d2c037f..8bbf5cf4ca8 100755
--- a/extensions/package-manager/src/Api/Controller/MinorUpdateController.php
+++ b/extensions/extension-manager/src/Api/Controller/MinorUpdateController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\MinorUpdate;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\MinorUpdate;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
diff --git a/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php b/extensions/extension-manager/src/Api/Controller/RemoveExtensionController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/RemoveExtensionController.php
rename to extensions/extension-manager/src/Api/Controller/RemoveExtensionController.php
index 1e3071f6700..70fcc30439e 100755
--- a/extensions/package-manager/src/Api/Controller/RemoveExtensionController.php
+++ b/extensions/extension-manager/src/Api/Controller/RemoveExtensionController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\RemoveExtension;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\RemoveExtension;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/extensions/package-manager/src/Api/Controller/RequireExtensionController.php b/extensions/extension-manager/src/Api/Controller/RequireExtensionController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/RequireExtensionController.php
rename to extensions/extension-manager/src/Api/Controller/RequireExtensionController.php
index 52465626ace..6eaf7edc6f2 100755
--- a/extensions/package-manager/src/Api/Controller/RequireExtensionController.php
+++ b/extensions/extension-manager/src/Api/Controller/RequireExtensionController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\RequireExtension;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\RequireExtension;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
diff --git a/extensions/package-manager/src/Api/Controller/UpdateExtensionController.php b/extensions/extension-manager/src/Api/Controller/UpdateExtensionController.php
similarity index 89%
rename from extensions/package-manager/src/Api/Controller/UpdateExtensionController.php
rename to extensions/extension-manager/src/Api/Controller/UpdateExtensionController.php
index 5cd1f40ef12..25f25a2433d 100755
--- a/extensions/package-manager/src/Api/Controller/UpdateExtensionController.php
+++ b/extensions/extension-manager/src/Api/Controller/UpdateExtensionController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\UpdateExtension;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\UpdateExtension;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/extensions/package-manager/src/Api/Controller/WhyNotController.php b/extensions/extension-manager/src/Api/Controller/WhyNotController.php
similarity index 88%
rename from extensions/package-manager/src/Api/Controller/WhyNotController.php
rename to extensions/extension-manager/src/Api/Controller/WhyNotController.php
index 261ce5d58ee..e4550fffe3d 100755
--- a/extensions/package-manager/src/Api/Controller/WhyNotController.php
+++ b/extensions/extension-manager/src/Api/Controller/WhyNotController.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Controller;
+namespace Flarum\ExtensionManager\Api\Controller;
 
 use Flarum\Http\RequestUtil;
-use Flarum\PackageManager\Command\WhyNot;
-use Flarum\PackageManager\Job\Dispatcher;
+use Flarum\ExtensionManager\Command\WhyNot;
+use Flarum\ExtensionManager\Job\Dispatcher;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
diff --git a/extensions/package-manager/src/Api/Serializer/TaskSerializer.php b/extensions/extension-manager/src/Api/Serializer/TaskSerializer.php
similarity index 89%
rename from extensions/package-manager/src/Api/Serializer/TaskSerializer.php
rename to extensions/extension-manager/src/Api/Serializer/TaskSerializer.php
index 8ba662c26f2..1418e06b404 100644
--- a/extensions/package-manager/src/Api/Serializer/TaskSerializer.php
+++ b/extensions/extension-manager/src/Api/Serializer/TaskSerializer.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Api\Serializer;
+namespace Flarum\ExtensionManager\Api\Serializer;
 
 use Flarum\Api\Serializer\AbstractSerializer;
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use InvalidArgumentException;
 
 class TaskSerializer extends AbstractSerializer
@@ -18,7 +18,7 @@ class TaskSerializer extends AbstractSerializer
     /**
      * {@inheritdoc}
      */
-    protected $type = 'package-manager-tasks';
+    protected $type = 'extension-manager-tasks';
 
     /**
      * {@inheritdoc}
diff --git a/extensions/package-manager/src/Command/AbstractActionCommand.php b/extensions/extension-manager/src/Command/AbstractActionCommand.php
similarity index 85%
rename from extensions/package-manager/src/Command/AbstractActionCommand.php
rename to extensions/extension-manager/src/Command/AbstractActionCommand.php
index dba507fc03d..3953576caf4 100644
--- a/extensions/package-manager/src/Command/AbstractActionCommand.php
+++ b/extensions/extension-manager/src/Command/AbstractActionCommand.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 
 abstract class AbstractActionCommand
 {
diff --git a/extensions/package-manager/src/Command/CheckForUpdates.php b/extensions/extension-manager/src/Command/CheckForUpdates.php
similarity index 86%
rename from extensions/package-manager/src/Command/CheckForUpdates.php
rename to extensions/extension-manager/src/Command/CheckForUpdates.php
index 2ca6efcb4d4..60559152861 100755
--- a/extensions/package-manager/src/Command/CheckForUpdates.php
+++ b/extensions/extension-manager/src/Command/CheckForUpdates.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class CheckForUpdates extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php b/extensions/extension-manager/src/Command/CheckForUpdatesHandler.php
similarity index 93%
rename from extensions/package-manager/src/Command/CheckForUpdatesHandler.php
rename to extensions/extension-manager/src/Command/CheckForUpdatesHandler.php
index 6097328c53d..e7b4e2c5d5d 100755
--- a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php
+++ b/extensions/extension-manager/src/Command/CheckForUpdatesHandler.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\Exception\ComposerCommandFailedException;
-use Flarum\PackageManager\Settings\LastUpdateCheck;
-use Flarum\PackageManager\Support\Util;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\Exception\ComposerCommandFailedException;
+use Flarum\ExtensionManager\Settings\LastUpdateCheck;
+use Flarum\ExtensionManager\Support\Util;
 use Illuminate\Support\Collection;
 use Symfony\Component\Console\Input\ArrayInput;
 
@@ -26,7 +26,7 @@ class CheckForUpdatesHandler
     protected $composer;
 
     /**
-     * @var \Flarum\PackageManager\Settings\LastUpdateCheck
+     * @var \Flarum\ExtensionManager\Settings\LastUpdateCheck
      */
     protected $lastUpdateCheck;
 
diff --git a/extensions/package-manager/src/Command/GlobalUpdate.php b/extensions/extension-manager/src/Command/GlobalUpdate.php
similarity index 86%
rename from extensions/package-manager/src/Command/GlobalUpdate.php
rename to extensions/extension-manager/src/Command/GlobalUpdate.php
index a2fb69f3493..694f3874c7f 100644
--- a/extensions/package-manager/src/Command/GlobalUpdate.php
+++ b/extensions/extension-manager/src/Command/GlobalUpdate.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class GlobalUpdate extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/GlobalUpdateHandler.php b/extensions/extension-manager/src/Command/GlobalUpdateHandler.php
similarity index 89%
rename from extensions/package-manager/src/Command/GlobalUpdateHandler.php
rename to extensions/extension-manager/src/Command/GlobalUpdateHandler.php
index 6b59351a83d..dfc527d224d 100644
--- a/extensions/package-manager/src/Command/GlobalUpdateHandler.php
+++ b/extensions/extension-manager/src/Command/GlobalUpdateHandler.php
@@ -7,13 +7,13 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
 use Flarum\Bus\Dispatcher as FlarumDispatcher;
 use Flarum\Foundation\Config;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Exception\ComposerUpdateFailedException;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\ArrayInput;
 
diff --git a/extensions/package-manager/src/Command/MajorUpdate.php b/extensions/extension-manager/src/Command/MajorUpdate.php
similarity index 88%
rename from extensions/package-manager/src/Command/MajorUpdate.php
rename to extensions/extension-manager/src/Command/MajorUpdate.php
index 97bae589b77..565f51bb616 100644
--- a/extensions/package-manager/src/Command/MajorUpdate.php
+++ b/extensions/extension-manager/src/Command/MajorUpdate.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class MajorUpdate extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/MajorUpdateHandler.php b/extensions/extension-manager/src/Command/MajorUpdateHandler.php
similarity index 89%
rename from extensions/package-manager/src/Command/MajorUpdateHandler.php
rename to extensions/extension-manager/src/Command/MajorUpdateHandler.php
index 6be1c64ffd6..4fa22039ae9 100644
--- a/extensions/package-manager/src/Command/MajorUpdateHandler.php
+++ b/extensions/extension-manager/src/Command/MajorUpdateHandler.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
-
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Exception\MajorUpdateFailedException;
-use Flarum\PackageManager\Exception\NoNewMajorVersionException;
-use Flarum\PackageManager\Settings\LastUpdateCheck;
+namespace Flarum\ExtensionManager\Command;
+
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Exception\MajorUpdateFailedException;
+use Flarum\ExtensionManager\Exception\NoNewMajorVersionException;
+use Flarum\ExtensionManager\Settings\LastUpdateCheck;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\ArrayInput;
 
diff --git a/extensions/package-manager/src/Command/MinorUpdate.php b/extensions/extension-manager/src/Command/MinorUpdate.php
similarity index 85%
rename from extensions/package-manager/src/Command/MinorUpdate.php
rename to extensions/extension-manager/src/Command/MinorUpdate.php
index e1cb0810106..712500bb220 100755
--- a/extensions/package-manager/src/Command/MinorUpdate.php
+++ b/extensions/extension-manager/src/Command/MinorUpdate.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class MinorUpdate extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/MinorUpdateHandler.php b/extensions/extension-manager/src/Command/MinorUpdateHandler.php
similarity index 81%
rename from extensions/package-manager/src/Command/MinorUpdateHandler.php
rename to extensions/extension-manager/src/Command/MinorUpdateHandler.php
index 232f37bebef..06bff34bd01 100755
--- a/extensions/package-manager/src/Command/MinorUpdateHandler.php
+++ b/extensions/extension-manager/src/Command/MinorUpdateHandler.php
@@ -7,13 +7,13 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
-use Flarum\PackageManager\Settings\LastUpdateCheck;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Exception\ComposerUpdateFailedException;
+use Flarum\ExtensionManager\Settings\LastUpdateCheck;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\StringInput;
 
@@ -25,7 +25,7 @@ class MinorUpdateHandler
     protected $composer;
 
     /**
-     * @var \Flarum\PackageManager\Settings\LastUpdateCheck
+     * @var \Flarum\ExtensionManager\Settings\LastUpdateCheck
      */
     protected $lastUpdateCheck;
 
diff --git a/extensions/package-manager/src/Command/RemoveExtension.php b/extensions/extension-manager/src/Command/RemoveExtension.php
similarity index 87%
rename from extensions/package-manager/src/Command/RemoveExtension.php
rename to extensions/extension-manager/src/Command/RemoveExtension.php
index bc8bf820e84..fe66991d1af 100755
--- a/extensions/package-manager/src/Command/RemoveExtension.php
+++ b/extensions/extension-manager/src/Command/RemoveExtension.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class RemoveExtension extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/RemoveExtensionHandler.php b/extensions/extension-manager/src/Command/RemoveExtensionHandler.php
similarity index 83%
rename from extensions/package-manager/src/Command/RemoveExtensionHandler.php
rename to extensions/extension-manager/src/Command/RemoveExtensionHandler.php
index 1eaa4d7993f..bc7f930c779 100755
--- a/extensions/package-manager/src/Command/RemoveExtensionHandler.php
+++ b/extensions/extension-manager/src/Command/RemoveExtensionHandler.php
@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\Exception\ComposerCommandFailedException;
-use Flarum\PackageManager\Exception\ExtensionNotInstalledException;
-use Flarum\PackageManager\Exception\IndirectExtensionDependencyCannotBeRemovedException;
-use Flarum\PackageManager\Extension\Event\Removed;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\Exception\ComposerCommandFailedException;
+use Flarum\ExtensionManager\Exception\ExtensionNotInstalledException;
+use Flarum\ExtensionManager\Exception\IndirectExtensionDependencyCannotBeRemovedException;
+use Flarum\ExtensionManager\Extension\Event\Removed;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\StringInput;
 
diff --git a/extensions/package-manager/src/Command/RequireExtension.php b/extensions/extension-manager/src/Command/RequireExtension.php
similarity index 88%
rename from extensions/package-manager/src/Command/RequireExtension.php
rename to extensions/extension-manager/src/Command/RequireExtension.php
index 88bc1b97512..dabcbe517cf 100755
--- a/extensions/package-manager/src/Command/RequireExtension.php
+++ b/extensions/extension-manager/src/Command/RequireExtension.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class RequireExtension extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/RequireExtensionHandler.php b/extensions/extension-manager/src/Command/RequireExtensionHandler.php
similarity index 84%
rename from extensions/package-manager/src/Command/RequireExtensionHandler.php
rename to extensions/extension-manager/src/Command/RequireExtensionHandler.php
index 8184ddde881..6c0aacda78e 100755
--- a/extensions/package-manager/src/Command/RequireExtensionHandler.php
+++ b/extensions/extension-manager/src/Command/RequireExtensionHandler.php
@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Exception\ComposerRequireFailedException;
-use Flarum\PackageManager\Exception\ExtensionAlreadyInstalledException;
-use Flarum\PackageManager\Extension\Event\Installed;
-use Flarum\PackageManager\RequirePackageValidator;
-use Flarum\PackageManager\Support\Util;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Exception\ComposerRequireFailedException;
+use Flarum\ExtensionManager\Exception\ExtensionAlreadyInstalledException;
+use Flarum\ExtensionManager\Extension\Event\Installed;
+use Flarum\ExtensionManager\RequirePackageValidator;
+use Flarum\ExtensionManager\Support\Util;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\StringInput;
 
diff --git a/extensions/package-manager/src/Command/UpdateExtension.php b/extensions/extension-manager/src/Command/UpdateExtension.php
similarity index 89%
rename from extensions/package-manager/src/Command/UpdateExtension.php
rename to extensions/extension-manager/src/Command/UpdateExtension.php
index 3b006b2d6b3..2573820acc8 100755
--- a/extensions/package-manager/src/Command/UpdateExtension.php
+++ b/extensions/extension-manager/src/Command/UpdateExtension.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class UpdateExtension extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/UpdateExtensionHandler.php b/extensions/extension-manager/src/Command/UpdateExtensionHandler.php
similarity index 87%
rename from extensions/package-manager/src/Command/UpdateExtensionHandler.php
rename to extensions/extension-manager/src/Command/UpdateExtensionHandler.php
index dec0ce2093d..ae11a5341b5 100755
--- a/extensions/package-manager/src/Command/UpdateExtensionHandler.php
+++ b/extensions/extension-manager/src/Command/UpdateExtensionHandler.php
@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Exception\ComposerUpdateFailedException;
-use Flarum\PackageManager\Exception\ExtensionNotInstalledException;
-use Flarum\PackageManager\Extension\Event\Updated;
-use Flarum\PackageManager\Settings\LastUpdateCheck;
-use Flarum\PackageManager\UpdateExtensionValidator;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Exception\ComposerUpdateFailedException;
+use Flarum\ExtensionManager\Exception\ExtensionNotInstalledException;
+use Flarum\ExtensionManager\Extension\Event\Updated;
+use Flarum\ExtensionManager\Settings\LastUpdateCheck;
+use Flarum\ExtensionManager\UpdateExtensionValidator;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\StringInput;
 
diff --git a/extensions/package-manager/src/Command/WhyNot.php b/extensions/extension-manager/src/Command/WhyNot.php
similarity index 89%
rename from extensions/package-manager/src/Command/WhyNot.php
rename to extensions/extension-manager/src/Command/WhyNot.php
index 4e2d0fc2a12..47acd84a25c 100755
--- a/extensions/package-manager/src/Command/WhyNot.php
+++ b/extensions/extension-manager/src/Command/WhyNot.php
@@ -7,9 +7,9 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\User\User;
 
 class WhyNot extends AbstractActionCommand
diff --git a/extensions/package-manager/src/Command/WhyNotHandler.php b/extensions/extension-manager/src/Command/WhyNotHandler.php
similarity index 87%
rename from extensions/package-manager/src/Command/WhyNotHandler.php
rename to extensions/extension-manager/src/Command/WhyNotHandler.php
index 33f4a2ec0fb..b9f7a4a607d 100755
--- a/extensions/package-manager/src/Command/WhyNotHandler.php
+++ b/extensions/extension-manager/src/Command/WhyNotHandler.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Command;
+namespace Flarum\ExtensionManager\Command;
 
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Exception\ComposerRequireFailedException;
-use Flarum\PackageManager\WhyNotValidator;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Exception\ComposerRequireFailedException;
+use Flarum\ExtensionManager\WhyNotValidator;
 use Illuminate\Contracts\Events\Dispatcher;
 use Symfony\Component\Console\Input\StringInput;
 
diff --git a/extensions/package-manager/src/Composer/ComposerAdapter.php b/extensions/extension-manager/src/Composer/ComposerAdapter.php
similarity index 91%
rename from extensions/package-manager/src/Composer/ComposerAdapter.php
rename to extensions/extension-manager/src/Composer/ComposerAdapter.php
index 88177720510..4b307ef86e1 100644
--- a/extensions/package-manager/src/Composer/ComposerAdapter.php
+++ b/extensions/extension-manager/src/Composer/ComposerAdapter.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Composer;
+namespace Flarum\ExtensionManager\Composer;
 
 use Composer\Config;
 use Composer\Console\Application;
 use Flarum\Foundation\Paths;
-use Flarum\PackageManager\OutputLogger;
-use Flarum\PackageManager\Support\Util;
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\OutputLogger;
+use Flarum\ExtensionManager\Support\Util;
+use Flarum\ExtensionManager\Task\Task;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\BufferedOutput;
 
diff --git a/extensions/package-manager/src/Composer/ComposerJson.php b/extensions/extension-manager/src/Composer/ComposerJson.php
similarity index 96%
rename from extensions/package-manager/src/Composer/ComposerJson.php
rename to extensions/extension-manager/src/Composer/ComposerJson.php
index 2d99ab83bf5..8e5738cf186 100644
--- a/extensions/package-manager/src/Composer/ComposerJson.php
+++ b/extensions/extension-manager/src/Composer/ComposerJson.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Composer;
+namespace Flarum\ExtensionManager\Composer;
 
 use Flarum\Extension\ExtensionManager;
 use Flarum\Foundation\Paths;
-use Flarum\PackageManager\Support\Util;
+use Flarum\ExtensionManager\Support\Util;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 
diff --git a/extensions/package-manager/src/Composer/ComposerOutput.php b/extensions/extension-manager/src/Composer/ComposerOutput.php
similarity index 93%
rename from extensions/package-manager/src/Composer/ComposerOutput.php
rename to extensions/extension-manager/src/Composer/ComposerOutput.php
index 87719880a16..95beca97b95 100644
--- a/extensions/package-manager/src/Composer/ComposerOutput.php
+++ b/extensions/extension-manager/src/Composer/ComposerOutput.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Composer;
+namespace Flarum\ExtensionManager\Composer;
 
 class ComposerOutput
 {
diff --git a/extensions/package-manager/src/ConfigureComposerValidator.php b/extensions/extension-manager/src/ConfigureComposerValidator.php
similarity index 96%
rename from extensions/package-manager/src/ConfigureComposerValidator.php
rename to extensions/extension-manager/src/ConfigureComposerValidator.php
index 44a39c42039..3c0fbaccb81 100644
--- a/extensions/package-manager/src/ConfigureComposerValidator.php
+++ b/extensions/extension-manager/src/ConfigureComposerValidator.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Flarum\Foundation\AbstractValidator;
 
diff --git a/extensions/package-manager/src/Event/FlarumUpdated.php b/extensions/extension-manager/src/Event/FlarumUpdated.php
similarity index 93%
rename from extensions/package-manager/src/Event/FlarumUpdated.php
rename to extensions/extension-manager/src/Event/FlarumUpdated.php
index 108d10ab90d..cf0ec489320 100644
--- a/extensions/package-manager/src/Event/FlarumUpdated.php
+++ b/extensions/extension-manager/src/Event/FlarumUpdated.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Event;
+namespace Flarum\ExtensionManager\Event;
 
 use Flarum\User\User;
 
diff --git a/extensions/package-manager/src/Exception/ComposerCommandFailedException.php b/extensions/extension-manager/src/Exception/ComposerCommandFailedException.php
similarity index 94%
rename from extensions/package-manager/src/Exception/ComposerCommandFailedException.php
rename to extensions/extension-manager/src/Exception/ComposerCommandFailedException.php
index 318f1fb37c8..6f0835301f8 100755
--- a/extensions/package-manager/src/Exception/ComposerCommandFailedException.php
+++ b/extensions/extension-manager/src/Exception/ComposerCommandFailedException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Exception;
 
diff --git a/extensions/package-manager/src/Exception/ComposerRequireFailedException.php b/extensions/extension-manager/src/Exception/ComposerRequireFailedException.php
similarity index 97%
rename from extensions/package-manager/src/Exception/ComposerRequireFailedException.php
rename to extensions/extension-manager/src/Exception/ComposerRequireFailedException.php
index 1ab1357ab4a..8d9a6d078b4 100755
--- a/extensions/package-manager/src/Exception/ComposerRequireFailedException.php
+++ b/extensions/extension-manager/src/Exception/ComposerRequireFailedException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 class ComposerRequireFailedException extends ComposerCommandFailedException
 {
diff --git a/extensions/package-manager/src/Exception/ComposerUpdateFailedException.php b/extensions/extension-manager/src/Exception/ComposerUpdateFailedException.php
similarity index 85%
rename from extensions/package-manager/src/Exception/ComposerUpdateFailedException.php
rename to extensions/extension-manager/src/Exception/ComposerUpdateFailedException.php
index db3bf683ef3..768c4066d83 100755
--- a/extensions/package-manager/src/Exception/ComposerUpdateFailedException.php
+++ b/extensions/extension-manager/src/Exception/ComposerUpdateFailedException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 class ComposerUpdateFailedException extends ComposerCommandFailedException
 {
diff --git a/extensions/package-manager/src/Exception/ExceptionHandler.php b/extensions/extension-manager/src/Exception/ExceptionHandler.php
similarity index 95%
rename from extensions/package-manager/src/Exception/ExceptionHandler.php
rename to extensions/extension-manager/src/Exception/ExceptionHandler.php
index 6ef7418672e..c80296d89f0 100755
--- a/extensions/package-manager/src/Exception/ExceptionHandler.php
+++ b/extensions/extension-manager/src/Exception/ExceptionHandler.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Flarum\Foundation\ErrorHandling\HandledError;
 
diff --git a/extensions/package-manager/src/Exception/ExtensionAlreadyInstalledException.php b/extensions/extension-manager/src/Exception/ExtensionAlreadyInstalledException.php
similarity index 92%
rename from extensions/package-manager/src/Exception/ExtensionAlreadyInstalledException.php
rename to extensions/extension-manager/src/Exception/ExtensionAlreadyInstalledException.php
index 90ef8c881cb..931d28d9178 100755
--- a/extensions/package-manager/src/Exception/ExtensionAlreadyInstalledException.php
+++ b/extensions/extension-manager/src/Exception/ExtensionAlreadyInstalledException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Exception;
 use Flarum\Extension\Extension;
diff --git a/extensions/package-manager/src/Exception/ExtensionNotInstalledException.php b/extensions/extension-manager/src/Exception/ExtensionNotInstalledException.php
similarity index 92%
rename from extensions/package-manager/src/Exception/ExtensionNotInstalledException.php
rename to extensions/extension-manager/src/Exception/ExtensionNotInstalledException.php
index 9b24a4a5888..b36cf6532fe 100755
--- a/extensions/package-manager/src/Exception/ExtensionNotInstalledException.php
+++ b/extensions/extension-manager/src/Exception/ExtensionNotInstalledException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Exception;
 use Flarum\Foundation\KnownError;
diff --git a/extensions/package-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php b/extensions/extension-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php
similarity index 93%
rename from extensions/package-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php
rename to extensions/extension-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php
index 6b9838cddcc..6021fa931d2 100755
--- a/extensions/package-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php
+++ b/extensions/extension-manager/src/Exception/IndirectExtensionDependencyCannotBeRemovedException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Exception;
 use Flarum\Foundation\KnownError;
diff --git a/extensions/package-manager/src/Exception/MajorUpdateFailedException.php b/extensions/extension-manager/src/Exception/MajorUpdateFailedException.php
similarity index 91%
rename from extensions/package-manager/src/Exception/MajorUpdateFailedException.php
rename to extensions/extension-manager/src/Exception/MajorUpdateFailedException.php
index e494176cfd4..043747982f2 100644
--- a/extensions/package-manager/src/Exception/MajorUpdateFailedException.php
+++ b/extensions/extension-manager/src/Exception/MajorUpdateFailedException.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Composer\Semver\Semver;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Settings\LastUpdateRun;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Settings\LastUpdateRun;
 
 class MajorUpdateFailedException extends ComposerCommandFailedException
 {
diff --git a/extensions/package-manager/src/Exception/NoNewMajorVersionException.php b/extensions/extension-manager/src/Exception/NoNewMajorVersionException.php
similarity index 92%
rename from extensions/package-manager/src/Exception/NoNewMajorVersionException.php
rename to extensions/extension-manager/src/Exception/NoNewMajorVersionException.php
index 37f17f91a43..104f87509f3 100755
--- a/extensions/package-manager/src/Exception/NoNewMajorVersionException.php
+++ b/extensions/extension-manager/src/Exception/NoNewMajorVersionException.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Exception;
+namespace Flarum\ExtensionManager\Exception;
 
 use Exception;
 use Flarum\Foundation\KnownError;
diff --git a/extensions/package-manager/src/Extension/Event/Installed.php b/extensions/extension-manager/src/Extension/Event/Installed.php
similarity index 87%
rename from extensions/package-manager/src/Extension/Event/Installed.php
rename to extensions/extension-manager/src/Extension/Event/Installed.php
index 8d56ddd96aa..f078f31e51a 100755
--- a/extensions/package-manager/src/Extension/Event/Installed.php
+++ b/extensions/extension-manager/src/Extension/Event/Installed.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Extension\Event;
+namespace Flarum\ExtensionManager\Extension\Event;
 
 class Installed
 {
diff --git a/extensions/package-manager/src/Extension/Event/Removed.php b/extensions/extension-manager/src/Extension/Event/Removed.php
similarity index 88%
rename from extensions/package-manager/src/Extension/Event/Removed.php
rename to extensions/extension-manager/src/Extension/Event/Removed.php
index 369453980ff..ab06e3b360b 100755
--- a/extensions/package-manager/src/Extension/Event/Removed.php
+++ b/extensions/extension-manager/src/Extension/Event/Removed.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Extension\Event;
+namespace Flarum\ExtensionManager\Extension\Event;
 
 use Flarum\Extension\Extension;
 
diff --git a/extensions/package-manager/src/Extension/Event/Updated.php b/extensions/extension-manager/src/Extension/Event/Updated.php
similarity index 90%
rename from extensions/package-manager/src/Extension/Event/Updated.php
rename to extensions/extension-manager/src/Extension/Event/Updated.php
index 61c9e55ec4b..14348a5068e 100755
--- a/extensions/package-manager/src/Extension/Event/Updated.php
+++ b/extensions/extension-manager/src/Extension/Event/Updated.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Extension\Event;
+namespace Flarum\ExtensionManager\Extension\Event;
 
 use Flarum\Extension\Extension;
 use Flarum\User\User;
diff --git a/extensions/package-manager/src/PackageManagerServiceProvider.php b/extensions/extension-manager/src/ExtensionManagerServiceProvider.php
similarity index 90%
rename from extensions/package-manager/src/PackageManagerServiceProvider.php
rename to extensions/extension-manager/src/ExtensionManagerServiceProvider.php
index df34802d749..87f2c5175e9 100755
--- a/extensions/package-manager/src/PackageManagerServiceProvider.php
+++ b/extensions/extension-manager/src/ExtensionManagerServiceProvider.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Composer\Config;
 use Composer\Console\Application;
@@ -17,18 +17,18 @@
 use Flarum\Foundation\Paths;
 use Flarum\Frontend\RecompileFrontendAssets;
 use Flarum\Locale\LocaleManager;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Extension\Event\Updated;
-use Flarum\PackageManager\Listener\ClearCacheAfterUpdate;
-use Flarum\PackageManager\Listener\ReCheckForUpdates;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Extension\Event\Updated;
+use Flarum\ExtensionManager\Listener\ClearCacheAfterUpdate;
+use Flarum\ExtensionManager\Listener\ReCheckForUpdates;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 
-class PackageManagerServiceProvider extends AbstractServiceProvider
+class ExtensionManagerServiceProvider extends AbstractServiceProvider
 {
     public function register()
     {
diff --git a/extensions/package-manager/src/Job/ComposerCommandJob.php b/extensions/extension-manager/src/Job/ComposerCommandJob.php
similarity index 88%
rename from extensions/package-manager/src/Job/ComposerCommandJob.php
rename to extensions/extension-manager/src/Job/ComposerCommandJob.php
index 205d7ce5748..8cd49001804 100644
--- a/extensions/package-manager/src/Job/ComposerCommandJob.php
+++ b/extensions/extension-manager/src/Job/ComposerCommandJob.php
@@ -7,12 +7,12 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Job;
+namespace Flarum\ExtensionManager\Job;
 
 use Flarum\Bus\Dispatcher;
-use Flarum\PackageManager\Command\AbstractActionCommand;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Exception\ComposerCommandFailedException;
+use Flarum\ExtensionManager\Command\AbstractActionCommand;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Exception\ComposerCommandFailedException;
 use Flarum\Queue\AbstractJob;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
diff --git a/extensions/package-manager/src/Job/Dispatcher.php b/extensions/extension-manager/src/Job/Dispatcher.php
similarity index 89%
rename from extensions/package-manager/src/Job/Dispatcher.php
rename to extensions/extension-manager/src/Job/Dispatcher.php
index a96200fa5eb..bb83dd45d7c 100644
--- a/extensions/package-manager/src/Job/Dispatcher.php
+++ b/extensions/extension-manager/src/Job/Dispatcher.php
@@ -7,13 +7,13 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Job;
+namespace Flarum\ExtensionManager\Job;
 
 use Carbon\Carbon;
 use Flarum\Bus\Dispatcher as Bus;
 use Flarum\Extension\ExtensionManager;
-use Flarum\PackageManager\Command\AbstractActionCommand;
-use Flarum\PackageManager\Task\Task;
+use Flarum\ExtensionManager\Command\AbstractActionCommand;
+use Flarum\ExtensionManager\Task\Task;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Queue\Queue;
 use Illuminate\Queue\SyncQueue;
@@ -73,7 +73,7 @@ public function async(): self
 
     public function dispatch(AbstractActionCommand $command): DispatcherResponse
     {
-        $queueJobs = ($this->runSyncOverride === false) || ($this->runSyncOverride !== true && $this->settings->get('flarum-package-manager.queue_jobs'));
+        $queueJobs = ($this->runSyncOverride === false) || ($this->runSyncOverride !== true && $this->settings->get('flarum-extension-manager.queue_jobs'));
 
         // Skip if there is already a pending or running task.
         if ($queueJobs && Task::query()->whereIn('status', [Task::PENDING, Task::RUNNING])->exists()) {
@@ -101,7 +101,7 @@ public function dispatch(AbstractActionCommand $command): DispatcherResponse
 
     protected function clearOldTasks(): void
     {
-        $days = $this->settings->get('flarum-package-manager.task_retention_days');
+        $days = $this->settings->get('flarum-extension-manager.task_retention_days');
 
         if ($days === null || ((int) $days) === 0) {
             return;
diff --git a/extensions/package-manager/src/Job/DispatcherResponse.php b/extensions/extension-manager/src/Job/DispatcherResponse.php
similarity index 90%
rename from extensions/package-manager/src/Job/DispatcherResponse.php
rename to extensions/extension-manager/src/Job/DispatcherResponse.php
index 4ff8790a4ce..e48af2be187 100644
--- a/extensions/package-manager/src/Job/DispatcherResponse.php
+++ b/extensions/extension-manager/src/Job/DispatcherResponse.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Job;
+namespace Flarum\ExtensionManager\Job;
 
 class DispatcherResponse
 {
diff --git a/extensions/package-manager/src/Listener/ClearCacheAfterUpdate.php b/extensions/extension-manager/src/Listener/ClearCacheAfterUpdate.php
similarity index 93%
rename from extensions/package-manager/src/Listener/ClearCacheAfterUpdate.php
rename to extensions/extension-manager/src/Listener/ClearCacheAfterUpdate.php
index 75a9417f0ef..5f4575af9a2 100644
--- a/extensions/package-manager/src/Listener/ClearCacheAfterUpdate.php
+++ b/extensions/extension-manager/src/Listener/ClearCacheAfterUpdate.php
@@ -7,12 +7,12 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Listener;
+namespace Flarum\ExtensionManager\Listener;
 
 use Composer\Command\ClearCacheCommand;
 use Flarum\Database\Console\MigrateCommand;
 use Flarum\Foundation\Console\AssetsPublishCommand;
-use Flarum\PackageManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
diff --git a/extensions/package-manager/src/Listener/ReCheckForUpdates.php b/extensions/extension-manager/src/Listener/ReCheckForUpdates.php
similarity index 83%
rename from extensions/package-manager/src/Listener/ReCheckForUpdates.php
rename to extensions/extension-manager/src/Listener/ReCheckForUpdates.php
index dfb60dca1bb..6e43e2162cd 100644
--- a/extensions/package-manager/src/Listener/ReCheckForUpdates.php
+++ b/extensions/extension-manager/src/Listener/ReCheckForUpdates.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Listener;
+namespace Flarum\ExtensionManager\Listener;
 
 use Flarum\Bus\Dispatcher;
-use Flarum\PackageManager\Command\CheckForUpdates;
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Extension\Event\Updated;
-use Flarum\PackageManager\Settings\LastUpdateCheck;
-use Flarum\PackageManager\Settings\LastUpdateRun;
+use Flarum\ExtensionManager\Command\CheckForUpdates;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Extension\Event\Updated;
+use Flarum\ExtensionManager\Settings\LastUpdateCheck;
+use Flarum\ExtensionManager\Settings\LastUpdateRun;
 
 class ReCheckForUpdates
 {
diff --git a/extensions/package-manager/src/OutputLogger.php b/extensions/extension-manager/src/OutputLogger.php
similarity index 95%
rename from extensions/package-manager/src/OutputLogger.php
rename to extensions/extension-manager/src/OutputLogger.php
index 6442d05d8fa..167fe8f8beb 100644
--- a/extensions/package-manager/src/OutputLogger.php
+++ b/extensions/extension-manager/src/OutputLogger.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/extensions/package-manager/src/RequirePackageValidator.php b/extensions/extension-manager/src/RequirePackageValidator.php
similarity index 93%
rename from extensions/package-manager/src/RequirePackageValidator.php
rename to extensions/extension-manager/src/RequirePackageValidator.php
index 0134b28bf86..ae752d3aa32 100755
--- a/extensions/package-manager/src/RequirePackageValidator.php
+++ b/extensions/extension-manager/src/RequirePackageValidator.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Flarum\Foundation\AbstractValidator;
 
diff --git a/extensions/package-manager/src/Settings/JsonSetting.php b/extensions/extension-manager/src/Settings/JsonSetting.php
similarity index 90%
rename from extensions/package-manager/src/Settings/JsonSetting.php
rename to extensions/extension-manager/src/Settings/JsonSetting.php
index 834ab780df4..645755648fb 100644
--- a/extensions/package-manager/src/Settings/JsonSetting.php
+++ b/extensions/extension-manager/src/Settings/JsonSetting.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Settings;
+namespace Flarum\ExtensionManager\Settings;
 
 interface JsonSetting
 {
diff --git a/extensions/package-manager/src/Settings/LastUpdateCheck.php b/extensions/extension-manager/src/Settings/LastUpdateCheck.php
similarity index 93%
rename from extensions/package-manager/src/Settings/LastUpdateCheck.php
rename to extensions/extension-manager/src/Settings/LastUpdateCheck.php
index c84b6a33060..e9e0c4fa8c2 100755
--- a/extensions/package-manager/src/Settings/LastUpdateCheck.php
+++ b/extensions/extension-manager/src/Settings/LastUpdateCheck.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Settings;
+namespace Flarum\ExtensionManager\Settings;
 
 use Carbon\Carbon;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -53,7 +53,7 @@ public function get(): array
 
     public static function key(): string
     {
-        return 'flarum-package-manager.last_update_check';
+        return 'flarum-extension-manager.last_update_check';
     }
 
     public static function default(): array
diff --git a/extensions/package-manager/src/Settings/LastUpdateRun.php b/extensions/extension-manager/src/Settings/LastUpdateRun.php
similarity index 93%
rename from extensions/package-manager/src/Settings/LastUpdateRun.php
rename to extensions/extension-manager/src/Settings/LastUpdateRun.php
index 4a21f9f1428..db698bbc031 100644
--- a/extensions/package-manager/src/Settings/LastUpdateRun.php
+++ b/extensions/extension-manager/src/Settings/LastUpdateRun.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Settings;
+namespace Flarum\ExtensionManager\Settings;
 
 use Carbon\Carbon;
-use Flarum\PackageManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
 use Flarum\Settings\SettingsRepositoryInterface;
 
 class LastUpdateRun implements JsonSetting
@@ -76,7 +76,7 @@ public function get(): array
 
     public static function key(): string
     {
-        return 'flarum-package-manager.last_update_run';
+        return 'flarum-extension-manager.last_update_run';
     }
 
     public static function default(): array
diff --git a/extensions/package-manager/src/Support/Util.php b/extensions/extension-manager/src/Support/Util.php
similarity index 97%
rename from extensions/package-manager/src/Support/Util.php
rename to extensions/extension-manager/src/Support/Util.php
index f665461502a..426ef0a4651 100755
--- a/extensions/package-manager/src/Support/Util.php
+++ b/extensions/extension-manager/src/Support/Util.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Support;
+namespace Flarum\ExtensionManager\Support;
 
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Input\ArrayInput;
diff --git a/extensions/package-manager/src/Task/Task.php b/extensions/extension-manager/src/Task/Task.php
similarity index 96%
rename from extensions/package-manager/src/Task/Task.php
rename to extensions/extension-manager/src/Task/Task.php
index eac38963c88..060468b5e3d 100644
--- a/extensions/package-manager/src/Task/Task.php
+++ b/extensions/extension-manager/src/Task/Task.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Task;
+namespace Flarum\ExtensionManager\Task;
 
 use Carbon\Carbon;
 use Flarum\Database\AbstractModel;
@@ -49,7 +49,7 @@ class Task extends AbstractModel
 
     public const UPDATED_AT = null;
 
-    protected $table = 'package_manager_tasks';
+    protected $table = 'extension_manager_tasks';
 
     protected $guarded = ['id'];
 
diff --git a/extensions/package-manager/src/Task/TaskRepository.php b/extensions/extension-manager/src/Task/TaskRepository.php
similarity index 93%
rename from extensions/package-manager/src/Task/TaskRepository.php
rename to extensions/extension-manager/src/Task/TaskRepository.php
index 05f014b3857..dfe54e76c8e 100644
--- a/extensions/package-manager/src/Task/TaskRepository.php
+++ b/extensions/extension-manager/src/Task/TaskRepository.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Task;
+namespace Flarum\ExtensionManager\Task;
 
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/extensions/package-manager/src/UpdateExtensionValidator.php b/extensions/extension-manager/src/UpdateExtensionValidator.php
similarity index 92%
rename from extensions/package-manager/src/UpdateExtensionValidator.php
rename to extensions/extension-manager/src/UpdateExtensionValidator.php
index d32323de31c..1fc4a242176 100755
--- a/extensions/package-manager/src/UpdateExtensionValidator.php
+++ b/extensions/extension-manager/src/UpdateExtensionValidator.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Flarum\Foundation\AbstractValidator;
 
diff --git a/extensions/package-manager/src/WhyNotValidator.php b/extensions/extension-manager/src/WhyNotValidator.php
similarity index 93%
rename from extensions/package-manager/src/WhyNotValidator.php
rename to extensions/extension-manager/src/WhyNotValidator.php
index ee5b2ef0e73..91730c8ed71 100644
--- a/extensions/package-manager/src/WhyNotValidator.php
+++ b/extensions/extension-manager/src/WhyNotValidator.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager;
+namespace Flarum\ExtensionManager;
 
 use Flarum\Foundation\AbstractValidator;
 
diff --git a/extensions/package-manager/tests/fixtures/.gitkeep b/extensions/extension-manager/tests/fixtures/.gitkeep
similarity index 100%
rename from extensions/package-manager/tests/fixtures/.gitkeep
rename to extensions/extension-manager/tests/fixtures/.gitkeep
diff --git a/extensions/package-manager/tests/integration/ChangeComposerConfig.php b/extensions/extension-manager/tests/integration/ChangeComposerConfig.php
similarity index 88%
rename from extensions/package-manager/tests/integration/ChangeComposerConfig.php
rename to extensions/extension-manager/tests/integration/ChangeComposerConfig.php
index 1508185a4a0..0c029843312 100644
--- a/extensions/package-manager/tests/integration/ChangeComposerConfig.php
+++ b/extensions/extension-manager/tests/integration/ChangeComposerConfig.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration;
+namespace Flarum\ExtensionManager\Tests\integration;
 
 trait ChangeComposerConfig
 {
diff --git a/extensions/package-manager/tests/integration/DummyExtensions.php b/extensions/extension-manager/tests/integration/DummyExtensions.php
similarity index 93%
rename from extensions/package-manager/tests/integration/DummyExtensions.php
rename to extensions/extension-manager/tests/integration/DummyExtensions.php
index cd2145b7643..19409b4004f 100644
--- a/extensions/package-manager/tests/integration/DummyExtensions.php
+++ b/extensions/extension-manager/tests/integration/DummyExtensions.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration;
+namespace Flarum\ExtensionManager\Tests\integration;
 
 trait DummyExtensions
 {
diff --git a/extensions/package-manager/tests/integration/RefreshComposerSetup.php b/extensions/extension-manager/tests/integration/RefreshComposerSetup.php
similarity index 92%
rename from extensions/package-manager/tests/integration/RefreshComposerSetup.php
rename to extensions/extension-manager/tests/integration/RefreshComposerSetup.php
index 4ad544db0d7..243afbd2a87 100644
--- a/extensions/package-manager/tests/integration/RefreshComposerSetup.php
+++ b/extensions/extension-manager/tests/integration/RefreshComposerSetup.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration;
+namespace Flarum\ExtensionManager\Tests\integration;
 
 use FilesystemIterator;
-use Flarum\PackageManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 
diff --git a/extensions/package-manager/tests/integration/SetupComposer.php b/extensions/extension-manager/tests/integration/SetupComposer.php
similarity index 96%
rename from extensions/package-manager/tests/integration/SetupComposer.php
rename to extensions/extension-manager/tests/integration/SetupComposer.php
index 8061152acaa..eac3063d2de 100644
--- a/extensions/package-manager/tests/integration/SetupComposer.php
+++ b/extensions/extension-manager/tests/integration/SetupComposer.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration;
+namespace Flarum\ExtensionManager\Tests\integration;
 
 use Flarum\Testing\integration\UsesTmpDir;
 
diff --git a/extensions/package-manager/tests/integration/TestCase.php b/extensions/extension-manager/tests/integration/TestCase.php
similarity index 91%
rename from extensions/package-manager/tests/integration/TestCase.php
rename to extensions/extension-manager/tests/integration/TestCase.php
index a3950951b49..07a03f98437 100644
--- a/extensions/package-manager/tests/integration/TestCase.php
+++ b/extensions/extension-manager/tests/integration/TestCase.php
@@ -7,12 +7,12 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration;
+namespace Flarum\ExtensionManager\Tests\integration;
 
 use Flarum\Foundation\Paths;
-use Flarum\PackageManager\Composer\ComposerAdapter;
-use Flarum\PackageManager\Composer\ComposerJson;
-use Flarum\PackageManager\Support\Util;
+use Flarum\ExtensionManager\Composer\ComposerAdapter;
+use Flarum\ExtensionManager\Composer\ComposerJson;
+use Flarum\ExtensionManager\Support\Util;
 use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ResponseInterface;
@@ -26,7 +26,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->extension('flarum-package-manager', 'flarum-tags');
+        $this->extension('flarum-extension-manager', 'flarum-tags');
 
         $tmp = realpath($this->tmpDir());
 
diff --git a/extensions/package-manager/tests/integration/api/CheckForUpdatesTest.php b/extensions/extension-manager/tests/integration/api/CheckForUpdatesTest.php
similarity index 72%
rename from extensions/package-manager/tests/integration/api/CheckForUpdatesTest.php
rename to extensions/extension-manager/tests/integration/api/CheckForUpdatesTest.php
index 88b53e75c94..28778e87fbb 100644
--- a/extensions/package-manager/tests/integration/api/CheckForUpdatesTest.php
+++ b/extensions/extension-manager/tests/integration/api/CheckForUpdatesTest.php
@@ -7,11 +7,11 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api;
+namespace Flarum\ExtensionManager\Tests\integration\api;
 
-use Flarum\PackageManager\Tests\integration\ChangeComposerConfig;
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\ChangeComposerConfig;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 use Illuminate\Support\Arr;
 
 class CheckForUpdatesTest extends TestCase
@@ -32,7 +32,7 @@ public function can_check_for_updates()
         ]);
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/check-for-updates', [
+            $this->request('POST', '/api/extension-manager/check-for-updates', [
                 'authenticatedAs' => 1,
             ])
         );
diff --git a/extensions/package-manager/tests/integration/api/GlobalUpdateTest.php b/extensions/extension-manager/tests/integration/api/GlobalUpdateTest.php
similarity index 65%
rename from extensions/package-manager/tests/integration/api/GlobalUpdateTest.php
rename to extensions/extension-manager/tests/integration/api/GlobalUpdateTest.php
index 6444ac81fe4..28e8a69daaa 100644
--- a/extensions/package-manager/tests/integration/api/GlobalUpdateTest.php
+++ b/extensions/extension-manager/tests/integration/api/GlobalUpdateTest.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api;
+namespace Flarum\ExtensionManager\Tests\integration\api;
 
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class GlobalUpdateTest extends TestCase
 {
@@ -22,7 +22,7 @@ class GlobalUpdateTest extends TestCase
     public function can_global_update()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/global-update', [
+            $this->request('POST', '/api/extension-manager/global-update', [
                 'authenticatedAs' => 1,
             ])
         );
diff --git a/extensions/package-manager/tests/integration/api/MajorUpdateTest.php b/extensions/extension-manager/tests/integration/api/MajorUpdateTest.php
similarity index 84%
rename from extensions/package-manager/tests/integration/api/MajorUpdateTest.php
rename to extensions/extension-manager/tests/integration/api/MajorUpdateTest.php
index f46957f9d91..f9d19c6acbd 100644
--- a/extensions/package-manager/tests/integration/api/MajorUpdateTest.php
+++ b/extensions/extension-manager/tests/integration/api/MajorUpdateTest.php
@@ -7,12 +7,12 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api;
+namespace Flarum\ExtensionManager\Tests\integration\api;
 
-use Flarum\PackageManager\Tests\integration\ChangeComposerConfig;
-use Flarum\PackageManager\Tests\integration\DummyExtensions;
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\ChangeComposerConfig;
+use Flarum\ExtensionManager\Tests\integration\DummyExtensions;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class MajorUpdateTest extends TestCase
 {
@@ -36,7 +36,7 @@ public function cannot_update_when_no_update_check_ran()
         ]);
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/major-update', [
+            $this->request('POST', '/api/extension-manager/major-update', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -61,7 +61,7 @@ public function can_update_when_major_update_available()
         ]);
 
         $lastUpdateCheck = $this->send(
-            $this->request('POST', '/api/package-manager/check-for-updates', [
+            $this->request('POST', '/api/extension-manager/check-for-updates', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -69,7 +69,7 @@ public function can_update_when_major_update_available()
         $this->forgetComposerApp();
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/major-update', [
+            $this->request('POST', '/api/extension-manager/major-update', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -107,13 +107,13 @@ public function cannot_update_with_incompatible_extensions()
         ]);
 
         $this->send(
-            $this->request('POST', '/api/package-manager/check-for-updates', [
+            $this->request('POST', '/api/extension-manager/check-for-updates', [
                 'authenticatedAs' => 1,
             ])
         );
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/major-update', [
+            $this->request('POST', '/api/extension-manager/major-update', [
                 'authenticatedAs' => 1,
             ])
         );
diff --git a/extensions/package-manager/tests/integration/api/MinorUpdateTest.php b/extensions/extension-manager/tests/integration/api/MinorUpdateTest.php
similarity index 80%
rename from extensions/package-manager/tests/integration/api/MinorUpdateTest.php
rename to extensions/extension-manager/tests/integration/api/MinorUpdateTest.php
index 8b43ee831d3..6ebdacb61e0 100644
--- a/extensions/package-manager/tests/integration/api/MinorUpdateTest.php
+++ b/extensions/extension-manager/tests/integration/api/MinorUpdateTest.php
@@ -7,14 +7,14 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api;
+namespace Flarum\ExtensionManager\Tests\integration\api;
 
-use Flarum\PackageManager\Event\FlarumUpdated;
-use Flarum\PackageManager\Settings\LastUpdateRun;
-use Flarum\PackageManager\Tests\integration\ChangeComposerConfig;
-use Flarum\PackageManager\Tests\integration\DummyExtensions;
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Event\FlarumUpdated;
+use Flarum\ExtensionManager\Settings\LastUpdateRun;
+use Flarum\ExtensionManager\Tests\integration\ChangeComposerConfig;
+use Flarum\ExtensionManager\Tests\integration\DummyExtensions;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class MinorUpdateTest extends TestCase
 {
@@ -43,7 +43,7 @@ public function can_update_to_next_minor_version()
         ]);
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/minor-update', [
+            $this->request('POST', '/api/extension-manager/minor-update', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -69,7 +69,7 @@ public function can_update_with_latest_ext_incompatible_with_latest_core()
         ]);
 
         $this->send(
-            $this->request('POST', '/api/package-manager/check-for-updates', [
+            $this->request('POST', '/api/extension-manager/check-for-updates', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -77,7 +77,7 @@ public function can_update_with_latest_ext_incompatible_with_latest_core()
         $this->forgetComposerApp();
 
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/minor-update', [
+            $this->request('POST', '/api/extension-manager/minor-update', [
                 'authenticatedAs' => 1,
             ])
         );
diff --git a/extensions/package-manager/tests/integration/api/extensions/RemoveExtensionTest.php b/extensions/extension-manager/tests/integration/api/extensions/RemoveExtensionTest.php
similarity index 72%
rename from extensions/package-manager/tests/integration/api/extensions/RemoveExtensionTest.php
rename to extensions/extension-manager/tests/integration/api/extensions/RemoveExtensionTest.php
index a62b05601d8..25ac2eddfd8 100644
--- a/extensions/package-manager/tests/integration/api/extensions/RemoveExtensionTest.php
+++ b/extensions/extension-manager/tests/integration/api/extensions/RemoveExtensionTest.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api\extensions;
+namespace Flarum\ExtensionManager\Tests\integration\api\extensions;
 
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class RemoveExtensionTest extends TestCase
 {
@@ -30,7 +30,7 @@ public function extension_installed_by_default()
     public function removing_an_extension_works()
     {
         $response = $this->send(
-            $this->request('DELETE', '/api/package-manager/extensions/flarum-tags', [
+            $this->request('DELETE', '/api/extension-manager/extensions/flarum-tags', [
                 'authenticatedAs' => 1
             ])
         );
@@ -45,7 +45,7 @@ public function removing_an_extension_works()
     public function removing_a_non_existant_extension_fails()
     {
         $response = $this->send(
-            $this->request('DELETE', '/api/package-manager/extensions/flarum-potato', [
+            $this->request('DELETE', '/api/extension-manager/extensions/flarum-potato', [
                 'authenticatedAs' => 1
             ])
         );
diff --git a/extensions/package-manager/tests/integration/api/extensions/RequireExtensionTest.php b/extensions/extension-manager/tests/integration/api/extensions/RequireExtensionTest.php
similarity index 84%
rename from extensions/package-manager/tests/integration/api/extensions/RequireExtensionTest.php
rename to extensions/extension-manager/tests/integration/api/extensions/RequireExtensionTest.php
index 2da97b62e4c..e9979b9d35c 100644
--- a/extensions/package-manager/tests/integration/api/extensions/RequireExtensionTest.php
+++ b/extensions/extension-manager/tests/integration/api/extensions/RequireExtensionTest.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api\extensions;
+namespace Flarum\ExtensionManager\Tests\integration\api\extensions;
 
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class RequireExtensionTest extends TestCase
 {
@@ -30,7 +30,7 @@ public function extension_uninstalled_by_default()
     public function requiring_an_existing_extension_fails()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/extensions', [
+            $this->request('POST', '/api/extension-manager/extensions', [
                 'authenticatedAs' => 1,
                 'json' => [
                     'data' => [
@@ -49,7 +49,7 @@ public function requiring_an_existing_extension_fails()
     public function requiring_a_compatible_extension_works()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/extensions', [
+            $this->request('POST', '/api/extension-manager/extensions', [
                 'authenticatedAs' => 1,
                 'json' => [
                     'data' => [
@@ -69,7 +69,7 @@ public function requiring_a_compatible_extension_works()
     public function requiring_a_compatible_extension_with_specific_version_works()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/extensions', [
+            $this->request('POST', '/api/extension-manager/extensions', [
                 'authenticatedAs' => 1,
                 'json' => [
                     'data' => [
@@ -89,7 +89,7 @@ public function requiring_a_compatible_extension_with_specific_version_works()
     public function requiring_an_uncompatible_extension_fails()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/extensions', [
+            $this->request('POST', '/api/extension-manager/extensions', [
                 'authenticatedAs' => 1,
                 'json' => [
                     'data' => [
@@ -109,7 +109,7 @@ public function requiring_an_uncompatible_extension_fails()
     public function requiring_an_uncompatible_extension_with_specific_version_fails()
     {
         $response = $this->send(
-            $this->request('POST', '/api/package-manager/extensions', [
+            $this->request('POST', '/api/extension-manager/extensions', [
                 'authenticatedAs' => 1,
                 'json' => [
                     'data' => [
diff --git a/extensions/package-manager/tests/integration/api/extensions/UpdateExtensionTest.php b/extensions/extension-manager/tests/integration/api/extensions/UpdateExtensionTest.php
similarity index 72%
rename from extensions/package-manager/tests/integration/api/extensions/UpdateExtensionTest.php
rename to extensions/extension-manager/tests/integration/api/extensions/UpdateExtensionTest.php
index 32d7d1e7736..3ca3f3a5835 100644
--- a/extensions/package-manager/tests/integration/api/extensions/UpdateExtensionTest.php
+++ b/extensions/extension-manager/tests/integration/api/extensions/UpdateExtensionTest.php
@@ -7,10 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\PackageManager\Tests\integration\api\extensions;
+namespace Flarum\ExtensionManager\Tests\integration\api\extensions;
 
-use Flarum\PackageManager\Tests\integration\RefreshComposerSetup;
-use Flarum\PackageManager\Tests\integration\TestCase;
+use Flarum\ExtensionManager\Tests\integration\RefreshComposerSetup;
+use Flarum\ExtensionManager\Tests\integration\TestCase;
 
 class UpdateExtensionTest extends TestCase
 {
@@ -30,7 +30,7 @@ public function extension_installed_by_default()
     public function updating_an_existing_extension_works()
     {
         $response = $this->send(
-            $this->request('PATCH', '/api/package-manager/extensions/flarum-tags', [
+            $this->request('PATCH', '/api/extension-manager/extensions/flarum-tags', [
                 'authenticatedAs' => 1,
             ])
         );
@@ -45,7 +45,7 @@ public function updating_an_existing_extension_works()
     public function updating_a_non_existing_extension_fails()
     {
         $response = $this->send(
-            $this->request('PATCH', '/api/package-manager/extensions/flarum-potato', [
+            $this->request('PATCH', '/api/extension-manager/extensions/flarum-potato', [
                 'authenticatedAs' => 1,
             ])
         );
diff --git a/extensions/package-manager/tests/integration/setup.php b/extensions/extension-manager/tests/integration/setup.php
similarity index 86%
rename from extensions/package-manager/tests/integration/setup.php
rename to extensions/extension-manager/tests/integration/setup.php
index 49ccccb8432..d79c3fb90ff 100644
--- a/extensions/package-manager/tests/integration/setup.php
+++ b/extensions/extension-manager/tests/integration/setup.php
@@ -7,7 +7,7 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Flarum\PackageManager\Tests\integration\SetupComposer;
+use Flarum\ExtensionManager\Tests\integration\SetupComposer;
 use Flarum\Testing\integration\Setup\SetupScript;
 
 require __DIR__.'/../../vendor/autoload.php';
diff --git a/extensions/package-manager/tests/phpunit.integration.xml b/extensions/extension-manager/tests/phpunit.integration.xml
similarity index 100%
rename from extensions/package-manager/tests/phpunit.integration.xml
rename to extensions/extension-manager/tests/phpunit.integration.xml
diff --git a/extensions/package-manager/tests/phpunit.unit.xml b/extensions/extension-manager/tests/phpunit.unit.xml
similarity index 100%
rename from extensions/package-manager/tests/phpunit.unit.xml
rename to extensions/extension-manager/tests/phpunit.unit.xml
diff --git a/extensions/package-manager/tests/unit/.gitkeep b/extensions/extension-manager/tests/unit/.gitkeep
similarity index 100%
rename from extensions/package-manager/tests/unit/.gitkeep
rename to extensions/extension-manager/tests/unit/.gitkeep
diff --git a/extensions/package-manager/js/src/admin/utils/jumpToQueue.ts b/extensions/package-manager/js/src/admin/utils/jumpToQueue.ts
deleted file mode 100644
index 0045f59ad34..00000000000
--- a/extensions/package-manager/js/src/admin/utils/jumpToQueue.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import app from 'flarum/admin/app';
-
-// @ts-ignore
-window.jumpToQueue = jumpToQueue;
-
-export default function jumpToQueue(): void {
-  app.modal.close();
-
-  m.route.set(app.route('extension', { id: 'flarum-package-manager' }));
-
-  app.packageManager.queue.load({}, true);
-
-  setTimeout(() => {
-    document.getElementById('PackageManager-queueSection')?.scrollIntoView({ block: 'nearest' });
-  }, 200);
-}
diff --git a/extensions/package-manager/less/admin.less b/extensions/package-manager/less/admin.less
deleted file mode 100755
index 44622f7125e..00000000000
--- a/extensions/package-manager/less/admin.less
+++ /dev/null
@@ -1,58 +0,0 @@
-@import "admin/Label";
-@import "admin/TaskOutputModal";
-@import "admin/QueueSection";
-@import "admin/ControlSection";
-
-.PackageManager-controlSection {
-  > .container {
-    padding-bottom: 0;
-  }
-}
-
-.FormControl-container {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 4px;
-}
-
-.Form-group--danger {
-  border: 2px solid var(--alert-error-bg);
-  border-radius: var(--border-radius);
-  background-color: transparent;
-}
-
-// @TODO add to core
-.Checkbox--switch.disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}
-
-.Form--controls {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 4px;
-  margin-top: auto;
-  padding-top: 16px;
-}
-
-.ButtonGroup--full {
-  width: 100%;
-  display: flex;
-
-  > .Button:first-child {
-    flex-grow: 1;
-    text-align: start;
-  }
-}
-
-.ConfigureAuth-hosts, .ConfigureComposer-repositories {
-  > .ButtonGroup {
-    margin-bottom: 8px;
-  }
-}
-
-.flarum-package-manager-Page .SettingsGroups .Form {
-  max-height: unset;
-}
diff --git a/extensions/package-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php b/extensions/package-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php
deleted file mode 100644
index 28f6f97b84c..00000000000
--- a/extensions/package-manager/migrations/2023_12_09_000000_add_guessed_cause_column_to_package_manager_tasks_table.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-use Flarum\Database\Migration;
-
-return Migration::addColumns('package_manager_tasks', [
-    'guessed_cause' => ['type' => 'string', 'length' => 255, 'nullable' => true, 'after' => 'output'],
-]);
diff --git a/flarum-monorepo.json b/flarum-monorepo.json
index f814cd1261b..55279ee7d6f 100644
--- a/flarum-monorepo.json
+++ b/flarum-monorepo.json
@@ -62,8 +62,8 @@
         "mainBranch": "main"
       },
       {
-        "name": "package-manager",
-        "gitRemote": "git@github.com:flarum/package-manager.git",
+        "name": "extension-manager",
+        "gitRemote": "git@github.com:flarum/extension-manager.git",
         "mainBranch": "main"
       },
       {
diff --git a/phpstan.neon b/phpstan.neon
index 5081c1bac09..288e0d82434 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -19,8 +19,8 @@ parameters:
 	  - extensions/mentions/extend.php
 	  - extensions/nicknames/src
 	  - extensions/nicknames/extend.php
-	  - extensions/package-manager/src
-	  - extensions/package-manager/extend.php
+	  - extensions/extension-manager/src
+	  - extensions/extension-manager/extend.php
 	  - extensions/pusher/src
 	  - extensions/pusher/extend.php
 	  - extensions/statistics/src