diff --git a/docs/cloud/projects.mdx b/docs/cloud/projects.mdx
index abf5c0ca59..491c762272 100644
--- a/docs/cloud/projects.mdx
+++ b/docs/cloud/projects.mdx
@@ -101,11 +101,11 @@ Projects generated from a template will come pre-configured with the official Cl
 `yarn add @payloadcms/plugin-cloud`
 
 ```js
-import { payloadCloud } from '@payloadcms/plugin-cloud'
+import { payloadCloudPlugin } from '@payloadcms/payload-cloud'
 import { buildConfig } from 'payload'
 
 export default buildConfig({
-  plugins: [payloadCloud()],
+  plugins: [payloadCloudPlugin()],
   // rest of config
 })
 ```
diff --git a/package.json b/package.json
index 76d7b21e0f..dfe608f1fb 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "build:live-preview-vue": "turbo build --filter \"@payloadcms/live-preview-vue\"",
     "build:next": "turbo build --filter \"@payloadcms/next\"",
     "build:payload": "turbo build --filter payload",
-    "build:plugin-cloud": "turbo build --filter \"@payloadcms/plugin-cloud\"",
+    "build:payload-cloud": "turbo build --filter \"@payloadcms/payload-cloud\"",
     "build:plugin-cloud-storage": "turbo build --filter \"@payloadcms/plugin-cloud-storage\"",
     "build:plugin-form-builder": "turbo build --filter \"@payloadcms/plugin-form-builder\"",
     "build:plugin-nested-docs": "turbo build --filter \"@payloadcms/plugin-nested-docs\"",
diff --git a/packages/create-payload-app/src/lib/init-next.ts b/packages/create-payload-app/src/lib/init-next.ts
index 58e12d3c97..ea5859fe6f 100644
--- a/packages/create-payload-app/src/lib/init-next.ts
+++ b/packages/create-payload-app/src/lib/init-next.ts
@@ -226,7 +226,7 @@ async function installDeps(projectDir: string, packageManager: PackageManager, d
     'payload',
     '@payloadcms/next',
     '@payloadcms/richtext-lexical',
-    '@payloadcms/plugin-cloud',
+    '@payloadcms/payload-cloud',
   ].map((pkg) => `${pkg}@beta`)
 
   packagesToInstall.push(`@payloadcms/db-${dbType}@beta`)
