diff --git a/AGENTS.md b/AGENTS.md
index 5426eaa0..50b001de 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,7 +1,7 @@
 
 - this is a monorepo project; packages:
   - ./packages/b2c-cli - the command line interface built with oclif
-  - ./packages/b2c-tooling - the SDK/library for B2C Commerce operations; support the CLI and can be used standalone
+  - ./packages/b2c-tooling-sdk - the SDK/library for B2C Commerce operations; support the CLI and can be used standalone
 
 ## Setup/Packaging
 
@@ -14,22 +14,22 @@
 
 - prefer verbose jsdoc comments for all public methods and classes
 - TypeDoc and vitepress will generate documentation from these comments in the `./docs/api` folder
-- module level jsdocs will be used for organization; for example packages/b2c-tooling/src/auth/index.ts barrel file has the module level docs for the `auth` module
+- module level jsdocs will be used for organization; for example packages/b2c-tooling-sdk/src/auth/index.ts barrel file has the module level docs for the `auth` module
 - see the typedoc.json file for configuration options including the entry points for documentation generation
 - update the docs/ markdown files (non-generated) for user guides and CLI reference when updating major CLI functionalty or adding new commands
 
 ## Logging
 
-- when logging use the logger instance from `@salesforce/b2c-tooling/logger` package
+- when logging use the logger instance from `@salesforce/b2c-tooling-sdk/logger` package
 - CLI commands have access to this logger via `this.log` method from oclif Command class
 - CLI commands can write directly to stdout/stderr if their primary purpose is to output or stream data
 
 ## Table Output
 
-When rendering tabular data in CLI commands, use the shared `TableRenderer` utility from `@salesforce/b2c-tooling/cli`:
+When rendering tabular data in CLI commands, use the shared `TableRenderer` utility from `@salesforce/b2c-tooling-sdk/cli`:
 
 ```typescript
-import { createTable, type ColumnDef } from '@salesforce/b2c-tooling/cli';
+import { createTable, type ColumnDef } from '@salesforce/b2c-tooling-sdk/cli';
 
 // Define columns with header and getter function
 const COLUMNS: Record<string, ColumnDef<MyDataType>> = {
diff --git a/README.md b/README.md
index 2e38c739..1bf81e6b 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This is a pnpm monorepo with the following packages:
 | Package | Description |
 |---------|-------------|
 | [`@salesforce/b2c-cli`](./packages/b2c-cli/README.md) | Command line interface built with oclif |
-| [`@salesforce/b2c-tooling`](./packages/b2c-tooling/README.md) | SDK/library for B2C Commerce operations; supports the CLI and can be used standalone |
+| [`@salesforce/b2c-tooling-sdk`](./packages/b2c-tooling-sdk/README.md) | SDK/library for B2C Commerce operations; supports the CLI and can be used standalone |
 
 ## Development
 
@@ -46,7 +46,7 @@ pnpm --filter @salesforce/b2c-cli run dev
 ./cli
 ```
 
-The dev mode uses Node.js `--conditions=development` to resolve TypeScript source files directly from `@salesforce/b2c-tooling` without needing to build first.
+The dev mode uses Node.js `--conditions=development` to resolve TypeScript source files directly from `@salesforce/b2c-tooling-sdk` without needing to build first.
 
 ### Building
 
@@ -56,7 +56,7 @@ pnpm -r run build
 
 # Build individual packages
 pnpm --filter @salesforce/b2c-cli run build
-pnpm --filter @salesforce/b2c-tooling run build
+pnpm --filter @salesforce/b2c-tooling-sdk run build
 ```
 
 ### Testing and Linting
@@ -67,7 +67,7 @@ pnpm test
 
 # Run linter only
 pnpm --filter @salesforce/b2c-cli run lint
-pnpm --filter @salesforce/b2c-tooling run lint
+pnpm --filter @salesforce/b2c-tooling-sdk run lint
 ```
 
 ### Code Formatting
@@ -116,7 +116,7 @@ pnpm run docs:preview
 
 ### API Documentation
 
