diff --git a/.changeset/smart-tomatoes-travel.md b/.changeset/smart-tomatoes-travel.md
new file mode 100644
index 0000000000..e303bd70e0
--- /dev/null
+++ b/.changeset/smart-tomatoes-travel.md
@@ -0,0 +1,5 @@
+---
+"@pnpm/core": major
+---
+
+Rename package from `supi` to `@pnpm/core`.
diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts
index 5e48602ef0..ad1e2a2dea 100644
--- a/.meta-updater/src/index.ts
+++ b/.meta-updater/src/index.ts
@@ -118,10 +118,10 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest,
   case '@pnpm/plugin-commands-script-runners':
   case '@pnpm/plugin-commands-store':
   case 'pnpm':
-  case 'supi': {
-    // supi tests currently works only with port 4873 due to the usage of
+  case '@pnpm/core': {
+    // @pnpm/core tests currently works only with port 4873 due to the usage of
     // the next package: pkg-with-tarball-dep-from-registry
-    const port = manifest.name === 'supi' ? 4873 : ++registryMockPort
+    const port = manifest.name === '@pnpm/core' ? 4873 : ++registryMockPort
     scripts = {
       ...(manifest.scripts as Record<string, string>),
       'registry-mock': 'registry-mock',
diff --git a/packages/build-modules/src/index.ts b/packages/build-modules/src/index.ts
index bc5330d512..8d76ed9795 100644
--- a/packages/build-modules/src/index.ts
+++ b/packages/build-modules/src/index.ts
@@ -206,7 +206,7 @@ export async function linkBinsOfDependencies (
       .map(([alias, childDepPath]) => ({ alias, dep: depGraph[childDepPath] }))
       .filter(({ alias, dep }) => {
         if (!dep) {
-          // TODO: Try to reproduce this issue with a test in supi
+          // TODO: Try to reproduce this issue with a test in @pnpm/core
           logger.debug({ message: `Failed to link bins of "${alias}" to "${binPath}". This is probably not an issue.` })
           return false
         }
diff --git a/packages/cli-utils/src/getConfig.ts b/packages/cli-utils/src/getConfig.ts
index a4dceffcbb..02f26c6ef1 100644
--- a/packages/cli-utils/src/getConfig.ts
+++ b/packages/cli-utils/src/getConfig.ts
@@ -23,7 +23,7 @@ export default async function (
   config.cliOptions = cliOptions
 
   if (opts.excludeReporter) {
-    delete config.reporter // This is a silly workaround because supi expects a function as opts.reporter
+    delete config.reporter // This is a silly workaround because @pnpm/core expects a function as opts.reporter
   }
 
   if (warnings.length > 0) {
diff --git a/packages/supi/CHANGELOG.md b/packages/core/CHANGELOG.md
similarity index 99%
rename from packages/supi/CHANGELOG.md
rename to packages/core/CHANGELOG.md
index 88dfa24ba5..7931200633 100644
--- a/packages/supi/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,4 +1,4 @@
-# supi
+# @pnpm/core
 
 ## 0.47.27
 
diff --git a/packages/supi/README.md b/packages/core/README.md
similarity index 76%
rename from packages/supi/README.md
rename to packages/core/README.md
index 409d3f4f78..1fd6813485 100644
--- a/packages/supi/README.md
+++ b/packages/core/README.md
@@ -1,8 +1,4 @@
-<p align="center">
-  <img alt="supi - pnpm's installation engine" src="https://cdn.rawgit.com/pnpm/supi/master/logo.svg" width="200">
-</p>
-
-# supi
+# @pnpm/core
 
 > Fast, disk space efficient installation engine. Used by [pnpm](https://github.com/pnpm/pnpm)
 
@@ -11,7 +7,7 @@
 Install it via npm.
 
 ```
-<pnpm|yarn|npm> add supi
+<pnpm|yarn|npm> add @pnpm/core
 ```
 
 It also depends on `@pnpm/logger` version `1`, so install it as well via:
@@ -22,11 +18,11 @@ It also depends on `@pnpm/logger` version `1`, so install it as well via:
 
 ## API
 
-### `supi.mutateModules(importers, options)`
+### `mutateModules(importers, options)`
 
 TODO
 
-### `supi.link(linkFromPkgs, linkToModules, [options])`
+### `link(linkFromPkgs, linkToModules, [options])`
 
 Create symbolic links from the linked packages to the target package's `node_modules` (and its `node_modules/.bin`).
 
@@ -36,7 +32,7 @@ Create symbolic links from the linked packages to the target package's `node_mod
 * `linkToModules` - *String* - path to the dependent package's `node_modules` directory.
 * `options.reporter` - *Function* - A function that listens for logs.
 
-### `supi.linkToGlobal(linkFrom, options)`
+### `linkToGlobal(linkFrom, options)`
 
 Create a symbolic link from the specified package to the global `node_modules`.
 
@@ -46,7 +42,7 @@ Create a symbolic link from the specified package to the global `node_modules`.
 * `globalDir` - *String* - path to the global directory.
 * `options.reporter` - *Function* - A function that listens for logs.
 
-### `supi.linkFromGlobal(pkgNames, linkTo, options)`
+### `linkFromGlobal(pkgNames, linkTo, options)`
 
 Create symbolic links from the global `pkgName`s to the `linkTo/node_modules` folder.
 
@@ -57,7 +53,7 @@ Create symbolic links from the global `pkgName`s to the `linkTo/node_modules` fo
 * `globalDir` - *String* - path to the global directory.
 * `options.reporter` - *Function* - A function that listens for logs.
 
-### `supi.storeStatus([options])`
+### `storeStatus([options])`
 
 Return the list of modified dependencies.
 
@@ -68,7 +64,7 @@ Return the list of modified dependencies.
 **Returns:** `Promise<string[]>` - the paths to the modified packages of the current project. The paths contain the location of packages in the store,
 not in the projects `node_modules` folder.
 
-### `supi.storePrune([options])`
+### `storePrune([options])`
 
 Remove unreferenced packages from the store.
 
@@ -79,14 +75,14 @@ Hooks are functions that can step into the installation process.
 ### `readPackage(pkg)`
 
 This hook is called with every dependency's manifest information.
-The modified manifest returned by this hook is then used by supi during installation.
+The modified manifest returned by this hook is then used by `@pnpm/core` during installation.
 
 **Example:**
 
 ```js
-const supi = require('supi')
+const { installPkgs } = require('@pnpm/core')
 
-supi.installPkgs({
+installPkgs({
   hooks: {readPackage}
 })
 
@@ -104,10 +100,6 @@ function readPackage (pkg) {
 
 This hook is called after all dependencies are resolved. It recieves and returns the resolved lockfile object.
 
-## Acknowledgements
-
-Thanks to [Valentina Kozlova](https://github.com/ValentinaKozlova) for the supi logo
-
 ## License
 
 [MIT](LICENSE)
diff --git a/packages/supi/jest.config.js b/packages/core/jest.config.js
similarity index 100%
rename from packages/supi/jest.config.js
rename to packages/core/jest.config.js
diff --git a/packages/supi/package.json b/packages/core/package.json
similarity index 98%
rename from packages/supi/package.json
rename to packages/core/package.json
index 234b950c37..af28d2c590 100644
--- a/packages/supi/package.json
+++ b/packages/core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "supi",
+  "name": "@pnpm/core",
   "description": "Fast, disk space efficient installation engine",
   "version": "0.47.27",
   "bugs": {
@@ -101,7 +101,7 @@
   "directories": {
     "test": "test"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/master/packages/supi#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/master/packages/core#readme",
   "keywords": [
     "pnpm6",
     "dependency manager",
@@ -129,7 +129,7 @@
   "engines": {
     "node": ">=12.17"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/master/packages/supi",
+  "repository": "https://github.com/pnpm/pnpm/blob/master/packages/core",
   "scripts": {
     "start": "pnpm run tsc -- --watch",
     "?commit": "echo 'Run Git commit wizard'",
diff --git a/packages/supi/src/api.ts b/packages/core/src/api.ts
similarity index 100%
rename from packages/supi/src/api.ts
rename to packages/core/src/api.ts
diff --git a/packages/supi/src/err.ts b/packages/core/src/err.ts
similarity index 100%
rename from packages/supi/src/err.ts
rename to packages/core/src/err.ts
diff --git a/packages/supi/src/fs/gracefulify.ts b/packages/core/src/fs/gracefulify.ts
similarity index 100%
rename from packages/supi/src/fs/gracefulify.ts
rename to packages/core/src/fs/gracefulify.ts
diff --git a/packages/supi/src/guessPinnedVersionFromExistingSpec.ts b/packages/core/src/guessPinnedVersionFromExistingSpec.ts
similarity index 100%
rename from packages/supi/src/guessPinnedVersionFromExistingSpec.ts
rename to packages/core/src/guessPinnedVersionFromExistingSpec.ts
diff --git a/packages/supi/src/index.ts b/packages/core/src/index.ts
similarity index 100%
rename from packages/supi/src/index.ts
rename to packages/core/src/index.ts
diff --git a/packages/supi/src/install/allProjectsAreUpToDate.ts b/packages/core/src/install/allProjectsAreUpToDate.ts
similarity index 100%
rename from packages/supi/src/install/allProjectsAreUpToDate.ts
rename to packages/core/src/install/allProjectsAreUpToDate.ts
diff --git a/packages/supi/src/install/createPackageExtender.ts b/packages/core/src/install/createPackageExtender.ts
similarity index 100%
rename from packages/supi/src/install/createPackageExtender.ts
rename to packages/core/src/install/createPackageExtender.ts
diff --git a/packages/supi/src/install/createVersionsOverrider.ts b/packages/core/src/install/createVersionsOverrider.ts
similarity index 100%
rename from packages/supi/src/install/createVersionsOverrider.ts
rename to packages/core/src/install/createVersionsOverrider.ts
diff --git a/packages/supi/src/install/extendInstallOptions.ts b/packages/core/src/install/extendInstallOptions.ts
similarity index 100%
rename from packages/supi/src/install/extendInstallOptions.ts
rename to packages/core/src/install/extendInstallOptions.ts
diff --git a/packages/supi/src/install/getPreferredVersions.test.ts b/packages/core/src/install/getPreferredVersions.test.ts
similarity index 100%
rename from packages/supi/src/install/getPreferredVersions.test.ts
rename to packages/core/src/install/getPreferredVersions.test.ts
diff --git a/packages/supi/src/install/getPreferredVersions.ts b/packages/core/src/install/getPreferredVersions.ts
similarity index 100%
rename from packages/supi/src/install/getPreferredVersions.ts
rename to packages/core/src/install/getPreferredVersions.ts
diff --git a/packages/supi/src/install/getWantedDependencies.ts b/packages/core/src/install/getWantedDependencies.ts
similarity index 100%
rename from packages/supi/src/install/getWantedDependencies.ts
rename to packages/core/src/install/getWantedDependencies.ts
diff --git a/packages/supi/src/install/index.ts b/packages/core/src/install/index.ts
similarity index 100%
rename from packages/supi/src/install/index.ts
rename to packages/core/src/install/index.ts
diff --git a/packages/supi/src/install/link.ts b/packages/core/src/install/link.ts
similarity index 100%
rename from packages/supi/src/install/link.ts
rename to packages/core/src/install/link.ts
diff --git a/packages/supi/src/link/index.ts b/packages/core/src/link/index.ts
similarity index 100%
rename from packages/supi/src/link/index.ts
rename to packages/core/src/link/index.ts
diff --git a/packages/supi/src/link/options.ts b/packages/core/src/link/options.ts
similarity index 100%
rename from packages/supi/src/link/options.ts
rename to packages/core/src/link/options.ts
diff --git a/packages/supi/src/parseWantedDependencies.ts b/packages/core/src/parseWantedDependencies.ts
similarity index 100%
rename from packages/supi/src/parseWantedDependencies.ts
rename to packages/core/src/parseWantedDependencies.ts
diff --git a/packages/supi/src/pnpmPkgJson.ts b/packages/core/src/pnpmPkgJson.ts
similarity index 100%
rename from packages/supi/src/pnpmPkgJson.ts
rename to packages/core/src/pnpmPkgJson.ts
diff --git a/packages/supi/src/safeIsInnerLink.ts b/packages/core/src/safeIsInnerLink.ts
similarity index 100%
rename from packages/supi/src/safeIsInnerLink.ts
rename to packages/core/src/safeIsInnerLink.ts
diff --git a/packages/supi/src/types.ts b/packages/core/src/types.ts
similarity index 100%
rename from packages/supi/src/types.ts
rename to packages/core/src/types.ts
diff --git a/packages/supi/src/uninstall/removeDeps.ts b/packages/core/src/uninstall/removeDeps.ts
similarity index 100%
rename from packages/supi/src/uninstall/removeDeps.ts
rename to packages/core/src/uninstall/removeDeps.ts
diff --git a/packages/supi/test/allProjectsAreUpToDate.test.ts b/packages/core/test/allProjectsAreUpToDate.test.ts
similarity index 98%
rename from packages/supi/test/allProjectsAreUpToDate.test.ts
rename to packages/core/test/allProjectsAreUpToDate.test.ts
index a02e222c39..ac6bd37268 100644
--- a/packages/supi/test/allProjectsAreUpToDate.test.ts
+++ b/packages/core/test/allProjectsAreUpToDate.test.ts
@@ -1,4 +1,4 @@
-import allProjectsAreUpToDate from 'supi/lib/install/allProjectsAreUpToDate'
+import allProjectsAreUpToDate from '@pnpm/core/lib/install/allProjectsAreUpToDate'
 
 const fooManifest = {
   name: 'foo',
diff --git a/packages/supi/test/api.ts b/packages/core/test/api.ts
similarity index 97%
rename from packages/supi/test/api.ts
rename to packages/core/test/api.ts
index fa0891720a..31755119c7 100644
--- a/packages/supi/test/api.ts
+++ b/packages/core/test/api.ts
@@ -1,4 +1,4 @@
-import * as pnpm from 'supi'
+import * as pnpm from '@pnpm/core'
 import { testDefaults } from './utils'
 
 test('API', () => {
diff --git a/packages/supi/test/breakingChanges.ts b/packages/core/test/breakingChanges.ts
similarity index 98%
rename from packages/supi/test/breakingChanges.ts
rename to packages/core/test/breakingChanges.ts
index 9778301eb0..f634f3aedb 100644
--- a/packages/supi/test/breakingChanges.ts
+++ b/packages/core/test/breakingChanges.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
 import PnpmError from '@pnpm/error'
 import { prepareEmpty, preparePackages } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import isCI from 'is-ci'
 import { testDefaults } from './utils'
diff --git a/packages/supi/test/brokenLockfileIntegrity.ts b/packages/core/test/brokenLockfileIntegrity.ts
similarity index 99%
rename from packages/supi/test/brokenLockfileIntegrity.ts
rename to packages/core/test/brokenLockfileIntegrity.ts
index fa633e96f7..80ba7d17a2 100644
--- a/packages/supi/test/brokenLockfileIntegrity.ts
+++ b/packages/core/test/brokenLockfileIntegrity.ts
@@ -5,7 +5,7 @@ import clone from 'ramda/src/clone'
 import {
   addDependenciesToPackage,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import writeYamlFile from 'write-yaml-file'
 import {
   addDistTag,
diff --git a/packages/supi/test/cache.ts b/packages/core/test/cache.ts
similarity index 94%
rename from packages/supi/test/cache.ts
rename to packages/core/test/cache.ts
index 2a2ff13e30..1aecfe088e 100644
--- a/packages/supi/test/cache.ts
+++ b/packages/core/test/cache.ts
@@ -1,5 +1,5 @@
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import {
   addDistTag,
   testDefaults,
diff --git a/packages/supi/test/install/aliases.ts b/packages/core/test/install/aliases.ts
similarity index 98%
rename from packages/supi/test/install/aliases.ts
rename to packages/core/test/install/aliases.ts
index 944ce439d0..93a367b692 100644
--- a/packages/supi/test/install/aliases.ts
+++ b/packages/core/test/install/aliases.ts
@@ -1,7 +1,7 @@
 import { LOCKFILE_VERSION } from '@pnpm/constants'
 import { prepareEmpty } from '@pnpm/prepare'
 import { getIntegrity } from '@pnpm/registry-mock'
-import { addDependenciesToPackage } from 'supi'
+import { addDependenciesToPackage } from '@pnpm/core'
 import {
   addDistTag,
   testDefaults,
diff --git a/packages/supi/test/install/auth.ts b/packages/core/test/install/auth.ts
similarity index 99%
rename from packages/supi/test/install/auth.ts
rename to packages/core/test/install/auth.ts
index 925cb86bdd..96e9a2d6b3 100644
--- a/packages/supi/test/install/auth.ts
+++ b/packages/core/test/install/auth.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { prepareEmpty } from '@pnpm/prepare'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import RegClient from 'anonymous-npm-registry-client'
 import { testDefaults } from '../utils'
diff --git a/packages/supi/test/install/createPackageExtender.test.ts b/packages/core/test/install/createPackageExtender.test.ts
similarity index 95%
rename from packages/supi/test/install/createPackageExtender.test.ts
rename to packages/core/test/install/createPackageExtender.test.ts
index 0e637efede..e0ac9a5de3 100644
--- a/packages/supi/test/install/createPackageExtender.test.ts
+++ b/packages/core/test/install/createPackageExtender.test.ts
@@ -1,4 +1,4 @@
-import createPackageExtender from 'supi/lib/install/createPackageExtender'
+import createPackageExtender from '@pnpm/core/lib/install/createPackageExtender'
 
 const packageExtender = createPackageExtender({
   foo: {
diff --git a/packages/supi/test/install/createVersionOverrider.test.ts b/packages/core/test/install/createVersionOverrider.test.ts
similarity index 98%
rename from packages/supi/test/install/createVersionOverrider.test.ts
rename to packages/core/test/install/createVersionOverrider.test.ts
index 19493b6eb2..dc49f30329 100644
--- a/packages/supi/test/install/createVersionOverrider.test.ts
+++ b/packages/core/test/install/createVersionOverrider.test.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import createVersionsOverrider from 'supi/lib/install/createVersionsOverrider'
+import createVersionsOverrider from '@pnpm/core/lib/install/createVersionsOverrider'
 
 test('createVersionsOverrider() matches subranges', () => {
   const overrider = createVersionsOverrider({
diff --git a/packages/supi/test/install/dedupe.ts b/packages/core/test/install/dedupe.ts
similarity index 98%
rename from packages/supi/test/install/dedupe.ts
rename to packages/core/test/install/dedupe.ts
index a0400d0874..a6098b4482 100644
--- a/packages/supi/test/install/dedupe.ts
+++ b/packages/core/test/install/dedupe.ts
@@ -1,5 +1,5 @@
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import pnpmRegistryMock from '@pnpm/registry-mock'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/fixLockfile.ts b/packages/core/test/install/fixLockfile.ts
similarity index 99%
rename from packages/supi/test/install/fixLockfile.ts
rename to packages/core/test/install/fixLockfile.ts
index 1af8abb048..ca099fb9e7 100644
--- a/packages/supi/test/install/fixLockfile.ts
+++ b/packages/core/test/install/fixLockfile.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants'
 import { prepareEmpty, preparePackages } from '@pnpm/prepare'
-import { install, MutatedProject, mutateModules } from 'supi'
+import { install, MutatedProject, mutateModules } from '@pnpm/core'
 import writeYamlFile from 'write-yaml-file'
 import readYamlFile from 'read-yaml-file'
 import { Lockfile, PackageSnapshots } from '@pnpm/lockfile-file'
diff --git a/packages/supi/test/install/fromRepo.ts b/packages/core/test/install/fromRepo.ts
similarity index 99%
rename from packages/supi/test/install/fromRepo.ts
rename to packages/core/test/install/fromRepo.ts
index 5c0f769f18..d2f070873a 100644
--- a/packages/supi/test/install/fromRepo.ts
+++ b/packages/core/test/install/fromRepo.ts
@@ -4,7 +4,7 @@ import { prepareEmpty } from '@pnpm/prepare'
 import {
   addDependenciesToPackage,
   install,
-} from 'supi'
+} from '@pnpm/core'
 import isCI from 'is-ci'
 import exists from 'path-exists'
 import sinon from 'sinon'
diff --git a/packages/supi/test/install/fromTarball.ts b/packages/core/test/install/fromTarball.ts
similarity index 95%
rename from packages/supi/test/install/fromTarball.ts
rename to packages/core/test/install/fromTarball.ts
index 7d13ae7c10..8f775a97c8 100644
--- a/packages/supi/test/install/fromTarball.ts
+++ b/packages/core/test/install/fromTarball.ts
@@ -1,6 +1,6 @@
 import { prepareEmpty } from '@pnpm/prepare'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
-import { addDependenciesToPackage } from 'supi'
+import { addDependenciesToPackage } from '@pnpm/core'
 import { testDefaults } from '../utils'
 
 test('tarball from npm registry', async () => {
diff --git a/packages/supi/test/install/frozenLockfile.ts b/packages/core/test/install/frozenLockfile.ts
similarity index 99%
rename from packages/supi/test/install/frozenLockfile.ts
rename to packages/core/test/install/frozenLockfile.ts
index 9cc994c915..a29fbd82dc 100644
--- a/packages/supi/test/install/frozenLockfile.ts
+++ b/packages/core/test/install/frozenLockfile.ts
@@ -5,7 +5,7 @@ import {
   install,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import sinon from 'sinon'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/hoist.ts b/packages/core/test/install/hoist.ts
similarity index 99%
rename from packages/supi/test/install/hoist.ts
rename to packages/core/test/install/hoist.ts
index a9aa96db14..0530981e95 100644
--- a/packages/supi/test/install/hoist.ts
+++ b/packages/core/test/install/hoist.ts
@@ -7,7 +7,7 @@ import {
   install,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import resolveLinkTarget from 'resolve-link-target'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
diff --git a/packages/supi/test/install/hooks.ts b/packages/core/test/install/hooks.ts
similarity index 98%
rename from packages/supi/test/install/hooks.ts
rename to packages/core/test/install/hooks.ts
index 7e7f05545e..faccfbc67d 100644
--- a/packages/supi/test/install/hooks.ts
+++ b/packages/core/test/install/hooks.ts
@@ -4,7 +4,7 @@ import { prepareEmpty } from '@pnpm/prepare'
 import {
   addDependenciesToPackage,
   PackageManifest,
-} from 'supi'
+} from '@pnpm/core'
 import sinon from 'sinon'
 import {
   addDistTag,
diff --git a/packages/supi/test/install/installationChecks.ts b/packages/core/test/install/installationChecks.ts
similarity index 97%
rename from packages/supi/test/install/installationChecks.ts
rename to packages/core/test/install/installationChecks.ts
index 0693ae24f6..d19ff2adcf 100644
--- a/packages/supi/test/install/installationChecks.ts
+++ b/packages/core/test/install/installationChecks.ts
@@ -1,6 +1,6 @@
 import { WANTED_LOCKFILE } from '@pnpm/constants'
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage } from 'supi'
+import { addDependenciesToPackage } from '@pnpm/core'
 import { testDefaults } from '../utils'
 
 test('fail if installed package does not support the current engine and engine-strict = true', async () => {
diff --git a/packages/supi/test/install/lifecycleScripts.ts b/packages/core/test/install/lifecycleScripts.ts
similarity index 99%
rename from packages/supi/test/install/lifecycleScripts.ts
rename to packages/core/test/install/lifecycleScripts.ts
index c69dd7a580..8fda26e3d3 100644
--- a/packages/supi/test/install/lifecycleScripts.ts
+++ b/packages/core/test/install/lifecycleScripts.ts
@@ -6,7 +6,7 @@ import {
   addDependenciesToPackage,
   install,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import isWindows from 'is-windows'
 import loadJsonFile from 'load-json-file'
diff --git a/packages/supi/test/install/local.ts b/packages/core/test/install/local.ts
similarity index 99%
rename from packages/supi/test/install/local.ts
rename to packages/core/test/install/local.ts
index ce08a97dd2..f2798d59c2 100644
--- a/packages/supi/test/install/local.ts
+++ b/packages/core/test/install/local.ts
@@ -8,7 +8,7 @@ import {
   addDependenciesToPackage,
   install,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import normalizePath from 'normalize-path'
 import symlinkDir from 'symlink-dir'
diff --git a/packages/supi/test/install/lockfileDir.ts b/packages/core/test/install/lockfileDir.ts
similarity index 97%
rename from packages/supi/test/install/lockfileDir.ts
rename to packages/core/test/install/lockfileDir.ts
index ad02e61208..56e94004fe 100644
--- a/packages/supi/test/install/lockfileDir.ts
+++ b/packages/core/test/install/lockfileDir.ts
@@ -4,7 +4,7 @@ import { Lockfile } from '@pnpm/lockfile-file'
 import { prepareEmpty } from '@pnpm/prepare'
 import { copyFixture } from '@pnpm/test-fixtures'
 import readYamlFile from 'read-yaml-file'
-import { addDependenciesToPackage, mutateModules } from 'supi'
+import { addDependenciesToPackage, mutateModules } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/lockfileOnly.ts b/packages/core/test/install/lockfileOnly.ts
similarity index 99%
rename from packages/supi/test/install/lockfileOnly.ts
rename to packages/core/test/install/lockfileOnly.ts
index cac6173d92..6990ddf622 100644
--- a/packages/supi/test/install/lockfileOnly.ts
+++ b/packages/core/test/install/lockfileOnly.ts
@@ -6,7 +6,7 @@ import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
 import {
   addDependenciesToPackage,
   install,
-} from 'supi'
+} from '@pnpm/core'
 import exists from 'path-exists'
 import sinon from 'sinon'
 import { addDistTag, testDefaults } from '../utils'
diff --git a/packages/supi/test/install/misc.ts b/packages/core/test/install/misc.ts
similarity index 99%
rename from packages/supi/test/install/misc.ts
rename to packages/core/test/install/misc.ts
index b29bd6c269..9f2738663a 100644
--- a/packages/supi/test/install/misc.ts
+++ b/packages/core/test/install/misc.ts
@@ -19,7 +19,7 @@ import {
   mutateModules,
   UnexpectedStoreError,
   UnexpectedVirtualStoreDirError,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import execa from 'execa'
 import isCI from 'is-ci'
diff --git a/packages/supi/test/install/modulesCache.ts b/packages/core/test/install/modulesCache.ts
similarity index 99%
rename from packages/supi/test/install/modulesCache.ts
rename to packages/core/test/install/modulesCache.ts
index 91de6e5ed5..3e57dd4190 100644
--- a/packages/supi/test/install/modulesCache.ts
+++ b/packages/core/test/install/modulesCache.ts
@@ -5,7 +5,7 @@ import {
   addDependenciesToPackage,
   install,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import { testDefaults } from '../utils'
 
 test('the modules cache is pruned when it expires', async () => {
diff --git a/packages/supi/test/install/modulesDir.ts b/packages/core/test/install/modulesDir.ts
similarity index 99%
rename from packages/supi/test/install/modulesDir.ts
rename to packages/core/test/install/modulesDir.ts
index 19716e6196..8cf94be62e 100644
--- a/packages/supi/test/install/modulesDir.ts
+++ b/packages/core/test/install/modulesDir.ts
@@ -4,7 +4,7 @@ import {
   install,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/multipleImporters.ts b/packages/core/test/install/multipleImporters.ts
similarity index 99%
rename from packages/supi/test/install/multipleImporters.ts
rename to packages/core/test/install/multipleImporters.ts
index 16ae42707d..f15c189d88 100644
--- a/packages/supi/test/install/multipleImporters.ts
+++ b/packages/core/test/install/multipleImporters.ts
@@ -8,7 +8,7 @@ import {
   addDependenciesToPackage,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import exists from 'path-exists'
 import pick from 'ramda/src/pick'
diff --git a/packages/supi/test/install/only.ts b/packages/core/test/install/only.ts
similarity index 98%
rename from packages/supi/test/install/only.ts
rename to packages/core/test/install/only.ts
index 9bbedc2b4f..7d61cb52b7 100644
--- a/packages/supi/test/install/only.ts
+++ b/packages/core/test/install/only.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import exists from 'path-exists'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/optionalDependencies.ts b/packages/core/test/install/optionalDependencies.ts
similarity index 99%
rename from packages/supi/test/install/optionalDependencies.ts
rename to packages/core/test/install/optionalDependencies.ts
index 9b209e60a2..10eac33093 100644
--- a/packages/supi/test/install/optionalDependencies.ts
+++ b/packages/core/test/install/optionalDependencies.ts
@@ -8,7 +8,7 @@ import {
   install,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import exists from 'path-exists'
 import sinon from 'sinon'
diff --git a/packages/supi/test/install/overrides.ts b/packages/core/test/install/overrides.ts
similarity index 98%
rename from packages/supi/test/install/overrides.ts
rename to packages/core/test/install/overrides.ts
index a8562fe1f0..fc4466f3c4 100644
--- a/packages/supi/test/install/overrides.ts
+++ b/packages/core/test/install/overrides.ts
@@ -1,7 +1,7 @@
 import PnpmError from '@pnpm/error'
 import { prepareEmpty } from '@pnpm/prepare'
 import { addDistTag } from '@pnpm/registry-mock'
-import { addDependenciesToPackage, mutateModules } from 'supi'
+import { addDependenciesToPackage, mutateModules } from '@pnpm/core'
 import {
   testDefaults,
 } from '../utils'
diff --git a/packages/supi/test/install/packageExtensions.ts b/packages/core/test/install/packageExtensions.ts
similarity index 95%
rename from packages/supi/test/install/packageExtensions.ts
rename to packages/core/test/install/packageExtensions.ts
index ec4e3e050a..a8330865e0 100644
--- a/packages/supi/test/install/packageExtensions.ts
+++ b/packages/core/test/install/packageExtensions.ts
@@ -1,7 +1,7 @@
 import PnpmError from '@pnpm/error'
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, mutateModules } from 'supi'
-import { createObjectChecksum } from 'supi/lib/install/index'
+import { addDependenciesToPackage, mutateModules } from '@pnpm/core'
+import { createObjectChecksum } from '@pnpm/core/lib/install/index'
 import {
   testDefaults,
 } from '../utils'
diff --git a/packages/supi/test/install/peerDependencies.ts b/packages/core/test/install/peerDependencies.ts
similarity index 99%
rename from packages/supi/test/install/peerDependencies.ts
rename to packages/core/test/install/peerDependencies.ts
index b3e1d6d7b9..a269cc2c19 100644
--- a/packages/supi/test/install/peerDependencies.ts
+++ b/packages/core/test/install/peerDependencies.ts
@@ -11,7 +11,7 @@ import {
   install,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import exists from 'path-exists'
 import sinon from 'sinon'
diff --git a/packages/supi/test/install/reporting.ts b/packages/core/test/install/reporting.ts
similarity index 98%
rename from packages/supi/test/install/reporting.ts
rename to packages/core/test/install/reporting.ts
index 92ee4f10fa..2d7f37abdb 100644
--- a/packages/supi/test/install/reporting.ts
+++ b/packages/core/test/install/reporting.ts
@@ -3,7 +3,7 @@ import { prepareEmpty } from '@pnpm/prepare'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
 import {
   addDependenciesToPackage,
-} from 'supi'
+} from '@pnpm/core'
 import * as sinon from 'sinon'
 import { testDefaults } from '../utils'
 
diff --git a/packages/supi/test/install/sideEffects.ts b/packages/core/test/install/sideEffects.ts
similarity index 99%
rename from packages/supi/test/install/sideEffects.ts
rename to packages/core/test/install/sideEffects.ts
index ed1776c1b8..93e1dc7ad7 100644
--- a/packages/supi/test/install/sideEffects.ts
+++ b/packages/core/test/install/sideEffects.ts
@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs'
 import path from 'path'
-import { addDependenciesToPackage } from 'supi'
+import { addDependenciesToPackage } from '@pnpm/core'
 import { PackageFilesIndex } from '@pnpm/cafs'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
 import { prepareEmpty } from '@pnpm/prepare'
diff --git a/packages/supi/test/install/store.ts b/packages/core/test/install/store.ts
similarity index 92%
rename from packages/supi/test/install/store.ts
rename to packages/core/test/install/store.ts
index 49983956be..20bd8ed4ad 100644
--- a/packages/supi/test/install/store.ts
+++ b/packages/core/test/install/store.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import writeJsonFile from 'write-json-file'
 import { testDefaults } from '../utils'
diff --git a/packages/supi/test/install/update.ts b/packages/core/test/install/update.ts
similarity index 99%
rename from packages/supi/test/install/update.ts
rename to packages/core/test/install/update.ts
index 4190bf3fa0..9a9c0ac5d2 100644
--- a/packages/supi/test/install/update.ts
+++ b/packages/core/test/install/update.ts
@@ -3,7 +3,7 @@ import { WANTED_LOCKFILE } from '@pnpm/constants'
 import { Lockfile } from '@pnpm/lockfile-file'
 import { prepareEmpty } from '@pnpm/prepare'
 import readYamlFile from 'read-yaml-file'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import {
   addDistTag,
   testDefaults,
diff --git a/packages/supi/test/install/updatingPkgJson.ts b/packages/core/test/install/updatingPkgJson.ts
similarity index 99%
rename from packages/supi/test/install/updatingPkgJson.ts
rename to packages/core/test/install/updatingPkgJson.ts
index dd673aa4c8..a615077ac0 100644
--- a/packages/supi/test/install/updatingPkgJson.ts
+++ b/packages/core/test/install/updatingPkgJson.ts
@@ -3,7 +3,7 @@ import {
   addDependenciesToPackage,
   install,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import {
   addDistTag,
   testDefaults,
diff --git a/packages/supi/test/link.ts b/packages/core/test/link.ts
similarity index 99%
rename from packages/supi/test/link.ts
rename to packages/core/test/link.ts
index baadb4b0c0..4b5e5b13c8 100644
--- a/packages/supi/test/link.ts
+++ b/packages/core/test/link.ts
@@ -7,7 +7,7 @@ import {
   link,
   linkFromGlobal,
   linkToGlobal,
-} from 'supi'
+} from '@pnpm/core'
 import { pathToLocalPkg } from '@pnpm/test-fixtures'
 import { prepareEmpty } from '@pnpm/prepare'
 import { RootLog } from '@pnpm/core-loggers'
diff --git a/packages/supi/test/lockfile.ts b/packages/core/test/lockfile.ts
similarity index 99%
rename from packages/supi/test/lockfile.ts
rename to packages/core/test/lockfile.ts
index a0995cc75f..17f1f062c1 100644
--- a/packages/supi/test/lockfile.ts
+++ b/packages/core/test/lockfile.ts
@@ -13,7 +13,7 @@ import {
   addDependenciesToPackage,
   install,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import loadJsonFile from 'load-json-file'
 import nock from 'nock'
diff --git a/packages/supi/test/offline.ts b/packages/core/test/offline.ts
similarity index 95%
rename from packages/supi/test/offline.ts
rename to packages/core/test/offline.ts
index 0e8c1dce78..d236b4b83e 100644
--- a/packages/supi/test/offline.ts
+++ b/packages/core/test/offline.ts
@@ -1,5 +1,5 @@
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage, install } from 'supi'
+import { addDependenciesToPackage, install } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import { testDefaults } from './utils'
 
diff --git a/packages/supi/test/packageImportMethods.ts b/packages/core/test/packageImportMethods.ts
similarity index 94%
rename from packages/supi/test/packageImportMethods.ts
rename to packages/core/test/packageImportMethods.ts
index 77d4658cf5..d8c8f27b24 100644
--- a/packages/supi/test/packageImportMethods.ts
+++ b/packages/core/test/packageImportMethods.ts
@@ -1,5 +1,5 @@
 import { prepareEmpty } from '@pnpm/prepare'
-import { addDependenciesToPackage } from 'supi'
+import { addDependenciesToPackage } from '@pnpm/core'
 import { testDefaults } from './utils'
 
 test('packageImportMethod can be set to copy', async () => {
diff --git a/packages/supi/test/prune.ts b/packages/core/test/prune.ts
similarity index 99%
rename from packages/supi/test/prune.ts
rename to packages/core/test/prune.ts
index df59802edb..db07e82040 100644
--- a/packages/supi/test/prune.ts
+++ b/packages/core/test/prune.ts
@@ -7,7 +7,7 @@ import {
   install,
   link,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import sinon from 'sinon'
 import { testDefaults } from './utils'
 
diff --git a/packages/supi/test/uninstall.ts b/packages/core/test/uninstall.ts
similarity index 99%
rename from packages/supi/test/uninstall.ts
rename to packages/core/test/uninstall.ts
index 745b68f929..e1f183b0e5 100644
--- a/packages/supi/test/uninstall.ts
+++ b/packages/core/test/uninstall.ts
@@ -16,7 +16,7 @@ import {
   addDependenciesToPackage,
   link,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import exists from 'path-exists'
 import sinon from 'sinon'
 import writeJsonFile from 'write-json-file'
diff --git a/packages/supi/test/unlink.ts b/packages/core/test/unlink.ts
similarity index 99%
rename from packages/supi/test/unlink.ts
rename to packages/core/test/unlink.ts
index 66a305b64c..be14964ad9 100644
--- a/packages/supi/test/unlink.ts
+++ b/packages/core/test/unlink.ts
@@ -5,7 +5,7 @@ import {
   install,
   link,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import { prepareEmpty } from '@pnpm/prepare'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
 import exists from 'path-exists'
diff --git a/packages/supi/test/utils/distTags.ts b/packages/core/test/utils/distTags.ts
similarity index 100%
rename from packages/supi/test/utils/distTags.ts
rename to packages/core/test/utils/distTags.ts
diff --git a/packages/supi/test/utils/index.ts b/packages/core/test/utils/index.ts
similarity index 100%
rename from packages/supi/test/utils/index.ts
rename to packages/core/test/utils/index.ts
diff --git a/packages/supi/test/utils/simple-package.json b/packages/core/test/utils/simple-package.json
similarity index 100%
rename from packages/supi/test/utils/simple-package.json
rename to packages/core/test/utils/simple-package.json
diff --git a/packages/supi/test/utils/testDefaults.ts b/packages/core/test/utils/testDefaults.ts
similarity index 97%
rename from packages/supi/test/utils/testDefaults.ts
rename to packages/core/test/utils/testDefaults.ts
index 988b93f9ce..84c687d412 100644
--- a/packages/supi/test/utils/testDefaults.ts
+++ b/packages/core/test/utils/testDefaults.ts
@@ -5,7 +5,7 @@ import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
 import { StoreController } from '@pnpm/store-controller-types'
 import storePath from '@pnpm/store-path'
 import { Registries } from '@pnpm/types'
-import { InstallOptions } from 'supi'
+import { InstallOptions } from '@pnpm/core'
 
 const registry = `http://localhost:${REGISTRY_MOCK_PORT}/`
 
diff --git a/packages/supi/tsconfig.json b/packages/core/tsconfig.json
similarity index 100%
rename from packages/supi/tsconfig.json
rename to packages/core/tsconfig.json
diff --git a/packages/supi/tsconfig.lint.json b/packages/core/tsconfig.lint.json
similarity index 100%
rename from packages/supi/tsconfig.lint.json
rename to packages/core/tsconfig.lint.json
diff --git a/packages/plugin-commands-import/package.json b/packages/plugin-commands-import/package.json
index 5fbb50fa06..e385192ca3 100644
--- a/packages/plugin-commands-import/package.json
+++ b/packages/plugin-commands-import/package.json
@@ -53,7 +53,7 @@
     "load-json-file": "^6.2.0",
     "path-exists": "^4.0.0",
     "render-help": "^1.0.1",
-    "supi": "workspace:0.47.27"
+    "@pnpm/core": "workspace:0.47.27"
   },
   "funding": "https://opencollective.com/pnpm"
 }
diff --git a/packages/plugin-commands-import/src/import.ts b/packages/plugin-commands-import/src/import.ts
index 5b3ef5ba18..1f5ba852c9 100644
--- a/packages/plugin-commands-import/src/import.ts
+++ b/packages/plugin-commands-import/src/import.ts
@@ -8,7 +8,7 @@ import {
   CreateStoreControllerOptions,
 } from '@pnpm/store-connection-manager'
 import gfs from '@pnpm/graceful-fs'
-import { install, InstallOptions } from 'supi'
+import { install, InstallOptions } from '@pnpm/core'
 import rimraf from '@zkochan/rimraf'
 import loadJsonFile from 'load-json-file'
 import renderHelp from 'render-help'
diff --git a/packages/plugin-commands-import/tsconfig.json b/packages/plugin-commands-import/tsconfig.json
index 2573983508..ccb9fa79b4 100644
--- a/packages/plugin-commands-import/tsconfig.json
+++ b/packages/plugin-commands-import/tsconfig.json
@@ -21,6 +21,9 @@
     {
       "path": "../constants"
     },
+    {
+      "path": "../core"
+    },
     {
       "path": "../error"
     },
@@ -32,9 +35,6 @@
     },
     {
       "path": "../store-connection-manager"
-    },
-    {
-      "path": "../supi"
     }
   ]
 }
diff --git a/packages/plugin-commands-installation/package.json b/packages/plugin-commands-installation/package.json
index 622ca3a9fa..9b19ce94d9 100644
--- a/packages/plugin-commands-installation/package.json
+++ b/packages/plugin-commands-installation/package.json
@@ -91,7 +91,7 @@
     "ramda": "^0.27.1",
     "read-ini-file": "^3.1.0",
     "render-help": "^1.0.1",
-    "supi": "workspace:0.47.27",
+    "@pnpm/core": "workspace:0.47.27",
     "version-selector-type": "^3.0.0"
   },
   "peerDependencies": {
diff --git a/packages/plugin-commands-installation/src/fetch.ts b/packages/plugin-commands-installation/src/fetch.ts
index a13949e267..62701ff94f 100644
--- a/packages/plugin-commands-installation/src/fetch.ts
+++ b/packages/plugin-commands-installation/src/fetch.ts
@@ -2,7 +2,7 @@ import { docsUrl } from '@pnpm/cli-utils'
 import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help'
 import { Config, types as allTypes } from '@pnpm/config'
 import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
-import { InstallOptions, mutateModules } from 'supi'
+import { InstallOptions, mutateModules } from '@pnpm/core'
 import pick from 'ramda/src/pick'
 import renderHelp from 'render-help'
 
diff --git a/packages/plugin-commands-installation/src/installDeps.ts b/packages/plugin-commands-installation/src/installDeps.ts
index 16a47cc6a1..e5682c58fc 100644
--- a/packages/plugin-commands-installation/src/installDeps.ts
+++ b/packages/plugin-commands-installation/src/installDeps.ts
@@ -14,7 +14,7 @@ import {
   install,
   mutateModules,
   WorkspacePackages,
-} from 'supi'
+} from '@pnpm/core'
 import logger from '@pnpm/logger'
 import { sequenceGraph } from '@pnpm/sort-packages'
 import getPinnedVersion from './getPinnedVersion'
diff --git a/packages/plugin-commands-installation/src/link.ts b/packages/plugin-commands-installation/src/link.ts
index 4a5cb5b330..f016aae829 100644
--- a/packages/plugin-commands-installation/src/link.ts
+++ b/packages/plugin-commands-installation/src/link.ts
@@ -20,7 +20,7 @@ import {
   LinkFunctionOptions,
   linkToGlobal,
   WorkspacePackages,
-} from 'supi'
+} from '@pnpm/core'
 import pLimit from 'p-limit'
 import pathAbsolute from 'path-absolute'
 import pick from 'ramda/src/pick'
diff --git a/packages/plugin-commands-installation/src/prune.ts b/packages/plugin-commands-installation/src/prune.ts
index f9f1389ad3..7e457acbf6 100644
--- a/packages/plugin-commands-installation/src/prune.ts
+++ b/packages/plugin-commands-installation/src/prune.ts
@@ -2,7 +2,7 @@ import { docsUrl, readProjectManifestOnly } from '@pnpm/cli-utils'
 import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help'
 import { Config, types as allTypes } from '@pnpm/config'
 import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
-import { InstallOptions, mutateModules } from 'supi'
+import { InstallOptions, mutateModules } from '@pnpm/core'
 import pick from 'ramda/src/pick'
 import renderHelp from 'render-help'
 
diff --git a/packages/plugin-commands-installation/src/recursive.ts b/packages/plugin-commands-installation/src/recursive.ts
index 49a4115776..9d37ded310 100755
--- a/packages/plugin-commands-installation/src/recursive.ts
+++ b/packages/plugin-commands-installation/src/recursive.ts
@@ -27,7 +27,7 @@ import {
   InstallOptions,
   MutatedProject,
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import camelcaseKeys from 'camelcase-keys'
 import isSubdir from 'is-subdir'
 import mem from 'mem'
diff --git a/packages/plugin-commands-installation/src/remove.ts b/packages/plugin-commands-installation/src/remove.ts
index de1acb339f..66796c5a6f 100644
--- a/packages/plugin-commands-installation/src/remove.ts
+++ b/packages/plugin-commands-installation/src/remove.ts
@@ -13,7 +13,7 @@ import { createOrConnectStoreController, CreateStoreControllerOptions } from '@p
 import { DependenciesField } from '@pnpm/types'
 import {
   mutateModules,
-} from 'supi'
+} from '@pnpm/core'
 import pick from 'ramda/src/pick'
 import without from 'ramda/src/without'
 import renderHelp from 'render-help'
diff --git a/packages/plugin-commands-installation/src/unlink.ts b/packages/plugin-commands-installation/src/unlink.ts
index aa9bbb28b6..9218d1b5fd 100644
--- a/packages/plugin-commands-installation/src/unlink.ts
+++ b/packages/plugin-commands-installation/src/unlink.ts
@@ -2,7 +2,7 @@ import { docsUrl, readProjectManifestOnly } from '@pnpm/cli-utils'
 import { UNIVERSAL_OPTIONS } from '@pnpm/common-cli-options-help'
 import { Config } from '@pnpm/config'
 import { createOrConnectStoreController, CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
-import { mutateModules } from 'supi'
+import { mutateModules } from '@pnpm/core'
 import renderHelp from 'render-help'
 import { cliOptionsTypes, rcOptionsTypes } from './install'
 import recursive from './recursive'
diff --git a/packages/plugin-commands-installation/tsconfig.json b/packages/plugin-commands-installation/tsconfig.json
index c32a05110f..a22adcd358 100644
--- a/packages/plugin-commands-installation/tsconfig.json
+++ b/packages/plugin-commands-installation/tsconfig.json
@@ -33,6 +33,9 @@
     {
       "path": "../constants"
     },
+    {
+      "path": "../core"
+    },
     {
       "path": "../error"
     },
@@ -81,9 +84,6 @@
     {
       "path": "../store-connection-manager"
     },
-    {
-      "path": "../supi"
-    },
     {
       "path": "../types"
     }
diff --git a/packages/supi/logo.svg b/packages/supi/logo.svg
deleted file mode 100644
index 0c98499a27..0000000000
--- a/packages/supi/logo.svg
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="579px" height="605px" viewBox="0 0 579 605" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
-    <title>logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="99.0433673%" y1="59.6098898%" x2="0%" y2="39.3009806%" id="linearGradient-1">
-            <stop stop-color="#A25F3B" offset="0%"></stop>
-            <stop stop-color="#B0704D" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="38.8004223%" x2="100%" y2="58.9678672%" id="linearGradient-2">
-            <stop stop-color="#955532" offset="0%"></stop>
-            <stop stop-color="#B76133" offset="100%"></stop>
-        </linearGradient>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="100%" gradientTransform="translate(0.500000,0.000000),scale(0.330009,1.000000),rotate(90.000000),translate(-0.500000,-0.000000)" id="radialGradient-3">
-            <stop stop-color="#B3B3B3" offset="0%"></stop>
-            <stop stop-color="#AFAFAF" offset="95.4161352%"></stop>
-        </radialGradient>
-        <linearGradient x1="0%" y1="38.8004223%" x2="100%" y2="58.9678672%" id="linearGradient-4">
-            <stop stop-color="#E1B780" offset="0%"></stop>
-            <stop stop-color="#D59860" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="100%" y1="59.806048%" x2="0%" y2="39.3009806%" id="linearGradient-5">
-            <stop stop-color="#ECC999" offset="0%"></stop>
-            <stop stop-color="#EDB179" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="10.7507165%" y1="87.7179269%" x2="102.288687%" y2="13.1618306%" id="linearGradient-6">
-            <stop stop-color="#BB6A3F" offset="0%"></stop>
-            <stop stop-color="#B56033" offset="94.2165799%"></stop>
-            <stop stop-color="#B76133" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="38.8004223%" x2="100%" y2="58.9678672%" id="linearGradient-7">
-            <stop stop-color="#9E603E" offset="0%"></stop>
-            <stop stop-color="#C3754C" offset="100%"></stop>
-        </linearGradient>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="100%" gradientTransform="translate(0.500000,0.000000),scale(0.896559,1.000000),rotate(90.000000),translate(-0.500000,-0.000000)" id="radialGradient-8">
-            <stop stop-color="#343434" offset="0%"></stop>
-            <stop stop-color="#5F5F5F" offset="100%"></stop>
-        </radialGradient>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="100%" gradientTransform="translate(0.500000,0.000000),scale(1.000000,0.995272),rotate(90.000000),translate(-0.500000,-0.000000)" id="radialGradient-9">
-            <stop stop-color="#343434" offset="0%"></stop>
-            <stop stop-color="#5F5F5F" offset="100%"></stop>
-        </radialGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-10">
-            <stop stop-color="#957566" offset="0%"></stop>
-            <stop stop-color="#69493C" offset="96.6876594%"></stop>
-        </linearGradient>
-        <path d="M162.590148,64.5981958 C167.418323,44.0372852 176.738777,45.4677032 181.231057,64.5981958 C184.22591,77.3518575 184.22591,103.812793 181.231057,143.981002 C193.955784,174.068768 201.873855,190.618438 204.985271,193.630012 C213.739378,202.103211 205.821307,211.584885 181.231057,222.075033 L194.362218,262.889008 L144.317365,262.889008 L157.416163,222.075033 C140.429757,219.499032 132.330994,211.774383 133.119875,198.901085 C133.908756,186.027787 142.007518,167.721093 157.416163,143.981002 C157.646704,104.766405 159.371365,78.3054695 162.590148,64.5981958 Z" id="path-11"></path>
-        <radialGradient cx="53.8461538%" cy="46.1538462%" fx="53.8461538%" fy="46.1538462%" r="26.577524%" gradientTransform="translate(0.538462,0.461538),rotate(89.999994),scale(1.000000,1.176143),translate(-0.538462,-0.461538)" id="radialGradient-12">
-            <stop stop-color="#FFFFFF" offset="0%"></stop>
-            <stop stop-color="#000000" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" transform="translate(0.000000, -26.000000)">
-            <g>
-                <g id="Box" transform="translate(0.000000, 149.000000)">
-                    <polygon id="Rectangle" fill="url(#linearGradient-1)" points="280.9375 250.378906 55 361.620938 55 71 280.9375 0.921875"></polygon>
-                    <polygon id="Rectangle" fill="url(#linearGradient-2)" transform="translate(402.923523, 165.585937) scale(1, -1) translate(-402.923523, -165.585937) " points="279.988281 67.4101562 525.858765 1.1484375 525.858765 258.171875 279.988281 330.023437"></polygon>
-                    <path d="M387.862003,163.227147 C401.962555,161.739142 411.59943,160.205017 418.751729,154.237798 C425.904029,148.27058 434.873723,142.505935 442.002521,136.656601 C449.131318,130.807267 438.47633,121.906694 442.002521,115.378906 C445.528712,108.851119 428.944875,106.774539 429.863281,97.0820313 C430.781688,87.3895237 146.806605,88.84375 136.859375,102.402344 C126.770579,116.153899 123.156685,124.95954 125.425781,133.402658 C127.694878,141.845776 125.686245,125.107136 129.665633,133.402658 C133.645022,141.69818 139.721872,145.790438 146.806605,150.669216 C153.891339,155.547993 156.515526,157.118514 161.022593,160.900284 C165.529661,164.682055 181.703514,167.630417 194.684777,167.140785 C201.075902,166.899722 240.438438,197.059922 284.645977,196.34375 C330.230089,195.605277 380.70364,163.982555 387.862003,163.227147 Z" id="Oval" fill="url(#radialGradient-3)"></path>
-                    <polygon id="Rectangle" fill="url(#linearGradient-4)" transform="translate(407.429382, 277.208287) scale(1, -1) translate(-407.429382, -277.208287) " points="289 73 525.858765 190.795637 525.858765 481.416574 289 381.679591"></polygon>
-                    <polygon id="Rectangle" fill="url(#linearGradient-5)" points="290.858765 481.416574 54 363.620938 54 73 290.858765 172.736983"></polygon>
-                    <polygon id="Rectangle-4" fill="url(#linearGradient-6)" points="290.515625 173.007812 524.421875 72.4453125 578.105469 132 364.949219 237.351562"></polygon>
-                    <polygon id="Rectangle-5" fill="url(#linearGradient-7)" points="55.0039063 71.4804688 291 173 215.644531 241.09375 0.5546875 132"></polygon>
-                </g>
-                <g id="Raccoon" transform="translate(117.000000, 0.000000)">
-                    <g id="base" fill="#D8D8D8">
-                        <path d="M172.257687,297.17848 C178.509497,297.17848 192.286529,296.184881 200.299754,295.394391 C208.312979,294.6039 225.571396,278.892211 235.17974,270.692124 C244.788084,262.492037 256.76145,263.715152 270.862003,262.227147 C284.962555,260.739142 294.59943,259.205017 301.751729,253.237798 C308.904029,247.27058 317.873723,241.505935 325.002521,235.656601 C332.131318,229.807267 335.567582,225.987178 339.093772,219.459391 C342.619963,212.931603 344.987384,202.431968 345.90579,192.73946 C346.824197,183.046953 346.877299,167.784415 340.638269,153.726094 C334.399239,139.667774 321.29924,132.730293 317.930236,130.564785 C314.561232,128.399277 305.801097,117.205793 301.751729,111.81415 C297.702362,106.422507 284.126319,63.0626959 248.967259,53.6017046 C213.8082,44.1407132 227.918508,47.1639357 215.681265,45.9075777 C203.444021,44.6512198 204.066052,43.3818993 196.809725,43.5695217 C189.553398,43.7571442 178.52707,45.9075777 172.257687,45.9075777 C165.988304,45.9075777 144.83417,43.1167401 135.065682,43.5695217 C125.297193,44.0223034 113.161471,48.9003189 98.8122441,53.6017046 C84.4630167,58.3030902 66.6662899,92.5719256 49.0647337,111.81415 C31.4631776,131.056374 34.7899566,134.690728 23.6585905,141.459486 C12.5272244,148.228244 0,167.027182 0,181.264112 C1.19033311e-15,195.501041 1.18310383,200.020127 3.45220017,208.463245 C5.72129651,216.906363 8.68624463,224.107136 12.6656331,232.402658 C16.6450216,240.69818 22.7218718,244.790438 29.8066053,249.669216 C36.8913388,254.547993 39.5155258,256.118514 44.0225934,259.900284 C48.529661,263.682055 64.7035136,266.630417 77.6847767,266.140785 C90.6660399,265.651153 106.969211,264.328111 115.569461,270.692124 C124.16971,277.056137 123.996626,280.723398 129.505399,286.750474 C135.014172,292.77755 137.929473,294.852724 142.40957,295.394391 C146.889667,295.936057 149.929545,296.215233 153.745638,296.497577 C157.561731,296.779921 166.005878,297.17848 172.257687,297.17848 Z" id="Oval"></path>
-                        <path d="M278.401779,20.4211759 C293.563311,20.4211759 308.724844,46.412375 323.886377,98.3947731 L232.91718,98.3947731 C248.078713,46.412375 263.240246,20.4211759 278.401779,20.4211759 Z" id="Triangle" transform="translate(278.401779, 59.407975) rotate(42.000000) translate(-278.401779, -59.407975) "></path>
-                        <path d="M60.8898681,30.9028228 C76.0514009,30.9028228 91.2129337,56.8940218 106.374466,108.87642 L15.4052698,108.87642 C30.5668025,56.8940218 45.7283353,30.9028228 60.8898681,30.9028228 Z" id="Triangle" transform="translate(60.889868, 69.889621) rotate(-43.000000) translate(-60.889868, -69.889621) "></path>
-                    </g>
-                    <path d="M172.079562,289.451888 C177.761122,289.451888 190.281504,288.561477 197.563815,287.853081 C204.846127,287.144685 220.530344,273.064696 229.262278,265.71621 C237.994212,258.367723 248.875446,259.463815 261.689838,258.130343 C274.504231,256.796871 283.262093,255.422069 289.762007,250.074562 C296.261921,244.727055 304.413458,239.561084 310.892014,234.319218 C317.370569,229.077353 320.493399,225.65399 323.697954,219.804131 C326.902509,213.954271 329.053989,204.545051 329.888624,195.859136 C330.72326,187.173221 330.771518,173.495738 325.101571,160.897411 C319.431625,148.299084 307.526521,142.082078 304.464816,140.141464 C301.40311,138.200849 293.442018,128.169838 289.762007,123.338132 C286.081996,118.506425 273.74427,79.6496447 241.79219,71.1712022 C209.840109,62.6927598 222.663367,65.4020126 211.542325,64.2761307 C200.421283,63.1502489 200.986576,62.0127507 194.392124,62.180888 C187.797671,62.3490254 177.777093,64.2761307 172.079562,64.2761307 C166.382031,64.2761307 147.157438,61.7751289 138.279967,62.180888 C129.402496,62.5866471 118.373715,66.9580679 105.33333,71.1712022 C92.2929451,75.3843366 76.1195189,106.094263 60.1234612,123.338132 C44.1274035,140.582 47.1507356,143.838917 37.0346997,149.904722 C26.9186637,155.970526 15.5340906,172.817145 15.5340906,185.575532 C15.5340906,198.333919 16.6092795,202.383686 18.6714037,209.949964 C20.733528,217.516242 23.428033,223.969195 27.0444478,231.403206 C30.6608626,238.837216 36.1834223,242.504483 42.6219329,246.876586 C49.0604435,251.24869 51.4452694,252.656107 55.5412319,256.045131 C59.6371943,259.434155 74.3357742,262.076322 86.1329717,261.637539 C97.9301691,261.198757 112.746272,260.013116 120.562063,265.71621 C128.377854,271.419303 128.220558,274.70571 133.226856,280.106858 C138.233155,285.508006 140.882542,287.367668 144.953994,287.853081 C149.025446,288.338494 151.788046,288.588677 155.25606,288.841699 C158.724074,289.094721 166.398001,289.451888 172.079562,289.451888 Z" id="Oval" fill="#FAFAFA"></path>
-                    <path d="M325.982932,217.410593 C329.265094,211.188458 331.468678,201.180449 332.323526,191.941775 C333.178375,182.703102 333.227802,168.155205 327.420543,154.75514 C321.613283,141.355075 309.419866,134.742428 306.284013,132.678316 C303.14816,130.614204 294.994269,119.944835 291.225136,114.805646 C287.456004,109.666457 274.819488,68.3368906 242.093602,59.3188931 C209.367717,50.3008955 222.501524,53.1825611 211.111157,51.9850298 C199.720789,50.7874986 200.299772,49.5776117 193.545617,49.7564491 C186.791462,49.9352864 176.528209,51.9850298 170.692697,51.9850298 C164.857185,51.9850298 145.167018,49.3248681 136.074555,49.7564491 C126.982092,50.18803 115.68622,54.8376413 102.330028,59.3188931 C88.973835,63.8001449 72.4087263,96.4644041 56.0252814,114.805646 C39.6418366,133.146887 42.7383867,136.61107 32.377364,143.062893 C22.0163413,149.514716 10.3560604,167.433428 10.3560604,181.003739 C10.3560604,194.57405 11.4572878,198.881538 13.5693519,206.929323 C13.9125103,208.236889 20.7943367,174.105132 47.7592379,154.75514 C54.4184798,149.976473 64.8444304,136.209621 79.8225718,128.520328 C98.1789169,119.096774 115.587228,114.443119 121.343901,114.805646 C133.760408,115.587576 152.884868,114.805646 170.692697,114.805646 C188.500526,114.805646 211.850165,114.004298 227.032352,120.259751 C247.081038,128.520328 257.65717,131.922599 269.91696,143.062893 C280.547781,152.722966 293.521673,153.325587 301.110547,163.633845 C318.749103,187.592971 325.08632,219.110341 325.982932,217.410593 Z" id="Oval" fill="#A1958E"></path>
-                    <path d="M276.724698,28.3407047 C287.852177,28.3407047 300.899426,49.2764118 315.866446,91.1478258 C297.654682,92.624544 284.761468,93.3629031 277.186805,93.3629031 C269.612142,93.3629031 258.330627,90.7645155 243.34226,85.5677402 C254.469739,47.4163832 265.597219,28.3407047 276.724698,28.3407047 Z" id="Triangle" fill="url(#radialGradient-8)" transform="translate(279.604353, 60.851804) rotate(42.000000) translate(-279.604353, -60.851804) "></path>
-                    <path d="M59.2745514,39.9432291 C69.7200157,39.9432291 80.6720175,55.3524633 92.1305567,86.1709317 C78.1941203,91.0492741 67.4952331,93.4884453 60.0338953,93.4884453 C52.5725575,93.4884453 43.8964237,95.1070935 34.0054941,98.3443898 C40.4060679,59.4102827 48.829087,39.9432291 59.2745514,39.9432291 Z" id="Triangle" fill="url(#radialGradient-9)" transform="translate(63.068025, 69.143809) rotate(-43.000000) translate(-63.068025, -69.143809) "></path>
-                    <g id="Rectangle-2">
-                        <use fill="url(#linearGradient-10)" fill-rule="evenodd" xlink:href="#path-11"></use>
-                        <path stroke="#979797" stroke-width="1" d="M145.002954,262.389008 L193.676111,262.389008 L180.61542,221.794067 L181.034864,221.615133 C205.339844,211.24668 212.995585,202.079139 204.637528,193.989283 C201.450643,190.90466 193.544504,174.379931 180.770548,144.175761 L180.723451,144.064401 L180.732441,143.943826 C183.723473,103.82687 183.723473,77.3993959 180.744297,64.7124981 C176.255209,45.595597 167.669139,45.1563599 163.076908,64.7124981 C159.869392,78.3717924 158.14648,104.805874 157.916155,143.983941 L157.915294,144.130381 L157.835566,144.253218 C142.47013,167.926737 134.401228,186.165933 133.618939,198.931668 C132.84785,211.51462 140.737711,219.040017 157.491132,221.580685 L158.071683,221.668726 L145.002954,262.389008 Z"></path>
-                    </g>
-                    <path d="M169.673532,278.476891 C182.736767,278.476891 193.956673,274.670642 193.956673,263.545556 C193.956673,257.227834 192.474057,251.736208 187.723821,246.351866 C183.613955,241.693375 177.108469,238.513016 171.463593,238.513016 C165.818717,238.513016 156.897864,242.162191 152.72863,246.351866 C148.559397,250.541541 145.88291,257.43113 145.88291,263.545556 C145.88291,274.670642 156.610296,278.476891 169.673532,278.476891 Z" id="Oval-2" stroke="#979797" fill="#3F3F3F"></path>
-                    <path d="M50.3910066,192.115213 C61.6933456,177.747856 72.3803626,171.372333 81.2366554,167.151361 C96.5001368,159.876679 107.517658,164.870928 116.614275,164.002575 C138.176364,161.944282 143.461539,169.535413 158.244644,181.819624 C166.154642,188.39254 164.4025,194.740176 162.000482,201.716828 C159.598463,208.69348 159.498388,218.101542 148.798274,223.467533 C138.967769,228.397423 142.723926,224.434815 120.939243,222.30859 C99.154561,220.182365 105.120905,241.125096 84.6273685,247.331316 C72.3584809,251.0468 61.770499,242.263704 54.8466857,235.899583 C46.0820904,227.84348 41.6410099,223.149796 41.6684464,217.449848 C41.7421123,202.145701 41.9092411,202.8971 50.3910066,192.115213 Z" id="Rectangle-3" fill="#363636" transform="translate(102.847747, 205.673353) rotate(-21.000000) translate(-102.847747, -205.673353) "></path>
-                    <path d="M301.631126,202.246578 C295.106638,184.928836 286.389218,184.761874 278.789633,177.537665 C265.692039,165.087017 252.616868,165.338559 243.585646,161.04483 C222.178568,150.867227 214.070104,155.672817 194.552849,161.04483 C184.109748,163.919234 183.664933,170.319437 183.664933,177.537665 C183.664933,184.755893 180.442529,193.278253 189.530199,202.246578 C197.879304,210.486038 195.423946,205.463122 218.538483,211.953235 C241.653019,218.443348 225.44544,236.556837 244.289576,250.062451 C255.571015,258.147871 269.432695,253.129177 278.789633,250.062451 C290.63423,246.180397 299.644732,237.42968 301.631126,232.279153 C306.964521,218.45018 306.527385,215.242563 301.631126,202.246578 Z" id="Rectangle-3" fill="#363636"></path>
-                    <g id="Group" transform="translate(119.094695, 172.946209)">
-                        <circle id="Oval-3" fill="#E1D5D5" cx="14.0474296" cy="14.9495395" r="13.9139335"></circle>
-                        <circle id="Oval-3" fill="url(#radialGradient-12)" cx="15.5340906" cy="13.4628785" r="13.4628785"></circle>
-                    </g>
-                    <g id="Group" transform="translate(189.515905, 172.946209)">
-                        <circle id="Oval-3" fill="#E1D5D5" cx="14.0474296" cy="14.9495395" r="13.9139335"></circle>
-                        <circle id="Oval-3" fill="url(#radialGradient-12)" cx="15.5340906" cy="13.4628785" r="13.4628785"></circle>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a78171c3f..aa95846b17 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -357,6 +357,173 @@ importers:
     devDependencies:
       '@pnpm/constants': 'link:'
 
+  packages/core:
+    specifiers:
+      '@pnpm/assert-project': workspace:*
+      '@pnpm/assert-store': workspace:*
+      '@pnpm/build-modules': workspace:7.1.1
+      '@pnpm/cafs': workspace:3.0.7
+      '@pnpm/client': workspace:5.0.7
+      '@pnpm/constants': workspace:5.0.0
+      '@pnpm/core': 'link:'
+      '@pnpm/core-loggers': workspace:6.0.4
+      '@pnpm/error': workspace:2.0.0
+      '@pnpm/filter-lockfile': workspace:5.0.8
+      '@pnpm/get-context': workspace:5.1.5
+      '@pnpm/headless': workspace:16.1.3
+      '@pnpm/hoist': workspace:5.2.0
+      '@pnpm/lifecycle': workspace:11.0.5
+      '@pnpm/link-bins': workspace:6.2.0
+      '@pnpm/lockfile-file': workspace:4.1.1
+      '@pnpm/lockfile-to-pnp': workspace:0.4.26
+      '@pnpm/lockfile-utils': workspace:3.0.8
+      '@pnpm/lockfile-walker': workspace:4.0.8
+      '@pnpm/logger': ^4.0.0
+      '@pnpm/manifest-utils': workspace:2.1.0
+      '@pnpm/modules-cleaner': workspace:11.0.12
+      '@pnpm/modules-yaml': workspace:9.0.4
+      '@pnpm/normalize-registries': workspace:2.0.4
+      '@pnpm/package-requester': workspace:15.1.2
+      '@pnpm/package-store': workspace:12.0.15
+      '@pnpm/parse-wanted-dependency': workspace:2.0.0
+      '@pnpm/prepare': workspace:0.0.26
+      '@pnpm/prune-lockfile': workspace:3.0.8
+      '@pnpm/read-modules-dir': workspace:3.0.1
+      '@pnpm/read-package-json': workspace:5.0.4
+      '@pnpm/read-project-manifest': workspace:2.0.5
+      '@pnpm/remove-bins': workspace:2.0.6
+      '@pnpm/resolve-dependencies': workspace:21.0.6
+      '@pnpm/resolver-base': workspace:8.0.4
+      '@pnpm/store-controller-types': workspace:11.0.5
+      '@pnpm/store-path': ^5.0.0
+      '@pnpm/symlink-dependency': workspace:4.0.5
+      '@pnpm/test-fixtures': workspace:*
+      '@pnpm/types': workspace:7.4.0
+      '@types/fs-extra': ^9.0.5
+      '@types/is-ci': ^3.0.0
+      '@types/is-windows': ^1.0.0
+      '@types/ncp': ^2.0.4
+      '@types/normalize-path': ^3.0.0
+      '@types/ramda': 0.27.39
+      '@types/semver': ^7.3.4
+      '@types/sinon': ^9.0.11
+      '@zkochan/npm-package-arg': ^2.0.1
+      '@zkochan/rimraf': ^2.1.1
+      anonymous-npm-registry-client: 0.1.2
+      deep-require-cwd: 1.0.0
+      dependency-path: workspace:8.0.4
+      execa: npm:safe-execa@^0.1.1
+      exists-link: 2.0.0
+      graph-sequencer: 2.0.0
+      is-ci: ^3.0.0
+      is-inner-link: ^4.0.0
+      is-subdir: ^1.1.1
+      is-windows: ^1.0.2
+      load-json-file: ^6.2.0
+      ncp: ^2.0.0
+      nock: 12.0.3
+      normalize-path: ^3.0.0
+      p-every: ^2.0.0
+      p-filter: ^2.1.0
+      p-limit: ^3.1.0
+      path-absolute: ^1.0.1
+      path-exists: ^4.0.0
+      path-name: ^1.0.0
+      ramda: ^0.27.1
+      read-yaml-file: ^2.1.0
+      resolve-link-target: ^2.0.0
+      run-groups: ^3.0.1
+      semver: ^7.3.4
+      semver-utils: ^1.1.4
+      sinon: ^11.1.1
+      symlink-dir: ^5.0.0
+      version-selector-type: ^3.0.0
+      write-json-file: ^4.3.0
+      write-yaml-file: ^4.2.0
+    dependencies:
+      '@pnpm/build-modules': link:../build-modules
+      '@pnpm/constants': link:../constants
+      '@pnpm/core-loggers': link:../core-loggers
+      '@pnpm/error': link:../error
+      '@pnpm/filter-lockfile': link:../filter-lockfile
+      '@pnpm/get-context': link:../get-context
+      '@pnpm/headless': link:../headless
+      '@pnpm/hoist': link:../hoist
+      '@pnpm/lifecycle': link:../lifecycle
+      '@pnpm/link-bins': link:../link-bins
+      '@pnpm/lockfile-file': link:../lockfile-file
+      '@pnpm/lockfile-to-pnp': link:../lockfile-to-pnp
+      '@pnpm/lockfile-utils': link:../lockfile-utils
+      '@pnpm/lockfile-walker': link:../lockfile-walker
+      '@pnpm/manifest-utils': link:../manifest-utils
+      '@pnpm/modules-cleaner': link:../modules-cleaner
+      '@pnpm/modules-yaml': link:../modules-yaml
+      '@pnpm/normalize-registries': link:../normalize-registries
+      '@pnpm/package-requester': link:../package-requester
+      '@pnpm/parse-wanted-dependency': link:../parse-wanted-dependency
+      '@pnpm/prune-lockfile': link:../prune-lockfile
+      '@pnpm/read-modules-dir': link:../read-modules-dir
+      '@pnpm/read-package-json': link:../read-package-json
+      '@pnpm/read-project-manifest': link:../read-project-manifest
+      '@pnpm/remove-bins': link:../remove-bins
+      '@pnpm/resolve-dependencies': link:../resolve-dependencies
+      '@pnpm/resolver-base': link:../resolver-base
+      '@pnpm/store-controller-types': link:../store-controller-types
+      '@pnpm/symlink-dependency': link:../symlink-dependency
+      '@pnpm/types': link:../types
+      '@zkochan/npm-package-arg': 2.0.1
+      '@zkochan/rimraf': 2.1.1
+      dependency-path: link:../dependency-path
+      graph-sequencer: 2.0.0
+      is-inner-link: 4.0.0
+      is-subdir: 1.2.0
+      load-json-file: 6.2.0
+      normalize-path: 3.0.0
+      p-every: 2.0.0
+      p-filter: 2.1.0
+      p-limit: 3.1.0
+      path-absolute: 1.0.1
+      path-exists: 4.0.0
+      ramda: 0.27.1
+      run-groups: 3.0.1
+      semver: 7.3.5
+      semver-utils: 1.1.4
+      version-selector-type: 3.0.0
+    devDependencies:
+      '@pnpm/assert-project': link:../../privatePackages/assert-project
+      '@pnpm/assert-store': link:../../privatePackages/assert-store
+      '@pnpm/cafs': link:../cafs
+      '@pnpm/client': link:../client
+      '@pnpm/core': 'link:'
+      '@pnpm/logger': 4.0.0
+      '@pnpm/package-store': link:../package-store
+      '@pnpm/prepare': link:../../privatePackages/prepare
+      '@pnpm/store-path': 5.0.0
+      '@pnpm/test-fixtures': link:../../privatePackages/test-fixtures
+      '@types/fs-extra': 9.0.13
+      '@types/is-ci': 3.0.0
+      '@types/is-windows': 1.0.0
+      '@types/ncp': 2.0.5
+      '@types/normalize-path': 3.0.0
+      '@types/ramda': 0.27.39
+      '@types/semver': 7.3.8
+      '@types/sinon': 9.0.11
+      anonymous-npm-registry-client: 0.1.2
+      deep-require-cwd: 1.0.0
+      execa: /safe-execa/0.1.1
+      exists-link: 2.0.0
+      is-ci: 3.0.0
+      is-windows: 1.0.2
+      ncp: 2.0.0
+      nock: 12.0.3
+      path-name: 1.0.0
+      read-yaml-file: 2.1.0
+      resolve-link-target: 2.0.0
+      sinon: 11.1.2
+      symlink-dir: 5.0.1
+      write-json-file: 4.3.0
+      write-yaml-file: 4.2.0
+
   packages/core-loggers:
     specifiers:
       '@pnpm/core-loggers': 'link:'
@@ -1857,6 +2024,7 @@ importers:
       '@pnpm/assert-project': workspace:*
       '@pnpm/cli-utils': workspace:0.6.26
       '@pnpm/constants': workspace:5.0.0
+      '@pnpm/core': workspace:0.47.27
       '@pnpm/error': workspace:2.0.0
       '@pnpm/graceful-fs': workspace:1.0.0
       '@pnpm/plugin-commands-import': 'link:'
@@ -1871,11 +2039,11 @@ importers:
       ncp: ^2.0.0
       path-exists: ^4.0.0
       render-help: ^1.0.1
-      supi: workspace:0.47.27
       tempy: ^1.0.0
     dependencies:
       '@pnpm/cli-utils': link:../cli-utils
       '@pnpm/constants': link:../constants
+      '@pnpm/core': link:../core
       '@pnpm/error': link:../error
       '@pnpm/graceful-fs': link:../graceful-fs
       '@pnpm/read-project-manifest': link:../read-project-manifest
@@ -1884,7 +2052,6 @@ importers:
       load-json-file: 6.2.0
       path-exists: 4.0.0
       render-help: 1.0.2
-      supi: link:../supi
     devDependencies:
       '@pnpm/assert-project': link:../../privatePackages/assert-project
       '@pnpm/plugin-commands-import': 'link:'
@@ -1904,6 +2071,7 @@ importers:
       '@pnpm/common-cli-options-help': workspace:0.7.1
       '@pnpm/config': workspace:13.2.0
       '@pnpm/constants': workspace:5.0.0
+      '@pnpm/core': workspace:0.47.27
       '@pnpm/error': workspace:2.0.0
       '@pnpm/filter-workspace-packages': workspace:4.3.2
       '@pnpm/find-workspace-dir': workspace:3.0.1
@@ -1951,7 +2119,6 @@ importers:
       read-yaml-file: ^2.1.0
       render-help: ^1.0.1
       sinon: ^11.1.1
-      supi: workspace:0.47.27
       tempy: ^1.0.0
       version-selector-type: ^3.0.0
       write-json-file: ^4.3.0
@@ -1964,6 +2131,7 @@ importers:
       '@pnpm/common-cli-options-help': link:../common-cli-options-help
       '@pnpm/config': link:../config
       '@pnpm/constants': link:../constants
+      '@pnpm/core': link:../core
       '@pnpm/error': link:../error
       '@pnpm/filter-workspace-packages': link:../filter-workspace-packages
       '@pnpm/find-workspace-dir': link:../find-workspace-dir
@@ -1994,7 +2162,6 @@ importers:
       ramda: 0.27.1
       read-ini-file: 3.1.0
       render-help: 1.0.2
-      supi: link:../supi
       version-selector-type: 3.0.0
     devDependencies:
       '@pnpm/assert-project': link:../../privatePackages/assert-project
@@ -3027,173 +3194,6 @@ importers:
     devDependencies:
       '@pnpm/store-controller-types': 'link:'
 
-  packages/supi:
-    specifiers:
-      '@pnpm/assert-project': workspace:*
-      '@pnpm/assert-store': workspace:*
-      '@pnpm/build-modules': workspace:7.1.1
-      '@pnpm/cafs': workspace:3.0.7
-      '@pnpm/client': workspace:5.0.7
-      '@pnpm/constants': workspace:5.0.0
-      '@pnpm/core-loggers': workspace:6.0.4
-      '@pnpm/error': workspace:2.0.0
-      '@pnpm/filter-lockfile': workspace:5.0.8
-      '@pnpm/get-context': workspace:5.1.5
-      '@pnpm/headless': workspace:16.1.3
-      '@pnpm/hoist': workspace:5.2.0
-      '@pnpm/lifecycle': workspace:11.0.5
-      '@pnpm/link-bins': workspace:6.2.0
-      '@pnpm/lockfile-file': workspace:4.1.1
-      '@pnpm/lockfile-to-pnp': workspace:0.4.26
-      '@pnpm/lockfile-utils': workspace:3.0.8
-      '@pnpm/lockfile-walker': workspace:4.0.8
-      '@pnpm/logger': ^4.0.0
-      '@pnpm/manifest-utils': workspace:2.1.0
-      '@pnpm/modules-cleaner': workspace:11.0.12
-      '@pnpm/modules-yaml': workspace:9.0.4
-      '@pnpm/normalize-registries': workspace:2.0.4
-      '@pnpm/package-requester': workspace:15.1.2
-      '@pnpm/package-store': workspace:12.0.15
-      '@pnpm/parse-wanted-dependency': workspace:2.0.0
-      '@pnpm/prepare': workspace:0.0.26
-      '@pnpm/prune-lockfile': workspace:3.0.8
-      '@pnpm/read-modules-dir': workspace:3.0.1
-      '@pnpm/read-package-json': workspace:5.0.4
-      '@pnpm/read-project-manifest': workspace:2.0.5
-      '@pnpm/remove-bins': workspace:2.0.6
-      '@pnpm/resolve-dependencies': workspace:21.0.6
-      '@pnpm/resolver-base': workspace:8.0.4
-      '@pnpm/store-controller-types': workspace:11.0.5
-      '@pnpm/store-path': ^5.0.0
-      '@pnpm/symlink-dependency': workspace:4.0.5
-      '@pnpm/test-fixtures': workspace:*
-      '@pnpm/types': workspace:7.4.0
-      '@types/fs-extra': ^9.0.5
-      '@types/is-ci': ^3.0.0
-      '@types/is-windows': ^1.0.0
-      '@types/ncp': ^2.0.4
-      '@types/normalize-path': ^3.0.0
-      '@types/ramda': 0.27.39
-      '@types/semver': ^7.3.4
-      '@types/sinon': ^9.0.11
-      '@zkochan/npm-package-arg': ^2.0.1
-      '@zkochan/rimraf': ^2.1.1
-      anonymous-npm-registry-client: 0.1.2
-      deep-require-cwd: 1.0.0
-      dependency-path: workspace:8.0.4
-      execa: npm:safe-execa@^0.1.1
-      exists-link: 2.0.0
-      graph-sequencer: 2.0.0
-      is-ci: ^3.0.0
-      is-inner-link: ^4.0.0
-      is-subdir: ^1.1.1
-      is-windows: ^1.0.2
-      load-json-file: ^6.2.0
-      ncp: ^2.0.0
-      nock: 12.0.3
-      normalize-path: ^3.0.0
-      p-every: ^2.0.0
-      p-filter: ^2.1.0
-      p-limit: ^3.1.0
-      path-absolute: ^1.0.1
-      path-exists: ^4.0.0
-      path-name: ^1.0.0
-      ramda: ^0.27.1
-      read-yaml-file: ^2.1.0
-      resolve-link-target: ^2.0.0
-      run-groups: ^3.0.1
-      semver: ^7.3.4
-      semver-utils: ^1.1.4
-      sinon: ^11.1.1
-      supi: 'link:'
-      symlink-dir: ^5.0.0
-      version-selector-type: ^3.0.0
-      write-json-file: ^4.3.0
-      write-yaml-file: ^4.2.0
-    dependencies:
-      '@pnpm/build-modules': link:../build-modules
-      '@pnpm/constants': link:../constants
-      '@pnpm/core-loggers': link:../core-loggers
-      '@pnpm/error': link:../error
-      '@pnpm/filter-lockfile': link:../filter-lockfile
-      '@pnpm/get-context': link:../get-context
-      '@pnpm/headless': link:../headless
-      '@pnpm/hoist': link:../hoist
-      '@pnpm/lifecycle': link:../lifecycle
-      '@pnpm/link-bins': link:../link-bins
-      '@pnpm/lockfile-file': link:../lockfile-file
-      '@pnpm/lockfile-to-pnp': link:../lockfile-to-pnp
-      '@pnpm/lockfile-utils': link:../lockfile-utils
-      '@pnpm/lockfile-walker': link:../lockfile-walker
-      '@pnpm/manifest-utils': link:../manifest-utils
-      '@pnpm/modules-cleaner': link:../modules-cleaner
-      '@pnpm/modules-yaml': link:../modules-yaml
-      '@pnpm/normalize-registries': link:../normalize-registries
-      '@pnpm/package-requester': link:../package-requester
-      '@pnpm/parse-wanted-dependency': link:../parse-wanted-dependency
-      '@pnpm/prune-lockfile': link:../prune-lockfile
-      '@pnpm/read-modules-dir': link:../read-modules-dir
-      '@pnpm/read-package-json': link:../read-package-json
-      '@pnpm/read-project-manifest': link:../read-project-manifest
-      '@pnpm/remove-bins': link:../remove-bins
-      '@pnpm/resolve-dependencies': link:../resolve-dependencies
-      '@pnpm/resolver-base': link:../resolver-base
-      '@pnpm/store-controller-types': link:../store-controller-types
-      '@pnpm/symlink-dependency': link:../symlink-dependency
-      '@pnpm/types': link:../types
-      '@zkochan/npm-package-arg': 2.0.1
-      '@zkochan/rimraf': 2.1.1
-      dependency-path: link:../dependency-path
-      graph-sequencer: 2.0.0
-      is-inner-link: 4.0.0
-      is-subdir: 1.2.0
-      load-json-file: 6.2.0
-      normalize-path: 3.0.0
-      p-every: 2.0.0
-      p-filter: 2.1.0
-      p-limit: 3.1.0
-      path-absolute: 1.0.1
-      path-exists: 4.0.0
-      ramda: 0.27.1
-      run-groups: 3.0.1
-      semver: 7.3.5
-      semver-utils: 1.1.4
-      version-selector-type: 3.0.0
-    devDependencies:
-      '@pnpm/assert-project': link:../../privatePackages/assert-project
-      '@pnpm/assert-store': link:../../privatePackages/assert-store
-      '@pnpm/cafs': link:../cafs
-      '@pnpm/client': link:../client
-      '@pnpm/logger': 4.0.0
-      '@pnpm/package-store': link:../package-store
-      '@pnpm/prepare': link:../../privatePackages/prepare
-      '@pnpm/store-path': 5.0.0
-      '@pnpm/test-fixtures': link:../../privatePackages/test-fixtures
-      '@types/fs-extra': 9.0.13
-      '@types/is-ci': 3.0.0
-      '@types/is-windows': 1.0.0
-      '@types/ncp': 2.0.5
-      '@types/normalize-path': 3.0.0
-      '@types/ramda': 0.27.39
-      '@types/semver': 7.3.8
-      '@types/sinon': 9.0.11
-      anonymous-npm-registry-client: 0.1.2
-      deep-require-cwd: 1.0.0
-      execa: /safe-execa/0.1.1
-      exists-link: 2.0.0
-      is-ci: 3.0.0
-      is-windows: 1.0.2
-      ncp: 2.0.0
-      nock: 12.0.3
-      path-name: 1.0.0
-      read-yaml-file: 2.1.0
-      resolve-link-target: 2.0.0
-      sinon: 11.1.2
-      supi: 'link:'
-      symlink-dir: 5.0.1
-      write-json-file: 4.3.0
-      write-yaml-file: 4.2.0
-
   packages/symlink-dependency:
     specifiers:
       '@pnpm/core-loggers': workspace:6.0.4
@@ -3377,6 +3377,7 @@ importers:
 
   utils/eslint-config:
     specifiers:
+      '@pnpm/eslint-config': 'link:'
       '@typescript-eslint/eslint-plugin': ^5.0.0
       eslint-config-standard-with-typescript: ^21.0.1
       eslint-plugin-import: ^2.22.1
@@ -3388,6 +3389,8 @@ importers:
       eslint-plugin-import: 2.25.2_eslint@8.0.1
       eslint-plugin-node: 11.1.0_eslint@8.0.1
       eslint-plugin-promise: 5.1.0_eslint@8.0.1
+    devDependencies:
+      '@pnpm/eslint-config': 'link:'
 
   utils/get-release-text:
     specifiers:
diff --git a/renovate.json b/renovate.json
index cf60abfaf6..78cdb833aa 100644
--- a/renovate.json
+++ b/renovate.json
@@ -60,7 +60,7 @@
     "pnpm-file-reporter",
     "publish-packed",
     "remove-all-except-outer-links",
-    "supi",
+    "@pnpm/core",
     "ts-node",
     "@types/ramda",
     "@types/table"
diff --git a/utils/eslint-config/package.json b/utils/eslint-config/package.json
index 7d0c76c21d..6f33828300 100644
--- a/utils/eslint-config/package.json
+++ b/utils/eslint-config/package.json
@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=10"
   },
-  "repository": "https://github.com/pnpm/eslint-config/blob/master/packages/supi",
+  "repository": "https://github.com/pnpm/pnpm/blob/master/utils/eslint-config",
   "scripts": {},
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.0.0",