diff --git a/packages/create-payload-app/src/lib/replacements.ts b/packages/create-payload-app/src/lib/replacements.ts
index 731c640179..cc109e63ce 100644
--- a/packages/create-payload-app/src/lib/replacements.ts
+++ b/packages/create-payload-app/src/lib/replacements.ts
@@ -82,8 +82,8 @@ const vercelBlobStorageReplacement: StorageAdapterReplacement = {
 
 const payloadCloudReplacement: StorageAdapterReplacement = {
   configReplacement: ['    payloadCloudPlugin(),'],
-  importReplacement: "import { payloadCloudPlugin } from '@payloadcms/plugin-cloud'",
-  packageName: '@payloadcms/plugin-cloud',
+  importReplacement: "import { payloadCloudPlugin } from '@payloadcms/payload-cloud'",
+  packageName: '@payloadcms/payload-cloud',
 }
 
 // Removes placeholders
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index ba516280b7..6169108525 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -43,7 +43,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "prepack": "pnpm clean && pnpm turbo build",
-    "prepublishOnly": "pnpm clean && pnpm turbo build",
+    "prepublishOnly": "pnpm clean && pnpm turbo build --filter=./",
     "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"
   },
   "dependencies": {
diff --git a/packages/plugin-cloud/.gitignore b/packages/payload-cloud/.gitignore
similarity index 100%
rename from packages/plugin-cloud/.gitignore
rename to packages/payload-cloud/.gitignore
diff --git a/packages/plugin-cloud/.prettierignore b/packages/payload-cloud/.prettierignore
similarity index 100%
rename from packages/plugin-cloud/.prettierignore
rename to packages/payload-cloud/.prettierignore
diff --git a/packages/plugin-cloud/.swcrc-build b/packages/payload-cloud/.swcrc-build
similarity index 100%
rename from packages/plugin-cloud/.swcrc-build
rename to packages/payload-cloud/.swcrc-build
diff --git a/packages/plugin-cloud/LICENSE.md b/packages/payload-cloud/LICENSE.md
similarity index 100%
rename from packages/plugin-cloud/LICENSE.md
rename to packages/payload-cloud/LICENSE.md
diff --git a/packages/plugin-cloud/README.md b/packages/payload-cloud/README.md
similarity index 97%
rename from packages/plugin-cloud/README.md
rename to packages/payload-cloud/README.md
index 2d7ddc3f78..5b79f278bf 100644
--- a/packages/plugin-cloud/README.md
+++ b/packages/payload-cloud/README.md
@@ -18,10 +18,10 @@ Payload Cloud provides a caching for all upload collections by default through C
 
 Add the plugin to your Payload config
 
-`yarn add @payloadcms/plugin-cloud`
+`yarn add @payloadcms/payload-cloud`
 
 ```ts
-import { payloadCloud } from '@payloadcms/plugin-cloud'
+import { payloadCloud } from '@payloadcms/payload-cloud'
 import { buildConfig } from 'payload'
 
 export default buildConfig({
diff --git a/packages/plugin-cloud/eslint.config.js b/packages/payload-cloud/eslint.config.js
similarity index 100%
rename from packages/plugin-cloud/eslint.config.js
rename to packages/payload-cloud/eslint.config.js
diff --git a/packages/plugin-cloud/jest.config.js b/packages/payload-cloud/jest.config.js
similarity index 100%
rename from packages/plugin-cloud/jest.config.js
rename to packages/payload-cloud/jest.config.js
diff --git a/packages/plugin-cloud/package.json b/packages/payload-cloud/package.json
similarity index 95%
rename from packages/plugin-cloud/package.json
rename to packages/payload-cloud/package.json
index 0be2ac9583..d0804cabef 100644
--- a/packages/plugin-cloud/package.json
+++ b/packages/payload-cloud/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "@payloadcms/plugin-cloud",
+  "name": "@payloadcms/payload-cloud",
   "version": "3.0.0-beta.118",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
     "url": "https://github.com/payloadcms/payload.git",
-    "directory": "packages/plugin-cloud"
+    "directory": "packages/payload-cloud"
   },
   "license": "MIT",
   "type": "module",
diff --git a/packages/plugin-cloud/src/email.spec.ts b/packages/payload-cloud/src/email.spec.ts
similarity index 100%
rename from packages/plugin-cloud/src/email.spec.ts
rename to packages/payload-cloud/src/email.spec.ts
diff --git a/packages/plugin-cloud/src/email.ts b/packages/payload-cloud/src/email.ts
similarity index 95%
rename from packages/plugin-cloud/src/email.ts
rename to packages/payload-cloud/src/email.ts
index d4e1f2ae60..68d1a78383 100644
--- a/packages/plugin-cloud/src/email.ts
+++ b/packages/payload-cloud/src/email.ts
@@ -22,6 +22,7 @@ export const payloadCloudEmail = async (
   // Check if already has email configuration
 
   if (args.config.email) {
+    // eslint-disable-next-line no-console
     console.log(
       'Payload Cloud Email is enabled but email configuration is already provided in Payload config. If this is intentional, set `email: false` in the Payload Cloud plugin options.',
     )
@@ -37,6 +38,7 @@ export const payloadCloudEmail = async (
   const customDomains = customDomainEnvs.map((e) => process.env[e]).filter(Boolean)
 
   if (customDomains.length) {
+    // eslint-disable-next-line no-console
     console.log(
       `Configuring Payload Cloud Email for ${[defaultDomain, ...(customDomains || [])].join(', ')}`,
     )
diff --git a/packages/plugin-cloud/src/hooks/afterDelete.ts b/packages/payload-cloud/src/hooks/afterDelete.ts
similarity index 100%
rename from packages/plugin-cloud/src/hooks/afterDelete.ts
rename to packages/payload-cloud/src/hooks/afterDelete.ts
diff --git a/packages/plugin-cloud/src/hooks/beforeChange.ts b/packages/payload-cloud/src/hooks/beforeChange.ts
similarity index 100%
rename from packages/plugin-cloud/src/hooks/beforeChange.ts
rename to packages/payload-cloud/src/hooks/beforeChange.ts
diff --git a/packages/plugin-cloud/src/hooks/uploadCache.ts b/packages/payload-cloud/src/hooks/uploadCache.ts
similarity index 100%
rename from packages/plugin-cloud/src/hooks/uploadCache.ts
rename to packages/payload-cloud/src/hooks/uploadCache.ts
diff --git a/packages/plugin-cloud/src/index.ts b/packages/payload-cloud/src/index.ts
similarity index 100%
rename from packages/plugin-cloud/src/index.ts
rename to packages/payload-cloud/src/index.ts
diff --git a/packages/plugin-cloud/src/plugin.spec.ts b/packages/payload-cloud/src/plugin.spec.ts
similarity index 100%
rename from packages/plugin-cloud/src/plugin.spec.ts
rename to packages/payload-cloud/src/plugin.spec.ts
diff --git a/packages/plugin-cloud/src/plugin.ts b/packages/payload-cloud/src/plugin.ts
similarity index 100%
rename from packages/plugin-cloud/src/plugin.ts
rename to packages/payload-cloud/src/plugin.ts
diff --git a/packages/plugin-cloud/src/staticHandler.ts b/packages/payload-cloud/src/staticHandler.ts
similarity index 100%
rename from packages/plugin-cloud/src/staticHandler.ts
rename to packages/payload-cloud/src/staticHandler.ts
diff --git a/packages/plugin-cloud/src/types.ts b/packages/payload-cloud/src/types.ts
similarity index 100%
rename from packages/plugin-cloud/src/types.ts
rename to packages/payload-cloud/src/types.ts
diff --git a/packages/plugin-cloud/src/utilities/authAsCognitoUser.ts b/packages/payload-cloud/src/utilities/authAsCognitoUser.ts
similarity index 97%
rename from packages/plugin-cloud/src/utilities/authAsCognitoUser.ts
rename to packages/payload-cloud/src/utilities/authAsCognitoUser.ts
index f236161b61..3c2e6b8428 100644
--- a/packages/plugin-cloud/src/utilities/authAsCognitoUser.ts
+++ b/packages/payload-cloud/src/utilities/authAsCognitoUser.ts
@@ -30,7 +30,7 @@ export const authAsCognitoUser = async (
 
   const result: CognitoUserSession = await new Promise((resolve, reject) => {
     cognitoUser.authenticateUser(authenticationDetails, {
-      onFailure: (err) => {
+      onFailure: (err: Error) => {
         reject(err)
       },
       onSuccess: (res) => {
diff --git a/packages/plugin-cloud/src/utilities/createKey.ts b/packages/payload-cloud/src/utilities/createKey.ts
similarity index 100%
rename from packages/plugin-cloud/src/utilities/createKey.ts
rename to packages/payload-cloud/src/utilities/createKey.ts
diff --git a/packages/plugin-cloud/src/utilities/getIncomingFiles.ts b/packages/payload-cloud/src/utilities/getIncomingFiles.ts
similarity index 100%
rename from packages/plugin-cloud/src/utilities/getIncomingFiles.ts
rename to packages/payload-cloud/src/utilities/getIncomingFiles.ts
diff --git a/packages/plugin-cloud/src/utilities/getStorageClient.ts b/packages/payload-cloud/src/utilities/getStorageClient.ts
similarity index 97%
rename from packages/plugin-cloud/src/utilities/getStorageClient.ts
rename to packages/payload-cloud/src/utilities/getStorageClient.ts
index bd431f5323..4867e0c68b 100644
--- a/packages/plugin-cloud/src/utilities/getStorageClient.ts
+++ b/packages/payload-cloud/src/utilities/getStorageClient.ts
@@ -43,7 +43,7 @@ export const getStorageClient: GetStorageClient = async () => {
 
   const credentials = await cognitoIdentity.config.credentials()
 
-  // @ts-expect-error
+  // @ts-expect-error - Incorrect AWS types
   identityID = credentials.identityId
 
   storageClient = new AWS.S3({
diff --git a/packages/plugin-cloud/tsconfig.json b/packages/payload-cloud/tsconfig.json
similarity index 100%
rename from packages/plugin-cloud/tsconfig.json
rename to packages/payload-cloud/tsconfig.json
diff --git a/packages/payload/src/versions/payloadPackageList.ts b/packages/payload/src/versions/payloadPackageList.ts
index 076e586e91..cd45da1e0e 100644
--- a/packages/payload/src/versions/payloadPackageList.ts
+++ b/packages/payload/src/versions/payloadPackageList.ts
@@ -11,7 +11,7 @@ export const PAYLOAD_PACKAGE_LIST = [
   '@payloadcms/live-preview',
   '@payloadcms/next/utilities',
   '@payloadcms/plugin-cloud-storage',
-  '@payloadcms/plugin-cloud',
+  '@payloadcms/payload-cloud',
   '@payloadcms/plugin-form-builder',
   '@payloadcms/plugin-nested-docs',
   '@payloadcms/plugin-redirects',
diff --git a/packages/plugin-cloud/src/admin.js b/packages/plugin-cloud/src/admin.js
deleted file mode 100644
index 8af775a671..0000000000
--- a/packages/plugin-cloud/src/admin.js
+++ /dev/null
@@ -1 +0,0 @@
-export const payloadCloud = () => (config) => config
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e0977f0dd9..2fd93d7bb8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -925,7 +925,7 @@ importers:
         specifier: 0.32.6
         version: 0.32.6
 
-  packages/plugin-cloud:
+  packages/payload-cloud:
     dependencies:
       '@aws-sdk/client-cognito-identity':
         specifier: ^3.614.0
@@ -1645,9 +1645,9 @@ importers:
       '@payloadcms/next':
         specifier: workspace:*
         version: link:../packages/next
-      '@payloadcms/plugin-cloud':
+      '@payloadcms/payload-cloud':
         specifier: workspace:*
-        version: link:../packages/plugin-cloud
+        version: link:../packages/payload-cloud
       '@payloadcms/plugin-cloud-storage':
         specifier: workspace:*
         version: link:../packages/plugin-cloud-storage
diff --git a/scripts/lib/publishList.ts b/scripts/lib/publishList.ts
index a81c5c210f..9487615e0d 100644
--- a/scripts/lib/publishList.ts
+++ b/scripts/lib/publishList.ts
@@ -36,6 +36,7 @@ export const packagePublishList = [
   'storage-uploadthing',
 
   // Plugins
+  'payload-cloud',
   'plugin-cloud',
   'plugin-cloud-storage',
   'plugin-form-builder',
diff --git a/test/import-test/import-all-2-exports.ts b/test/import-test/import-all-2-exports.ts
index 9409fd61a9..580da50fcf 100644
--- a/test/import-test/import-all-2-exports.ts
+++ b/test/import-test/import-all-2-exports.ts
@@ -342,7 +342,7 @@ import {
 } from '@payloadcms/db-postgres'
 import { handleMessage, mergeData, ready, subscribe, unsubscribe } from '@payloadcms/live-preview'
 import { useLivePreview } from '@payloadcms/live-preview-react'
-import { createKey, getStorageClient, payloadCloud } from '@payloadcms/plugin-cloud'
+import { createKey, getStorageClient, payloadCloud } from '@payloadcms/payload-cloud'
 import { cloudStorage } from '@payloadcms/plugin-cloud-storage'
 import { fields, getPaymentTotal } from '@payloadcms/plugin-form-builder'
 import {
diff --git a/test/package.json b/test/package.json
index d377bcb4c8..12101ffceb 100644
--- a/test/package.json
+++ b/test/package.json
@@ -38,7 +38,7 @@
     "@payloadcms/live-preview": "workspace:*",
     "@payloadcms/live-preview-react": "workspace:*",
     "@payloadcms/next": "workspace:*",
-    "@payloadcms/plugin-cloud": "workspace:*",
+    "@payloadcms/payload-cloud": "workspace:*",
     "@payloadcms/plugin-cloud-storage": "workspace:*",
     "@payloadcms/plugin-form-builder": "workspace:*",
     "@payloadcms/plugin-nested-docs": "workspace:*",
diff --git a/test/plugin-cloud/collections/Media.ts b/test/payload-cloud/collections/Media.ts
similarity index 100%
rename from test/plugin-cloud/collections/Media.ts
rename to test/payload-cloud/collections/Media.ts
diff --git a/test/plugin-cloud/collections/Users.ts b/test/payload-cloud/collections/Users.ts
similarity index 100%
rename from test/plugin-cloud/collections/Users.ts
rename to test/payload-cloud/collections/Users.ts
diff --git a/test/plugin-cloud/config.ts b/test/payload-cloud/config.ts
similarity index 94%
rename from test/plugin-cloud/config.ts
rename to test/payload-cloud/config.ts
index f7b99f7332..7e11881103 100644
--- a/test/plugin-cloud/config.ts
+++ b/test/payload-cloud/config.ts
@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'node:url'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
-import { payloadCloudPlugin } from '@payloadcms/plugin-cloud'
+import { payloadCloudPlugin } from '@payloadcms/payload-cloud'
 import dotenv from 'dotenv'
 import path from 'path'
 
diff --git a/test/plugin-cloud/eslint.config.js b/test/payload-cloud/eslint.config.js
similarity index 100%
rename from test/plugin-cloud/eslint.config.js
rename to test/payload-cloud/eslint.config.js
diff --git a/test/plugin-cloud/int.spec.ts b/test/payload-cloud/int.spec.ts
similarity index 100%
rename from test/plugin-cloud/int.spec.ts
rename to test/payload-cloud/int.spec.ts
diff --git a/test/plugin-cloud/payload-types.ts b/test/payload-cloud/payload-types.ts
similarity index 100%
rename from test/plugin-cloud/payload-types.ts
rename to test/payload-cloud/payload-types.ts
diff --git a/test/plugin-cloud/tsconfig.eslint.json b/test/payload-cloud/tsconfig.eslint.json
similarity index 100%
rename from test/plugin-cloud/tsconfig.eslint.json
rename to test/payload-cloud/tsconfig.eslint.json
diff --git a/test/plugin-cloud/tsconfig.json b/test/payload-cloud/tsconfig.json
similarity index 100%
rename from test/plugin-cloud/tsconfig.json
rename to test/payload-cloud/tsconfig.json
diff --git a/test/setupProd.ts b/test/setupProd.ts
index e9cc523a12..8dfb48a8d6 100644
--- a/test/setupProd.ts
+++ b/test/setupProd.ts
@@ -20,7 +20,7 @@ export const tgzToPkgNameMap = {
   '@payloadcms/live-preview': 'payloadcms-live-preview-*',
   '@payloadcms/live-preview-react': 'payloadcms-live-preview-react-*',
   '@payloadcms/next': 'payloadcms-next-*',
-  '@payloadcms/plugin-cloud': 'payloadcms-plugin-cloud-*',
+  '@payloadcms/payload-cloud': 'payloadcms-payload-cloud-*',
   '@payloadcms/plugin-cloud-storage': 'payloadcms-plugin-cloud-storage-*',
   '@payloadcms/plugin-form-builder': 'payloadcms-plugin-form-builder-*',
   '@payloadcms/plugin-nested-docs': 'payloadcms-plugin-nested-docs-*',
diff --git a/test/tsconfig.typecheck.json b/test/tsconfig.typecheck.json
index b5d2267a37..b8b427da75 100644
--- a/test/tsconfig.typecheck.json
+++ b/test/tsconfig.typecheck.json
@@ -63,7 +63,7 @@
       "path": "../packages/plugin-cloud-storage"
     },
     {
-      "path": "../packages/plugin-cloud"
+      "path": "../packages/payload-cloud"
     },
     {
       "path": "../packages/plugin-form-builder"
diff --git a/tsconfig.json b/tsconfig.json
index d28ddbca63..6795fac0ab 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -137,7 +137,7 @@
       "path": "./packages/plugin-cloud-storage"
     },
     {
-      "path": "./packages/plugin-cloud"
+      "path": "./packages/payload-cloud"
     },
     {
       "path": "./packages/plugin-form-builder"