-API documentation is auto-generated from JSDoc comments in the `@salesforce/b2c-tooling` package. The entry points are defined in `typedoc.json`:
+API documentation is auto-generated from JSDoc comments in the `@salesforce/b2c-tooling-sdk` package. The entry points are defined in `typedoc.json`:
 
 See the [documentation site](https://verbose-adventure-1eqmr1r.pages.github.io/) for the generated API reference.
 
@@ -133,12 +133,12 @@ When adding new public APIs, ensure they have comprehensive JSDoc comments as th
 
 ## Package Exports
 
-The `@salesforce/b2c-tooling` package uses the `exports` field in package.json to define its public API surface. Each module is available as a subpath export:
+The `@salesforce/b2c-tooling-sdk` package uses the `exports` field in package.json to define its public API surface. Each module is available as a subpath export:
 
 ```typescript
-import { OAuthStrategy } from '@salesforce/b2c-tooling/auth';
-import { B2CInstance } from '@salesforce/b2c-tooling/instance';
-import { getLogger } from '@salesforce/b2c-tooling/logging';
+import { OAuthStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+import { B2CInstance } from '@salesforce/b2c-tooling-sdk/instance';
+import { getLogger } from '@salesforce/b2c-tooling-sdk/logging';
 ```
 
 The `development` condition in exports enables direct TypeScript source resolution when using `--conditions=development`, which is how `bin/dev.js` works for local development.
diff --git a/b2c_log_center_stream3.png b/b2c_log_center_stream3.png
new file mode 100644
index 00000000..a8fb13b8
Binary files /dev/null and b/b2c_log_center_stream3.png differ
diff --git a/docs/api-readme.md b/docs/api-readme.md
index 25964f4c..3904213e 100644
--- a/docs/api-readme.md
+++ b/docs/api-readme.md
@@ -1,11 +1,11 @@
 # API Reference
 
-The `@salesforce/b2c-tooling` package provides a programmatic API for interacting with Salesforce B2C Commerce instances.
+The `@salesforce/b2c-tooling-sdk` package provides a programmatic API for interacting with Salesforce B2C Commerce instances.
 
 ## Installation
 
 ```bash
-npm install @salesforce/b2c-tooling
+npm install @salesforce/b2c-tooling-sdk
 ```
 
 ## Quick Start
@@ -15,7 +15,7 @@ npm install @salesforce/b2c-tooling
 The easiest way to create an instance is from a `dw.json` file:
 
 ```typescript
-import { B2CInstance } from '@salesforce/b2c-tooling';
+import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
 
 // Load configuration from dw.json, override secrets from environment
 const instance = B2CInstance.fromDwJson({
@@ -38,7 +38,7 @@ const { data, error } = await instance.ocapi.GET('/sites', {
 You can also construct an instance directly with configuration:
 
 ```typescript
-import { B2CInstance } from '@salesforce/b2c-tooling';
+import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
 
 const instance = new B2CInstance(
   { hostname: 'your-sandbox.demandware.net', codeVersion: 'v1' },
@@ -145,7 +145,7 @@ const { data, error } = await instance.ocapi.PATCH('/code_versions/{code_version
 Configure logging for debugging HTTP requests:
 
 ```typescript
-import { configureLogger } from '@salesforce/b2c-tooling/logging';
+import { configureLogger } from '@salesforce/b2c-tooling-sdk/logging';
 
 // Enable debug logging (shows HTTP request summaries)
 configureLogger({ level: 'debug' });
diff --git a/docs/guide/index.md b/docs/guide/index.md
index eb070d5c..fda367a0 100644
--- a/docs/guide/index.md
+++ b/docs/guide/index.md
@@ -20,12 +20,12 @@ The command-line interface that you interact with directly. It provides a set of
 b2c code deploy --server your-instance.demandware.net
 ```
 
-### @salesforce/b2c-tooling
+### @salesforce/b2c-tooling-sdk
 
 The underlying SDK library that powers the CLI. You can use this package directly in your own Node.js applications to automate B2C Commerce operations.
 
 ```typescript
-import { uploadCartridges, B2CInstance } from '@salesforce/b2c-tooling';
+import { uploadCartridges, B2CInstance } from '@salesforce/b2c-tooling-sdk';
 
 const instance = new B2CInstance({
   server: 'your-instance.demandware.net',
diff --git a/docs/guide/installation.md b/docs/guide/installation.md
index eb29013c..2c598c28 100644
--- a/docs/guide/installation.md
+++ b/docs/guide/installation.md
@@ -40,15 +40,15 @@ If you want to use the SDK library in your own projects:
 ::: code-group
 
 ```bash [npm]
-npm install @salesforce/b2c-tooling
+npm install @salesforce/b2c-tooling-sdk
 ```
 
 ```bash [pnpm]
-pnpm add @salesforce/b2c-tooling
+pnpm add @salesforce/b2c-tooling-sdk
 ```
 
 ```bash [yarn]
-yarn add @salesforce/b2c-tooling
+yarn add @salesforce/b2c-tooling-sdk
 ```
 
 :::
diff --git a/docs/index.md b/docs/index.md
index ae36e9f4..43c3d1c7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -24,5 +24,5 @@ features:
   - title: Managed Runtime
     details: Configure and manage MRT environments and environment variables.
   - title: SDK Library
-    details: Use the @salesforce/b2c-tooling package to build your own integrations.
+    details: Use the @salesforce/b2c-tooling-sdk package to build your own integrations.
 ---
diff --git a/dw.json.bak b/dw.json.bak
new file mode 120000
index 00000000..c4b894ec
--- /dev/null
+++ b/dw.json.bak
@@ -0,0 +1 @@
+/Users/clavery/code/b2c-commerce-industries/dw.json
\ No newline at end of file
diff --git a/easy-setup-step-by-step.sh b/easy-setup-step-by-step.sh
new file mode 100644
index 00000000..17db539e
--- /dev/null
+++ b/easy-setup-step-by-step.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+export SFCC_MRT_PROJECT=cli
+export REALM="zzpq"
+export SFCC_CLIENT_ID="a0a4deb0-5e03-477b-bfdc-e42ccfae6161"
+
+b2c ods create -r $REALM --wait --ttl 0
+
+# create mrt env called chuck in the cli project
+b2c mrt env create chuck --name chuck \
+  --allow-cookies \
+  --proxy api=kv7kzm78.api.commercecloud.salesforce.com \
+  --proxy einstein=api.cquotient.com
+
+# construct redirect-uri from ssr_external_hostname above and don't use localhost:3000
+b2c slas client create \
+  --channels MarketStreet \
+  --tenant-id zzpq_014 \
+  --short-code kv7kzm78 \
+  --redirect-uri https://myproject-chuck.sfdc-8tgtt5-ecom1.exp-delivery.com/callback,http://localhost:3000/callback \
+  --default-scopes
+
+# get clientId and COMMERCE_API_SLAS_SECRET from the output of the previous command and callback from the redirect-uri above
+b2c mrt env var set -e chuck \
+  PUBLIC__app__commerce__api__clientId=5810be72-3b2f-49bc-8ca1-eb88119de2fa \
+  PUBLIC__app__commerce__api__organizationId=f_ecom_zzpq_014 \
+  PUBLIC__app__commerce__api__siteId=RefArch \
+  PUBLIC__app__commerce__api__shortCode= \
+  PUBLIC__app__commerce__api__callback=https://myproject-chuck.sfdc-8tgtt5-ecom1.exp-delivery.com/callback \
+  PUBLIC__app__commerce__api__privateKeyEnabled=true \
+  COMMERCE_API_SLAS_SECRET=sk_kasdjlkjsalkjasd
+
+# import market street data from storefront-datasets repo
+b2c job import --server zzpq-014.dx.commercecloud.salesforce.com ~/code/storefront-datasets/demo_data_marketstreet
+
+b2c code deploy
+b2c mrt push -e headertest -p cli -b ~/code/SFCC-Odyssey/packages/template-retail-rsc-app/build --ssr-only='ssr.js,ssr.mjs,chunk.mjs,server/**/*'
+
+
diff --git a/easy-setup.sh b/easy-setup.sh
new file mode 100755
index 00000000..0a2b88c1
--- /dev/null
+++ b/easy-setup.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Configuration - modify these values for your setup
+ENV_SLUG="demo15"
+ENV_NAME="demo15"
+SITE_ID="RefArch"
+TENANT_ID="zzpq_013"
+ORGANIZATION_ID="f_ecom_zzsa_009"
+SHORT_CODE="kv7kzm78"
+BUILD_PATH="${BUILD_PATH:-$HOME/code/SFCC-Odyssey/packages/template-retail-rsc-app/build}"
+
+export SFCC_MRT_PROJECT="${SFCC_MRT_PROJECT:-cli}"
+
+echo "=== Step 1: Creating MRT environment ==="
+ENV_JSON=$(b2c mrt env create "$ENV_SLUG" --name "$ENV_NAME" --json)
+echo "Environment created."
+
+# Extract the external hostname for the callback URL
+SSR_EXTERNAL_HOSTNAME=$(echo "$ENV_JSON" | jq -r '.ssr_external_hostname // empty')
+if [[ -z "$SSR_EXTERNAL_HOSTNAME" ]]; then
+  # Fall back to hostname if external hostname not set
+  SSR_EXTERNAL_HOSTNAME=$(echo "$ENV_JSON" | jq -r '.hostname // empty')
+fi
+
+if [[ -z "$SSR_EXTERNAL_HOSTNAME" ]]; then
+  echo "Warning: Could not determine external hostname from environment. Using localhost."
+  CALLBACK_URL="http://localhost:3000/callback"
+else
+  CALLBACK_URL="https://${SSR_EXTERNAL_HOSTNAME}/callback"
+fi
+echo "Callback URL: $CALLBACK_URL"
+
+echo ""
+echo "=== Step 2: Creating SLAS client ==="
+SLAS_JSON=$(b2c slas client create --channels "$SITE_ID" \
+  --redirect-uri "$CALLBACK_URL" \
+  --default-scopes \
+  --tenant-id "$TENANT_ID" \
+  --json)
+echo "SLAS client created."
+
+# Extract client ID and secret from SLAS response
+CLIENT_ID=$(echo "$SLAS_JSON" | jq -r '.clientId')
+CLIENT_SECRET=$(echo "$SLAS_JSON" | jq -r '.secret // empty')
+
+if [[ -z "$CLIENT_ID" ]]; then
+  echo "Error: Failed to get client ID from SLAS response"
+  exit 1
+fi
+
+echo "Client ID: $CLIENT_ID"
+if [[ -n "$CLIENT_SECRET" ]]; then
+  echo "Client Secret: $CLIENT_SECRET (save this - it won't be shown again)"
+fi
+
+echo ""
+echo "=== Step 3: Setting environment variables ==="
+b2c mrt env var set -e "$ENV_SLUG" \
+  "PUBLIC__app__commerce__api__clientId=$CLIENT_ID" \
+  "PUBLIC__app__commerce__api__organizationId=$ORGANIZATION_ID" \
+  "PUBLIC__app__commerce__api__siteId=$SITE_ID" \
+  "PUBLIC__app__commerce__api__shortCode=$SHORT_CODE" \
+  "PUBLIC__app__commerce__api__proxy=/mobify/proxy/api" \
+  "PUBLIC__app__commerce__api__callback=$CALLBACK_URL" \
+  "PUBLIC__app__commerce__api__privateKeyEnabled=true" \
+  ${CLIENT_SECRET:+"COMMERCE_API_SLAS_SECRET=$CLIENT_SECRET"}
+
+echo ""
+echo "=== Step 4: Deploying code ==="
+b2c code deploy
+
+echo ""
+echo "=== Step 5: Importing job data ==="
+b2c job import data/urls
+
+echo ""
+echo "=== Step 6: Pushing to MRT ==="
+b2c mrt push -e "$ENV_SLUG" -b "$BUILD_PATH"
+
+echo ""
+echo "=== Setup Complete ==="
+echo "Environment: $ENV_SLUG"
+echo "Client ID: $CLIENT_ID"
+echo "URL: https://${SSR_EXTERNAL_HOSTNAME:-localhost:3000}"
diff --git a/packages/b2c-cli/package.json b/packages/b2c-cli/package.json
index 0bd3d2fb..30bec83b 100644
--- a/packages/b2c-cli/package.json
+++ b/packages/b2c-cli/package.json
@@ -14,7 +14,7 @@
     "@oclif/plugin-not-found": "^3",
     "@oclif/plugin-autocomplete": "^3",
     "@oclif/plugin-version": "^2",
-    "@salesforce/b2c-tooling": "workspace:*",
+    "@salesforce/b2c-tooling-sdk": "workspace:*",
     "cliui": "^9.0.1"
   },
   "devDependencies": {
diff --git a/packages/b2c-cli/src/commands/_test/index.ts b/packages/b2c-cli/src/commands/_test/index.ts
index 7fe0eddd..10e3112f 100644
--- a/packages/b2c-cli/src/commands/_test/index.ts
+++ b/packages/b2c-cli/src/commands/_test/index.ts
@@ -1,4 +1,4 @@
-import {BaseCommand} from '@salesforce/b2c-tooling/cli';
+import {BaseCommand} from '@salesforce/b2c-tooling-sdk/cli';
 
 export default class Test extends BaseCommand<typeof Test> {
   static description = 'Test logging output';
diff --git a/packages/b2c-cli/src/commands/auth/token.ts b/packages/b2c-cli/src/commands/auth/token.ts
index 9c68287c..959e23f2 100644
--- a/packages/b2c-cli/src/commands/auth/token.ts
+++ b/packages/b2c-cli/src/commands/auth/token.ts
@@ -1,6 +1,6 @@
 import {ux} from '@oclif/core';
-import {OAuthCommand} from '@salesforce/b2c-tooling/cli';
-import type {AccessTokenResponse} from '@salesforce/b2c-tooling/auth';
+import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {AccessTokenResponse} from '@salesforce/b2c-tooling-sdk/auth';
 import {t} from '../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/code/activate.ts b/packages/b2c-cli/src/commands/code/activate.ts
index d20b0520..de3f2d24 100644
--- a/packages/b2c-cli/src/commands/code/activate.ts
+++ b/packages/b2c-cli/src/commands/code/activate.ts
@@ -1,6 +1,6 @@
 import {Args, Flags} from '@oclif/core';
-import {InstanceCommand} from '@salesforce/b2c-tooling/cli';
-import {activateCodeVersion, reloadCodeVersion} from '@salesforce/b2c-tooling/operations/code';
+import {InstanceCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {activateCodeVersion, reloadCodeVersion} from '@salesforce/b2c-tooling-sdk/operations/code';
 import {t} from '../../i18n/index.js';
 
 export default class CodeActivate extends InstanceCommand<typeof CodeActivate> {
diff --git a/packages/b2c-cli/src/commands/code/delete.ts b/packages/b2c-cli/src/commands/code/delete.ts
index 534d77ff..fd80ebdb 100644
--- a/packages/b2c-cli/src/commands/code/delete.ts
+++ b/packages/b2c-cli/src/commands/code/delete.ts
@@ -1,7 +1,7 @@
 import * as readline from 'node:readline';
 import {Args, Flags} from '@oclif/core';
-import {InstanceCommand} from '@salesforce/b2c-tooling/cli';
-import {deleteCodeVersion} from '@salesforce/b2c-tooling/operations/code';
+import {InstanceCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {deleteCodeVersion} from '@salesforce/b2c-tooling-sdk/operations/code';
 import {t} from '../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/code/deploy.ts b/packages/b2c-cli/src/commands/code/deploy.ts
index a6f3e489..4d464261 100644
--- a/packages/b2c-cli/src/commands/code/deploy.ts
+++ b/packages/b2c-cli/src/commands/code/deploy.ts
@@ -3,8 +3,8 @@ import {
   findAndDeployCartridges,
   getActiveCodeVersion,
   type DeployResult,
-} from '@salesforce/b2c-tooling/operations/code';
-import {CartridgeCommand} from '@salesforce/b2c-tooling/cli';
+} from '@salesforce/b2c-tooling-sdk/operations/code';
+import {CartridgeCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {t} from '../../i18n/index.js';
 
 export default class CodeDeploy extends CartridgeCommand<typeof CodeDeploy> {
diff --git a/packages/b2c-cli/src/commands/code/list.ts b/packages/b2c-cli/src/commands/code/list.ts
index 953d2338..6e59e616 100644
--- a/packages/b2c-cli/src/commands/code/list.ts
+++ b/packages/b2c-cli/src/commands/code/list.ts
@@ -1,6 +1,6 @@
 import {ux} from '@oclif/core';
-import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling/cli';
-import {listCodeVersions, type CodeVersion, type CodeVersionResult} from '@salesforce/b2c-tooling/operations/code';
+import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
+import {listCodeVersions, type CodeVersion, type CodeVersionResult} from '@salesforce/b2c-tooling-sdk/operations/code';
 import {t} from '../../i18n/index.js';
 
 const COLUMNS: Record<string, ColumnDef<CodeVersion>> = {
diff --git a/packages/b2c-cli/src/commands/code/watch.ts b/packages/b2c-cli/src/commands/code/watch.ts
index bea62d5b..b414332c 100644
--- a/packages/b2c-cli/src/commands/code/watch.ts
+++ b/packages/b2c-cli/src/commands/code/watch.ts
@@ -1,5 +1,5 @@
-import {watchCartridges} from '@salesforce/b2c-tooling/operations/code';
-import {CartridgeCommand} from '@salesforce/b2c-tooling/cli';
+import {watchCartridges} from '@salesforce/b2c-tooling-sdk/operations/code';
+import {CartridgeCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {t} from '../../i18n/index.js';
 
 export default class CodeWatch extends CartridgeCommand<typeof CodeWatch> {
diff --git a/packages/b2c-cli/src/commands/job/export.ts b/packages/b2c-cli/src/commands/job/export.ts
index 377704a4..53d0571b 100644
--- a/packages/b2c-cli/src/commands/job/export.ts
+++ b/packages/b2c-cli/src/commands/job/export.ts
@@ -1,11 +1,11 @@
 import {Flags} from '@oclif/core';
-import {JobCommand} from '@salesforce/b2c-tooling/cli';
+import {JobCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   siteArchiveExportToPath,
   JobExecutionError,
   type SiteArchiveExportResult,
   type ExportDataUnitsConfiguration,
-} from '@salesforce/b2c-tooling/operations/jobs';
+} from '@salesforce/b2c-tooling-sdk/operations/jobs';
 import {t} from '../../i18n/index.js';
 
 export default class JobExport extends JobCommand<typeof JobExport> {
diff --git a/packages/b2c-cli/src/commands/job/import.ts b/packages/b2c-cli/src/commands/job/import.ts
index 73e6ab0c..cc79d381 100644
--- a/packages/b2c-cli/src/commands/job/import.ts
+++ b/packages/b2c-cli/src/commands/job/import.ts
@@ -1,10 +1,10 @@
 import {Args, Flags} from '@oclif/core';
-import {JobCommand} from '@salesforce/b2c-tooling/cli';
+import {JobCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   siteArchiveImport,
   JobExecutionError,
   type SiteArchiveImportResult,
-} from '@salesforce/b2c-tooling/operations/jobs';
+} from '@salesforce/b2c-tooling-sdk/operations/jobs';
 import {t} from '../../i18n/index.js';
 
 export default class JobImport extends JobCommand<typeof JobImport> {
diff --git a/packages/b2c-cli/src/commands/job/run.ts b/packages/b2c-cli/src/commands/job/run.ts
index f01f4ad9..f96af01d 100644
--- a/packages/b2c-cli/src/commands/job/run.ts
+++ b/packages/b2c-cli/src/commands/job/run.ts
@@ -1,6 +1,11 @@
 import {Args, Flags} from '@oclif/core';
-import {JobCommand} from '@salesforce/b2c-tooling/cli';
-import {executeJob, waitForJob, JobExecutionError, type JobExecution} from '@salesforce/b2c-tooling/operations/jobs';
+import {JobCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {
+  executeJob,
+  waitForJob,
+  JobExecutionError,
+  type JobExecution,
+} from '@salesforce/b2c-tooling-sdk/operations/jobs';
 import {t} from '../../i18n/index.js';
 
 export default class JobRun extends JobCommand<typeof JobRun> {
diff --git a/packages/b2c-cli/src/commands/job/search.ts b/packages/b2c-cli/src/commands/job/search.ts
index 95af973e..f67ca7dc 100644
--- a/packages/b2c-cli/src/commands/job/search.ts
+++ b/packages/b2c-cli/src/commands/job/search.ts
@@ -1,10 +1,10 @@
 import {Flags, ux} from '@oclif/core';
-import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling/cli';
+import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   searchJobExecutions,
   type JobExecutionSearchResult,
   type JobExecution,
-} from '@salesforce/b2c-tooling/operations/jobs';
+} from '@salesforce/b2c-tooling-sdk/operations/jobs';
 import {t} from '../../i18n/index.js';
 
 const COLUMNS: Record<string, ColumnDef<JobExecution>> = {
diff --git a/packages/b2c-cli/src/commands/job/wait.ts b/packages/b2c-cli/src/commands/job/wait.ts
index fafde227..848504b0 100644
--- a/packages/b2c-cli/src/commands/job/wait.ts
+++ b/packages/b2c-cli/src/commands/job/wait.ts
@@ -1,6 +1,6 @@
 import {Args, Flags} from '@oclif/core';
-import {JobCommand} from '@salesforce/b2c-tooling/cli';
-import {waitForJob, JobExecutionError, type JobExecution} from '@salesforce/b2c-tooling/operations/jobs';
+import {JobCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {waitForJob, JobExecutionError, type JobExecution} from '@salesforce/b2c-tooling-sdk/operations/jobs';
 import {t} from '../../i18n/index.js';
 
 export default class JobWait extends JobCommand<typeof JobWait> {
diff --git a/packages/b2c-cli/src/commands/mrt/env/create.ts b/packages/b2c-cli/src/commands/mrt/env/create.ts
index 67ba0bc8..95fb35a9 100644
--- a/packages/b2c-cli/src/commands/mrt/env/create.ts
+++ b/packages/b2c-cli/src/commands/mrt/env/create.ts
@@ -1,7 +1,7 @@
 import {Args, Flags, ux} from '@oclif/core';
 import cliui from 'cliui';
-import {MrtCommand} from '@salesforce/b2c-tooling/cli';
-import {createEnv, type MrtEnvironment} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {createEnv, type MrtEnvironment} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/mrt/env/delete.ts b/packages/b2c-cli/src/commands/mrt/env/delete.ts
index 06034168..65bb4fa5 100644
--- a/packages/b2c-cli/src/commands/mrt/env/delete.ts
+++ b/packages/b2c-cli/src/commands/mrt/env/delete.ts
@@ -1,7 +1,7 @@
 import * as readline from 'node:readline';
 import {Args, Flags} from '@oclif/core';
-import {MrtCommand} from '@salesforce/b2c-tooling/cli';
-import {deleteEnv} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {deleteEnv} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/mrt/env/var/delete.ts b/packages/b2c-cli/src/commands/mrt/env/var/delete.ts
index 01b1756a..229f37b6 100644
--- a/packages/b2c-cli/src/commands/mrt/env/var/delete.ts
+++ b/packages/b2c-cli/src/commands/mrt/env/var/delete.ts
@@ -1,6 +1,6 @@
 import {Args} from '@oclif/core';
-import {MrtCommand} from '@salesforce/b2c-tooling/cli';
-import {deleteEnvVar} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {deleteEnvVar} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/mrt/env/var/list.ts b/packages/b2c-cli/src/commands/mrt/env/var/list.ts
index 70f665e8..fdc51b68 100644
--- a/packages/b2c-cli/src/commands/mrt/env/var/list.ts
+++ b/packages/b2c-cli/src/commands/mrt/env/var/list.ts
@@ -1,5 +1,9 @@
-import {MrtCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling/cli';
-import {listEnvVars, type ListEnvVarsResult, type EnvironmentVariable} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
+import {
+  listEnvVars,
+  type ListEnvVarsResult,
+  type EnvironmentVariable,
+} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../../../i18n/index.js';
 
 const COLUMNS: Record<string, ColumnDef<EnvironmentVariable>> = {
diff --git a/packages/b2c-cli/src/commands/mrt/env/var/set.ts b/packages/b2c-cli/src/commands/mrt/env/var/set.ts
index a4be45fb..4755e738 100644
--- a/packages/b2c-cli/src/commands/mrt/env/var/set.ts
+++ b/packages/b2c-cli/src/commands/mrt/env/var/set.ts
@@ -1,6 +1,6 @@
 import {Args} from '@oclif/core';
-import {MrtCommand} from '@salesforce/b2c-tooling/cli';
-import {setEnvVars} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {setEnvVars} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/mrt/push.ts b/packages/b2c-cli/src/commands/mrt/push.ts
index 0a6b8d92..3618cdce 100644
--- a/packages/b2c-cli/src/commands/mrt/push.ts
+++ b/packages/b2c-cli/src/commands/mrt/push.ts
@@ -1,6 +1,6 @@
 import {Flags} from '@oclif/core';
-import {MrtCommand} from '@salesforce/b2c-tooling/cli';
-import {pushBundle, DEFAULT_SSR_PARAMETERS, type PushResult} from '@salesforce/b2c-tooling/operations/mrt';
+import {MrtCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {pushBundle, DEFAULT_SSR_PARAMETERS, type PushResult} from '@salesforce/b2c-tooling-sdk/operations/mrt';
 import {t} from '../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/ods/create.ts b/packages/b2c-cli/src/commands/ods/create.ts
index bcdd73d4..df368856 100644
--- a/packages/b2c-cli/src/commands/ods/create.ts
+++ b/packages/b2c-cli/src/commands/ods/create.ts
@@ -1,7 +1,7 @@
 import {Flags, ux} from '@oclif/core';
 import cliui from 'cliui';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxModel = OdsComponents['schemas']['SandboxModel'];
diff --git a/packages/b2c-cli/src/commands/ods/delete.ts b/packages/b2c-cli/src/commands/ods/delete.ts
index 3b3e438e..6dc18714 100644
--- a/packages/b2c-cli/src/commands/ods/delete.ts
+++ b/packages/b2c-cli/src/commands/ods/delete.ts
@@ -1,7 +1,7 @@
 import * as readline from 'node:readline';
 import {Args, Flags} from '@oclif/core';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 /**
diff --git a/packages/b2c-cli/src/commands/ods/get.ts b/packages/b2c-cli/src/commands/ods/get.ts
index 979a5a40..3422a63a 100644
--- a/packages/b2c-cli/src/commands/ods/get.ts
+++ b/packages/b2c-cli/src/commands/ods/get.ts
@@ -1,7 +1,7 @@
 import {Args, ux} from '@oclif/core';
 import cliui from 'cliui';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxModel = OdsComponents['schemas']['SandboxModel'];
diff --git a/packages/b2c-cli/src/commands/ods/info.ts b/packages/b2c-cli/src/commands/ods/info.ts
index 665b918e..cda8fc3c 100644
--- a/packages/b2c-cli/src/commands/ods/info.ts
+++ b/packages/b2c-cli/src/commands/ods/info.ts
@@ -1,7 +1,7 @@
 import {ux} from '@oclif/core';
 import cliui from 'cliui';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type UserInfoSpec = OdsComponents['schemas']['UserInfoSpec'];
diff --git a/packages/b2c-cli/src/commands/ods/list.ts b/packages/b2c-cli/src/commands/ods/list.ts
index 016625a0..7db5fdb9 100644
--- a/packages/b2c-cli/src/commands/ods/list.ts
+++ b/packages/b2c-cli/src/commands/ods/list.ts
@@ -1,6 +1,6 @@
 import {Flags} from '@oclif/core';
-import {OdsCommand, TableRenderer, type ColumnDef} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand, TableRenderer, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxModel = OdsComponents['schemas']['SandboxModel'];
diff --git a/packages/b2c-cli/src/commands/ods/restart.ts b/packages/b2c-cli/src/commands/ods/restart.ts
index 8aa6c8c2..9e4e690c 100644
--- a/packages/b2c-cli/src/commands/ods/restart.ts
+++ b/packages/b2c-cli/src/commands/ods/restart.ts
@@ -1,6 +1,6 @@
 import {Args} from '@oclif/core';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxOperationModel = OdsComponents['schemas']['SandboxOperationModel'];
diff --git a/packages/b2c-cli/src/commands/ods/start.ts b/packages/b2c-cli/src/commands/ods/start.ts
index 59f85d72..95aa9654 100644
--- a/packages/b2c-cli/src/commands/ods/start.ts
+++ b/packages/b2c-cli/src/commands/ods/start.ts
@@ -1,6 +1,6 @@
 import {Args} from '@oclif/core';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxOperationModel = OdsComponents['schemas']['SandboxOperationModel'];
diff --git a/packages/b2c-cli/src/commands/ods/stop.ts b/packages/b2c-cli/src/commands/ods/stop.ts
index 35051cd3..06c24aef 100644
--- a/packages/b2c-cli/src/commands/ods/stop.ts
+++ b/packages/b2c-cli/src/commands/ods/stop.ts
@@ -1,6 +1,6 @@
 import {Args} from '@oclif/core';
-import {OdsCommand} from '@salesforce/b2c-tooling/cli';
-import type {OdsComponents} from '@salesforce/b2c-tooling';
+import {OdsCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OdsComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type SandboxOperationModel = OdsComponents['schemas']['SandboxOperationModel'];
diff --git a/packages/b2c-cli/src/commands/sites/list.ts b/packages/b2c-cli/src/commands/sites/list.ts
index c05adaad..8d0f4fc5 100644
--- a/packages/b2c-cli/src/commands/sites/list.ts
+++ b/packages/b2c-cli/src/commands/sites/list.ts
@@ -1,6 +1,6 @@
 import {ux} from '@oclif/core';
-import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling/cli';
-import type {OcapiComponents} from '@salesforce/b2c-tooling';
+import {InstanceCommand, createTable, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
+import type {OcapiComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 type Sites = OcapiComponents['schemas']['sites'];
diff --git a/packages/b2c-cli/src/commands/slas/client/list.ts b/packages/b2c-cli/src/commands/slas/client/list.ts
index fb7e7283..de5d56ff 100644
--- a/packages/b2c-cli/src/commands/slas/client/list.ts
+++ b/packages/b2c-cli/src/commands/slas/client/list.ts
@@ -1,4 +1,4 @@
-import {createTable, type ColumnDef} from '@salesforce/b2c-tooling/cli';
+import {createTable, type ColumnDef} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   SlasClientCommand,
   type Client,
diff --git a/packages/b2c-cli/src/i18n/index.ts b/packages/b2c-cli/src/i18n/index.ts
index 9f363128..ed44d8bf 100644
--- a/packages/b2c-cli/src/i18n/index.ts
+++ b/packages/b2c-cli/src/i18n/index.ts
@@ -2,14 +2,14 @@
  * i18n setup for b2c-cli.
  *
  * This module registers CLI-specific translations with the 'cli' namespace.
- * The core i18n infrastructure comes from @salesforce/b2c-tooling.
+ * The core i18n infrastructure comes from @salesforce/b2c-tooling-sdk.
  *
  * Usage in commands:
  *   import { t } from '../i18n/index.js'
  *   this.log(t('commands.sites.list.fetching', 'Fetching sites from {{hostname}}...', { hostname }))
  */
 
-import {registerTranslations, t as toolingT, type TOptions} from '@salesforce/b2c-tooling';
+import {registerTranslations, t as toolingT, type TOptions} from '@salesforce/b2c-tooling-sdk';
 import {locales} from './locales/index.js';
 
 /** The namespace used by b2c-cli messages */
@@ -24,7 +24,7 @@ for (const [lang, translations] of Object.entries(locales)) {
  * Translate a CLI message key with an inline default.
  *
  * This is a convenience wrapper that uses the 'cli' namespace.
- * For b2c-tooling messages, import t directly from @salesforce/b2c-tooling.
+ * For b2c-tooling messages, import t directly from @salesforce/b2c-tooling-sdk.
  *
  * @param key - Dot-notation key (e.g., 'commands.sites.list.fetching')
  * @param defaultValue - The default English string
@@ -39,4 +39,4 @@ export function t(key: string, defaultValue: string, options?: TOptions): string
 }
 
 // Re-export for convenience
-export {setLanguage, getLanguage, getI18nInstance} from '@salesforce/b2c-tooling';
+export {setLanguage, getLanguage, getI18nInstance} from '@salesforce/b2c-tooling-sdk';
diff --git a/packages/b2c-cli/src/index.ts b/packages/b2c-cli/src/index.ts
index 39576ff3..3eb15eb8 100644
--- a/packages/b2c-cli/src/index.ts
+++ b/packages/b2c-cli/src/index.ts
@@ -10,5 +10,5 @@ export {
   // Config utilities
   loadConfig,
   findDwJson,
-} from '@salesforce/b2c-tooling/cli';
-export type {ResolvedConfig, LoadConfigOptions} from '@salesforce/b2c-tooling/cli';
+} from '@salesforce/b2c-tooling-sdk/cli';
+export type {ResolvedConfig, LoadConfigOptions} from '@salesforce/b2c-tooling-sdk/cli';
diff --git a/packages/b2c-cli/src/utils/slas/client.ts b/packages/b2c-cli/src/utils/slas/client.ts
index 5d0e2aa8..efb8ce99 100644
--- a/packages/b2c-cli/src/utils/slas/client.ts
+++ b/packages/b2c-cli/src/utils/slas/client.ts
@@ -1,7 +1,7 @@
 import {Command, Flags, ux} from '@oclif/core';
 import cliui from 'cliui';
-import {OAuthCommand} from '@salesforce/b2c-tooling/cli';
-import {createSlasClient, type SlasClient, type SlasComponents} from '@salesforce/b2c-tooling';
+import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
+import {createSlasClient, type SlasClient, type SlasComponents} from '@salesforce/b2c-tooling-sdk';
 import {t} from '../../i18n/index.js';
 
 export type Client = SlasComponents['schemas']['Client'];
diff --git a/packages/b2c-tooling/.gitignore b/packages/b2c-tooling-sdk/.gitignore
similarity index 100%
rename from packages/b2c-tooling/.gitignore
rename to packages/b2c-tooling-sdk/.gitignore
diff --git a/packages/b2c-tooling/.prettierignore b/packages/b2c-tooling-sdk/.prettierignore
similarity index 100%
rename from packages/b2c-tooling/.prettierignore
rename to packages/b2c-tooling-sdk/.prettierignore
diff --git a/packages/b2c-tooling/.prettierrc.json b/packages/b2c-tooling-sdk/.prettierrc.json
similarity index 100%
rename from packages/b2c-tooling/.prettierrc.json
rename to packages/b2c-tooling-sdk/.prettierrc.json
diff --git a/packages/b2c-tooling/eslint.config.mjs b/packages/b2c-tooling-sdk/eslint.config.mjs
similarity index 100%
rename from packages/b2c-tooling/eslint.config.mjs
rename to packages/b2c-tooling-sdk/eslint.config.mjs
diff --git a/packages/b2c-tooling/package.json b/packages/b2c-tooling-sdk/package.json
similarity index 99%
rename from packages/b2c-tooling/package.json
rename to packages/b2c-tooling-sdk/package.json
index ab787591..3900ac44 100644
--- a/packages/b2c-tooling/package.json
+++ b/packages/b2c-tooling-sdk/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@salesforce/b2c-tooling",
+  "name": "@salesforce/b2c-tooling-sdk",
   "version": "0.0.0",
   "description": "Core tooling library for Salesforce Commerce Cloud B2C CLI",
   "author": "Charles Lavery",
diff --git a/packages/b2c-tooling/scripts/fix-ocapi-spec.js b/packages/b2c-tooling-sdk/scripts/fix-ocapi-spec.js
similarity index 100%
rename from packages/b2c-tooling/scripts/fix-ocapi-spec.js
rename to packages/b2c-tooling-sdk/scripts/fix-ocapi-spec.js
diff --git a/packages/b2c-tooling/specs/README.md b/packages/b2c-tooling-sdk/specs/README.md
similarity index 100%
rename from packages/b2c-tooling/specs/README.md
rename to packages/b2c-tooling-sdk/specs/README.md
diff --git a/packages/b2c-tooling/specs/data-api.json b/packages/b2c-tooling-sdk/specs/data-api.json
similarity index 100%
rename from packages/b2c-tooling/specs/data-api.json
rename to packages/b2c-tooling-sdk/specs/data-api.json
diff --git a/packages/b2c-tooling/specs/mrt-api-v1.json b/packages/b2c-tooling-sdk/specs/mrt-api-v1.json
similarity index 100%
rename from packages/b2c-tooling/specs/mrt-api-v1.json
rename to packages/b2c-tooling-sdk/specs/mrt-api-v1.json
diff --git a/packages/b2c-tooling/specs/ods-api-v1.json b/packages/b2c-tooling-sdk/specs/ods-api-v1.json
similarity index 100%
rename from packages/b2c-tooling/specs/ods-api-v1.json
rename to packages/b2c-tooling-sdk/specs/ods-api-v1.json
diff --git a/packages/b2c-tooling/specs/slas-admin-v1.yaml b/packages/b2c-tooling-sdk/specs/slas-admin-v1.yaml
similarity index 100%
rename from packages/b2c-tooling/specs/slas-admin-v1.yaml
rename to packages/b2c-tooling-sdk/specs/slas-admin-v1.yaml
diff --git a/packages/b2c-tooling/src/auth/api-key.ts b/packages/b2c-tooling-sdk/src/auth/api-key.ts
similarity index 100%
rename from packages/b2c-tooling/src/auth/api-key.ts
rename to packages/b2c-tooling-sdk/src/auth/api-key.ts
diff --git a/packages/b2c-tooling/src/auth/basic.ts b/packages/b2c-tooling-sdk/src/auth/basic.ts
similarity index 100%
rename from packages/b2c-tooling/src/auth/basic.ts
rename to packages/b2c-tooling-sdk/src/auth/basic.ts
diff --git a/packages/b2c-tooling/src/auth/index.ts b/packages/b2c-tooling-sdk/src/auth/index.ts
similarity index 96%
rename from packages/b2c-tooling/src/auth/index.ts
rename to packages/b2c-tooling-sdk/src/auth/index.ts
index ab275b28..e4bbefed 100644
--- a/packages/b2c-tooling/src/auth/index.ts
+++ b/packages/b2c-tooling-sdk/src/auth/index.ts
@@ -17,7 +17,7 @@
  * available credentials and allowed methods:
  *
  * ```typescript
- * import { resolveAuthStrategy } from '@salesforce/b2c-tooling';
+ * import { resolveAuthStrategy } from '@salesforce/b2c-tooling-sdk';
  *
  * // Automatically picks client-credentials if secret available, otherwise implicit
  * const strategy = resolveAuthStrategy({
@@ -37,7 +37,7 @@
  * All strategies implement the {@link AuthStrategy} interface:
  *
  * ```typescript
- * import { OAuthStrategy, ImplicitOAuthStrategy } from '@salesforce/b2c-tooling';
+ * import { OAuthStrategy, ImplicitOAuthStrategy } from '@salesforce/b2c-tooling-sdk';
  *
  * // For automated/server usage (client credentials)
  * const oauthAuth = new OAuthStrategy({
diff --git a/packages/b2c-tooling/src/auth/oauth-implicit.ts b/packages/b2c-tooling-sdk/src/auth/oauth-implicit.ts
similarity index 99%
rename from packages/b2c-tooling/src/auth/oauth-implicit.ts
rename to packages/b2c-tooling-sdk/src/auth/oauth-implicit.ts
index 9b8cd71e..d7139072 100644
--- a/packages/b2c-tooling/src/auth/oauth-implicit.ts
+++ b/packages/b2c-tooling-sdk/src/auth/oauth-implicit.ts
@@ -81,7 +81,7 @@ async function openBrowser(url: string): Promise<void> {
  *
  * @example
  * ```typescript
- * import { ImplicitOAuthStrategy } from '@salesforce/b2c-tooling';
+ * import { ImplicitOAuthStrategy } from '@salesforce/b2c-tooling-sdk';
  *
  * const auth = new ImplicitOAuthStrategy({
  *   clientId: 'your-client-id',
diff --git a/packages/b2c-tooling/src/auth/oauth.ts b/packages/b2c-tooling-sdk/src/auth/oauth.ts
similarity index 100%
rename from packages/b2c-tooling/src/auth/oauth.ts
rename to packages/b2c-tooling-sdk/src/auth/oauth.ts
diff --git a/packages/b2c-tooling/src/auth/resolve.ts b/packages/b2c-tooling-sdk/src/auth/resolve.ts
similarity index 98%
rename from packages/b2c-tooling/src/auth/resolve.ts
rename to packages/b2c-tooling-sdk/src/auth/resolve.ts
index c6906ea1..943a299e 100644
--- a/packages/b2c-tooling/src/auth/resolve.ts
+++ b/packages/b2c-tooling-sdk/src/auth/resolve.ts
@@ -7,7 +7,7 @@
  * ## Usage
  *
  * ```typescript
- * import { resolveAuthStrategy, checkAvailableAuthMethods } from '@salesforce/b2c-tooling';
+ * import { resolveAuthStrategy, checkAvailableAuthMethods } from '@salesforce/b2c-tooling-sdk';
  *
  * // Auto-select best strategy based on credentials
  * const strategy = resolveAuthStrategy({
@@ -60,7 +60,7 @@ export interface AvailableAuthMethods {
  *
  * @example
  * ```typescript
- * import { checkAvailableAuthMethods } from '@salesforce/b2c-tooling';
+ * import { checkAvailableAuthMethods } from '@salesforce/b2c-tooling-sdk';
  *
  * const result = checkAvailableAuthMethods({
  *   clientId: 'my-client',
@@ -133,7 +133,7 @@ export function checkAvailableAuthMethods(
  *
  * @example
  * ```typescript
- * import { resolveAuthStrategy } from '@salesforce/b2c-tooling';
+ * import { resolveAuthStrategy } from '@salesforce/b2c-tooling-sdk';
  *
  * // Will use client-credentials if secret is available, otherwise implicit
  * const strategy = resolveAuthStrategy({
diff --git a/packages/b2c-tooling/src/auth/types.ts b/packages/b2c-tooling-sdk/src/auth/types.ts
similarity index 100%
rename from packages/b2c-tooling/src/auth/types.ts
rename to packages/b2c-tooling-sdk/src/auth/types.ts
diff --git a/packages/b2c-tooling/src/cli/base-command.ts b/packages/b2c-tooling-sdk/src/cli/base-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/base-command.ts
rename to packages/b2c-tooling-sdk/src/cli/base-command.ts
diff --git a/packages/b2c-tooling/src/cli/cartridge-command.ts b/packages/b2c-tooling-sdk/src/cli/cartridge-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/cartridge-command.ts
rename to packages/b2c-tooling-sdk/src/cli/cartridge-command.ts
diff --git a/packages/b2c-tooling/src/cli/config.ts b/packages/b2c-tooling-sdk/src/cli/config.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/config.ts
rename to packages/b2c-tooling-sdk/src/cli/config.ts
diff --git a/packages/b2c-tooling/src/cli/index.ts b/packages/b2c-tooling-sdk/src/cli/index.ts
similarity index 96%
rename from packages/b2c-tooling/src/cli/index.ts
rename to packages/b2c-tooling-sdk/src/cli/index.ts
index d8071c18..1feab46d 100644
--- a/packages/b2c-tooling/src/cli/index.ts
+++ b/packages/b2c-tooling-sdk/src/cli/index.ts
@@ -33,7 +33,7 @@
  * ## Example Usage
  *
  * ```typescript
- * import { InstanceCommand, createTable, type ColumnDef } from '@salesforce/b2c-tooling/cli';
+ * import { InstanceCommand, createTable, type ColumnDef } from '@salesforce/b2c-tooling-sdk/cli';
  *
  * export default class ListSites extends InstanceCommand {
  *   static description = 'List all sites on the instance';
@@ -57,7 +57,7 @@
  * Use {@link loadConfig} to resolve configuration from multiple sources:
  *
  * ```typescript
- * import { loadConfig } from '@salesforce/b2c-tooling/cli';
+ * import { loadConfig } from '@salesforce/b2c-tooling-sdk/cli';
  *
  * const config = await loadConfig({
  *   flags: { hostname: 'example.com' },
@@ -70,7 +70,7 @@
  * Use {@link createTable} for consistent tabular output:
  *
  * ```typescript
- * import { createTable, type ColumnDef } from '@salesforce/b2c-tooling/cli';
+ * import { createTable, type ColumnDef } from '@salesforce/b2c-tooling-sdk/cli';
  *
  * const columns: Record<string, ColumnDef<Item>> = {
  *   id: { header: 'ID', get: (item) => item.id },
diff --git a/packages/b2c-tooling/src/cli/instance-command.ts b/packages/b2c-tooling-sdk/src/cli/instance-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/instance-command.ts
rename to packages/b2c-tooling-sdk/src/cli/instance-command.ts
diff --git a/packages/b2c-tooling/src/cli/job-command.ts b/packages/b2c-tooling-sdk/src/cli/job-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/job-command.ts
rename to packages/b2c-tooling-sdk/src/cli/job-command.ts
diff --git a/packages/b2c-tooling/src/cli/mrt-command.ts b/packages/b2c-tooling-sdk/src/cli/mrt-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/mrt-command.ts
rename to packages/b2c-tooling-sdk/src/cli/mrt-command.ts
diff --git a/packages/b2c-tooling/src/cli/oauth-command.ts b/packages/b2c-tooling-sdk/src/cli/oauth-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/oauth-command.ts
rename to packages/b2c-tooling-sdk/src/cli/oauth-command.ts
diff --git a/packages/b2c-tooling/src/cli/ods-command.ts b/packages/b2c-tooling-sdk/src/cli/ods-command.ts
similarity index 100%
rename from packages/b2c-tooling/src/cli/ods-command.ts
rename to packages/b2c-tooling-sdk/src/cli/ods-command.ts
diff --git a/packages/b2c-tooling/src/cli/table.ts b/packages/b2c-tooling-sdk/src/cli/table.ts
similarity index 99%
rename from packages/b2c-tooling/src/cli/table.ts
rename to packages/b2c-tooling-sdk/src/cli/table.ts
index f232c4e7..213a4a4b 100644
--- a/packages/b2c-tooling/src/cli/table.ts
+++ b/packages/b2c-tooling-sdk/src/cli/table.ts
@@ -8,7 +8,7 @@
  *
  * @example
  * ```typescript
- * import { TableRenderer, type ColumnDef } from '@salesforce/b2c-tooling/cli';
+ * import { TableRenderer, type ColumnDef } from '@salesforce/b2c-tooling-sdk/cli';
  *
  * interface User {
  *   name: string;
diff --git a/packages/b2c-tooling/src/clients/index.ts b/packages/b2c-tooling-sdk/src/clients/index.ts
similarity index 97%
rename from packages/b2c-tooling/src/clients/index.ts
rename to packages/b2c-tooling-sdk/src/clients/index.ts
index 6c82cfb2..be025258 100644
--- a/packages/b2c-tooling/src/clients/index.ts
+++ b/packages/b2c-tooling-sdk/src/clients/index.ts
@@ -18,7 +18,7 @@
  * and provides convenient `webdav` and `ocapi` getters.
  *
  * ```typescript
- * import { B2CInstance } from '@salesforce/b2c-tooling';
+ * import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
  *
  * const instance = B2CInstance.fromDwJson({
  *   clientSecret: process.env.SFCC_CLIENT_SECRET,
@@ -36,7 +36,7 @@
  * For advanced use cases, clients can be instantiated directly:
  *
  * ```typescript
- * import { WebDavClient, createOcapiClient, createSlasClient } from '@salesforce/b2c-tooling/clients';
+ * import { WebDavClient, createOcapiClient, createSlasClient } from '@salesforce/b2c-tooling-sdk/clients';
  *
  * const webdav = new WebDavClient('sandbox.demandware.net', authStrategy);
  * const ocapi = createOcapiClient('sandbox.demandware.net', authStrategy);
diff --git a/packages/b2c-tooling/src/clients/middleware.ts b/packages/b2c-tooling-sdk/src/clients/middleware.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/middleware.ts
rename to packages/b2c-tooling-sdk/src/clients/middleware.ts
diff --git a/packages/b2c-tooling/src/clients/mrt.generated.ts b/packages/b2c-tooling-sdk/src/clients/mrt.generated.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/mrt.generated.ts
rename to packages/b2c-tooling-sdk/src/clients/mrt.generated.ts
diff --git a/packages/b2c-tooling/src/clients/mrt.ts b/packages/b2c-tooling-sdk/src/clients/mrt.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/mrt.ts
rename to packages/b2c-tooling-sdk/src/clients/mrt.ts
diff --git a/packages/b2c-tooling/src/clients/ocapi.generated.ts b/packages/b2c-tooling-sdk/src/clients/ocapi.generated.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/ocapi.generated.ts
rename to packages/b2c-tooling-sdk/src/clients/ocapi.generated.ts
diff --git a/packages/b2c-tooling/src/clients/ocapi.ts b/packages/b2c-tooling-sdk/src/clients/ocapi.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/ocapi.ts
rename to packages/b2c-tooling-sdk/src/clients/ocapi.ts
diff --git a/packages/b2c-tooling/src/clients/ods.generated.ts b/packages/b2c-tooling-sdk/src/clients/ods.generated.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/ods.generated.ts
rename to packages/b2c-tooling-sdk/src/clients/ods.generated.ts
diff --git a/packages/b2c-tooling/src/clients/ods.ts b/packages/b2c-tooling-sdk/src/clients/ods.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/ods.ts
rename to packages/b2c-tooling-sdk/src/clients/ods.ts
diff --git a/packages/b2c-tooling/src/clients/slas-admin.generated.ts b/packages/b2c-tooling-sdk/src/clients/slas-admin.generated.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/slas-admin.generated.ts
rename to packages/b2c-tooling-sdk/src/clients/slas-admin.generated.ts
diff --git a/packages/b2c-tooling/src/clients/slas-admin.ts b/packages/b2c-tooling-sdk/src/clients/slas-admin.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/slas-admin.ts
rename to packages/b2c-tooling-sdk/src/clients/slas-admin.ts
diff --git a/packages/b2c-tooling/src/clients/webdav.ts b/packages/b2c-tooling-sdk/src/clients/webdav.ts
similarity index 100%
rename from packages/b2c-tooling/src/clients/webdav.ts
rename to packages/b2c-tooling-sdk/src/clients/webdav.ts
diff --git a/packages/b2c-tooling/src/config/dw-json.ts b/packages/b2c-tooling-sdk/src/config/dw-json.ts
similarity index 100%
rename from packages/b2c-tooling/src/config/dw-json.ts
rename to packages/b2c-tooling-sdk/src/config/dw-json.ts
diff --git a/packages/b2c-tooling/src/config/index.ts b/packages/b2c-tooling-sdk/src/config/index.ts
similarity index 100%
rename from packages/b2c-tooling/src/config/index.ts
rename to packages/b2c-tooling-sdk/src/config/index.ts
diff --git a/packages/b2c-tooling/src/defaults.ts b/packages/b2c-tooling-sdk/src/defaults.ts
similarity index 100%
rename from packages/b2c-tooling/src/defaults.ts
rename to packages/b2c-tooling-sdk/src/defaults.ts
diff --git a/packages/b2c-tooling/src/i18n/index.ts b/packages/b2c-tooling-sdk/src/i18n/index.ts
similarity index 99%
rename from packages/b2c-tooling/src/i18n/index.ts
rename to packages/b2c-tooling-sdk/src/i18n/index.ts
index 11162948..e884bba2 100644
--- a/packages/b2c-tooling/src/i18n/index.ts
+++ b/packages/b2c-tooling-sdk/src/i18n/index.ts
@@ -29,7 +29,7 @@
  * ## Usage
  *
  * ```typescript
- * import { t } from '@salesforce/b2c-tooling';
+ * import { t } from '@salesforce/b2c-tooling-sdk';
  *
  * // Simple translation with inline default
  * const message = t('error.serverRequired', 'Server is required.');
@@ -43,7 +43,7 @@
  * ## Adding Translations
  *
  * ```typescript
- * import { registerTranslations } from '@salesforce/b2c-tooling';
+ * import { registerTranslations } from '@salesforce/b2c-tooling-sdk';
  *
  * // Register translations for a new namespace
  * registerTranslations('my-package', 'de', {
diff --git a/packages/b2c-tooling/src/i18n/locales/de.ts b/packages/b2c-tooling-sdk/src/i18n/locales/de.ts
similarity index 100%
rename from packages/b2c-tooling/src/i18n/locales/de.ts
rename to packages/b2c-tooling-sdk/src/i18n/locales/de.ts
diff --git a/packages/b2c-tooling/src/i18n/locales/index.ts b/packages/b2c-tooling-sdk/src/i18n/locales/index.ts
similarity index 100%
rename from packages/b2c-tooling/src/i18n/locales/index.ts
rename to packages/b2c-tooling-sdk/src/i18n/locales/index.ts
diff --git a/packages/b2c-tooling/src/index.ts b/packages/b2c-tooling-sdk/src/index.ts
similarity index 100%
rename from packages/b2c-tooling/src/index.ts
rename to packages/b2c-tooling-sdk/src/index.ts
diff --git a/packages/b2c-tooling/src/instance/index.ts b/packages/b2c-tooling-sdk/src/instance/index.ts
similarity index 99%
rename from packages/b2c-tooling/src/instance/index.ts
rename to packages/b2c-tooling-sdk/src/instance/index.ts
index 07f616fd..66e4bf50 100644
--- a/packages/b2c-tooling/src/instance/index.ts
+++ b/packages/b2c-tooling-sdk/src/instance/index.ts
@@ -10,7 +10,7 @@
  * ### From dw.json (recommended)
  *
  * ```typescript
- * import { B2CInstance } from '@salesforce/b2c-tooling';
+ * import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
  *
  * // Load from dw.json, override secrets from environment
  * const instance = B2CInstance.fromDwJson({
diff --git a/packages/b2c-tooling/src/logger.ts b/packages/b2c-tooling-sdk/src/logger.ts
similarity index 99%
rename from packages/b2c-tooling/src/logger.ts
rename to packages/b2c-tooling-sdk/src/logger.ts
index cd7f6520..644b1ce5 100644
--- a/packages/b2c-tooling/src/logger.ts
+++ b/packages/b2c-tooling-sdk/src/logger.ts
@@ -12,7 +12,7 @@
  * ## Usage
  *
  * ```typescript
- * import { setLogger, getLogger, consoleLogger } from '@salesforce/b2c-tooling';
+ * import { setLogger, getLogger, consoleLogger } from '@salesforce/b2c-tooling-sdk';
  *
  * // Enable console logging
  * setLogger(consoleLogger);
diff --git a/packages/b2c-tooling/src/logging/index.ts b/packages/b2c-tooling-sdk/src/logging/index.ts
similarity index 95%
rename from packages/b2c-tooling/src/logging/index.ts
rename to packages/b2c-tooling-sdk/src/logging/index.ts
index 4337a7fa..f1491433 100644
--- a/packages/b2c-tooling/src/logging/index.ts
+++ b/packages/b2c-tooling-sdk/src/logging/index.ts
@@ -8,7 +8,7 @@
  * ## Basic Usage
  *
  * ```typescript
- * import { createLogger } from '@salesforce/b2c-tooling/logging';
+ * import { createLogger } from '@salesforce/b2c-tooling-sdk/logging';
  *
  * const logger = createLogger({ level: 'debug' });
  * logger.info('Hello world');
@@ -73,7 +73,7 @@
  * For CLI applications, use the global logger pattern:
  *
  * ```typescript
- * import { configureLogger, getLogger } from '@salesforce/b2c-tooling/logging';
+ * import { configureLogger, getLogger } from '@salesforce/b2c-tooling-sdk/logging';
  *
  * // Configure once at startup
  * configureLogger({
@@ -92,7 +92,7 @@
  * **Library code** should accept a logger as a parameter:
  *
  * ```typescript
- * import type { Logger } from '@salesforce/b2c-tooling/logging';
+ * import type { Logger } from '@salesforce/b2c-tooling-sdk/logging';
  *
  * export function myOperation(options: { logger?: Logger }) {
  *   const log = options.logger ?? console;
diff --git a/packages/b2c-tooling/src/logging/logger.ts b/packages/b2c-tooling-sdk/src/logging/logger.ts
similarity index 100%
rename from packages/b2c-tooling/src/logging/logger.ts
rename to packages/b2c-tooling-sdk/src/logging/logger.ts
diff --git a/packages/b2c-tooling/src/logging/types.ts b/packages/b2c-tooling-sdk/src/logging/types.ts
similarity index 100%
rename from packages/b2c-tooling/src/logging/types.ts
rename to packages/b2c-tooling-sdk/src/logging/types.ts
diff --git a/packages/b2c-tooling/src/operations/code/cartridges.ts b/packages/b2c-tooling-sdk/src/operations/code/cartridges.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/code/cartridges.ts
rename to packages/b2c-tooling-sdk/src/operations/code/cartridges.ts
diff --git a/packages/b2c-tooling/src/operations/code/deploy.ts b/packages/b2c-tooling-sdk/src/operations/code/deploy.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/code/deploy.ts
rename to packages/b2c-tooling-sdk/src/operations/code/deploy.ts
diff --git a/packages/b2c-tooling/src/operations/code/index.ts b/packages/b2c-tooling-sdk/src/operations/code/index.ts
similarity index 95%
rename from packages/b2c-tooling/src/operations/code/index.ts
rename to packages/b2c-tooling-sdk/src/operations/code/index.ts
index fe1e8304..decc17e5 100644
--- a/packages/b2c-tooling/src/operations/code/index.ts
+++ b/packages/b2c-tooling-sdk/src/operations/code/index.ts
@@ -33,8 +33,8 @@
  *   listCodeVersions,
  *   activateCodeVersion,
  *   watchCartridges,
- * } from '@salesforce/b2c-tooling/operations/code';
- * import { B2CInstance } from '@salesforce/b2c-tooling';
+ * } from '@salesforce/b2c-tooling-sdk/operations/code';
+ * import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
  *
  * const instance = B2CInstance.fromDwJson();
  *
diff --git a/packages/b2c-tooling/src/operations/code/versions.ts b/packages/b2c-tooling-sdk/src/operations/code/versions.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/code/versions.ts
rename to packages/b2c-tooling-sdk/src/operations/code/versions.ts
diff --git a/packages/b2c-tooling/src/operations/code/watch.ts b/packages/b2c-tooling-sdk/src/operations/code/watch.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/code/watch.ts
rename to packages/b2c-tooling-sdk/src/operations/code/watch.ts
diff --git a/packages/b2c-tooling/src/operations/jobs/index.ts b/packages/b2c-tooling-sdk/src/operations/jobs/index.ts
similarity index 95%
rename from packages/b2c-tooling/src/operations/jobs/index.ts
rename to packages/b2c-tooling-sdk/src/operations/jobs/index.ts
index 7f30f14c..e27da0c1 100644
--- a/packages/b2c-tooling/src/operations/jobs/index.ts
+++ b/packages/b2c-tooling-sdk/src/operations/jobs/index.ts
@@ -28,8 +28,8 @@
  *   searchJobExecutions,
  *   siteArchiveImport,
  *   siteArchiveExport,
- * } from '@salesforce/b2c-tooling/operations/jobs';
- * import { B2CInstance } from '@salesforce/b2c-tooling';
+ * } from '@salesforce/b2c-tooling-sdk/operations/jobs';
+ * import { B2CInstance } from '@salesforce/b2c-tooling-sdk';
  *
  * const instance = B2CInstance.fromDwJson();
  *
diff --git a/packages/b2c-tooling/src/operations/jobs/run.ts b/packages/b2c-tooling-sdk/src/operations/jobs/run.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/jobs/run.ts
rename to packages/b2c-tooling-sdk/src/operations/jobs/run.ts
diff --git a/packages/b2c-tooling/src/operations/jobs/site-archive.ts b/packages/b2c-tooling-sdk/src/operations/jobs/site-archive.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/jobs/site-archive.ts
rename to packages/b2c-tooling-sdk/src/operations/jobs/site-archive.ts
diff --git a/packages/b2c-tooling/src/operations/mrt/bundle.ts b/packages/b2c-tooling-sdk/src/operations/mrt/bundle.ts
similarity index 100%
rename from packages/b2c-tooling/src/operations/mrt/bundle.ts
rename to packages/b2c-tooling-sdk/src/operations/mrt/bundle.ts
diff --git a/packages/b2c-tooling/src/operations/mrt/env-var.ts b/packages/b2c-tooling-sdk/src/operations/mrt/env-var.ts
similarity index 94%
rename from packages/b2c-tooling/src/operations/mrt/env-var.ts
rename to packages/b2c-tooling-sdk/src/operations/mrt/env-var.ts
index dae40ca3..97cfa4d1 100644
--- a/packages/b2c-tooling/src/operations/mrt/env-var.ts
+++ b/packages/b2c-tooling-sdk/src/operations/mrt/env-var.ts
@@ -67,8 +67,8 @@ export interface EnvVarOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { listEnvVars } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { listEnvVars } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
@@ -176,8 +176,8 @@ export interface SetEnvVarOptions extends EnvVarOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { setEnvVar } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { setEnvVar } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
@@ -235,8 +235,8 @@ export interface SetEnvVarsOptions extends EnvVarOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { setEnvVars } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { setEnvVars } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
@@ -299,8 +299,8 @@ export interface DeleteEnvVarOptions extends EnvVarOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { deleteEnvVar } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { deleteEnvVar } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
diff --git a/packages/b2c-tooling/src/operations/mrt/env.ts b/packages/b2c-tooling-sdk/src/operations/mrt/env.ts
similarity index 95%
rename from packages/b2c-tooling/src/operations/mrt/env.ts
rename to packages/b2c-tooling-sdk/src/operations/mrt/env.ts
index 18e55828..de5f31a8 100644
--- a/packages/b2c-tooling/src/operations/mrt/env.ts
+++ b/packages/b2c-tooling-sdk/src/operations/mrt/env.ts
@@ -110,8 +110,8 @@ export interface CreateEnvOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { createEnv } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { createEnv } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
@@ -229,8 +229,8 @@ export interface DeleteEnvOptions {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { deleteEnv } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { deleteEnv } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
diff --git a/packages/b2c-tooling/src/operations/mrt/index.ts b/packages/b2c-tooling-sdk/src/operations/mrt/index.ts
similarity index 92%
rename from packages/b2c-tooling/src/operations/mrt/index.ts
rename to packages/b2c-tooling-sdk/src/operations/mrt/index.ts
index 897cbc14..9bafd318 100644
--- a/packages/b2c-tooling/src/operations/mrt/index.ts
+++ b/packages/b2c-tooling-sdk/src/operations/mrt/index.ts
@@ -14,8 +14,8 @@
  * ## Usage
  *
  * ```typescript
- * import { pushBundle } from '@salesforce/b2c-tooling/operations/mrt';
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
+ * import { pushBundle } from '@salesforce/b2c-tooling-sdk/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
diff --git a/packages/b2c-tooling/src/operations/mrt/push.ts b/packages/b2c-tooling-sdk/src/operations/mrt/push.ts
similarity index 97%
rename from packages/b2c-tooling/src/operations/mrt/push.ts
rename to packages/b2c-tooling-sdk/src/operations/mrt/push.ts
index 89b70169..7d36dd0c 100644
--- a/packages/b2c-tooling/src/operations/mrt/push.ts
+++ b/packages/b2c-tooling-sdk/src/operations/mrt/push.ts
@@ -73,8 +73,8 @@ export interface PushResult {
  *
  * @example
  * ```typescript
- * import { ApiKeyStrategy } from '@salesforce/b2c-tooling/auth';
- * import { pushBundle } from '@salesforce/b2c-tooling/operations/mrt';
+ * import { ApiKeyStrategy } from '@salesforce/b2c-tooling-sdk/auth';
+ * import { pushBundle } from '@salesforce/b2c-tooling-sdk/operations/mrt';
  *
  * const auth = new ApiKeyStrategy(process.env.MRT_API_KEY!, 'Authorization');
  *
diff --git a/packages/b2c-tooling/src/operations/sites/index.ts b/packages/b2c-tooling-sdk/src/operations/sites/index.ts
similarity index 94%
rename from packages/b2c-tooling/src/operations/sites/index.ts
rename to packages/b2c-tooling-sdk/src/operations/sites/index.ts
index f04abb64..051d22d9 100644
--- a/packages/b2c-tooling/src/operations/sites/index.ts
+++ b/packages/b2c-tooling-sdk/src/operations/sites/index.ts
@@ -12,8 +12,8 @@
  * ## Usage
  *
  * ```typescript
- * import { listSites, getSite } from '@salesforce/b2c-tooling/operations/sites';
- * import { B2CInstance, OAuthStrategy } from '@salesforce/b2c-tooling';
+ * import { listSites, getSite } from '@salesforce/b2c-tooling-sdk/operations/sites';
+ * import { B2CInstance, OAuthStrategy } from '@salesforce/b2c-tooling-sdk';
  *
  * const auth = new OAuthStrategy({
  *   clientId: 'your-client-id',
diff --git a/packages/b2c-tooling/src/platform/index.ts b/packages/b2c-tooling-sdk/src/platform/index.ts
similarity index 96%
rename from packages/b2c-tooling/src/platform/index.ts
rename to packages/b2c-tooling-sdk/src/platform/index.ts
index 44a67343..e6ebce83 100644
--- a/packages/b2c-tooling/src/platform/index.ts
+++ b/packages/b2c-tooling-sdk/src/platform/index.ts
@@ -12,8 +12,8 @@
  * ## Usage
  *
  * ```typescript
- * import { MrtClient, OdsClient } from '@salesforce/b2c-tooling/platform';
- * import { ApiKeyStrategy, OAuthStrategy } from '@salesforce/b2c-tooling/auth';
+ * import { MrtClient, OdsClient } from '@salesforce/b2c-tooling-sdk/platform';
+ * import { ApiKeyStrategy, OAuthStrategy } from '@salesforce/b2c-tooling-sdk/auth';
  *
  * // MRT operations use API key authentication
  * const mrtAuth = new ApiKeyStrategy('your-api-key');
diff --git a/packages/b2c-tooling/src/platform/mrt.ts b/packages/b2c-tooling-sdk/src/platform/mrt.ts
similarity index 100%
rename from packages/b2c-tooling/src/platform/mrt.ts
rename to packages/b2c-tooling-sdk/src/platform/mrt.ts
diff --git a/packages/b2c-tooling/src/platform/ods.ts b/packages/b2c-tooling-sdk/src/platform/ods.ts
similarity index 100%
rename from packages/b2c-tooling/src/platform/ods.ts
rename to packages/b2c-tooling-sdk/src/platform/ods.ts
diff --git a/packages/b2c-tooling/src/types/cliui.d.ts b/packages/b2c-tooling-sdk/src/types/cliui.d.ts
similarity index 100%
rename from packages/b2c-tooling/src/types/cliui.d.ts
rename to packages/b2c-tooling-sdk/src/types/cliui.d.ts
diff --git a/packages/b2c-tooling/tsconfig.cjs.json b/packages/b2c-tooling-sdk/tsconfig.cjs.json
similarity index 100%
rename from packages/b2c-tooling/tsconfig.cjs.json
rename to packages/b2c-tooling-sdk/tsconfig.cjs.json
diff --git a/packages/b2c-tooling/tsconfig.esm.json b/packages/b2c-tooling-sdk/tsconfig.esm.json
similarity index 100%
rename from packages/b2c-tooling/tsconfig.esm.json
rename to packages/b2c-tooling-sdk/tsconfig.esm.json
diff --git a/packages/b2c-tooling/tsconfig.json b/packages/b2c-tooling-sdk/tsconfig.json
similarity index 100%
rename from packages/b2c-tooling/tsconfig.json
rename to packages/b2c-tooling-sdk/tsconfig.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 44c7e3dc..3a0f01ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,9 +41,9 @@ importers:
       '@oclif/plugin-version':
         specifier: ^2
         version: 2.2.36
-      '@salesforce/b2c-tooling':
+      '@salesforce/b2c-tooling-sdk':
         specifier: workspace:*
-        version: link:../b2c-tooling
+        version: link:../b2c-tooling-sdk
       cliui:
         specifier: ^9.0.1
         version: 9.0.1
@@ -103,7 +103,7 @@ importers:
         specifier: ^5
         version: 5.9.3
 
-  packages/b2c-tooling:
+  packages/b2c-tooling-sdk:
     dependencies:
       archiver:
         specifier: ^7.0.1
diff --git a/typedoc.json b/typedoc.json
index c84c3c67..26def8db 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -1,23 +1,23 @@
 {
   "$schema": "https://typedoc.org/schema.json",
   "entryPoints": [
-    "./packages/b2c-tooling/src/auth/index.ts",
-    "./packages/b2c-tooling/src/cli/index.ts",
-    "./packages/b2c-tooling/src/clients/index.ts",
-    "./packages/b2c-tooling/src/config/index.ts",
-    "./packages/b2c-tooling/src/i18n/index.ts",
-    "./packages/b2c-tooling/src/instance/index.ts",
-    "./packages/b2c-tooling/src/logging/index.ts",
-    "./packages/b2c-tooling/src/operations/code/index.ts",
-    "./packages/b2c-tooling/src/operations/jobs/index.ts",
-    "./packages/b2c-tooling/src/operations/mrt/index.ts",
-    "./packages/b2c-tooling/src/operations/sites/index.ts",
-    "./packages/b2c-tooling/src/platform/index.ts"
+    "./packages/b2c-tooling-sdk/src/auth/index.ts",
+    "./packages/b2c-tooling-sdk/src/cli/index.ts",
+    "./packages/b2c-tooling-sdk/src/clients/index.ts",
+    "./packages/b2c-tooling-sdk/src/config/index.ts",
+    "./packages/b2c-tooling-sdk/src/i18n/index.ts",
+    "./packages/b2c-tooling-sdk/src/instance/index.ts",
+    "./packages/b2c-tooling-sdk/src/logging/index.ts",
+    "./packages/b2c-tooling-sdk/src/operations/code/index.ts",
+    "./packages/b2c-tooling-sdk/src/operations/jobs/index.ts",
+    "./packages/b2c-tooling-sdk/src/operations/mrt/index.ts",
+    "./packages/b2c-tooling-sdk/src/operations/sites/index.ts",
+    "./packages/b2c-tooling-sdk/src/platform/index.ts"
   ],
   "exclude": ["**/*.generated.ts"],
   "out": "./docs/api",
   "plugin": ["typedoc-plugin-markdown", "typedoc-vitepress-theme"],
-  "tsconfig": "./packages/b2c-tooling/tsconfig.json",
+  "tsconfig": "./packages/b2c-tooling-sdk/tsconfig.json",
   "readme": "./docs/api-readme.md",
   "excludePrivate": true,
   "excludeProtected": true,