diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
index 6571acb2ea3..acf2f8c6d18 100644
--- a/.github/workflows/ci-check.yml
+++ b/.github/workflows/ci-check.yml
@@ -2,9 +2,9 @@ name: ci-check
 
 on:
   push:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
   pull_request:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
 
 concurrency:
   group: ci-check-${{ github.ref }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c429c8e3e11..dccbc6766dd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
index 5657818c907..79c02c5887f 100644
--- a/.github/workflows/deploy-canary.yml
+++ b/.github/workflows/deploy-canary.yml
@@ -10,6 +10,63 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  carbon-web-components:
+    if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom'
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{secrets.MERGE_ACTION}}
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.x'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --offline
+      - name: Build project
+        run: yarn lerna run --scope @carbon/carbon-web-components build
+
+      - name: Set env vars
+        uses: ./.github/actions/set-dotenv
+        with:
+          env-file: packages/carbon-web-components/.env
+        env:
+          KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
+          KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
+          PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
+      - name: Building @carbon/carbon-web-components storybook
+        run: yarn build-storybook
+        working-directory: packages/carbon-web-components
+      - name: Move storybook to build folder
+        run: |
+          rm packages/carbon-web-components/.env
+          mkdir -p builds
+          mv packages/carbon-web-components/storybook-static builds/carbon-web-components
+
+      - name: Deploying @carbon/carbon-web-components storybook to Github Pages
+        run: |
+          git config --global user.email ${{ secrets.BOT_EMAIL }}
+          git config --global user.name ${{ secrets.BOT_NAME }}
+
+          git fetch origin gh-pages
+          git checkout -b gh-pages origin/gh-pages
+          git update-ref -d refs/remotes/origin/gh-pages
+          git pull origin gh-pages
+
+          rm -rf canary/carbon-web-components
+          mkdir -p canary
+          mv builds/carbon-web-components canary/carbon-web-components
+
+          git add canary/carbon-web-components
+          git commit -m "chore(deploy): deploy Carbon web components canary to GitHub Pages"
+          git push origin gh-pages
+      - uses: act10ns/slack@v1
+        if: failure()
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        with:
+          status: ${{ job.status }}
   react:
     if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom'
     runs-on: ubuntu-20.04
@@ -25,7 +82,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --stream --ignore @carbon/ibmdotcom-web-components --ignore @carbon/ibmdotcom-services-store build
+        run: yarn lerna run --scope @carbon/ibmdotcom-react build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
@@ -121,7 +178,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --stream --ignore @carbon/ibmdotcom-react build
+        run: yarn lerna run --scope @carbon/ibmdotcom-web-components build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
@@ -236,7 +293,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --stream --ignore @carbon/ibmdotcom-react --ignore @carbon/ibmdotcom-web-components --ignore @carbon/ibmdotcom-services-store build
+        run: yarn lerna run --scope @carbon/ibmdotcom-services build
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
         with:
diff --git a/.github/workflows/deploy-next.yml b/.github/workflows/deploy-next.yml
index 5a43512f2f7..fd63e422636 100644
--- a/.github/workflows/deploy-next.yml
+++ b/.github/workflows/deploy-next.yml
@@ -10,6 +10,63 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  carbon-web-components:
+    if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom'
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{secrets.MERGE_ACTION}}
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.x'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn install --offline
+      - name: Build project
+        run: yarn lerna run --scope @carbon/carbon-web-components build
+
+      - name: Set env vars
+        uses: ./.github/actions/set-dotenv
+        with:
+          env-file: packages/carbon-web-components/.env
+        env:
+          KALTURA_PARTNER_ID: ${{ secrets.KALTURA_PARTNER_ID }}
+          KALTURA_UICONF_ID: ${{ secrets.KALTURA_UICONF_ID }}
+          PROFILE_HOST: ${{ secrets.PROFILE_HOST }}
+      - name: Building @carbon/carbon-web-components (next) storybook
+        run: yarn build-storybook
+        working-directory: packages/carbon-web-components
+      - name: Move storybook to build folder
+        run: |
+          rm packages/carbon-web-components/.env
+          mkdir -p builds
+          mv packages/carbon-web-components/storybook-static builds/carbon-web-components
+
+      - name: Deploying @carbon/carbon-web-components (next) storybook to Github Pages
+        run: |
+          git config --global user.email ${{ secrets.BOT_EMAIL }}
+          git config --global user.name ${{ secrets.BOT_NAME }}
+
+          git fetch origin gh-pages
+          git checkout -b gh-pages origin/gh-pages
+          git update-ref -d refs/remotes/origin/gh-pages
+          git pull origin gh-pages
+
+          rm -rf next/carbon-web-components
+          mkdir -p next
+          mv builds/carbon-web-components next/carbon-web-components
+
+          git add next/carbon-web-components
+          git commit -m "chore(deploy): deploy Carbon web components next to GitHub Pages"
+          git push origin gh-pages
+      - uses: act10ns/slack@v1
+        if: failure()
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        with:
+          status: ${{ job.status }}
   react:
     if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom'
     runs-on: ubuntu-20.04
@@ -25,7 +82,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --stream --ignore @carbon/ibmdotcom-web-components --ignore @carbon/ibmdotcom-services-store build
+        run: yarn lerna run --scope @carbon/ibmdotcom-react build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
@@ -101,7 +158,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project
-        run: yarn lerna run --stream --ignore @carbon/ibmdotcom-react build
+        run: yarn lerna run --scope @carbon/ibmdotcom-web-components build
 
       - name: Set env vars
         uses: ./.github/actions/set-dotenv
diff --git a/.github/workflows/e2e-integration.yml b/.github/workflows/e2e-integration.yml
index b944bf0d8c6..fa4c38d5d6a 100644
--- a/.github/workflows/e2e-integration.yml
+++ b/.github/workflows/e2e-integration.yml
@@ -2,7 +2,7 @@ name: e2e-integration
 
 on:
   push:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
   schedule:
     - cron: '0 20 * * 1-5'
 
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index adeca009995..56eedf04cf6 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -2,9 +2,9 @@ name: e2e-tests
 
 on:
   push:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
   pull_request:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
 
 concurrency:
   group: e2e-tests-${{ github.ref }}
diff --git a/.github/workflows/percy-update-base.yml b/.github/workflows/percy-update-base.yml
index f28962174ed..3e04e22a36e 100644
--- a/.github/workflows/percy-update-base.yml
+++ b/.github/workflows/percy-update-base.yml
@@ -2,7 +2,7 @@ name: percy-update-base
 
 on:
   push:
-    branches: [ main, release/*, chore/revert-cwc-import ]
+    branches: [ main, release/* ]
 
 concurrency:
   group: percy-update-base-${{ github.ref }}
diff --git a/.yarn/offline-mirror/carbon-components-10.52.0.tgz b/.yarn/offline-mirror/carbon-components-10.52.0.tgz
deleted file mode 100644
index a6c106b1e5d..00000000000
Binary files a/.yarn/offline-mirror/carbon-components-10.52.0.tgz and /dev/null differ
diff --git a/.yarn/offline-mirror/carbon-web-components-1.21.0.tgz b/.yarn/offline-mirror/carbon-web-components-1.21.0.tgz
deleted file mode 100644
index dcbef3987e1..00000000000
Binary files a/.yarn/offline-mirror/carbon-web-components-1.21.0.tgz and /dev/null differ
diff --git a/packages/carbon-web-components/examples/codesandbox/angular/package.json b/packages/carbon-web-components/examples/codesandbox/angular/package.json
index 54c10968315..a5199f0fa6a 100644
--- a/packages/carbon-web-components/examples/codesandbox/angular/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/angular/package.json
@@ -18,7 +18,7 @@
     "@angular/platform-browser-dynamic": "^8.0.0",
     "@angular/router": "^8.0.0",
     "@babel/runtime": "^7.8.0",
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "rxjs": "^6.0.0",
     "tslib": "^1.10.0",
     "zone.js": "~0.9.0"
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/accordion/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/accordion/package.json
index 298781737a5..ff2aab598ea 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/accordion/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/accordion/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/package.json
index 6b58e83e04e..14447d7317c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/breadcrumb/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/button/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/button/package.json
index 649839c157e..9bb2c451452 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/button/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/button/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/package.json
index 614c01db0a8..de20cf0f351 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/checkbox/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/package.json
index 78139fd01d4..f8f2c0f277c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/code-snippet/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/package.json
index 348e48cd03f..cf6142e8cef 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/combo-box/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/package.json
index bed51f78fda..67a85d10a48 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/content-switcher/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/package.json
index 5e69e955c83..8fd262ac0cb 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/copy-button/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/data-table/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/data-table/package.json
index 269ac55e3d4..d086c1cbb18 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/data-table/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/data-table/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/package.json
index 68d2a082cbf..266064dcd7c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/date-picker/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/package.json
index 0351596f13d..64ea9d163b6 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/dropdown/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/package.json
index 5b60364ca05..a557a535cf3 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/file-uploader/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/package.json
index 4799004cdb4..c86457615a9 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/inline-loading/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/input/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/input/package.json
index 556df08a807..067fb5142a6 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/input/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/input/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/link/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/link/package.json
index 6e2334e5147..a30aaf4c8d2 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/link/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/link/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/list/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/list/package.json
index 41578f5f12c..2c13106d23c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/list/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/list/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/loading/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/loading/package.json
index 38ba0a274e7..50bd39e69db 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/loading/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/loading/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/modal/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/modal/package.json
index 9d6e42dd75b..e3c5764c876 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/modal/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/modal/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/multi-select/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/multi-select/package.json
index 0791cbccb43..e4e7e831bd7 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/multi-select/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/multi-select/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/notification/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/notification/package.json
index e368690a21e..d288221786c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/notification/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/notification/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/number-input/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/number-input/package.json
index 2b04479d1ea..61bca89948b 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/number-input/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/number-input/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/overflow-menu/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/overflow-menu/package.json
index 89ede944064..2624f16dfe0 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/overflow-menu/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/overflow-menu/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/pagination/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/pagination/package.json
index 830f80a0087..897a240e56f 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/pagination/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/pagination/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/progress-indicator/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/progress-indicator/package.json
index bfb72463b4c..ffde4944e34 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/progress-indicator/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/progress-indicator/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/radio-button/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/radio-button/package.json
index 49fbdc2869b..780bc7cac76 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/radio-button/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/radio-button/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/search/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/search/package.json
index c1177b4d460..77a5d1e0a07 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/search/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/search/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/select/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/select/package.json
index 4d1cf4470a2..5a496fa61f2 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/select/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/select/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-placeholder/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-placeholder/package.json
index 688661ae400..77ed5ed465c 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-placeholder/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-placeholder/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-text/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-text/package.json
index 1cd4741af85..fb445511a8a 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-text/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/skeleton-text/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/skip-to-content/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/skip-to-content/package.json
index 91bc9ca4f7f..9f2c346aee0 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/skip-to-content/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/skip-to-content/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/slider/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/slider/package.json
index 25d2d0663c8..4ad8f9c2579 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/slider/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/slider/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/structured-list/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/structured-list/package.json
index e422fcbcfd3..a95cc49fd00 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/structured-list/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/structured-list/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/tabs/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/tabs/package.json
index 6e0019f1c9f..6e7aedc9f74 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/tabs/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/tabs/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/tag/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/tag/package.json
index f808910eb45..d89ad0e5b96 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/tag/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/tag/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/textarea/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/textarea/package.json
index e8c31a2a0fb..444b0ac1ebf 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/textarea/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/textarea/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/tile/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/tile/package.json
index 25b5ed30ed4..2ee2c90aaf3 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/tile/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/tile/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/toggle/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/toggle/package.json
index 0d5014616d3..f6feeb6ebd4 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/toggle/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/toggle/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/tooltip/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/tooltip/package.json
index f507e5f27e6..5d2f8a6ace0 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/tooltip/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/tooltip/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/components/ui-shell/package.json b/packages/carbon-web-components/examples/codesandbox/basic/components/ui-shell/package.json
index e780b1e38e3..a78e33a85e8 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/components/ui-shell/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/components/ui-shell/package.json
@@ -11,7 +11,7 @@
     "start": "parcel index.html --port=9000 --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "latest"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
diff --git a/packages/carbon-web-components/examples/codesandbox/basic/package.json b/packages/carbon-web-components/examples/codesandbox/basic/package.json
index 23adf7def97..17e28ff303b 100644
--- a/packages/carbon-web-components/examples/codesandbox/basic/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/basic/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "html-webpack-plugin": "^4.5.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/data-table/package.json b/packages/carbon-web-components/examples/codesandbox/data-table/package.json
index 5f2b91ff9c2..27beb7c7bb5 100644
--- a/packages/carbon-web-components/examples/codesandbox/data-table/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/data-table/package.json
@@ -10,7 +10,7 @@
     "start": "parcel index.html --no-hmr"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "lit-element": "^2.5.1",
     "lit-html": "^1.4.1",
     "lodash-es": "^4.17.0"
diff --git a/packages/carbon-web-components/examples/codesandbox/form/basic/package.json b/packages/carbon-web-components/examples/codesandbox/form/basic/package.json
index c2fa79b4c3c..b1c83535451 100644
--- a/packages/carbon-web-components/examples/codesandbox/form/basic/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/form/basic/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "html-webpack-plugin": "^4.5.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/form/redux-form/package.json b/packages/carbon-web-components/examples/codesandbox/form/redux-form/package.json
index 50c68620060..4f0ba8d7eb1 100644
--- a/packages/carbon-web-components/examples/codesandbox/form/redux-form/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/form/redux-form/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "prop-types": "^15.7.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/ie/package.json b/packages/carbon-web-components/examples/codesandbox/ie/package.json
index b97d8786c8d..30ef29d2d9d 100644
--- a/packages/carbon-web-components/examples/codesandbox/ie/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/ie/package.json
@@ -20,7 +20,7 @@
     "@webcomponents/url": "^0.7.0",
     "@webcomponents/webcomponents-platform": "^1.0.0",
     "babel-loader": "^8.0.0",
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "core-js": "^3.0.0",
     "es6-promise": "^4.1.0",
     "html-webpack-plugin": "^3.2.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/next/package.json b/packages/carbon-web-components/examples/codesandbox/next/package.json
index f944943d73f..b280a81b26f 100644
--- a/packages/carbon-web-components/examples/codesandbox/next/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/next/package.json
@@ -8,7 +8,7 @@
     "start": "echo 'Running Next in Node 12.16.3+. If you have such Node version in your system just `next` here will work.' && ./node_modules/node/node_modules/.bin/node ./node_modules/.bin/next"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "next": "^10.0.0",
     "node": "^12.16.3",
     "react": "^17.0.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/react-ssr/package.json b/packages/carbon-web-components/examples/codesandbox/react-ssr/package.json
index 24b975bcc42..c4a61eada7d 100644
--- a/packages/carbon-web-components/examples/codesandbox/react-ssr/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/react-ssr/package.json
@@ -10,7 +10,7 @@
     "start": "echo 'Running server in Node 12.16.3+. If you have such Node version in your system just `node app.js` here will work.' && ./node_modules/node/node_modules/.bin/node app.js"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "express": "^4.17.0",
     "prop-types": "^15.7.0",
     "react": "^16.12.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/react/package.json b/packages/carbon-web-components/examples/codesandbox/react/package.json
index 4e607c095ce..f5f3008c218 100644
--- a/packages/carbon-web-components/examples/codesandbox/react/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/react/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "prop-types": "^15.7.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
diff --git a/packages/carbon-web-components/examples/codesandbox/rtl/package.json b/packages/carbon-web-components/examples/codesandbox/rtl/package.json
index 8823a7a8906..abdee15f821 100644
--- a/packages/carbon-web-components/examples/codesandbox/rtl/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/rtl/package.json
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.8.0",
     "@babel/runtime": "^7.8.0",
     "accept-language-parser": "^1.5.0",
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "classnames": "^2.2.0",
     "es6-promise": "^4.1.0",
     "html-webpack-plugin": "^3.2.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/styling/custom-style/package.json b/packages/carbon-web-components/examples/codesandbox/styling/custom-style/package.json
index 87e39669064..f9ea60e56ae 100644
--- a/packages/carbon-web-components/examples/codesandbox/styling/custom-style/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/styling/custom-style/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "lit-element": "^2.5.1"
   },
   "devDependencies": {
diff --git a/packages/carbon-web-components/examples/codesandbox/styling/theme-zoning/package.json b/packages/carbon-web-components/examples/codesandbox/styling/theme-zoning/package.json
index 6a39e317790..36dda417100 100644
--- a/packages/carbon-web-components/examples/codesandbox/styling/theme-zoning/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/styling/theme-zoning/package.json
@@ -8,7 +8,7 @@
     "start": "webpack serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0"
+    "@carbon/carbon-web-components": "latest"
   },
   "devDependencies": {
     "autoprefixer": "^9.0.0",
diff --git a/packages/carbon-web-components/examples/codesandbox/vue/package.json b/packages/carbon-web-components/examples/codesandbox/vue/package.json
index a6c824800bb..0b06ddd4cab 100644
--- a/packages/carbon-web-components/examples/codesandbox/vue/package.json
+++ b/packages/carbon-web-components/examples/codesandbox/vue/package.json
@@ -7,7 +7,7 @@
     "serve": "vue-cli-service serve"
   },
   "dependencies": {
-    "carbon-web-components": "^1.19.0",
+    "@carbon/carbon-web-components": "latest",
     "vue": "^2.5.0"
   },
   "devDependencies": {
diff --git a/packages/carbon-web-components/renovate.json b/packages/carbon-web-components/renovate.json
deleted file mode 100644
index 388d63f3e40..00000000000
--- a/packages/carbon-web-components/renovate.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "enabled": false,
-  "extends": ["config:base", ":maintainLockFilesWeekly", ":preserveSemverRanges", "schedule:weekends", ":noUnscheduledUpdates"],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["major"],
-      "enabled": false
-    }
-  ],
-  "rangeStrategy": "replace",
-  "vulnerabilityAlerts": {
-    "enabled": true
-  }
-}
diff --git a/packages/styles/scss/components/filter-panel/_filter-panel.scss b/packages/styles/scss/components/filter-panel/_filter-panel.scss
index 2cd2963c80a..1020a4e0874 100644
--- a/packages/styles/scss/components/filter-panel/_filter-panel.scss
+++ b/packages/styles/scss/components/filter-panel/_filter-panel.scss
@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2021
+ * Copyright IBM Corp. 2016, 2022
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -9,7 +9,7 @@
 @import '../../globals/imports';
 @import 'carbon-components/scss/components/accordion/keyframes';
 @import 'carbon-components/scss/components/accordion/accordion';
-@import 'carbon-web-components/scss/components/checkbox/checkbox';
+@import '@carbon/carbon-web-components/scss/components/checkbox/checkbox';
 
 @mixin filter-panel {
   .#{$prefix}--filter__heading {
diff --git a/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss b/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss
index 1cbb34d7562..627c46ed7b5 100644
--- a/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss
+++ b/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss
@@ -7,8 +7,8 @@
 
 @import 'carbon-components/scss/components/ui-shell/header';
 @import 'carbon-components/scss/components/ui-shell/side-nav';
-@import 'carbon-web-components/scss/components/dropdown/dropdown';
-@import 'carbon-web-components/scss/components/select/select';
+@import '@carbon/carbon-web-components/scss/components/dropdown/dropdown';
+@import '@carbon/carbon-web-components/scss/components/select/select';
 
 @import '../../globals/vars';
 @import '../../globals/imports';
diff --git a/packages/styles/scss/components/structured-list/_structured-list.scss b/packages/styles/scss/components/structured-list/_structured-list.scss
index d0d419fed85..adfb9f0bdca 100644
--- a/packages/styles/scss/components/structured-list/_structured-list.scss
+++ b/packages/styles/scss/components/structured-list/_structured-list.scss
@@ -7,7 +7,7 @@
 
 @import '../../globals/imports';
 @import '../../globals/vars';
-@import 'carbon-web-components/scss/components/structured-list/structured-list';
+@import '@carbon/carbon-web-components/scss/components/structured-list/structured-list';
 
 // Overridden column spanning
 @mixin structured-list-colspan($colNumber) {
diff --git a/packages/styles/scss/components/tabs-extended/_tabs-extended.scss b/packages/styles/scss/components/tabs-extended/_tabs-extended.scss
index 6c144b8967f..8c7342b2b3e 100644
--- a/packages/styles/scss/components/tabs-extended/_tabs-extended.scss
+++ b/packages/styles/scss/components/tabs-extended/_tabs-extended.scss
@@ -9,7 +9,7 @@
 @import '../link-list/index';
 @import 'carbon-components/scss/globals/scss/vendor/@carbon/elements/scss/layout/breakpoint';
 @import 'carbon-components/scss/components/tabs/tabs';
-@import 'carbon-web-components/scss/components/tooltip/tooltip';
+@import '@carbon/carbon-web-components/scss/components/tooltip/tooltip';
 @import 'carbon-components/scss/components/accordion/accordion';
 @import 'carbon-components/scss/components/accordion/keyframes';
 
diff --git a/packages/web-components/.storybook/preview.ts b/packages/web-components/.storybook/preview.ts
index 5ead683d589..b0bb688d683 100644
--- a/packages/web-components/.storybook/preview.ts
+++ b/packages/web-components/.storybook/preview.ts
@@ -12,7 +12,7 @@ import { classMap } from 'lit-html/directives/class-map';
 import coreEvents from '@storybook/core-events';
 import addons from '@storybook/addons';
 
-import 'carbon-web-components/es/components/skip-to-content/skip-to-content.js';
+import '@carbon/carbon-web-components/es/components/skip-to-content/skip-to-content.js';
 
 import { withKnobs } from '@storybook/addon-knobs';
 import { CURRENT_THEME } from '@carbon/storybook-addon-theme/es/shared';
diff --git a/packages/web-components/.storybook/react/preview.tsx b/packages/web-components/.storybook/react/preview.tsx
index e3c1151d108..c3e653b50d2 100644
--- a/packages/web-components/.storybook/react/preview.tsx
+++ b/packages/web-components/.storybook/react/preview.tsx
@@ -12,7 +12,7 @@ import React, { StrictMode } from 'react';
 import coreEvents from '@storybook/core-events';
 import addons from '@storybook/addons';
 import { withKnobs } from '@storybook/addon-knobs';
-import BXSkipToContent from 'carbon-web-components/es/components-react/skip-to-content/skip-to-content';
+import BXSkipToContent from '@carbon/carbon-web-components/es/components-react/skip-to-content/skip-to-content';
 import { CURRENT_THEME } from '@carbon/storybook-addon-theme/es/shared';
 import containerStyles from './container.scss'; // eslint-disable-line import/first
 
@@ -55,8 +55,16 @@ export const decorators = [
     return (
       <StrictMode>
         <style>{containerStyles.cssText}</style>
-        <BXSkipToContent href="#main-content">Skip to main content</BXSkipToContent>
-        <div id="main-content" data-floating-menu-container data-modal-container role="main" className={classes}>
+        <BXSkipToContent href="#main-content">
+          Skip to main content
+        </BXSkipToContent>
+        <div
+          id="main-content"
+          data-floating-menu-container
+          data-modal-container
+          role="main"
+          className={classes}
+        >
           {result}
         </div>
       </StrictMode>
@@ -65,7 +73,10 @@ export const decorators = [
   withKnobs,
   (story, { parameters }) => {
     const root = document.documentElement;
-    root.toggleAttribute('storybook-carbon-theme-prevent-reload', parameters['carbon-theme']?.preventReload);
+    root.toggleAttribute(
+      'storybook-carbon-theme-prevent-reload',
+      parameters['carbon-theme']?.preventReload
+    );
     if (parameters['carbon-theme']?.disabled) {
       root.setAttribute('storybook-carbon-theme', '');
     } else {
@@ -75,10 +86,17 @@ export const decorators = [
   },
 ];
 
-addons.getChannel().on(CURRENT_THEME, theme => {
-  document.documentElement.setAttribute('storybook-carbon-theme', (preservedTheme = theme));
+addons.getChannel().on(CURRENT_THEME, (theme) => {
+  document.documentElement.setAttribute(
+    'storybook-carbon-theme',
+    (preservedTheme = theme)
+  );
   // Re-rendering upon theme change causes adverse effect for some stories
-  if (!document.documentElement.hasAttribute('storybook-carbon-theme-prevent-reload')) {
+  if (
+    !document.documentElement.hasAttribute(
+      'storybook-carbon-theme-prevent-reload'
+    )
+  ) {
     addons.getChannel().emit(coreEvents.FORCE_RE_RENDER);
   }
 });
@@ -89,19 +107,23 @@ addons.getChannel().on(CURRENT_THEME, theme => {
 let currentPath;
 if (window.parent) {
   const parentWindow = window.parent;
-  parentWindow.setInterval(function() {
+  parentWindow.setInterval(function () {
     const urlParams = new URLSearchParams(parentWindow.location.search);
     const path = urlParams.get('path');
     if (path && path !== currentPath) {
       currentPath = path;
 
-      const knobButtons = parentWindow.document.querySelectorAll('#panel-tab-content button');
+      const knobButtons = parentWindow.document.querySelectorAll(
+        '#panel-tab-content button'
+      );
       if (knobButtons) {
         const resetButton = knobButtons[knobButtons.length - 1];
         (resetButton as HTMLElement)?.click();
       }
     }
-    const knobLabel = parentWindow.document.querySelector('[id*="tabbutton-knobs-"]');
+    const knobLabel = parentWindow.document.querySelector(
+      '[id*="tabbutton-knobs-"]'
+    );
     if (knobLabel) {
       (knobLabel as HTMLElement).textContent = 'Knobs';
     }
diff --git a/packages/web-components/IMPLEMENTATION_NOTES.md b/packages/web-components/IMPLEMENTATION_NOTES.md
index 100d907ef1f..63fb7930936 100644
--- a/packages/web-components/IMPLEMENTATION_NOTES.md
+++ b/packages/web-components/IMPLEMENTATION_NOTES.md
@@ -291,7 +291,7 @@ custom element:
 ```javascript
 import createCustomElementType, {
   booleanSerializer,
-} from 'carbon-web-components/es/globals/wrappers/createCustomElementType.js';
+} from '@carbon/carbon-web-components/es/globals/wrappers/createCustomElementType.js';
 
 const BXDropdown = createCustomElementType('bx-dropdown', {
   disabled: {
diff --git a/packages/web-components/docs/coding-conventions.md b/packages/web-components/docs/coding-conventions.md
index d60bc47f288..95daa5f0356 100644
--- a/packages/web-components/docs/coding-conventions.md
+++ b/packages/web-components/docs/coding-conventions.md
@@ -87,8 +87,8 @@ Here's an example seen in `<bx-modal>` code:
 
 ```typescript
 ...
-import HostListener from 'carbon-web-components/es/globals/decorators/HostListener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/HostListener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/HostListener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/HostListener.js';
 ...
 
 @customElement(`${prefix}-modal` as any)
diff --git a/packages/web-components/examples/codesandbox/components-react/content-group-cards/src/index.js b/packages/web-components/examples/codesandbox/components-react/content-group-cards/src/index.js
index f64894be147..abafb2c6009 100644
--- a/packages/web-components/examples/codesandbox/components-react/content-group-cards/src/index.js
+++ b/packages/web-components/examples/codesandbox/components-react/content-group-cards/src/index.js
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import DDSContentGroupCardsItem from '@carbon/ibmdotcom-web-components/es/components-react/content-group-cards/content-group-cards-item';
 import DDSCardHeading from '@carbon/ibmdotcom-web-components/es/components-react/card/card-heading';
 import DDSCardFooter from '@carbon/ibmdotcom-web-components/es/components-react/card/card-footer';
diff --git a/packages/web-components/examples/codesandbox/components-react/content-group-pictograms/src/index.js b/packages/web-components/examples/codesandbox/components-react/content-group-pictograms/src/index.js
index e5001b5f731..092a592bd1b 100644
--- a/packages/web-components/examples/codesandbox/components-react/content-group-pictograms/src/index.js
+++ b/packages/web-components/examples/codesandbox/components-react/content-group-pictograms/src/index.js
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import { render } from 'react-dom';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 // eslint-disable-next-line max-len
 import DDSContentGroupPictograms from '@carbon/ibmdotcom-web-components/es/components-react/content-group-pictograms/content-group-pictograms';
 import DDSContentGroupHeading from '@carbon/ibmdotcom-web-components/es/components-react/content-group/content-group-heading';
diff --git a/packages/web-components/examples/codesandbox/usage/webpack-handlebars/package.json b/packages/web-components/examples/codesandbox/usage/webpack-handlebars/package.json
index 06e3b83572d..a88e215b34c 100644
--- a/packages/web-components/examples/codesandbox/usage/webpack-handlebars/package.json
+++ b/packages/web-components/examples/codesandbox/usage/webpack-handlebars/package.json
@@ -19,11 +19,11 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
+    "@carbon/carbon-web-components": "latest",
     "@carbon/ibmdotcom-services": "canary",
     "@carbon/ibmdotcom-web-components": "canary",
     "accept-language-parser": "^1.5.0",
     "carbon-components": "^10.21.0",
-    "carbon-web-components": "^1.13.0",
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0"
   }
diff --git a/packages/web-components/examples/codesandbox/usage/webpack-rtl/package.json b/packages/web-components/examples/codesandbox/usage/webpack-rtl/package.json
index 9cbe28ef283..de94c6e4eff 100644
--- a/packages/web-components/examples/codesandbox/usage/webpack-rtl/package.json
+++ b/packages/web-components/examples/codesandbox/usage/webpack-rtl/package.json
@@ -12,9 +12,9 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
+    "@carbon/carbon-web-components": "latest",
     "@carbon/ibmdotcom-web-components": "canary",
     "accept-language-parser": "^1.5.0",
-    "carbon-web-components": "^1.13.0",
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0",
     "rtl-detect": "^1.0.0"
diff --git a/packages/web-components/gulp-tasks/build/modules/icons.js b/packages/web-components/gulp-tasks/build/modules/icons.js
index fa7b11c324a..c2498d9c91e 100644
--- a/packages/web-components/gulp-tasks/build/modules/icons.js
+++ b/packages/web-components/gulp-tasks/build/modules/icons.js
@@ -41,7 +41,7 @@ async function icons() {
           const descriptor = await descriptorFromSVG(String(file.contents));
           file.contents = Buffer.from(`
                 import { svg } from 'lit-html';
-                import spread from 'carbon-web-components/es/globals/directives/spread.js';
+                import spread from '@carbon/carbon-web-components/es/globals/directives/spread.js';
                 const svgResultIBMdotcomIcon = ${createSVGResultFromIconDescriptor(descriptor)};
                 export default svgResultIBMdotcomIcon;
               `);
diff --git a/packages/web-components/package.json b/packages/web-components/package.json
index c151232a1cf..f0ecbe26ed2 100644
--- a/packages/web-components/package.json
+++ b/packages/web-components/package.json
@@ -88,6 +88,7 @@
     "wca": "web-component-analyzer analyze src --outFile custom-elements.json"
   },
   "dependencies": {
+    "@carbon/carbon-web-components": "1.22.0-rc.0",
     "@carbon/ibmdotcom-services": "1.41.0-rc.0",
     "@carbon/ibmdotcom-styles": "1.41.0-rc.0",
     "@carbon/ibmdotcom-utilities": "1.41.0-rc.0",
@@ -95,7 +96,6 @@
     "@carbon/motion": "^11.0.0",
     "@carbon/telemetry": "0.1.0",
     "carbon-components": "10.58.5",
-    "carbon-web-components": "1.21.0",
     "lit-element": "2.5.1",
     "lit-html": "1.4.1",
     "lodash-es": "^4.17.0",
diff --git a/packages/web-components/src/component-mixins/cta/cta.ts b/packages/web-components/src/component-mixins/cta/cta.ts
index c244c24a353..a1638f6c61e 100644
--- a/packages/web-components/src/component-mixins/cta/cta.ts
+++ b/packages/web-components/src/component-mixins/cta/cta.ts
@@ -9,18 +9,18 @@
 
 import { html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ArrowDown20 from 'carbon-web-components/es/icons/arrow--down/20.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Download20 from 'carbon-web-components/es/icons/download/20.js';
-import Launch20 from 'carbon-web-components/es/icons/launch/20.js';
-import PlayOutline20 from 'carbon-web-components/es/icons/play--outline/20.js';
-import Blog20 from 'carbon-web-components/es/icons/blog/20.js';
-import DocumentPDF20 from 'carbon-web-components/es/icons/document--pdf/20.js';
-import NewTab20 from 'carbon-web-components/es/icons/new-tab/20.js';
-import Phone20 from 'carbon-web-components/es/icons/phone/20.js';
-import Calendar20 from 'carbon-web-components/es/icons/calendar/20.js';
-import Email20 from 'carbon-web-components/es/icons/email/20.js';
-import Chat20 from 'carbon-web-components/es/icons/chat/20.js';
+import ArrowDown20 from '@carbon/carbon-web-components/es/icons/arrow--down/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Download20 from '@carbon/carbon-web-components/es/icons/download/20.js';
+import Launch20 from '@carbon/carbon-web-components/es/icons/launch/20.js';
+import PlayOutline20 from '@carbon/carbon-web-components/es/icons/play--outline/20.js';
+import Blog20 from '@carbon/carbon-web-components/es/icons/blog/20.js';
+import DocumentPDF20 from '@carbon/carbon-web-components/es/icons/document--pdf/20.js';
+import NewTab20 from '@carbon/carbon-web-components/es/icons/new-tab/20.js';
+import Phone20 from '@carbon/carbon-web-components/es/icons/phone/20.js';
+import Calendar20 from '@carbon/carbon-web-components/es/icons/calendar/20.js';
+import Email20 from '@carbon/carbon-web-components/es/icons/email/20.js';
+import Chat20 from '@carbon/carbon-web-components/es/icons/chat/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { Constructor } from '../../globals/defs';
 import { CTA_TYPE } from '../../components/cta/defs';
diff --git a/packages/web-components/src/component-mixins/cta/video.ts b/packages/web-components/src/component-mixins/cta/video.ts
index b761fa6a8c4..fe2c8f47a07 100644
--- a/packages/web-components/src/component-mixins/cta/video.ts
+++ b/packages/web-components/src/component-mixins/cta/video.ts
@@ -7,11 +7,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ArrowDown20 from 'carbon-web-components/es/icons/arrow--down/20.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Download20 from 'carbon-web-components/es/icons/download/20.js';
-import Launch20 from 'carbon-web-components/es/icons/launch/20.js';
-import PlayOutline20 from 'carbon-web-components/es/icons/play--outline/20.js';
+import ArrowDown20 from '@carbon/carbon-web-components/es/icons/arrow--down/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Download20 from '@carbon/carbon-web-components/es/icons/download/20.js';
+import Launch20 from '@carbon/carbon-web-components/es/icons/launch/20.js';
+import PlayOutline20 from '@carbon/carbon-web-components/es/icons/play--outline/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { Constructor } from '../../globals/defs';
 import { CTA_TYPE } from '../../components/cta/defs';
diff --git a/packages/web-components/src/components/back-to-top/__stories__/data/content.ts b/packages/web-components/src/components/back-to-top/__stories__/data/content.ts
index 3657126daf8..1460462e4ed 100644
--- a/packages/web-components/src/components/back-to-top/__stories__/data/content.ts
+++ b/packages/web-components/src/components/back-to-top/__stories__/data/content.ts
@@ -15,7 +15,7 @@ import '../../../cta-section/index';
 import '../../../link-list/index';
 import '../../../cta/index';
 
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import imgLg1x1 from '../../../../../../storybook-images/assets/960/fpo--1x1--960x960--006.jpg';
 import leadspaceImg from '../../../../../../storybook-images/assets/leadspace/leadspaceMax2.jpg';
 
diff --git a/packages/web-components/src/components/back-to-top/back-to-top.ts b/packages/web-components/src/components/back-to-top/back-to-top.ts
index d60582e33ee..0f680398d52 100644
--- a/packages/web-components/src/components/back-to-top/back-to-top.ts
+++ b/packages/web-components/src/components/back-to-top/back-to-top.ts
@@ -8,11 +8,11 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import throttle from 'lodash-es/throttle.js';
-import UpToTop20 from 'carbon-web-components/es/icons/up-to-top/20.js';
+import UpToTop20 from '@carbon/carbon-web-components/es/icons/up-to-top/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './back-to-top.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/background-media/__stories__/background-media.stories.ts b/packages/web-components/src/components/background-media/__stories__/background-media.stories.ts
index f430d9373ef..21437214a38 100644
--- a/packages/web-components/src/components/background-media/__stories__/background-media.stories.ts
+++ b/packages/web-components/src/components/background-media/__stories__/background-media.stories.ts
@@ -10,7 +10,7 @@
 import '../index';
 import '../../video-player/video-player-container';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { text, select, number } from '@storybook/addon-knobs';
 import imgMax from '../../../../../storybook-images/assets/leadspace/leadspaceMax.jpg';
 import imgLg16x9 from '../../../../../storybook-images/assets/leadspace/fpo--leadspace--16x9--1594x891--005.jpg';
diff --git a/packages/web-components/src/components/background-media/background-media.scss b/packages/web-components/src/components/background-media/background-media.scss
index 49f2cf088c2..379bbaf557e 100644
--- a/packages/web-components/src/components/background-media/background-media.scss
+++ b/packages/web-components/src/components/background-media/background-media.scss
@@ -7,7 +7,7 @@
 
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
 @import '@carbon/ibmdotcom-styles/scss/components/background-media/background-media';
-@import 'carbon-web-components/scss/components/tooltip/tooltip';
+@import '@carbon/carbon-web-components/scss/components/tooltip/tooltip';
 
 .#{$prefix}--background-media--video {
   aspect-ratio: 16 / 9; /* stylelint-disable-line property-no-unknown */
diff --git a/packages/web-components/src/components/background-media/background-media.ts b/packages/web-components/src/components/background-media/background-media.ts
index 79efb9ac4e3..a4c10ee7c2a 100644
--- a/packages/web-components/src/components/background-media/background-media.ts
+++ b/packages/web-components/src/components/background-media/background-media.ts
@@ -10,8 +10,8 @@
 import { html, property, customElement } from 'lit-element';
 import { classMap } from 'lit-html/directives/class-map.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import pauseIcon from 'carbon-web-components/es/icons/pause--outline--filled/32.js';
-import playIcon from 'carbon-web-components/es/icons/play--filled/32.js';
+import pauseIcon from '@carbon/carbon-web-components/es/icons/pause--outline--filled/32.js';
+import playIcon from '@carbon/carbon-web-components/es/icons/play--filled/32.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './background-media.scss';
 import { GRADIENT_DIRECTION, MOBILE_POSITION } from './defs';
diff --git a/packages/web-components/src/components/button-group/__stories__/README.stories.mdx b/packages/web-components/src/components/button-group/__stories__/README.stories.mdx
index 5e1035abdd7..a2c89f385de 100644
--- a/packages/web-components/src/components/button-group/__stories__/README.stories.mdx
+++ b/packages/web-components/src/components/button-group/__stories__/README.stories.mdx
@@ -23,7 +23,7 @@ Here's a quick example to get you started.
 
 ```javascript
 import '@carbon/ibmdotcom-web-components/es/components/button-group/index.js';
-import 'carbon-web-components/es/icons/arrow--right/20.js';
+import '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 ```
 
 <Description markdown={`${cdnJs({ components: ['button-group'] })}`} />
diff --git a/packages/web-components/src/components/button-group/__stories__/button-group.stories.ts b/packages/web-components/src/components/button-group/__stories__/button-group.stories.ts
index 33bb22f4897..75ec654400b 100644
--- a/packages/web-components/src/components/button-group/__stories__/button-group.stories.ts
+++ b/packages/web-components/src/components/button-group/__stories__/button-group.stories.ts
@@ -9,9 +9,9 @@
 
 import { number, select, text } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import ArrowDown20 from 'carbon-web-components/es/icons/arrow--down/20.js';
-import Pdf20 from 'carbon-web-components/es/icons/PDF/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowDown20 from '@carbon/carbon-web-components/es/icons/arrow--down/20.js';
+import Pdf20 from '@carbon/carbon-web-components/es/icons/PDF/20.js';
 import readme from './README.stories.mdx';
 import '../index';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/button-group/button-group.ts b/packages/web-components/src/components/button-group/button-group.ts
index 7ce602ae061..31c70071cf1 100644
--- a/packages/web-components/src/components/button-group/button-group.ts
+++ b/packages/web-components/src/components/button-group/button-group.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { customElement, html, LitElement } from 'lit-element';
-import { BUTTON_KIND } from 'carbon-web-components/es/components/button/defs.js';
+import { BUTTON_KIND } from '@carbon/carbon-web-components/es/components/button/defs.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import styles from './button-group.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/button/button.scss b/packages/web-components/src/components/button/button.scss
index a38fda0a8fc..18a10acfa0b 100644
--- a/packages/web-components/src/components/button/button.scss
+++ b/packages/web-components/src/components/button/button.scss
@@ -1,12 +1,12 @@
 //
-// Copyright IBM Corp. 2020, 2021
+// Copyright IBM Corp. 2020, 2022
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 //
 
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
-@import 'carbon-web-components/scss/components/button/button';
+@import '@carbon/carbon-web-components/scss/components/button/button';
 @import '../../globals/scss/box-sizing';
 
 :host(#{$dds-prefix}-button-expressive) {
diff --git a/packages/web-components/src/components/button/button.ts b/packages/web-components/src/components/button/button.ts
index 7e9de27fc61..1a7b74f9c3b 100644
--- a/packages/web-components/src/components/button/button.ts
+++ b/packages/web-components/src/components/button/button.ts
@@ -10,13 +10,13 @@
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, property, state, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import {
   BUTTON_ICON_LAYOUT,
   BUTTON_KIND,
   BUTTON_SIZE,
-} from 'carbon-web-components/es/components/button/button.js';
+} from '@carbon/carbon-web-components/es/components/button/button.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './button.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts b/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts
index 970da0e3ac0..78c0d8e8875 100644
--- a/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts
+++ b/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts
@@ -9,7 +9,7 @@
 
 import '../index';
 import '../callout-link-with-icon';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import { html } from 'lit-element';
 import { select } from '@storybook/addon-knobs';
 import { QUOTE_TYPES } from '../../quote/quote';
diff --git a/packages/web-components/src/components/card-group/__stories__/card-group.stories.ts b/packages/web-components/src/components/card-group/__stories__/card-group.stories.ts
index 671e25f87c8..85c390c7ded 100644
--- a/packages/web-components/src/components/card-group/__stories__/card-group.stories.ts
+++ b/packages/web-components/src/components/card-group/__stories__/card-group.stories.ts
@@ -14,7 +14,7 @@ import '../index';
 import '../../cta/video-cta-container';
 import { html } from 'lit-element';
 import { select, number, boolean } from '@storybook/addon-knobs';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 // eslint-disable-next-line sort-imports
 import imgXlg4x3 from '../../../../../storybook-images/assets/1312/fpo--4x3--1312x984--003.jpg';
 import imgXlg16x9 from '../../../../../storybook-images/assets/1312/fpo--16x9--1312x738--005.jpg';
diff --git a/packages/web-components/src/components/card-in-card/__stories__/card-in-card.stories.ts b/packages/web-components/src/components/card-in-card/__stories__/card-in-card.stories.ts
index d7da67ac95a..add91752d0f 100644
--- a/packages/web-components/src/components/card-in-card/__stories__/card-in-card.stories.ts
+++ b/packages/web-components/src/components/card-in-card/__stories__/card-in-card.stories.ts
@@ -12,9 +12,9 @@ import '../../image/image';
 import '../index';
 import '../../cta/card-cta-footer';
 import '../../cta/video-cta-container';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { boolean } from '@storybook/addon-knobs';
 
 import imgXlg16x9 from '../../../../../storybook-images/assets/1312/fpo--16x9--1312x738--005.jpg';
diff --git a/packages/web-components/src/components/card-in-card/card-in-card.ts b/packages/web-components/src/components/card-in-card/card-in-card.ts
index 78a6efcb4da..7de82beca6c 100644
--- a/packages/web-components/src/components/card-in-card/card-in-card.ts
+++ b/packages/web-components/src/components/card-in-card/card-in-card.ts
@@ -9,7 +9,7 @@
 
 import { css, customElement, html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import PlayVideo from '@carbon/ibmdotcom-styles/icons/svg/play-video.svg';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSCardCTA, { CTA_TYPE } from '../cta/card-cta';
diff --git a/packages/web-components/src/components/card-link/__stories__/card-link.stories.ts b/packages/web-components/src/components/card-link/__stories__/card-link.stories.ts
index a0804f0ba07..68320a8d26b 100644
--- a/packages/web-components/src/components/card-link/__stories__/card-link.stories.ts
+++ b/packages/web-components/src/components/card-link/__stories__/card-link.stories.ts
@@ -9,9 +9,9 @@
 
 import { boolean } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Error20 from 'carbon-web-components/es/icons/error/20.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Error20 from '@carbon/carbon-web-components/es/icons/error/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import '../index';
diff --git a/packages/web-components/src/components/card-section-carousel/__stories__/card-section-carousel.stories.ts b/packages/web-components/src/components/card-section-carousel/__stories__/card-section-carousel.stories.ts
index 90b57ebc9e7..d7c6bc8b44f 100644
--- a/packages/web-components/src/components/card-section-carousel/__stories__/card-section-carousel.stories.ts
+++ b/packages/web-components/src/components/card-section-carousel/__stories__/card-section-carousel.stories.ts
@@ -8,8 +8,8 @@
  */
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import '../index';
 import styles from './card-section-carousel.stories.scss';
 import readme from './README.stories.mdx';
diff --git a/packages/web-components/src/components/card-section-offset/__stories__/card-section-offset.stories.ts b/packages/web-components/src/components/card-section-offset/__stories__/card-section-offset.stories.ts
index dd984ed3f62..8b025422c82 100644
--- a/packages/web-components/src/components/card-section-offset/__stories__/card-section-offset.stories.ts
+++ b/packages/web-components/src/components/card-section-offset/__stories__/card-section-offset.stories.ts
@@ -8,8 +8,8 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import readme from './README.stories.mdx';
 import '../index';
diff --git a/packages/web-components/src/components/card-section-offset/__tests__/card-section-offset.test.ts b/packages/web-components/src/components/card-section-offset/__tests__/card-section-offset.test.ts
index 9b2aa4514f0..6da69c2834f 100644
--- a/packages/web-components/src/components/card-section-offset/__tests__/card-section-offset.test.ts
+++ b/packages/web-components/src/components/card-section-offset/__tests__/card-section-offset.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 
 import '../card-section-offset';
 
diff --git a/packages/web-components/src/components/card-section-simple/__stories__/card-section-simple.stories.ts b/packages/web-components/src/components/card-section-simple/__stories__/card-section-simple.stories.ts
index f8cccaa073a..8e1f4575b93 100644
--- a/packages/web-components/src/components/card-section-simple/__stories__/card-section-simple.stories.ts
+++ b/packages/web-components/src/components/card-section-simple/__stories__/card-section-simple.stories.ts
@@ -9,7 +9,7 @@
 
 import { html } from 'lit-element';
 import { boolean } from '@storybook/addon-knobs';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import imgLg4x3 from '../../../../../storybook-images/assets/720/fpo--4x3--720x540--005.jpg';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/card-section-simple/__tests__/card-section-simple.test.ts b/packages/web-components/src/components/card-section-simple/__tests__/card-section-simple.test.ts
index 7f294b15587..cabd8cc4b24 100644
--- a/packages/web-components/src/components/card-section-simple/__tests__/card-section-simple.test.ts
+++ b/packages/web-components/src/components/card-section-simple/__tests__/card-section-simple.test.ts
@@ -8,8 +8,8 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../../card/card-heading';
 import '../card-section-simple';
 
diff --git a/packages/web-components/src/components/card/__stories__/card.stories.ts b/packages/web-components/src/components/card/__stories__/card.stories.ts
index 69fe86d7f9d..69cd3454956 100644
--- a/packages/web-components/src/components/card/__stories__/card.stories.ts
+++ b/packages/web-components/src/components/card/__stories__/card.stories.ts
@@ -9,12 +9,12 @@
 
 import '../../image/image';
 import '../../tag-group/tag-group';
-import 'carbon-web-components/es/components/tag/tag.js';
+import '@carbon/carbon-web-components/es/components/tag/tag.js';
 import '../index';
 import { boolean, select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import imgXlg4x3 from '../../../../../storybook-images/assets/1312/fpo--4x3--1312x984--003.jpg';
 import logoMicrosoft2x1 from '../../../../../storybook-images/assets/logos/logo-microsoft--2x1.png';
 import { PICTOGRAM_PLACEMENT } from '../defs';
diff --git a/packages/web-components/src/components/card/card.ts b/packages/web-components/src/components/card/card.ts
index 78bc1116222..a6ae7935a3d 100644
--- a/packages/web-components/src/components/card/card.ts
+++ b/packages/web-components/src/components/card/card.ts
@@ -16,7 +16,7 @@ import {
   query,
 } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import markdownToHtml from '@carbon/ibmdotcom-utilities/es/utilities/markdownToHtml/markdownToHtml.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { BASIC_COLOR_SCHEME } from '../../globals/defs';
diff --git a/packages/web-components/src/components/carousel/__stories__/carousel.stories.ts b/packages/web-components/src/components/carousel/__stories__/carousel.stories.ts
index be535fb5caa..fd922e3e993 100644
--- a/packages/web-components/src/components/carousel/__stories__/carousel.stories.ts
+++ b/packages/web-components/src/components/carousel/__stories__/carousel.stories.ts
@@ -12,8 +12,8 @@ import { html } from 'lit-element';
 // Below path will be there when an application installs `carbon-web-components` package.
 // In our dev env, we auto-generate the file and re-map below path to to point to the generated file.
 // @ts-ignore
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import '../../card/index';
 import '../../cta/index';
 import '../../image/index';
diff --git a/packages/web-components/src/components/carousel/__tests__/carousel.test.ts b/packages/web-components/src/components/carousel/__tests__/carousel.test.ts
index 46fda02fd78..d88496c6c41 100644
--- a/packages/web-components/src/components/carousel/__tests__/carousel.test.ts
+++ b/packages/web-components/src/components/carousel/__tests__/carousel.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import MockResizeObserver from '../../../../tests/utils/mock-resize-observer';
 import DDSCarousel from '../carousel';
 // Above import is interface-only ref and thus code won't be brought into the build
diff --git a/packages/web-components/src/components/carousel/carousel.ts b/packages/web-components/src/components/carousel/carousel.ts
index a596cdfce88..dab042e96ac 100644
--- a/packages/web-components/src/components/carousel/carousel.ts
+++ b/packages/web-components/src/components/carousel/carousel.ts
@@ -18,12 +18,12 @@ import {
 } from 'lit-element';
 import 'wicg-inert';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import CaretLeft20 from 'carbon-web-components/es/icons/caret--left/20.js';
-import CaretRight20 from 'carbon-web-components/es/icons/caret--right/20.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import { selectorTabbable } from 'carbon-web-components/es/globals/settings.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import CaretLeft20 from '@carbon/carbon-web-components/es/icons/caret--left/20.js';
+import CaretRight20 from '@carbon/carbon-web-components/es/icons/caret--right/20.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import { selectorTabbable } from '@carbon/carbon-web-components/es/globals/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import sameHeight from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/sameHeight/sameHeight';
 import styles from './carousel.scss';
diff --git a/packages/web-components/src/components/content-block-card-static/__stories__/README.stories.mdx b/packages/web-components/src/components/content-block-card-static/__stories__/README.stories.mdx
index 4143aeaa801..e3cc92ecbec 100644
--- a/packages/web-components/src/components/content-block-card-static/__stories__/README.stories.mdx
+++ b/packages/web-components/src/components/content-block-card-static/__stories__/README.stories.mdx
@@ -37,11 +37,11 @@ Here's a quick example to get you started.
 import '@carbon/ibmdotcom-web-components/es/components/content-block-card-static/index.js';
 
 // with tags
-import 'carbon-web-components/es/components/tag/tag.js';
+import '@carbon/carbon-web-components/es/components/tag/tag.js';
 
 // Optional icons for Button Group
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Chat20 from 'carbon-web-components/es/icons/chat/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Chat20 from '@carbon/carbon-web-components/es/icons/chat/20.js';
 ```
 
 <Description markdown={`${cdnJs({ components: ['content-block-card-static', 'tag'] })}`} />
diff --git a/packages/web-components/src/components/content-block-card-static/__stories__/content-block-card-static.stories.ts b/packages/web-components/src/components/content-block-card-static/__stories__/content-block-card-static.stories.ts
index 0dc09449e55..c09aab573b1 100644
--- a/packages/web-components/src/components/content-block-card-static/__stories__/content-block-card-static.stories.ts
+++ b/packages/web-components/src/components/content-block-card-static/__stories__/content-block-card-static.stories.ts
@@ -9,8 +9,8 @@
 
 import '../index';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Chat20 from 'carbon-web-components/es/icons/chat/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Chat20 from '@carbon/carbon-web-components/es/icons/chat/20.js';
 // eslint-disable-next-line sort-imports
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/content-block-card-static/__tests__/content-block-card-static.test.ts b/packages/web-components/src/components/content-block-card-static/__tests__/content-block-card-static.test.ts
index a62a069b5aa..189b2b28496 100644
--- a/packages/web-components/src/components/content-block-card-static/__tests__/content-block-card-static.test.ts
+++ b/packages/web-components/src/components/content-block-card-static/__tests__/content-block-card-static.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import '../index';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/content-block-cards/__stories__/content-block-cards.stories.ts b/packages/web-components/src/components/content-block-cards/__stories__/content-block-cards.stories.ts
index eeb2b182914..bb59717dc88 100644
--- a/packages/web-components/src/components/content-block-cards/__stories__/content-block-cards.stories.ts
+++ b/packages/web-components/src/components/content-block-cards/__stories__/content-block-cards.stories.ts
@@ -9,7 +9,7 @@
 
 import '../index';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 // eslint-disable-next-line sort-imports
 import { CTA_TYPE } from '../../cta/defs';
diff --git a/packages/web-components/src/components/content-block-cards/__tests__/content-block-cards.test.ts b/packages/web-components/src/components/content-block-cards/__tests__/content-block-cards.test.ts
index 763c77cca0f..e61a5aabb74 100644
--- a/packages/web-components/src/components/content-block-cards/__tests__/content-block-cards.test.ts
+++ b/packages/web-components/src/components/content-block-cards/__tests__/content-block-cards.test.ts
@@ -8,8 +8,8 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../../card/card-heading';
 import '../content-block-cards';
 
diff --git a/packages/web-components/src/components/content-block-media/__stories__/content-block-media.stories.ts b/packages/web-components/src/components/content-block-media/__stories__/content-block-media.stories.ts
index 3b8355b6f7d..7d360807d7e 100644
--- a/packages/web-components/src/components/content-block-media/__stories__/content-block-media.stories.ts
+++ b/packages/web-components/src/components/content-block-media/__stories__/content-block-media.stories.ts
@@ -12,7 +12,7 @@ import '../../cta/index';
 import '../../link-list/link-list';
 import '../../link-list/link-list-heading';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import imgLg16x9 from '../../../../../storybook-images/assets/720/fpo--16x9--720x405--002.jpg';
diff --git a/packages/web-components/src/components/content-block-mixed/__stories__/content-block-mixed.stories.ts b/packages/web-components/src/components/content-block-mixed/__stories__/content-block-mixed.stories.ts
index 6fdb4a78d69..9a4fa6e7d01 100644
--- a/packages/web-components/src/components/content-block-mixed/__stories__/content-block-mixed.stories.ts
+++ b/packages/web-components/src/components/content-block-mixed/__stories__/content-block-mixed.stories.ts
@@ -13,9 +13,9 @@ import '../../content-block-cards/index';
 import '../../content-group-cards/index';
 import '../../content-group-pictograms/index';
 import '../../content-group-simple/index';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import imgLg16x9 from '../../../../../storybook-images/assets/720/fpo--16x9--720x405--001.jpg';
 import imgMd16x9 from '../../../../../storybook-images/assets/480/fpo--16x9--480x270--001.jpg';
diff --git a/packages/web-components/src/components/content-block-segmented/__stories__/content-block-segmented.stories.ts b/packages/web-components/src/components/content-block-segmented/__stories__/content-block-segmented.stories.ts
index b037fadba1c..ac5e631938a 100644
--- a/packages/web-components/src/components/content-block-segmented/__stories__/content-block-segmented.stories.ts
+++ b/packages/web-components/src/components/content-block-segmented/__stories__/content-block-segmented.stories.ts
@@ -12,7 +12,7 @@ import '../../video-player/video-player-container';
 import '../../link-list/index';
 import '../../cta/index';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 // eslint-disable-next-line sort-imports
 import { CTA_STYLE, CTA_TYPE } from '../../cta/defs';
diff --git a/packages/web-components/src/components/content-block-simple/__stories__/README.stories.mdx b/packages/web-components/src/components/content-block-simple/__stories__/README.stories.mdx
index bdaf166318f..3683bac51ca 100644
--- a/packages/web-components/src/components/content-block-simple/__stories__/README.stories.mdx
+++ b/packages/web-components/src/components/content-block-simple/__stories__/README.stories.mdx
@@ -67,7 +67,7 @@ import '@carbon/ibmdotcom-web-components/es/components/content-block-simple/inde
 
 // with card link CTA
 import '@carbon/ibmdotcom-web-components/es/components/cta/card-link-cta.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 ```
 
 ### HTML
diff --git a/packages/web-components/src/components/content-block-simple/__stories__/content-block-simple.stories.ts b/packages/web-components/src/components/content-block-simple/__stories__/content-block-simple.stories.ts
index 1568fd65472..7f8a431cc8a 100644
--- a/packages/web-components/src/components/content-block-simple/__stories__/content-block-simple.stories.ts
+++ b/packages/web-components/src/components/content-block-simple/__stories__/content-block-simple.stories.ts
@@ -11,11 +11,11 @@ import '../index';
 import '../../cta/index';
 import '../../link-list/index';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import ArrowDown20 from 'carbon-web-components/es/icons/arrow--down/20.js';
-import Launch20 from 'carbon-web-components/es/icons/launch/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowDown20 from '@carbon/carbon-web-components/es/icons/arrow--down/20.js';
+import Launch20 from '@carbon/carbon-web-components/es/icons/launch/20.js';
 import { CONTENT_BLOCK_COMPLEMENTARY_STYLE_SCHEME } from '../../content-block/content-block';
 import { CONTENT_BLOCK_COPY_SIZE } from '../../content-block/content-block-copy';
 import { CTA_STYLE, CTA_TYPE } from '../../cta/defs';
diff --git a/packages/web-components/src/components/content-block-simple/__tests__/content-block-simple.test.ts b/packages/web-components/src/components/content-block-simple/__tests__/content-block-simple.test.ts
index bfa38191d55..f92425faf3f 100644
--- a/packages/web-components/src/components/content-block-simple/__tests__/content-block-simple.test.ts
+++ b/packages/web-components/src/components/content-block-simple/__tests__/content-block-simple.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { CONTENT_BLOCK_COMPLEMENTARY_STYLE_SCHEME } from '../../content-block/content-block';
 import '../content-block-simple';
 
diff --git a/packages/web-components/src/components/content-block/__stories__/content-block.stories.ts b/packages/web-components/src/components/content-block/__stories__/content-block.stories.ts
index b73a7990c34..327f3bebcba 100644
--- a/packages/web-components/src/components/content-block/__stories__/content-block.stories.ts
+++ b/packages/web-components/src/components/content-block/__stories__/content-block.stories.ts
@@ -12,7 +12,7 @@ import '../../cta/index';
 import '../../card-link/index';
 import { html } from 'lit-element';
 import { boolean, optionsKnob } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import { CONTENT_BLOCK_COMPLEMENTARY_STYLE_SCHEME } from '../content-block';
 import imgLg16x9 from '../../../../../storybook-images/assets/720/fpo--16x9--720x405--002.jpg';
 import imgMd16x9 from '../../../../../storybook-images/assets/480/fpo--16x9--480x270--002.jpg';
diff --git a/packages/web-components/src/components/content-group-banner/__stories__/content-group-banner.stories.ts b/packages/web-components/src/components/content-group-banner/__stories__/content-group-banner.stories.ts
index 3c14197da45..4213d85df24 100644
--- a/packages/web-components/src/components/content-group-banner/__stories__/content-group-banner.stories.ts
+++ b/packages/web-components/src/components/content-group-banner/__stories__/content-group-banner.stories.ts
@@ -8,8 +8,8 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import '../index';
diff --git a/packages/web-components/src/components/content-group-cards/__stories__/README.stories.react.mdx b/packages/web-components/src/components/content-group-cards/__stories__/README.stories.react.mdx
index 119194b6680..38a93562ba4 100644
--- a/packages/web-components/src/components/content-group-cards/__stories__/README.stories.react.mdx
+++ b/packages/web-components/src/components/content-group-cards/__stories__/README.stories.react.mdx
@@ -20,7 +20,7 @@ Here's a quick example to get you started.
 ### JS
 
 ```js
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import DDSContentGroupCardsItem from '@carbon/ibmdotcom-web-components/es/components-react/content-group-cards/content-group-cards-item';
 import DDSCardHeading from '@carbon/ibmdotcom-web-components/es/components-react/card/card-heading';
 import DDSCardFooter from '@carbon/ibmdotcom-web-components/es/components-react/card/card-footer';
diff --git a/packages/web-components/src/components/content-group-cards/__stories__/content-group-cards.stories.ts b/packages/web-components/src/components/content-group-cards/__stories__/content-group-cards.stories.ts
index ae5ef3e1828..179452f35bd 100644
--- a/packages/web-components/src/components/content-group-cards/__stories__/content-group-cards.stories.ts
+++ b/packages/web-components/src/components/content-group-cards/__stories__/content-group-cards.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import '../index';
diff --git a/packages/web-components/src/components/content-group-cards/__tests__/content-group-cards.test.ts b/packages/web-components/src/components/content-group-cards/__tests__/content-group-cards.test.ts
index 66b453560c7..11f05f1b682 100644
--- a/packages/web-components/src/components/content-group-cards/__tests__/content-group-cards.test.ts
+++ b/packages/web-components/src/components/content-group-cards/__tests__/content-group-cards.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import '../../card/card-heading';
 import '../content-group-cards';
 import '../content-group-cards-item';
diff --git a/packages/web-components/src/components/content-group-pictograms/__stories__/README.stories.react.mdx b/packages/web-components/src/components/content-group-pictograms/__stories__/README.stories.react.mdx
index cd487b530df..f8bcddacf02 100644
--- a/packages/web-components/src/components/content-group-pictograms/__stories__/README.stories.react.mdx
+++ b/packages/web-components/src/components/content-group-pictograms/__stories__/README.stories.react.mdx
@@ -20,7 +20,7 @@ Here's a quick example to get you started.
 ### JS
 
 ```js
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 // eslint-disable-next-line max-len
 import DDSContentGroupPictograms from '@carbon/ibmdotcom-web-components/es/components-react/content-group-pictograms/content-group-pictograms';
 import DDSContentGroupHeading from '@carbon/ibmdotcom-web-components/es/components-react/content-group/content-group-heading';
diff --git a/packages/web-components/src/components/content-group-pictograms/__stories__/content-group-pictograms.stories.ts b/packages/web-components/src/components/content-group-pictograms/__stories__/content-group-pictograms.stories.ts
index 9c2de7e0600..39c5abe4477 100644
--- a/packages/web-components/src/components/content-group-pictograms/__stories__/content-group-pictograms.stories.ts
+++ b/packages/web-components/src/components/content-group-pictograms/__stories__/content-group-pictograms.stories.ts
@@ -10,7 +10,7 @@
 
 import '../index';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import styles from './content-group-pictograms.stories.scss';
diff --git a/packages/web-components/src/components/content-group-simple/__stories__/content-group-simple.stories.ts b/packages/web-components/src/components/content-group-simple/__stories__/content-group-simple.stories.ts
index 723bb2f832d..8ffbab93b80 100644
--- a/packages/web-components/src/components/content-group-simple/__stories__/content-group-simple.stories.ts
+++ b/packages/web-components/src/components/content-group-simple/__stories__/content-group-simple.stories.ts
@@ -10,7 +10,7 @@
 import '../index';
 import '../../cta/index';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 // eslint-disable-next-line sort-imports
 import { CTA_TYPE } from '../../cta/defs';
diff --git a/packages/web-components/src/components/content-item-horizontal/__stories__/content-item-horizontal.stories.ts b/packages/web-components/src/components/content-item-horizontal/__stories__/content-item-horizontal.stories.ts
index aff47eb901f..4b4b0c120f9 100644
--- a/packages/web-components/src/components/content-item-horizontal/__stories__/content-item-horizontal.stories.ts
+++ b/packages/web-components/src/components/content-item-horizontal/__stories__/content-item-horizontal.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/content-item-horizontal/content-item-horizontal-media.ts b/packages/web-components/src/components/content-item-horizontal/content-item-horizontal-media.ts
index d667e5b1a75..dcd3764a850 100644
--- a/packages/web-components/src/components/content-item-horizontal/content-item-horizontal-media.ts
+++ b/packages/web-components/src/components/content-item-horizontal/content-item-horizontal-media.ts
@@ -16,8 +16,8 @@ import {
 } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import { baseFontSize, breakpoints } from '@carbon/layout';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSContentItem from '../content-item/content-item';
 import styles from './content-item-horizontal-media.scss';
diff --git a/packages/web-components/src/components/content-item/__tests__/content-item.test.ts b/packages/web-components/src/components/content-item/__tests__/content-item.test.ts
index cf5472429a7..e6d8fb1b726 100644
--- a/packages/web-components/src/components/content-item/__tests__/content-item.test.ts
+++ b/packages/web-components/src/components/content-item/__tests__/content-item.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { BASIC_COLOR_SCHEME } from '../../../globals/defs';
 import '../content-item';
 import '../content-item-copy';
diff --git a/packages/web-components/src/components/content-section/__stories__/content-section.stories.ts b/packages/web-components/src/components/content-section/__stories__/content-section.stories.ts
index 406cb8a642a..09971ad5869 100644
--- a/packages/web-components/src/components/content-section/__stories__/content-section.stories.ts
+++ b/packages/web-components/src/components/content-section/__stories__/content-section.stories.ts
@@ -8,8 +8,8 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { optionsKnob } from '@storybook/addon-knobs';
 import '../index';
 import '../../cta/text-cta';
diff --git a/packages/web-components/src/components/cta-block/__stories__/cta-block.stories.ts b/packages/web-components/src/components/cta-block/__stories__/cta-block.stories.ts
index 73577ede47d..178a63a2b83 100644
--- a/packages/web-components/src/components/cta-block/__stories__/cta-block.stories.ts
+++ b/packages/web-components/src/components/cta-block/__stories__/cta-block.stories.ts
@@ -8,10 +8,10 @@
  */
 
 import { boolean, number, select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import Launch20 from 'carbon-web-components/es/icons/launch/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import Launch20 from '@carbon/carbon-web-components/es/icons/launch/20';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import styles from './cta-block.stories.scss';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/cta-block/__tests__/cta-block.test.ts b/packages/web-components/src/components/cta-block/__tests__/cta-block.test.ts
index cb72f7df94c..2b9080fbe0c 100644
--- a/packages/web-components/src/components/cta-block/__tests__/cta-block.test.ts
+++ b/packages/web-components/src/components/cta-block/__tests__/cta-block.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../cta-block';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/cta-section/__stories__/cta-section.stories.ts b/packages/web-components/src/components/cta-section/__stories__/cta-section.stories.ts
index 589c6fa4f22..04846374297 100644
--- a/packages/web-components/src/components/cta-section/__stories__/cta-section.stories.ts
+++ b/packages/web-components/src/components/cta-section/__stories__/cta-section.stories.ts
@@ -8,9 +8,9 @@
  */
 
 import { select, number, boolean } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import '../../link-list/index';
diff --git a/packages/web-components/src/components/cta/__stories__/cta.stories.ts b/packages/web-components/src/components/cta/__stories__/cta.stories.ts
index 8f93d0145b3..bed8de40dae 100644
--- a/packages/web-components/src/components/cta/__stories__/cta.stories.ts
+++ b/packages/web-components/src/components/cta/__stories__/cta.stories.ts
@@ -17,7 +17,7 @@ import '../feature-cta-footer';
 import '../text-cta';
 import '../../button-group/index';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select, boolean } from '@storybook/addon-knobs';
 import { icons as ctaIcons } from '../../../component-mixins/cta/cta';
 // eslint-disable-next-line sort-imports
diff --git a/packages/web-components/src/components/cta/card-cta.ts b/packages/web-components/src/components/cta/card-cta.ts
index 975b031e086..c81daf6f36a 100644
--- a/packages/web-components/src/components/cta/card-cta.ts
+++ b/packages/web-components/src/components/cta/card-cta.ts
@@ -10,7 +10,7 @@
 import { html, property, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import PlayVideo from '@carbon/ibmdotcom-styles/icons/svg/play-video.svg';
 import {
   formatVideoCaption,
diff --git a/packages/web-components/src/components/cta/feature-cta.ts b/packages/web-components/src/components/cta/feature-cta.ts
index 3e3f6552729..3570ce90b94 100644
--- a/packages/web-components/src/components/cta/feature-cta.ts
+++ b/packages/web-components/src/components/cta/feature-cta.ts
@@ -10,7 +10,7 @@
 import { property, customElement, html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import PlayVideo from '@carbon/ibmdotcom-styles/icons/svg/play-video.svg';
 import {
   formatVideoCaption,
diff --git a/packages/web-components/src/components/cta/video-cta-composite.ts b/packages/web-components/src/components/cta/video-cta-composite.ts
index 1aac4ef6499..a36012cd707 100644
--- a/packages/web-components/src/components/cta/video-cta-composite.ts
+++ b/packages/web-components/src/components/cta/video-cta-composite.ts
@@ -9,9 +9,9 @@
 
 import { html, property, state, customElement, LitElement } from 'lit-element';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import KalturaPlayerAPI from '../../internal/vendor/@carbon/ibmdotcom-services/services/KalturaPlayer/KalturaPlayer';
 import ModalRenderMixin from '../../globals/mixins/modal-render';
diff --git a/packages/web-components/src/components/dotcom-shell/__stories__/data/content.ts b/packages/web-components/src/components/dotcom-shell/__stories__/data/content.ts
index 5e9a25e91d9..ab605506e4e 100644
--- a/packages/web-components/src/components/dotcom-shell/__stories__/data/content.ts
+++ b/packages/web-components/src/components/dotcom-shell/__stories__/data/content.ts
@@ -7,7 +7,7 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import logosGroup from '../../../logo-grid/__stories__/data/logos.js';
 import { TOC_TYPES } from '../../../table-of-contents/defs';
 
diff --git a/packages/web-components/src/components/dotcom-shell/__stories__/dotcom-shell.stories.ts b/packages/web-components/src/components/dotcom-shell/__stories__/dotcom-shell.stories.ts
index d7cb02f7883..1849b21200a 100644
--- a/packages/web-components/src/components/dotcom-shell/__stories__/dotcom-shell.stories.ts
+++ b/packages/web-components/src/components/dotcom-shell/__stories__/dotcom-shell.stories.ts
@@ -10,7 +10,7 @@
 import { html } from 'lit-element';
 import { boolean, select, object } from '@storybook/addon-knobs';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import inPercy from '@percy-io/in-percy';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import DDSLeftNav from '../../masthead/left-nav';
diff --git a/packages/web-components/src/components/expressive-modal/__stories__/expressive-modal.stories.ts b/packages/web-components/src/components/expressive-modal/__stories__/expressive-modal.stories.ts
index 3a81b6780d4..840b15bd5b7 100644
--- a/packages/web-components/src/components/expressive-modal/__stories__/expressive-modal.stories.ts
+++ b/packages/web-components/src/components/expressive-modal/__stories__/expressive-modal.stories.ts
@@ -10,9 +10,9 @@
 import { html } from 'lit-element';
 import { action } from '@storybook/addon-actions';
 import { boolean, select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import 'carbon-web-components/es/components/button/button.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import '@carbon/carbon-web-components/es/components/button/button.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import { EXPRESSIVE_MODAL_SIZE } from '../defs';
 import '../index';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal-body.ts b/packages/web-components/src/components/expressive-modal/expressive-modal-body.ts
index 15eb4d260f9..05581e4507a 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal-body.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal-body.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalBody from 'carbon-web-components/es/components/modal/modal-body.js';
+import BXModalBody from '@carbon/carbon-web-components/es/components/modal/modal-body.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './expressive-modal.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal-close-button.ts b/packages/web-components/src/components/expressive-modal/expressive-modal-close-button.ts
index 31ff3ccee53..12142b44477 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal-close-button.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal-close-button.ts
@@ -8,7 +8,7 @@
  */
 
 import { property, customElement } from 'lit-element';
-import BXModalCloseButton from 'carbon-web-components/es/components/modal/modal-close-button.js';
+import BXModalCloseButton from '@carbon/carbon-web-components/es/components/modal/modal-close-button.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { EXPRESSIVE_MODAL_SIZE } from './defs';
 import styles from './expressive-modal.scss';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal-footer.ts b/packages/web-components/src/components/expressive-modal/expressive-modal-footer.ts
index bb4f71af343..1b76e7bc53c 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal-footer.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal-footer.ts
@@ -8,7 +8,7 @@
  */
 
 import { property, customElement } from 'lit-element';
-import BXModalFooter from 'carbon-web-components/es/components/modal/modal-footer.js';
+import BXModalFooter from '@carbon/carbon-web-components/es/components/modal/modal-footer.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './expressive-modal.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal-header.ts b/packages/web-components/src/components/expressive-modal/expressive-modal-header.ts
index d72a5937ff6..e2a930c9344 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal-header.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal-header.ts
@@ -8,7 +8,7 @@
  */
 
 import { property, customElement } from 'lit-element';
-import BXModalHeader from 'carbon-web-components/es/components/modal/modal-header.js';
+import BXModalHeader from '@carbon/carbon-web-components/es/components/modal/modal-header.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './expressive-modal.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal-heading.ts b/packages/web-components/src/components/expressive-modal/expressive-modal-heading.ts
index 788392846c3..d17de2dbd48 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal-heading.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal-heading.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalHeading from 'carbon-web-components/es/components/modal/modal-heading.js';
+import BXModalHeading from '@carbon/carbon-web-components/es/components/modal/modal-heading.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './expressive-modal.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal.scss b/packages/web-components/src/components/expressive-modal/expressive-modal.scss
index d0d1f49980a..657e88a5883 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal.scss
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal.scss
@@ -7,7 +7,7 @@
 
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
 @import '@carbon/ibmdotcom-styles/scss/components/expressive-modal/expressive-modal';
-@import 'carbon-web-components/scss/components/modal/modal';
+@import '@carbon/carbon-web-components/scss/components/modal/modal';
 @import '../../globals/scss/box-sizing';
 
 :host(#{$dds-prefix}-expressive-modal) {
diff --git a/packages/web-components/src/components/expressive-modal/expressive-modal.ts b/packages/web-components/src/components/expressive-modal/expressive-modal.ts
index 7bad2611c2a..5aebc2464fc 100644
--- a/packages/web-components/src/components/expressive-modal/expressive-modal.ts
+++ b/packages/web-components/src/components/expressive-modal/expressive-modal.ts
@@ -20,9 +20,9 @@ import {
 } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import { selectorTabbable } from 'carbon-web-components/es/globals/settings.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import { selectorTabbable } from '@carbon/carbon-web-components/es/globals/settings.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import { EXPRESSIVE_MODAL_SIZE, EXPRESSIVE_MODAL_MODE } from './defs';
diff --git a/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts b/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts
index b7b1477865f..727ed3f4acf 100644
--- a/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts
+++ b/packages/web-components/src/components/feature-card/__stories__/feature-card.stories.ts
@@ -11,9 +11,9 @@ import '../../card/index';
 import '../../image/image';
 import '../index';
 
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import mediumImgLg1x1 from '../../../../../storybook-images/assets/720/fpo--1x1--720x720--004.jpg';
 
 import imgLg1x1 from '../../../../../storybook-images/assets/720/fpo--1x1--720x720--002.jpg';
diff --git a/packages/web-components/src/components/feature-section/__stories__/feature-section.stories.ts b/packages/web-components/src/components/feature-section/__stories__/feature-section.stories.ts
index bd4c5cdd0c1..8967c28086f 100644
--- a/packages/web-components/src/components/feature-section/__stories__/feature-section.stories.ts
+++ b/packages/web-components/src/components/feature-section/__stories__/feature-section.stories.ts
@@ -10,7 +10,7 @@
 import '../index';
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 
 import imgXlg1x1 from '../../../../../storybook-images/assets/1584/fpo--1x1--1584x1584--002.jpg';
diff --git a/packages/web-components/src/components/filter-panel/filter-group-item.ts b/packages/web-components/src/components/filter-panel/filter-group-item.ts
index 32c10729634..75aec26e00c 100644
--- a/packages/web-components/src/components/filter-panel/filter-group-item.ts
+++ b/packages/web-components/src/components/filter-panel/filter-group-item.ts
@@ -9,7 +9,7 @@
 
 import { customElement, property, query, state } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import BXAccordionItem from 'carbon-web-components/es/components/accordion/accordion-item.js';
+import BXAccordionItem from '@carbon/carbon-web-components/es/components/accordion/accordion-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './filter-panel.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/filter-panel/filter-group.ts b/packages/web-components/src/components/filter-panel/filter-group.ts
index c52c2170a75..a3f0f329f37 100644
--- a/packages/web-components/src/components/filter-panel/filter-group.ts
+++ b/packages/web-components/src/components/filter-panel/filter-group.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXAccordion from 'carbon-web-components/es/components/accordion/accordion.js';
+import BXAccordion from '@carbon/carbon-web-components/es/components/accordion/accordion.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import './filter-panel-input-select';
diff --git a/packages/web-components/src/components/filter-panel/filter-modal-button.ts b/packages/web-components/src/components/filter-panel/filter-modal-button.ts
index e37c5be61a2..61caac0ce59 100644
--- a/packages/web-components/src/components/filter-panel/filter-modal-button.ts
+++ b/packages/web-components/src/components/filter-panel/filter-modal-button.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalFooterButton from 'carbon-web-components/es/components/modal/modal-footer-button.js';
+import BXModalFooterButton from '@carbon/carbon-web-components/es/components/modal/modal-footer-button.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
diff --git a/packages/web-components/src/components/filter-panel/filter-modal-footer.ts b/packages/web-components/src/components/filter-panel/filter-modal-footer.ts
index e76ea622912..223978207d7 100644
--- a/packages/web-components/src/components/filter-panel/filter-modal-footer.ts
+++ b/packages/web-components/src/components/filter-panel/filter-modal-footer.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalFooter from 'carbon-web-components/es/components/modal/modal-footer.js';
+import BXModalFooter from '@carbon/carbon-web-components/es/components/modal/modal-footer.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import './filter-panel-input-select';
diff --git a/packages/web-components/src/components/filter-panel/filter-modal-heading.ts b/packages/web-components/src/components/filter-panel/filter-modal-heading.ts
index c04eed7d8b8..7addcd88140 100644
--- a/packages/web-components/src/components/filter-panel/filter-modal-heading.ts
+++ b/packages/web-components/src/components/filter-panel/filter-modal-heading.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalHeading from 'carbon-web-components/es/components/modal/modal-heading.js';
+import BXModalHeading from '@carbon/carbon-web-components/es/components/modal/modal-heading.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
diff --git a/packages/web-components/src/components/filter-panel/filter-panel-checkbox.ts b/packages/web-components/src/components/filter-panel/filter-panel-checkbox.ts
index f949f22db6c..cca09fc7527 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel-checkbox.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel-checkbox.ts
@@ -8,10 +8,10 @@
  */
 
 import { customElement } from 'lit-element';
-import BXCheckbox from 'carbon-web-components/es/components/checkbox/checkbox.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import BXCheckbox from '@carbon/carbon-web-components/es/components/checkbox/checkbox.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
-import 'carbon-web-components/es/components/modal/modal.js';
+import '@carbon/carbon-web-components/es/components/modal/modal.js';
 import styles from './filter-panel.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 
diff --git a/packages/web-components/src/components/filter-panel/filter-panel-composite.ts b/packages/web-components/src/components/filter-panel/filter-panel-composite.ts
index ac2d3246eb5..a740eb8ab10 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel-composite.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel-composite.ts
@@ -16,18 +16,18 @@ import {
   TemplateResult,
 } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Filter from 'carbon-web-components/es/icons/filter/16.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import Filter from '@carbon/carbon-web-components/es/icons/filter/16.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import { baseFontSize, breakpoints } from '@carbon/layout';
 import './filter-group';
 import './filter-panel';
 import './filter-panel-modal';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
-import 'carbon-web-components/es/components/checkbox/checkbox.js';
+import '@carbon/carbon-web-components/es/components/checkbox/checkbox.js';
 import DDSFilterGroupItem from './filter-group-item';
 import DDSFilterPanelCheckbox from './filter-panel-checkbox';
 import DDSFilterPanelInputSelect from './filter-panel-input-select';
diff --git a/packages/web-components/src/components/filter-panel/filter-panel-input-select-item.ts b/packages/web-components/src/components/filter-panel/filter-panel-input-select-item.ts
index 3a07a8a6460..9cbad7b145e 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel-input-select-item.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel-input-select-item.ts
@@ -9,8 +9,8 @@
 
 import { customElement, html, property, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Close from 'carbon-web-components/es/icons/close/16.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import Close from '@carbon/carbon-web-components/es/icons/close/16.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
diff --git a/packages/web-components/src/components/filter-panel/filter-panel-input-select.ts b/packages/web-components/src/components/filter-panel/filter-panel-input-select.ts
index a8456fe9254..aa4e6e31bd6 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel-input-select.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel-input-select.ts
@@ -9,8 +9,8 @@
 
 import { customElement, html, property, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Close from 'carbon-web-components/es/icons/close/16.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import Close from '@carbon/carbon-web-components/es/icons/close/16.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
diff --git a/packages/web-components/src/components/filter-panel/filter-panel-modal.ts b/packages/web-components/src/components/filter-panel/filter-panel-modal.ts
index 14e26004b97..1f4c0ff0ba0 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel-modal.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel-modal.ts
@@ -9,16 +9,16 @@
 
 import { customElement, html, property } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import './filter-group';
 import './filter-modal-button';
 import './filter-modal-heading';
-import BXModal from 'carbon-web-components/es/components/modal/modal.js';
+import BXModal from '@carbon/carbon-web-components/es/components/modal/modal.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import './filter-modal-footer';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
-import 'carbon-web-components/es/components/checkbox/checkbox.js';
+import '@carbon/carbon-web-components/es/components/checkbox/checkbox.js';
 
 const { prefix } = settings;
 const { stablePrefix: ddsPrefix } = ddsSettings;
diff --git a/packages/web-components/src/components/filter-panel/filter-panel.scss b/packages/web-components/src/components/filter-panel/filter-panel.scss
index 17f7fe2278f..5b02f016cc6 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel.scss
+++ b/packages/web-components/src/components/filter-panel/filter-panel.scss
@@ -8,7 +8,7 @@
  */
 
 @import '@carbon/ibmdotcom-styles/scss/components/filter-panel/filter-panel';
-@import 'carbon-web-components/scss/components/modal/modal';
+@import '@carbon/carbon-web-components/scss/components/modal/modal';
 
 :host(#{$dds-prefix}-filter-panel-modal) {
   @extend :host(#{$prefix}-modal);
diff --git a/packages/web-components/src/components/filter-panel/filter-panel.ts b/packages/web-components/src/components/filter-panel/filter-panel.ts
index 6fbc6c9a8e3..edcc326e4a7 100644
--- a/packages/web-components/src/components/filter-panel/filter-panel.ts
+++ b/packages/web-components/src/components/filter-panel/filter-panel.ts
@@ -9,8 +9,8 @@
 
 import { customElement, html, LitElement, property } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Reset from 'carbon-web-components/es/icons/reset/16.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import Reset from '@carbon/carbon-web-components/es/icons/reset/16.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './filter-panel.scss';
diff --git a/packages/web-components/src/components/footer/__stories__/footer.stories.ts b/packages/web-components/src/components/footer/__stories__/footer.stories.ts
index 26e27c87ba4..fad2e665cde 100644
--- a/packages/web-components/src/components/footer/__stories__/footer.stories.ts
+++ b/packages/web-components/src/components/footer/__stories__/footer.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { boolean, object } from '@storybook/addon-knobs';
 import inPercy from '@percy-io/in-percy';
 import { FOOTER_SIZE } from '../footer';
diff --git a/packages/web-components/src/components/footer/__tests__/footer-logo.test.ts b/packages/web-components/src/components/footer/__tests__/footer-logo.test.ts
index ebdac746ae9..3470aaaad8a 100644
--- a/packages/web-components/src/components/footer/__tests__/footer-logo.test.ts
+++ b/packages/web-components/src/components/footer/__tests__/footer-logo.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../footer-logo';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/footer/__tests__/footer-nav-group.test.ts b/packages/web-components/src/components/footer/__tests__/footer-nav-group.test.ts
index 5455b807a15..ae6e8f64c56 100644
--- a/packages/web-components/src/components/footer/__tests__/footer-nav-group.test.ts
+++ b/packages/web-components/src/components/footer/__tests__/footer-nav-group.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import EventManager from '../../../../tests/utils/event-manager';
 import DDSFooterNavGroup from '../footer-nav-group';
 // Above import is interface-only ref and thus code won't be brought into the build
diff --git a/packages/web-components/src/components/footer/__tests__/footer-nav-item.test.ts b/packages/web-components/src/components/footer/__tests__/footer-nav-item.test.ts
index 92050216831..bc65ce853ff 100644
--- a/packages/web-components/src/components/footer/__tests__/footer-nav-item.test.ts
+++ b/packages/web-components/src/components/footer/__tests__/footer-nav-item.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../footer-nav-item';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/footer/combo-box.ts b/packages/web-components/src/components/footer/combo-box.ts
index ab9cf3ec0dd..88407f9e9dc 100644
--- a/packages/web-components/src/components/footer/combo-box.ts
+++ b/packages/web-components/src/components/footer/combo-box.ts
@@ -10,8 +10,8 @@
 import settings from 'carbon-components/es/globals/js/settings.js';
 import { TemplateResult } from 'lit-html';
 import { html, property, query, customElement } from 'lit-element';
-import BXComboBoxItem from 'carbon-web-components/es/components/combo-box/combo-box-item.js';
-import Close16 from 'carbon-web-components/es/icons/close/16.js';
+import BXComboBoxItem from '@carbon/carbon-web-components/es/components/combo-box/combo-box-item.js';
+import Close16 from '@carbon/carbon-web-components/es/icons/close/16.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import { findIndex, forEach } from '../../globals/internal/collection-helpers';
 import DDSDropdown, { DROPDOWN_KEYBOARD_ACTION } from './dropdown';
diff --git a/packages/web-components/src/components/footer/defs.ts b/packages/web-components/src/components/footer/defs.ts
index e6d31d968bc..5ab75aad6e8 100644
--- a/packages/web-components/src/components/footer/defs.ts
+++ b/packages/web-components/src/components/footer/defs.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export { FORM_ELEMENT_COLOR_SCHEME as DROPDOWN_COLOR_SCHEME } from 'carbon-web-components/es/globals/shared-enums.js';
+export { FORM_ELEMENT_COLOR_SCHEME as DROPDOWN_COLOR_SCHEME } from '@carbon/carbon-web-components/es/globals/shared-enums.js';
 
 /**
  * Footer size.
diff --git a/packages/web-components/src/components/footer/dropdown.ts b/packages/web-components/src/components/footer/dropdown.ts
index 36071c1255a..c79bfe723b7 100644
--- a/packages/web-components/src/components/footer/dropdown.ts
+++ b/packages/web-components/src/components/footer/dropdown.ts
@@ -12,10 +12,10 @@ import { classMap } from 'lit-html/directives/class-map.js';
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { html, query, customElement, property } from 'lit-element';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
-import BXDropdown from 'carbon-web-components/es/components/dropdown/dropdown.js';
-import BXDropdownItem from 'carbon-web-components/es/components/dropdown/dropdown-item.js';
-import ChevronDown16 from 'carbon-web-components/es/icons/chevron--down/16.js';
-import WarningFilled16 from 'carbon-web-components/es/icons/warning--filled/16.js';
+import BXDropdown from '@carbon/carbon-web-components/es/components/dropdown/dropdown.js';
+import BXDropdownItem from '@carbon/carbon-web-components/es/components/dropdown/dropdown-item.js';
+import ChevronDown16 from '@carbon/carbon-web-components/es/icons/chevron--down/16.js';
+import WarningFilled16 from '@carbon/carbon-web-components/es/icons/warning--filled/16.js';
 import {
   DROPDOWN_COLOR_SCHEME,
   DROPDOWN_KEYBOARD_ACTION,
diff --git a/packages/web-components/src/components/footer/footer-composite.ts b/packages/web-components/src/components/footer/footer-composite.ts
index 3db2df8247b..87e35080bd4 100644
--- a/packages/web-components/src/components/footer/footer-composite.ts
+++ b/packages/web-components/src/components/footer/footer-composite.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import LocaleAPI from '../../internal/vendor/@carbon/ibmdotcom-services/services/Locale/Locale';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import HybridRenderMixin from '../../globals/mixins/hybrid-render';
@@ -37,8 +37,8 @@ import './legal-nav-item';
 import './legal-nav-cookie-preferences-placeholder';
 import './language-selector-desktop';
 import './language-selector-mobile';
-import 'carbon-web-components/es/components/combo-box/combo-box-item.js';
-import 'carbon-web-components/es/components/select/select-item.js';
+import '@carbon/carbon-web-components/es/components/combo-box/combo-box-item.js';
+import '@carbon/carbon-web-components/es/components/select/select-item.js';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
 
diff --git a/packages/web-components/src/components/footer/footer-logo.ts b/packages/web-components/src/components/footer/footer-logo.ts
index 771e56882f5..c31db783fe0 100644
--- a/packages/web-components/src/components/footer/footer-logo.ts
+++ b/packages/web-components/src/components/footer/footer-logo.ts
@@ -9,8 +9,8 @@
 
 import { html, svg, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import IBM8BarLogoH65White from '@carbon/ibmdotcom-styles/icons/svg/IBM-8bar-logo--h65-white.svg';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/footer/footer-nav-group.ts b/packages/web-components/src/components/footer/footer-nav-group.ts
index 8b94518cb18..ece8c2e0590 100644
--- a/packages/web-components/src/components/footer/footer-nav-group.ts
+++ b/packages/web-components/src/components/footer/footer-nav-group.ts
@@ -9,7 +9,7 @@
 
 import { html, property, state, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ChevronRight16 from 'carbon-web-components/es/icons/chevron--right/16.js';
+import ChevronRight16 from '@carbon/carbon-web-components/es/icons/chevron--right/16.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import Handle from '../../globals/internal/handle';
diff --git a/packages/web-components/src/components/footer/footer-nav-item.ts b/packages/web-components/src/components/footer/footer-nav-item.ts
index 7eb7cbd1723..a6d3fce0eca 100644
--- a/packages/web-components/src/components/footer/footer-nav-item.ts
+++ b/packages/web-components/src/components/footer/footer-nav-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, property, customElement } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './footer.scss';
diff --git a/packages/web-components/src/components/footer/language-selector-desktop.ts b/packages/web-components/src/components/footer/language-selector-desktop.ts
index e97fb0deb3d..73b256c8188 100644
--- a/packages/web-components/src/components/footer/language-selector-desktop.ts
+++ b/packages/web-components/src/components/footer/language-selector-desktop.ts
@@ -8,9 +8,9 @@
  */
 
 import { property, customElement, query, state } from 'lit-element';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import BXComboBoxItem from 'carbon-web-components/es/components/combo-box/combo-box-item.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import BXComboBoxItem from '@carbon/carbon-web-components/es/components/combo-box/combo-box-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { LANGUAGE_SELECTOR_STYLE_SCHEME } from './defs';
 import DDSComboBox, { DROPDOWN_SIZE } from './combo-box';
diff --git a/packages/web-components/src/components/footer/language-selector-mobile.ts b/packages/web-components/src/components/footer/language-selector-mobile.ts
index 24e127dbd62..47d2274027a 100644
--- a/packages/web-components/src/components/footer/language-selector-mobile.ts
+++ b/packages/web-components/src/components/footer/language-selector-mobile.ts
@@ -8,8 +8,8 @@
  */
 
 import { property, customElement } from 'lit-element';
-import BXSelect from 'carbon-web-components/es/components/select/select.js';
-import { INPUT_SIZE } from 'carbon-web-components/es/components/input/input.js';
+import BXSelect from '@carbon/carbon-web-components/es/components/select/select.js';
+import { INPUT_SIZE } from '@carbon/carbon-web-components/es/components/input/input.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './footer.scss';
 
diff --git a/packages/web-components/src/components/footer/locale-button.ts b/packages/web-components/src/components/footer/locale-button.ts
index 6578903c15f..c05b836677a 100644
--- a/packages/web-components/src/components/footer/locale-button.ts
+++ b/packages/web-components/src/components/footer/locale-button.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import EarthFilled16 from 'carbon-web-components/es/icons/earth--filled/16.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import EarthFilled16 from '@carbon/carbon-web-components/es/icons/earth--filled/16.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { FOOTER_SIZE } from './footer';
diff --git a/packages/web-components/src/components/horizontal-rule/__stories__/horizontal-rule.stories.ts b/packages/web-components/src/components/horizontal-rule/__stories__/horizontal-rule.stories.ts
index 07537084090..9fd97cbba87 100644
--- a/packages/web-components/src/components/horizontal-rule/__stories__/horizontal-rule.stories.ts
+++ b/packages/web-components/src/components/horizontal-rule/__stories__/horizontal-rule.stories.ts
@@ -9,7 +9,7 @@
 
 import { select } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../horizontal-rule';
 import readme from './README.stories.mdx';
 
diff --git a/packages/web-components/src/components/horizontal-rule/__tests__/horizontal-rule.test.ts b/packages/web-components/src/components/horizontal-rule/__tests__/horizontal-rule.test.ts
index 23adc1670ee..0d371778650 100644
--- a/packages/web-components/src/components/horizontal-rule/__tests__/horizontal-rule.test.ts
+++ b/packages/web-components/src/components/horizontal-rule/__tests__/horizontal-rule.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../horizontal-rule';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/image-with-caption/image-with-caption.ts b/packages/web-components/src/components/image-with-caption/image-with-caption.ts
index b6f2c2e6865..b6a30465a20 100644
--- a/packages/web-components/src/components/image-with-caption/image-with-caption.ts
+++ b/packages/web-components/src/components/image-with-caption/image-with-caption.ts
@@ -10,14 +10,14 @@
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import '../expressive-modal/expressive-modal';
 import '../expressive-modal/expressive-modal-close-button';
 import '../image/image';
 import '../lightbox-media-viewer/lightbox-image-viewer';
 import '../button/button';
-import ZoomIn20 from 'carbon-web-components/es/icons/zoom--in/20.js';
+import ZoomIn20 from '@carbon/carbon-web-components/es/icons/zoom--in/20.js';
 import deprecate from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/deprecate/deprecate';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './image-with-caption.scss';
diff --git a/packages/web-components/src/components/image/__stories__/image.stories.ts b/packages/web-components/src/components/image/__stories__/image.stories.ts
index 19bef82ad3f..83672d0e6c2 100644
--- a/packages/web-components/src/components/image/__stories__/image.stories.ts
+++ b/packages/web-components/src/components/image/__stories__/image.stories.ts
@@ -9,7 +9,7 @@
 
 import '../image';
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select, boolean } from '@storybook/addon-knobs';
 // eslint-disable-next-line sort-imports
 import imgLg16x9 from '../../../../../storybook-images/assets/720/fpo--16x9--720x405--005.jpg';
diff --git a/packages/web-components/src/components/image/image.ts b/packages/web-components/src/components/image/image.ts
index 9e2c82d9990..eae98241485 100644
--- a/packages/web-components/src/components/image/image.ts
+++ b/packages/web-components/src/components/image/image.ts
@@ -11,13 +11,13 @@ import { html, property, customElement, LitElement, state } from 'lit-element';
 import { classMap } from 'lit-html/directives/class-map.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import '../expressive-modal/expressive-modal';
 import '../expressive-modal/expressive-modal-close-button';
 import '../lightbox-media-viewer/lightbox-image-viewer';
 import '../button/button';
-import ZoomIn20 from 'carbon-web-components/es/icons/zoom--in/20.js';
+import ZoomIn20 from '@carbon/carbon-web-components/es/icons/zoom--in/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './image.scss';
 import ModalRenderMixin from '../../globals/mixins/modal-render';
diff --git a/packages/web-components/src/components/leadspace-block/__stories__/leadspace-block.stories.ts b/packages/web-components/src/components/leadspace-block/__stories__/leadspace-block.stories.ts
index dda5eae8ae1..dfe9dfe2387 100644
--- a/packages/web-components/src/components/leadspace-block/__stories__/leadspace-block.stories.ts
+++ b/packages/web-components/src/components/leadspace-block/__stories__/leadspace-block.stories.ts
@@ -9,8 +9,8 @@
 
 import { html } from 'lit-element';
 import { text } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import Download20 from 'carbon-web-components/es/icons/download/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import Download20 from '@carbon/carbon-web-components/es/icons/download/20';
 
 import '../index';
 import '../../link-list/index';
diff --git a/packages/web-components/src/components/leadspace/__stories__/README.stories.mdx b/packages/web-components/src/components/leadspace/__stories__/README.stories.mdx
index bf1658bedc1..025b2a087df 100644
--- a/packages/web-components/src/components/leadspace/__stories__/README.stories.mdx
+++ b/packages/web-components/src/components/leadspace/__stories__/README.stories.mdx
@@ -25,7 +25,7 @@ Here's a quick example to get you started.
 import '@carbon/ibmdotcom-web-components/es/components/leadspace/index.js';
 
 // icon for the button
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 ```
 
 <Description markdown={`${cdnJs({ components: ['leadspace'] })}`} />
diff --git a/packages/web-components/src/components/leadspace/__stories__/leadspace.stories.ts b/packages/web-components/src/components/leadspace/__stories__/leadspace.stories.ts
index 62f6c20b2a5..139697b3db8 100644
--- a/packages/web-components/src/components/leadspace/__stories__/leadspace.stories.ts
+++ b/packages/web-components/src/components/leadspace/__stories__/leadspace.stories.ts
@@ -9,10 +9,10 @@
 
 import { text, select, number } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import ArrowDown20 from 'carbon-web-components/es/icons/arrow--down/20.js';
-import Pdf20 from 'carbon-web-components/es/icons/PDF/20.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowDown20 from '@carbon/carbon-web-components/es/icons/arrow--down/20.js';
+import Pdf20 from '@carbon/carbon-web-components/es/icons/PDF/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 
 // Above import is interface-only ref and thus code won't be brought into the build
 import '../index';
diff --git a/packages/web-components/src/components/leadspace/breadcrumb-item.ts b/packages/web-components/src/components/leadspace/breadcrumb-item.ts
index 98f89deaee5..2a13df87317 100644
--- a/packages/web-components/src/components/leadspace/breadcrumb-item.ts
+++ b/packages/web-components/src/components/leadspace/breadcrumb-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXBreadcrumbItem from 'carbon-web-components/es/components/breadcrumb/breadcrumb-item.js';
+import BXBreadcrumbItem from '@carbon/carbon-web-components/es/components/breadcrumb/breadcrumb-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './leadspace.scss';
diff --git a/packages/web-components/src/components/leadspace/breadcrumb-link.ts b/packages/web-components/src/components/leadspace/breadcrumb-link.ts
index 6f33d754def..e832b6bc444 100644
--- a/packages/web-components/src/components/leadspace/breadcrumb-link.ts
+++ b/packages/web-components/src/components/leadspace/breadcrumb-link.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXBreadcrumbLink from 'carbon-web-components/es/components/breadcrumb/breadcrumb-link.js';
+import BXBreadcrumbLink from '@carbon/carbon-web-components/es/components/breadcrumb/breadcrumb-link.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './leadspace.scss';
diff --git a/packages/web-components/src/components/leadspace/breadcrumb.ts b/packages/web-components/src/components/leadspace/breadcrumb.ts
index 7320011695d..c1be2fdda01 100644
--- a/packages/web-components/src/components/leadspace/breadcrumb.ts
+++ b/packages/web-components/src/components/leadspace/breadcrumb.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXBreadcrumb from 'carbon-web-components/es/components/breadcrumb/breadcrumb.js';
+import BXBreadcrumb from '@carbon/carbon-web-components/es/components/breadcrumb/breadcrumb.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './leadspace.scss';
diff --git a/packages/web-components/src/components/leadspace/leadspace.scss b/packages/web-components/src/components/leadspace/leadspace.scss
index 9a32b57a605..ac0be5f1433 100644
--- a/packages/web-components/src/components/leadspace/leadspace.scss
+++ b/packages/web-components/src/components/leadspace/leadspace.scss
@@ -7,7 +7,7 @@
 
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
 @import '@carbon/ibmdotcom-styles/scss/components/leadspace/leadspace';
-@import 'carbon-web-components/scss/components/breadcrumb/breadcrumb';
+@import '@carbon/carbon-web-components/scss/components/breadcrumb/breadcrumb';
 
 :host(#{$dds-prefix}-leadspace) {
   display: block;
diff --git a/packages/web-components/src/components/leaving-ibm/__stories__/leaving-ibm.stories.ts b/packages/web-components/src/components/leaving-ibm/__stories__/leaving-ibm.stories.ts
index 719801ca030..a093dbcb9a8 100644
--- a/packages/web-components/src/components/leaving-ibm/__stories__/leaving-ibm.stories.ts
+++ b/packages/web-components/src/components/leaving-ibm/__stories__/leaving-ibm.stories.ts
@@ -9,7 +9,7 @@
 
 import { html } from 'lit-element';
 import { text, select } from '@storybook/addon-knobs';
-import Launch20 from 'carbon-web-components/es/icons/launch/20.js';
+import Launch20 from '@carbon/carbon-web-components/es/icons/launch/20.js';
 import styles from './leaving-ibm.stories.scss';
 import mediumImgLg1x1 from '../../../../../storybook-images/assets/720/fpo--1x1--720x720--004.jpg';
 import '../index';
diff --git a/packages/web-components/src/components/leaving-ibm/leaving-ibm-composite.ts b/packages/web-components/src/components/leaving-ibm/leaving-ibm-composite.ts
index eafc5f812f5..c539b0200e7 100644
--- a/packages/web-components/src/components/leaving-ibm/leaving-ibm-composite.ts
+++ b/packages/web-components/src/components/leaving-ibm/leaving-ibm-composite.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import BXModal from 'carbon-web-components/es/components/modal/modal.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import BXModal from '@carbon/carbon-web-components/es/components/modal/modal.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import {
   LeavingIBMLabels,
@@ -21,10 +21,10 @@ import './leaving-ibm-modal-body';
 import './leaving-ibm-modal-heading';
 import './leaving-ibm-modal-supplemental';
 import ModalRenderMixin from '../../globals/mixins/modal-render';
-import 'carbon-web-components/es/components/modal/modal-header.js';
-import 'carbon-web-components/es/components/modal/modal-close-button.js';
-import 'carbon-web-components/es/components/modal/modal-footer.js';
-import 'carbon-web-components/es/components/button/button.js';
+import '@carbon/carbon-web-components/es/components/modal/modal-header.js';
+import '@carbon/carbon-web-components/es/components/modal/modal-close-button.js';
+import '@carbon/carbon-web-components/es/components/modal/modal-footer.js';
+import '@carbon/carbon-web-components/es/components/button/button.js';
 import styles from './leaving-ibm.scss';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
diff --git a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-body.ts b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-body.ts
index bdf3f488352..94f2cf79493 100644
--- a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-body.ts
+++ b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-body.ts
@@ -8,10 +8,10 @@
  */
 
 import { customElement, html, property } from 'lit-element';
-import BXModalBody from 'carbon-web-components/es/components/modal/modal-body.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import BXModalBody from '@carbon/carbon-web-components/es/components/modal/modal-body.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
-import 'carbon-web-components/es/components/link/link.js';
+import '@carbon/carbon-web-components/es/components/link/link.js';
 import styles from './leaving-ibm.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 
diff --git a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-heading.ts b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-heading.ts
index e19bdfa00c3..49172c07c0e 100644
--- a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-heading.ts
+++ b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal-heading.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXModalHeading from 'carbon-web-components/es/components/modal/modal-heading.js';
+import BXModalHeading from '@carbon/carbon-web-components/es/components/modal/modal-heading.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './leaving-ibm.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal.ts b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal.ts
index 8a7d765a3f3..9ccb0f82d87 100644
--- a/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal.ts
+++ b/packages/web-components/src/components/leaving-ibm/leaving-ibm-modal.ts
@@ -10,8 +10,8 @@
 import { property, customElement } from 'lit-element';
 import BXModal, {
   MODAL_SIZE,
-} from 'carbon-web-components/es/components/modal/modal.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+} from '@carbon/carbon-web-components/es/components/modal/modal.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './leaving-ibm.scss';
diff --git a/packages/web-components/src/components/leaving-ibm/leaving-ibm.scss b/packages/web-components/src/components/leaving-ibm/leaving-ibm.scss
index e3f48494237..c4422204765 100644
--- a/packages/web-components/src/components/leaving-ibm/leaving-ibm.scss
+++ b/packages/web-components/src/components/leaving-ibm/leaving-ibm.scss
@@ -1,12 +1,12 @@
 //
-// Copyright IBM Corp. 2020, 2021
+// Copyright IBM Corp. 2020, 2022
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 //
 
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
-@import 'carbon-web-components/scss/components/modal/modal';
+@import '@carbon/carbon-web-components/scss/components/modal/modal';
 
 :host(#{$dds-prefix}-leaving-ibm-composite),
 :host(#{$dds-prefix}-leaving-ibm-container) {
diff --git a/packages/web-components/src/components/lightbox-media-viewer/__stories__/lightbox-media-viewer.stories.ts b/packages/web-components/src/components/lightbox-media-viewer/__stories__/lightbox-media-viewer.stories.ts
index 132502147c7..9facda46b95 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/__stories__/lightbox-media-viewer.stories.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/__stories__/lightbox-media-viewer.stories.ts
@@ -10,8 +10,8 @@
 import { html } from 'lit-element';
 import { action } from '@storybook/addon-actions';
 import { boolean, select } from '@storybook/addon-knobs';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import 'carbon-web-components/es/components/modal/modal-close-button.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import '@carbon/carbon-web-components/es/components/modal/modal-close-button.js';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import '../index';
 import '../../carousel/index';
diff --git a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-image-viewer.test.ts b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-image-viewer.test.ts
index f92e5fc1dd0..7a285ed1f89 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-image-viewer.test.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-image-viewer.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../lightbox-image-viewer';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player-composite.test.ts b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player-composite.test.ts
index c3f5d97d799..9811cb11db5 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player-composite.test.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player-composite.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import DDSLightboxVideoPlayer from '../lightbox-video-player';
 import DDSLightboxVideoPlayerComposite from '../lightbox-video-player-composite';
 // Above import is interface-only ref and thus code won't be brought into the build
diff --git a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player.test.ts b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player.test.ts
index e6c0a2a6c50..9bb7b90ea7a 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player.test.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/__tests__/lightbox-video-player.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../lightbox-video-player';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/lightbox-media-viewer/lightbox-image-viewer.ts b/packages/web-components/src/components/lightbox-media-viewer/lightbox-image-viewer.ts
index a70d9ce528f..33066b1158a 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/lightbox-image-viewer.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/lightbox-image-viewer.ts
@@ -9,7 +9,7 @@
 
 import { html, property, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSLightboxMediaViewerBody from './lightbox-media-viewer-body';
 import '../expressive-modal/expressive-modal';
diff --git a/packages/web-components/src/components/lightbox-media-viewer/lightbox-media-viewer-body.ts b/packages/web-components/src/components/lightbox-media-viewer/lightbox-media-viewer-body.ts
index 26cbe5e6851..1bb59f69a22 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/lightbox-media-viewer-body.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/lightbox-media-viewer-body.ts
@@ -9,7 +9,7 @@
 
 import { html, LitElement, TemplateResult } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './lightbox-media-viewer.scss';
 
diff --git a/packages/web-components/src/components/lightbox-media-viewer/lightbox-video-player-composite.ts b/packages/web-components/src/components/lightbox-media-viewer/lightbox-video-player-composite.ts
index 6a1c5e1bdc0..224952017e7 100644
--- a/packages/web-components/src/components/lightbox-media-viewer/lightbox-video-player-composite.ts
+++ b/packages/web-components/src/components/lightbox-media-viewer/lightbox-video-player-composite.ts
@@ -9,8 +9,8 @@
 
 import { html, property, customElement } from 'lit-element';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { MediaData } from '../../internal/vendor/@carbon/ibmdotcom-services-store/types/kalturaPlayerAPI.d';
 import ModalRenderMixin from '../../globals/mixins/modal-render';
diff --git a/packages/web-components/src/components/link-list-section/__stories__/link-list-section.stories.ts b/packages/web-components/src/components/link-list-section/__stories__/link-list-section.stories.ts
index 9b323e3a7bf..1bcf958d7ba 100644
--- a/packages/web-components/src/components/link-list-section/__stories__/link-list-section.stories.ts
+++ b/packages/web-components/src/components/link-list-section/__stories__/link-list-section.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import '../index';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import readme from './README.stories.mdx';
diff --git a/packages/web-components/src/components/link-list/__stories__/link-list.stories.ts b/packages/web-components/src/components/link-list/__stories__/link-list.stories.ts
index 3e487276357..1844a72b914 100644
--- a/packages/web-components/src/components/link-list/__stories__/link-list.stories.ts
+++ b/packages/web-components/src/components/link-list/__stories__/link-list.stories.ts
@@ -8,8 +8,8 @@
  */
 
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import { CTA_TYPE } from '../../cta/defs';
diff --git a/packages/web-components/src/components/link-with-icon/__stories__/link-with-icon.stories.ts b/packages/web-components/src/components/link-with-icon/__stories__/link-with-icon.stories.ts
index 86136c571dc..a108827c271 100644
--- a/packages/web-components/src/components/link-with-icon/__stories__/link-with-icon.stories.ts
+++ b/packages/web-components/src/components/link-with-icon/__stories__/link-with-icon.stories.ts
@@ -10,8 +10,8 @@
 import { html } from 'lit-element';
 import { action } from '@storybook/addon-actions';
 import { boolean, select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import readme from './README.stories.mdx';
 import { ICON_PLACEMENT } from '../link-with-icon';
diff --git a/packages/web-components/src/components/link-with-icon/link-with-icon.ts b/packages/web-components/src/components/link-with-icon/link-with-icon.ts
index 6e943ba0034..660a47ac861 100644
--- a/packages/web-components/src/components/link-with-icon/link-with-icon.ts
+++ b/packages/web-components/src/components/link-with-icon/link-with-icon.ts
@@ -10,7 +10,7 @@
 import { html, customElement, TemplateResult, property } from 'lit-element';
 import BXLink, {
   LINK_SIZE,
-} from 'carbon-web-components/es/components/link/link.js';
+} from '@carbon/carbon-web-components/es/components/link/link.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { ICON_PLACEMENT } from '../../globals/defs';
diff --git a/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.react.tsx b/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.react.tsx
index c0583ac62e5..91865516ad9 100644
--- a/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.react.tsx
+++ b/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.react.tsx
@@ -12,22 +12,28 @@ import React from 'react';
 // In our dev env, we auto-generate the file and re-map below path to to point to the generated file.
 // @ts-ignore
 import DDSLocaleModalContainer from '@carbon/ibmdotcom-web-components/es/components-react/locale-modal/locale-modal-container.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import localeData from './locale-data.json';
 
 import readme from './README.stories.react.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import styles from './locale-modal.stories.scss';
 
-export const Default = args => {
+export const Default = (args) => {
   const { langDisplay } = args?.LocaleModalComposite;
-  return <DDSLocaleModalContainer lang-display={ifNonNull(langDisplay)} open localeList={localeData}></DDSLocaleModalContainer>;
+  return (
+    <DDSLocaleModalContainer
+      lang-display={ifNonNull(langDisplay)}
+      open
+      localeList={localeData}
+    ></DDSLocaleModalContainer>
+  );
 };
 
 export default {
   title: 'Components/Locale modal',
   decorators: [
-    story => {
+    (story) => {
       return (
         <>
           <style>{styles.cssText}</style>
@@ -41,7 +47,10 @@ export default {
     hasStoryPadding: true,
     knobs: {
       LocaleModalComposite: () => ({
-        langDisplay: textNullable('Display language (lang-display)', 'United States — English'),
+        langDisplay: textNullable(
+          'Display language (lang-display)',
+          'United States — English'
+        ),
       }),
     },
     propsSet: {
diff --git a/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.ts b/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.ts
index a3b355df06a..80051ce8ac9 100644
--- a/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.ts
+++ b/packages/web-components/src/components/locale-modal/__stories__/locale-modal.stories.ts
@@ -9,7 +9,7 @@
 
 import { html } from 'lit-element';
 import inPercy from '@percy-io/in-percy';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import localeData from './locale-data.json';
 import styles from './locale-modal.stories.scss';
diff --git a/packages/web-components/src/components/locale-modal/__tests__/locale-item.test.ts b/packages/web-components/src/components/locale-modal/__tests__/locale-item.test.ts
index 9a4657b3678..d788e40c9bd 100644
--- a/packages/web-components/src/components/locale-modal/__tests__/locale-item.test.ts
+++ b/packages/web-components/src/components/locale-modal/__tests__/locale-item.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../locale-item';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/locale-modal/__tests__/locale-modal-composite.test.ts b/packages/web-components/src/components/locale-modal/__tests__/locale-modal-composite.test.ts
index 092a8d6e575..cdc9ec7849c 100644
--- a/packages/web-components/src/components/locale-modal/__tests__/locale-modal-composite.test.ts
+++ b/packages/web-components/src/components/locale-modal/__tests__/locale-modal-composite.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { LocaleList } from '../../../internal/vendor/@carbon/ibmdotcom-services-store/types/localeAPI.d';
 // Above import is interface-only ref and thus code won't be brought into the build
 import '../locale-modal-container';
diff --git a/packages/web-components/src/components/locale-modal/__tests__/locale-modal.test.ts b/packages/web-components/src/components/locale-modal/__tests__/locale-modal.test.ts
index f00c0eefd3c..3c0c3e7aaa3 100644
--- a/packages/web-components/src/components/locale-modal/__tests__/locale-modal.test.ts
+++ b/packages/web-components/src/components/locale-modal/__tests__/locale-modal.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../locale-modal';
 import '../regions';
 import '../region-item';
diff --git a/packages/web-components/src/components/locale-modal/__tests__/locale-search.test.ts b/packages/web-components/src/components/locale-modal/__tests__/locale-search.test.ts
index 5cda8468c94..ea51f5e155d 100644
--- a/packages/web-components/src/components/locale-modal/__tests__/locale-search.test.ts
+++ b/packages/web-components/src/components/locale-modal/__tests__/locale-search.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import DDSSearch from '../../search/search';
 import DDSLocaleSearch from '../locale-search';
 import '../locale-item';
diff --git a/packages/web-components/src/components/locale-modal/__tests__/region-item.test.ts b/packages/web-components/src/components/locale-modal/__tests__/region-item.test.ts
index 8fd8c3bcba0..8b16bafe85e 100644
--- a/packages/web-components/src/components/locale-modal/__tests__/region-item.test.ts
+++ b/packages/web-components/src/components/locale-modal/__tests__/region-item.test.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, render } from 'lit-html';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import Error20 from 'carbon-web-components/es/icons/error/20.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import Error20 from '@carbon/carbon-web-components/es/icons/error/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../region-item';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/locale-modal/locale-item.ts b/packages/web-components/src/components/locale-modal/locale-item.ts
index 566a1eef0dd..2d3dc6a1b8f 100644
--- a/packages/web-components/src/components/locale-modal/locale-item.ts
+++ b/packages/web-components/src/components/locale-modal/locale-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, property, customElement } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './locale-modal.scss';
diff --git a/packages/web-components/src/components/locale-modal/locale-modal-composite.ts b/packages/web-components/src/components/locale-modal/locale-modal-composite.ts
index ad1a873ef7f..5049c7e5ec5 100644
--- a/packages/web-components/src/components/locale-modal/locale-modal-composite.ts
+++ b/packages/web-components/src/components/locale-modal/locale-modal-composite.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import LocaleAPI from '@carbon/ibmdotcom-services/es/services/Locale/Locale.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import altlangs from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/altlangs/altlangs.js';
diff --git a/packages/web-components/src/components/locale-modal/locale-modal.ts b/packages/web-components/src/components/locale-modal/locale-modal.ts
index 343369d0d29..481a29092f8 100644
--- a/packages/web-components/src/components/locale-modal/locale-modal.ts
+++ b/packages/web-components/src/components/locale-modal/locale-modal.ts
@@ -9,11 +9,11 @@
 
 import { html, property, state, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ArrowLeft20 from 'carbon-web-components/es/icons/arrow--left/20.js';
-import EarthFilled16 from 'carbon-web-components/es/icons/earth--filled/16.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import { selectorTabbable } from 'carbon-web-components/es/globals/settings.js';
+import ArrowLeft20 from '@carbon/carbon-web-components/es/icons/arrow--left/20.js';
+import EarthFilled16 from '@carbon/carbon-web-components/es/icons/earth--filled/16.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import { selectorTabbable } from '@carbon/carbon-web-components/es/globals/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSExpressiveModal from '../expressive-modal/expressive-modal';
 import '../expressive-modal/expressive-modal-header';
diff --git a/packages/web-components/src/components/locale-modal/locale-search.ts b/packages/web-components/src/components/locale-modal/locale-search.ts
index 58a6ddd16fc..9bf81b16194 100644
--- a/packages/web-components/src/components/locale-modal/locale-search.ts
+++ b/packages/web-components/src/components/locale-modal/locale-search.ts
@@ -16,7 +16,7 @@ import {
   LitElement,
 } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import { INPUT_SIZE } from 'carbon-web-components/es/components/input/input.js';
+import { INPUT_SIZE } from '@carbon/carbon-web-components/es/components/input/input.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import ThrottedInputMixin from '../../globals/mixins/throttled-input';
 import { forEach } from '../../globals/internal/collection-helpers';
diff --git a/packages/web-components/src/components/locale-modal/region-item.ts b/packages/web-components/src/components/locale-modal/region-item.ts
index d8ad92feea8..42191ae94cf 100644
--- a/packages/web-components/src/components/locale-modal/region-item.ts
+++ b/packages/web-components/src/components/locale-modal/region-item.ts
@@ -9,9 +9,9 @@
 
 import { html, property, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
-import Error20 from 'carbon-web-components/es/icons/error/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
+import Error20 from '@carbon/carbon-web-components/es/icons/error/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './locale-modal.scss';
 
diff --git a/packages/web-components/src/components/locale-modal/regions.ts b/packages/web-components/src/components/locale-modal/regions.ts
index beb54577fa2..25f7d94e718 100644
--- a/packages/web-components/src/components/locale-modal/regions.ts
+++ b/packages/web-components/src/components/locale-modal/regions.ts
@@ -10,7 +10,7 @@
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
-import 'carbon-web-components/es/components/search/search.js';
+import '@carbon/carbon-web-components/es/components/search/search.js';
 import styles from './locale-modal.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 
diff --git a/packages/web-components/src/components/logo-grid/__stories__/logo-grid.stories.ts b/packages/web-components/src/components/logo-grid/__stories__/logo-grid.stories.ts
index 9fbec3bbd47..9783caf2bee 100644
--- a/packages/web-components/src/components/logo-grid/__stories__/logo-grid.stories.ts
+++ b/packages/web-components/src/components/logo-grid/__stories__/logo-grid.stories.ts
@@ -15,7 +15,7 @@ import '../../card-link/card-link-heading';
 import '../../card/card-footer';
 import { boolean, text, select } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import logos from './data/logos.js';
 import readme from './README.stories.mdx';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/markdown/markdown.ts b/packages/web-components/src/components/markdown/markdown.ts
index 9ba9d1ff8d9..74e2c0eec69 100644
--- a/packages/web-components/src/components/markdown/markdown.ts
+++ b/packages/web-components/src/components/markdown/markdown.ts
@@ -11,10 +11,10 @@ import { render } from 'lit-html';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import 'carbon-web-components/es/components/link/link.js';
-import 'carbon-web-components/es/components/list/ordered-list.js';
-import 'carbon-web-components/es/components/list/unordered-list.js';
-import 'carbon-web-components/es/components/list/list-item.js';
+import '@carbon/carbon-web-components/es/components/link/link.js';
+import '@carbon/carbon-web-components/es/components/list/ordered-list.js';
+import '@carbon/carbon-web-components/es/components/list/unordered-list.js';
+import '@carbon/carbon-web-components/es/components/list/list-item.js';
 import markdownToHtml from '@carbon/ibmdotcom-utilities/es/utilities/markdownToHtml/markdownToHtml.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './markdown.scss';
diff --git a/packages/web-components/src/components/masthead/__stories__/cloud-masthead.stories.ts b/packages/web-components/src/components/masthead/__stories__/cloud-masthead.stories.ts
index 4b3938980f5..3a82c604334 100644
--- a/packages/web-components/src/components/masthead/__stories__/cloud-masthead.stories.ts
+++ b/packages/web-components/src/components/masthead/__stories__/cloud-masthead.stories.ts
@@ -10,7 +10,7 @@
 import { html } from 'lit-element';
 import { select } from '@storybook/addon-knobs';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import inPercy from '@percy-io/in-percy';
 import DDSLeftNav from '../left-nav';
 import '../masthead-container';
diff --git a/packages/web-components/src/components/masthead/__stories__/masthead.stories.ts b/packages/web-components/src/components/masthead/__stories__/masthead.stories.ts
index efd4575f24a..497dd92d2c9 100644
--- a/packages/web-components/src/components/masthead/__stories__/masthead.stories.ts
+++ b/packages/web-components/src/components/masthead/__stories__/masthead.stories.ts
@@ -10,7 +10,7 @@
 import { html } from 'lit-element';
 import { boolean, select } from '@storybook/addon-knobs';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import inPercy from '@percy-io/in-percy';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import DDSLeftNav from '../left-nav';
diff --git a/packages/web-components/src/components/masthead/__stories__/scoped-search-masthead.stories.ts b/packages/web-components/src/components/masthead/__stories__/scoped-search-masthead.stories.ts
index edc1471d7fc..a8dcb6e1167 100644
--- a/packages/web-components/src/components/masthead/__stories__/scoped-search-masthead.stories.ts
+++ b/packages/web-components/src/components/masthead/__stories__/scoped-search-masthead.stories.ts
@@ -10,7 +10,7 @@
 import { html } from 'lit-element';
 import { boolean, select } from '@storybook/addon-knobs';
 import on from 'carbon-components/es/globals/js/misc/on.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import inPercy from '@percy-io/in-percy';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import DDSLeftNav from '../left-nav';
diff --git a/packages/web-components/src/components/masthead/__tests__/left-nav-menu.test.ts b/packages/web-components/src/components/masthead/__tests__/left-nav-menu.test.ts
index 1ebd395258a..64158cd63a6 100644
--- a/packages/web-components/src/components/masthead/__tests__/left-nav-menu.test.ts
+++ b/packages/web-components/src/components/masthead/__tests__/left-nav-menu.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../left-nav-menu';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/masthead/__tests__/left-nav.test.ts b/packages/web-components/src/components/masthead/__tests__/left-nav.test.ts
index f71a087620f..2898cf19f9b 100644
--- a/packages/web-components/src/components/masthead/__tests__/left-nav.test.ts
+++ b/packages/web-components/src/components/masthead/__tests__/left-nav.test.ts
@@ -8,8 +8,8 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import { SIDE_NAV_USAGE_MODE } from 'carbon-web-components/es/components/ui-shell/side-nav.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import { SIDE_NAV_USAGE_MODE } from '@carbon/carbon-web-components/es/components/ui-shell/side-nav.js';
 import '../left-nav';
 import DDSLeftNavOverlay from '../left-nav-overlay';
 
diff --git a/packages/web-components/src/components/masthead/__tests__/masthead-composite.test.ts b/packages/web-components/src/components/masthead/__tests__/masthead-composite.test.ts
index 8579fd028af..9a35777bb26 100644
--- a/packages/web-components/src/components/masthead/__tests__/masthead-composite.test.ts
+++ b/packages/web-components/src/components/masthead/__tests__/masthead-composite.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import EventManager from '../../../../tests/utils/event-manager';
 import { MastheadLink } from '../../../internal/vendor/@carbon/ibmdotcom-services-store/types/translateAPI.d';
 import DDSMastheadComposite from '../masthead-composite';
diff --git a/packages/web-components/src/components/masthead/__tests__/masthead-logo.test.ts b/packages/web-components/src/components/masthead/__tests__/masthead-logo.test.ts
index 3873803113e..e8aad4f66c4 100644
--- a/packages/web-components/src/components/masthead/__tests__/masthead-logo.test.ts
+++ b/packages/web-components/src/components/masthead/__tests__/masthead-logo.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../masthead-logo';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/masthead/__tests__/masthead-profile.test.ts b/packages/web-components/src/components/masthead/__tests__/masthead-profile.test.ts
index 601e3ec4efe..81be86c46be 100644
--- a/packages/web-components/src/components/masthead/__tests__/masthead-profile.test.ts
+++ b/packages/web-components/src/components/masthead/__tests__/masthead-profile.test.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import User20 from 'carbon-web-components/es/icons/user/20.js';
-import UserOnline20 from 'carbon-web-components/es/icons/user--online/20.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import User20 from '@carbon/carbon-web-components/es/icons/user/20.js';
+import UserOnline20 from '@carbon/carbon-web-components/es/icons/user--online/20.js';
 import DDSMastheadProfile from '../masthead-profile';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-left-nav-item.ts b/packages/web-components/src/components/masthead/cloud/cloud-left-nav-item.ts
index 15aee6582e7..6de6b79e302 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-left-nav-item.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-left-nav-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXSideNavLink from 'carbon-web-components/es/components/ui-shell/side-nav-link.js';
+import BXSideNavLink from '@carbon/carbon-web-components/es/components/ui-shell/side-nav-link.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-masthead-composite.ts b/packages/web-components/src/components/masthead/cloud/cloud-masthead-composite.ts
index 9e42552ed4b..28b877ab6dd 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-masthead-composite.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-masthead-composite.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement, html, property } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { globalInit } from '../../../internal/vendor/@carbon/ibmdotcom-services/services/global/global';
 import './cloud-button-cta';
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-masthead-profile.ts b/packages/web-components/src/components/masthead/cloud/cloud-masthead-profile.ts
index 7ee8880e667..5baee325715 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-masthead-profile.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-masthead-profile.ts
@@ -10,7 +10,7 @@
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { html, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import User20 from 'carbon-web-components/es/icons/user/20.js';
+import User20 from '@carbon/carbon-web-components/es/icons/user/20.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 import DDSMastheadProfile from '../masthead-profile';
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-heading.ts b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-heading.ts
index 354d0b00410..650c874756e 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-heading.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-heading.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, customElement, LitElement, property } from 'lit-element';
-import ArrowRight32 from 'carbon-web-components/es/icons/arrow--right/32.js';
+import ArrowRight32 from '@carbon/carbon-web-components/es/icons/arrow--right/32.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-link.ts b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-link.ts
index 3ab75358a2f..2b08a4d230e 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-link.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-category-link.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, property, customElement } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tab.ts b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tab.ts
index 68a25004b8c..a623c8467a2 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tab.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tab.ts
@@ -9,7 +9,7 @@
 
 import { customElement, html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import BXTab from 'carbon-web-components/es/components/tabs/tab.js';
+import BXTab from '@carbon/carbon-web-components/es/components/tabs/tab.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tabs.ts b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tabs.ts
index 8aaf5b75b1e..73610efcf83 100644
--- a/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tabs.ts
+++ b/packages/web-components/src/components/masthead/cloud/cloud-megamenu-tabs.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXTabs from 'carbon-web-components/es/components/tabs/tabs.js';
+import BXTabs from '@carbon/carbon-web-components/es/components/tabs/tabs.js';
 import ddsSettings from '../../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './cloud-masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/left-nav-item.ts b/packages/web-components/src/components/masthead/left-nav-item.ts
index 8be8a90e2a5..5b3fbeb95e7 100644
--- a/packages/web-components/src/components/masthead/left-nav-item.ts
+++ b/packages/web-components/src/components/masthead/left-nav-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXSideNavLink from 'carbon-web-components/es/components/ui-shell/side-nav-link.js';
+import BXSideNavLink from '@carbon/carbon-web-components/es/components/ui-shell/side-nav-link.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/left-nav-menu-item.ts b/packages/web-components/src/components/masthead/left-nav-menu-item.ts
index 53798fd986b..1f0179a5b89 100644
--- a/packages/web-components/src/components/masthead/left-nav-menu-item.ts
+++ b/packages/web-components/src/components/masthead/left-nav-menu-item.ts
@@ -10,7 +10,7 @@
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import BXSideNavMenuItem from 'carbon-web-components/es/components/ui-shell/side-nav-menu-item.js';
+import BXSideNavMenuItem from '@carbon/carbon-web-components/es/components/ui-shell/side-nav-menu-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/left-nav-menu-section.ts b/packages/web-components/src/components/masthead/left-nav-menu-section.ts
index 79b62930ee8..ecc6797b32f 100644
--- a/packages/web-components/src/components/masthead/left-nav-menu-section.ts
+++ b/packages/web-components/src/components/masthead/left-nav-menu-section.ts
@@ -9,12 +9,12 @@
 
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import ChevronLeft20 from 'carbon-web-components/es/icons/chevron--left/20.js';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
-import { selectorTabbable } from 'carbon-web-components/es/globals/settings.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import ChevronLeft20 from '@carbon/carbon-web-components/es/icons/chevron--left/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
+import { selectorTabbable } from '@carbon/carbon-web-components/es/globals/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { forEach } from '../../globals/internal/collection-helpers';
 import styles from './masthead.scss';
diff --git a/packages/web-components/src/components/masthead/left-nav-menu.ts b/packages/web-components/src/components/masthead/left-nav-menu.ts
index 0bc89031453..03cf6e5e8b8 100644
--- a/packages/web-components/src/components/masthead/left-nav-menu.ts
+++ b/packages/web-components/src/components/masthead/left-nav-menu.ts
@@ -10,8 +10,8 @@
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ChevronDown20 from 'carbon-web-components/es/icons/chevron--down/20.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import ChevronDown20 from '@carbon/carbon-web-components/es/icons/chevron--down/20.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/left-nav-name.ts b/packages/web-components/src/components/masthead/left-nav-name.ts
index f448a04d059..922b0378974 100644
--- a/packages/web-components/src/components/masthead/left-nav-name.ts
+++ b/packages/web-components/src/components/masthead/left-nav-name.ts
@@ -9,8 +9,8 @@
 
 import { html, property, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import BXHeaderName from 'carbon-web-components/es/components/ui-shell/header-name.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import BXHeaderName from '@carbon/carbon-web-components/es/components/ui-shell/header-name.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 import DDSLeftNav from './left-nav';
diff --git a/packages/web-components/src/components/masthead/left-nav.ts b/packages/web-components/src/components/masthead/left-nav.ts
index 08ba538bf49..13e80ca0b23 100644
--- a/packages/web-components/src/components/masthead/left-nav.ts
+++ b/packages/web-components/src/components/masthead/left-nav.ts
@@ -10,11 +10,11 @@
 import findLast from 'lodash-es/findLast.js';
 import { html, query, property, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import { selectorTabbable } from 'carbon-web-components/es/globals/settings.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import { selectorTabbable } from '@carbon/carbon-web-components/es/globals/settings.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import BXSideNav, {
   SIDE_NAV_USAGE_MODE,
-} from 'carbon-web-components/es/components/ui-shell/side-nav.js';
+} from '@carbon/carbon-web-components/es/components/ui-shell/side-nav.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import focuswrap from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/focuswrap/focuswrap';
 import { find, forEach } from '../../globals/internal/collection-helpers';
diff --git a/packages/web-components/src/components/masthead/masthead-composite.ts b/packages/web-components/src/components/masthead/masthead-composite.ts
index 57869694e4e..bd733708b43 100644
--- a/packages/web-components/src/components/masthead/masthead-composite.ts
+++ b/packages/web-components/src/components/masthead/masthead-composite.ts
@@ -9,8 +9,8 @@
 
 import { html, property, customElement, LitElement } from 'lit-element';
 import { nothing } from 'lit-html';
-import ArrowRight16 from 'carbon-web-components/es/icons/arrow--right/16.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight16 from '@carbon/carbon-web-components/es/icons/arrow--right/16.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { unsafeSVG } from 'lit-html/directives/unsafe-svg.js';
 import root from 'window-or-global';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
diff --git a/packages/web-components/src/components/masthead/masthead-global-bar.ts b/packages/web-components/src/components/masthead/masthead-global-bar.ts
index 0908adc260e..da352582fe3 100644
--- a/packages/web-components/src/components/masthead/masthead-global-bar.ts
+++ b/packages/web-components/src/components/masthead/masthead-global-bar.ts
@@ -9,9 +9,9 @@
 
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, property, customElement, LitElement } from 'lit-element';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/masthead/masthead-logo.ts b/packages/web-components/src/components/masthead/masthead-logo.ts
index 69ae9e00546..ccb4babd198 100644
--- a/packages/web-components/src/components/masthead/masthead-logo.ts
+++ b/packages/web-components/src/components/masthead/masthead-logo.ts
@@ -8,11 +8,11 @@
  */
 
 import { html, state, property, customElement } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import IBM8BarLogoH23 from '@carbon/ibmdotcom-styles/icons/svg/IBM-8bar-logo--h23.svg';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
diff --git a/packages/web-components/src/components/masthead/masthead-menu-button.ts b/packages/web-components/src/components/masthead/masthead-menu-button.ts
index ab713aaa03e..508291e1b7b 100644
--- a/packages/web-components/src/components/masthead/masthead-menu-button.ts
+++ b/packages/web-components/src/components/masthead/masthead-menu-button.ts
@@ -9,10 +9,10 @@
 
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, state, property, query, customElement } from 'lit-element';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import BXHeaderMenuButton from 'carbon-web-components/es/components/ui-shell/header-menu-button.js';
+import BXHeaderMenuButton from '@carbon/carbon-web-components/es/components/ui-shell/header-menu-button.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import focuswrap from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/focuswrap/focuswrap';
 import Handle from '../../globals/internal/handle';
diff --git a/packages/web-components/src/components/masthead/masthead-profile-item.ts b/packages/web-components/src/components/masthead/masthead-profile-item.ts
index 3a38fef7797..3d80ea76f73 100644
--- a/packages/web-components/src/components/masthead/masthead-profile-item.ts
+++ b/packages/web-components/src/components/masthead/masthead-profile-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXHeaderMenuItem from 'carbon-web-components/es/components/ui-shell/header-menu-item.js';
+import BXHeaderMenuItem from '@carbon/carbon-web-components/es/components/ui-shell/header-menu-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/masthead-profile.ts b/packages/web-components/src/components/masthead/masthead-profile.ts
index fc801e569c9..29ab2716911 100644
--- a/packages/web-components/src/components/masthead/masthead-profile.ts
+++ b/packages/web-components/src/components/masthead/masthead-profile.ts
@@ -10,11 +10,11 @@
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import { html, property, query, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import User20 from 'carbon-web-components/es/icons/user/20.js';
-import UserOnline20 from 'carbon-web-components/es/icons/user--online/20.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import User20 from '@carbon/carbon-web-components/es/icons/user/20.js';
+import UserOnline20 from '@carbon/carbon-web-components/es/icons/user--online/20.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/masthead/masthead.scss b/packages/web-components/src/components/masthead/masthead.scss
index 600e62d2a39..4de5a473832 100644
--- a/packages/web-components/src/components/masthead/masthead.scss
+++ b/packages/web-components/src/components/masthead/masthead.scss
@@ -13,9 +13,9 @@
 @import '@carbon/ibmdotcom-styles/scss/components/masthead/masthead-top-nav-name';
 @import '@carbon/ibmdotcom-styles/scss/components/search-with-typeahead/search-with-typeahead';
 @import '@carbon/ibmdotcom-styles/scss/components/masthead/masthead-l1';
-@import 'carbon-web-components/scss/components/tooltip/tooltip';
-@import 'carbon-web-components/scss/components/ui-shell/header';
-@import 'carbon-web-components/scss/components/ui-shell/side-nav';
+@import '@carbon/carbon-web-components/scss/components/tooltip/tooltip';
+@import '@carbon/carbon-web-components/scss/components/ui-shell/header';
+@import '@carbon/carbon-web-components/scss/components/ui-shell/side-nav';
 @import '@carbon/ibmdotcom-styles/scss/components/masthead/masthead-megamenu';
 @import '../../globals/scss/box-sizing';
 
diff --git a/packages/web-components/src/components/masthead/megamenu-category-group.ts b/packages/web-components/src/components/masthead/megamenu-category-group.ts
index 72fd95298d2..a55e9d3d908 100644
--- a/packages/web-components/src/components/masthead/megamenu-category-group.ts
+++ b/packages/web-components/src/components/masthead/megamenu-category-group.ts
@@ -8,8 +8,8 @@
  */
 
 import { html, customElement, LitElement, property } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import ArrowRight16 from 'carbon-web-components/es/icons/arrow--right/16.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import ArrowRight16 from '@carbon/carbon-web-components/es/icons/arrow--right/16.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
diff --git a/packages/web-components/src/components/masthead/megamenu-category-link.ts b/packages/web-components/src/components/masthead/megamenu-category-link.ts
index e4b1444c463..185d1726b57 100644
--- a/packages/web-components/src/components/masthead/megamenu-category-link.ts
+++ b/packages/web-components/src/components/masthead/megamenu-category-link.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, property, customElement } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/megamenu-link-with-icon.ts b/packages/web-components/src/components/masthead/megamenu-link-with-icon.ts
index de526e7f786..4ef1bd0de98 100644
--- a/packages/web-components/src/components/masthead/megamenu-link-with-icon.ts
+++ b/packages/web-components/src/components/masthead/megamenu-link-with-icon.ts
@@ -8,7 +8,7 @@
  */
 
 import { css, customElement, property } from 'lit-element';
-import BXLink from 'carbon-web-components/es/components/link/link.js';
+import BXLink from '@carbon/carbon-web-components/es/components/link/link.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { MEGAMENU_LINK_WITH_ICON_STYLE_SCHEME } from './defs';
 import styles from './masthead.scss';
diff --git a/packages/web-components/src/components/masthead/megamenu-right-navigation.ts b/packages/web-components/src/components/masthead/megamenu-right-navigation.ts
index ab5a3d13b17..32eb21afed0 100644
--- a/packages/web-components/src/components/masthead/megamenu-right-navigation.ts
+++ b/packages/web-components/src/components/masthead/megamenu-right-navigation.ts
@@ -9,7 +9,7 @@
 
 import { html, property, customElement, LitElement } from 'lit-element';
 import { classMap } from 'lit-html/directives/class-map.js';
-import ArrowRight16 from 'carbon-web-components/es/icons/arrow--right/16.js';
+import ArrowRight16 from '@carbon/carbon-web-components/es/icons/arrow--right/16.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { MEGAMENU_RIGHT_NAVIGATION_STYLE_SCHEME } from './defs';
diff --git a/packages/web-components/src/components/masthead/skip-to-content.ts b/packages/web-components/src/components/masthead/skip-to-content.ts
index bc32166d8ae..7d116bfc912 100644
--- a/packages/web-components/src/components/masthead/skip-to-content.ts
+++ b/packages/web-components/src/components/masthead/skip-to-content.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement, property } from 'lit-element';
-import BXSkipToContent from 'carbon-web-components/es/components/skip-to-content/skip-to-content.js';
+import BXSkipToContent from '@carbon/carbon-web-components/es/components/skip-to-content/skip-to-content.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/top-nav-item.ts b/packages/web-components/src/components/masthead/top-nav-item.ts
index e1d6180f948..8cd898a81c7 100644
--- a/packages/web-components/src/components/masthead/top-nav-item.ts
+++ b/packages/web-components/src/components/masthead/top-nav-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { property, query, customElement } from 'lit-element';
-import BXHeaderNavItem from 'carbon-web-components/es/components/ui-shell/header-nav-item.js';
+import BXHeaderNavItem from '@carbon/carbon-web-components/es/components/ui-shell/header-nav-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/top-nav-menu-item.ts b/packages/web-components/src/components/masthead/top-nav-menu-item.ts
index 18507d1e809..137ea96c47f 100644
--- a/packages/web-components/src/components/masthead/top-nav-menu-item.ts
+++ b/packages/web-components/src/components/masthead/top-nav-menu-item.ts
@@ -8,7 +8,7 @@
  */
 
 import { customElement } from 'lit-element';
-import BXHeaderMenuItem from 'carbon-web-components/es/components/ui-shell/header-menu-item.js';
+import BXHeaderMenuItem from '@carbon/carbon-web-components/es/components/ui-shell/header-menu-item.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/top-nav-menu.ts b/packages/web-components/src/components/masthead/top-nav-menu.ts
index 655a4f5351a..6d5f99e49cf 100644
--- a/packages/web-components/src/components/masthead/top-nav-menu.ts
+++ b/packages/web-components/src/components/masthead/top-nav-menu.ts
@@ -8,7 +8,7 @@
  */
 
 import { property, query, customElement } from 'lit-element';
-import BXHeaderMenu from 'carbon-web-components/es/components/ui-shell/header-menu.js';
+import BXHeaderMenu from '@carbon/carbon-web-components/es/components/ui-shell/header-menu.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './masthead.scss';
 
diff --git a/packages/web-components/src/components/masthead/top-nav-name.ts b/packages/web-components/src/components/masthead/top-nav-name.ts
index e2cb423eb7f..92fd10357d0 100644
--- a/packages/web-components/src/components/masthead/top-nav-name.ts
+++ b/packages/web-components/src/components/masthead/top-nav-name.ts
@@ -9,7 +9,7 @@
 
 import { html, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSMastheadTopNav from './top-nav';
 import DDSLeftNavName from './left-nav-name';
diff --git a/packages/web-components/src/components/masthead/top-nav.ts b/packages/web-components/src/components/masthead/top-nav.ts
index 2db96b382fe..85f1473a047 100644
--- a/packages/web-components/src/components/masthead/top-nav.ts
+++ b/packages/web-components/src/components/masthead/top-nav.ts
@@ -10,12 +10,12 @@
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, property, state, query, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import CaretLeft20 from 'carbon-web-components/es/icons/caret--left/20.js';
-import CaretRight20 from 'carbon-web-components/es/icons/caret--right/20.js';
-import BXHeaderNav from 'carbon-web-components/es/components/ui-shell/header-nav.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import CaretLeft20 from '@carbon/carbon-web-components/es/icons/caret--left/20.js';
+import CaretRight20 from '@carbon/carbon-web-components/es/icons/caret--right/20.js';
+import BXHeaderNav from '@carbon/carbon-web-components/es/components/ui-shell/header-nav.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './masthead.scss';
diff --git a/packages/web-components/src/components/pictogram-item/__stories__/pictogram-item.stories.ts b/packages/web-components/src/components/pictogram-item/__stories__/pictogram-item.stories.ts
index ddfc32a2900..a0202cb57d1 100644
--- a/packages/web-components/src/components/pictogram-item/__stories__/pictogram-item.stories.ts
+++ b/packages/web-components/src/components/pictogram-item/__stories__/pictogram-item.stories.ts
@@ -9,7 +9,7 @@
 
 import { html } from 'lit-element';
 import '../index';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import { select } from '@storybook/addon-knobs';
 import styles from './pictogram-item.stories.scss';
 import { COLOR_OPTIONS } from '../defs';
diff --git a/packages/web-components/src/components/pricing-table/__stories__/pricing-table.stories.ts b/packages/web-components/src/components/pricing-table/__stories__/pricing-table.stories.ts
index 9513d770af6..ce7954fc6fb 100644
--- a/packages/web-components/src/components/pricing-table/__stories__/pricing-table.stories.ts
+++ b/packages/web-components/src/components/pricing-table/__stories__/pricing-table.stories.ts
@@ -11,7 +11,7 @@ import { html, TemplateResult } from 'lit-element';
 import { number, text } from '@storybook/addon-knobs';
 import readme from './README.stories.mdx';
 import '../index';
-import 'carbon-web-components/es/components/tooltip/index.js';
+import '@carbon/carbon-web-components/es/components/tooltip/index.js';
 import textNullable from '../../../../.storybook/knob-text-nullable';
 import { PRICING_TABLE_HEADER_CELL_TYPES } from '../defs';
 import styles from './pricing-table.stories.scss';
diff --git a/packages/web-components/src/components/pricing-table/pricing-table-annotation-toggle.ts b/packages/web-components/src/components/pricing-table/pricing-table-annotation-toggle.ts
index ae45bf308a9..cd320fe82d0 100644
--- a/packages/web-components/src/components/pricing-table/pricing-table-annotation-toggle.ts
+++ b/packages/web-components/src/components/pricing-table/pricing-table-annotation-toggle.ts
@@ -9,8 +9,8 @@
 
 import { customElement, html, LitElement, property } from 'lit-element';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
-import ChevronDown16 from 'carbon-web-components/es/icons/chevron--down/16.js';
-import Close16 from 'carbon-web-components/es/icons/close/16.js';
+import ChevronDown16 from '@carbon/carbon-web-components/es/icons/chevron--down/16.js';
+import Close16 from '@carbon/carbon-web-components/es/icons/close/16.js';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import styles from './pricing-table.scss';
 import DDSPricingTableRow from './pricing-table-row';
diff --git a/packages/web-components/src/components/pricing-table/pricing-table-cell.ts b/packages/web-components/src/components/pricing-table/pricing-table-cell.ts
index 01b1a5a7dbc..1802ba85719 100644
--- a/packages/web-components/src/components/pricing-table/pricing-table-cell.ts
+++ b/packages/web-components/src/components/pricing-table/pricing-table-cell.ts
@@ -10,8 +10,8 @@
 import { customElement, html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import DDSStructuredListCell from '../structured-list/structured-list-cell';
 import DDSPricingTableGroup from './pricing-table-group';
diff --git a/packages/web-components/src/components/pricing-table/pricing-table.ts b/packages/web-components/src/components/pricing-table/pricing-table.ts
index 4999645ec5c..8515a15e545 100644
--- a/packages/web-components/src/components/pricing-table/pricing-table.ts
+++ b/packages/web-components/src/components/pricing-table/pricing-table.ts
@@ -9,8 +9,8 @@
 
 import { customElement, property, query, html } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
 import ddsSettings from '@carbon/ibmdotcom-utilities/es/utilities/settings/settings.js';
 import { slow01 } from '@carbon/motion/es/index';
 import StickyHeader from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/StickyHeader/StickyHeader';
diff --git a/packages/web-components/src/components/quote/__stories__/quote.stories.ts b/packages/web-components/src/components/quote/__stories__/quote.stories.ts
index 56be39f667d..d19dd392dc3 100644
--- a/packages/web-components/src/components/quote/__stories__/quote.stories.ts
+++ b/packages/web-components/src/components/quote/__stories__/quote.stories.ts
@@ -9,7 +9,7 @@
 
 import { select } from '@storybook/addon-knobs';
 import { html } from 'lit-element';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20.js';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20.js';
 import { QUOTE_TYPES, QUOTE_COLOR_SCHEMES } from '../quote';
 import '../index';
 import '../quote-link-with-icon';
diff --git a/packages/web-components/src/components/search-with-typeahead/__tests__/search-with-typeahead.test.ts b/packages/web-components/src/components/search-with-typeahead/__tests__/search-with-typeahead.test.ts
index 086d946405c..442874526e0 100644
--- a/packages/web-components/src/components/search-with-typeahead/__tests__/search-with-typeahead.test.ts
+++ b/packages/web-components/src/components/search-with-typeahead/__tests__/search-with-typeahead.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { find } from '../../../globals/internal/collection-helpers';
 import EventManager from '../../../../tests/utils/event-manager';
 import DDSSearchWithTypeahead from '../search-with-typeahead';
diff --git a/packages/web-components/src/components/search-with-typeahead/scoped-search-dropdown-mobile.ts b/packages/web-components/src/components/search-with-typeahead/scoped-search-dropdown-mobile.ts
index 8ac3d379058..4e6109b84b8 100644
--- a/packages/web-components/src/components/search-with-typeahead/scoped-search-dropdown-mobile.ts
+++ b/packages/web-components/src/components/search-with-typeahead/scoped-search-dropdown-mobile.ts
@@ -9,12 +9,12 @@
 
 import { ifDefined } from 'lit-html/directives/if-defined.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Filter20 from 'carbon-web-components/es/icons/filter/20.js';
+import Filter20 from '@carbon/carbon-web-components/es/icons/filter/20.js';
 import { property, customElement, html } from 'lit-element';
-import BXSelect from 'carbon-web-components/es/components/select/select.js';
-import { INPUT_SIZE } from 'carbon-web-components/es/components/input/input.js';
+import BXSelect from '@carbon/carbon-web-components/es/components/select/select.js';
+import { INPUT_SIZE } from '@carbon/carbon-web-components/es/components/input/input.js';
 import { classMap } from 'lit-html/directives/class-map.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import { filter } from '../../globals/internal/collection-helpers';
 import styles from './search-with-typeahead.scss';
diff --git a/packages/web-components/src/components/search-with-typeahead/search-with-typeahead.ts b/packages/web-components/src/components/search-with-typeahead/search-with-typeahead.ts
index 1ee4bcc23b6..1acbce83686 100644
--- a/packages/web-components/src/components/search-with-typeahead/search-with-typeahead.ts
+++ b/packages/web-components/src/components/search-with-typeahead/search-with-typeahead.ts
@@ -7,18 +7,18 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { classMap } from 'lit-html/directives/class-map.js';
 import { html, property, query, customElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import Close20 from 'carbon-web-components/es/icons/close/20.js';
-import Search20 from 'carbon-web-components/es/icons/search/20.js';
+import Close20 from '@carbon/carbon-web-components/es/icons/close/20.js';
+import Search20 from '@carbon/carbon-web-components/es/icons/search/20.js';
 import BXDropdown, {
   DROPDOWN_KEYBOARD_ACTION,
-} from 'carbon-web-components/es/components/dropdown/dropdown.js';
-import BXDropdownItem from 'carbon-web-components/es/components/dropdown/dropdown-item.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+} from '@carbon/carbon-web-components/es/components/dropdown/dropdown.js';
+import BXDropdownItem from '@carbon/carbon-web-components/es/components/dropdown/dropdown-item.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import { baseFontSize, breakpoints } from '@carbon/layout';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import SearchTypeaheadAPI from '../../internal/vendor/@carbon/ibmdotcom-services/services/SearchTypeahead/SearchTypeahead';
diff --git a/packages/web-components/src/components/search/search.scss b/packages/web-components/src/components/search/search.scss
index a813b6d3ef5..c1c26084c4e 100644
--- a/packages/web-components/src/components/search/search.scss
+++ b/packages/web-components/src/components/search/search.scss
@@ -1,11 +1,11 @@
 //
-// Copyright IBM Corp. 2020, 2021
+// Copyright IBM Corp. 2020, 2022
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 //
 
-@import 'carbon-web-components/scss/components/search/search';
+@import '@carbon/carbon-web-components/scss/components/search/search';
 @import '@carbon/ibmdotcom-styles/scss/globals/vars';
 @import '../../globals/scss/box-sizing';
 
diff --git a/packages/web-components/src/components/search/search.ts b/packages/web-components/src/components/search/search.ts
index 7ee31192df1..8f26e98afa9 100644
--- a/packages/web-components/src/components/search/search.ts
+++ b/packages/web-components/src/components/search/search.ts
@@ -8,11 +8,11 @@
  */
 
 import { customElement } from 'lit-element';
-import BXSearch from 'carbon-web-components/es/components/search/search.js';
+import BXSearch from '@carbon/carbon-web-components/es/components/search/search.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './search.scss';
 
-export { SEARCH_COLOR_SCHEME } from 'carbon-web-components/es/components/search/search.js';
+export { SEARCH_COLOR_SCHEME } from '@carbon/carbon-web-components/es/components/search/search.js';
 
 const { stablePrefix: ddsPrefix } = ddsSettings;
 
diff --git a/packages/web-components/src/components/structured-list/index.ts b/packages/web-components/src/components/structured-list/index.ts
index 8354c9adc23..cfb64a13629 100644
--- a/packages/web-components/src/components/structured-list/index.ts
+++ b/packages/web-components/src/components/structured-list/index.ts
@@ -15,5 +15,5 @@ import './structured-list-body';
 import './structured-list-group';
 import './structured-list-row';
 import './structured-list-cell';
-import 'carbon-web-components/es/components/tooltip/index.js';
-import 'carbon-web-components/es/components/tag/index.js';
+import '@carbon/carbon-web-components/es/components/tooltip/index.js';
+import '@carbon/carbon-web-components/es/components/tag/index.js';
diff --git a/packages/web-components/src/components/structured-list/structured-list-body.ts b/packages/web-components/src/components/structured-list/structured-list-body.ts
index 316253cee26..c19557fadf3 100644
--- a/packages/web-components/src/components/structured-list/structured-list-body.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-body.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListBody from 'carbon-web-components/es/components/structured-list/structured-list-body.js';
+import BXStructuredListBody from '@carbon/carbon-web-components/es/components/structured-list/structured-list-body.js';
 import { customElement } from 'lit-element';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './structured-list.scss';
diff --git a/packages/web-components/src/components/structured-list/structured-list-cell.ts b/packages/web-components/src/components/structured-list/structured-list-cell.ts
index ff3193a939a..124a410388b 100644
--- a/packages/web-components/src/components/structured-list/structured-list-cell.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-cell.ts
@@ -7,11 +7,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListCell from 'carbon-web-components/es/components/structured-list/structured-list-cell.js';
+import BXStructuredListCell from '@carbon/carbon-web-components/es/components/structured-list/structured-list-cell.js';
 import { customElement, property, html } from 'lit-element';
-import Info16 from 'carbon-web-components/es/icons/information/16.js';
-import Checkmark20 from 'carbon-web-components/es/icons/checkmark/20.js';
-import Error20 from 'carbon-web-components/es/icons/error/20.js';
+import Info16 from '@carbon/carbon-web-components/es/icons/information/16.js';
+import Checkmark20 from '@carbon/carbon-web-components/es/icons/checkmark/20.js';
+import Error20 from '@carbon/carbon-web-components/es/icons/error/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import DDSStructuredListGroup from './structured-list-group';
 import styles from './structured-list.scss';
diff --git a/packages/web-components/src/components/structured-list/structured-list-head.ts b/packages/web-components/src/components/structured-list/structured-list-head.ts
index 94c91118e96..9b640e4a20a 100644
--- a/packages/web-components/src/components/structured-list/structured-list-head.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-head.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListHead from 'carbon-web-components/es/components/structured-list/structured-list-head.js';
+import BXStructuredListHead from '@carbon/carbon-web-components/es/components/structured-list/structured-list-head.js';
 import { customElement } from 'lit-element';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './structured-list.scss';
diff --git a/packages/web-components/src/components/structured-list/structured-list-header-cell.ts b/packages/web-components/src/components/structured-list/structured-list-header-cell.ts
index b63578b23be..c779217e7e3 100644
--- a/packages/web-components/src/components/structured-list/structured-list-header-cell.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-header-cell.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListHeaderCell from 'carbon-web-components/es/components/structured-list/structured-list-header-cell.js';
+import BXStructuredListHeaderCell from '@carbon/carbon-web-components/es/components/structured-list/structured-list-header-cell.js';
 import { customElement } from 'lit-element';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './structured-list.scss';
diff --git a/packages/web-components/src/components/structured-list/structured-list-header-row.ts b/packages/web-components/src/components/structured-list/structured-list-header-row.ts
index 3474eee0503..d65d7739523 100644
--- a/packages/web-components/src/components/structured-list/structured-list-header-row.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-header-row.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListHeaderRow from 'carbon-web-components/es/components/structured-list/structured-list-header-row.js';
+import BXStructuredListHeaderRow from '@carbon/carbon-web-components/es/components/structured-list/structured-list-header-row.js';
 import { customElement } from 'lit-element';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './structured-list.scss';
diff --git a/packages/web-components/src/components/structured-list/structured-list-row.ts b/packages/web-components/src/components/structured-list/structured-list-row.ts
index 2dd5c4ca5a1..27ed2f69178 100644
--- a/packages/web-components/src/components/structured-list/structured-list-row.ts
+++ b/packages/web-components/src/components/structured-list/structured-list-row.ts
@@ -7,7 +7,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import BXStructuredListRow from 'carbon-web-components/es/components/structured-list/structured-list-row.js';
+import BXStructuredListRow from '@carbon/carbon-web-components/es/components/structured-list/structured-list-row.js';
 import { customElement } from 'lit-element';
 import { html } from 'lit-html';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
diff --git a/packages/web-components/src/components/table-of-contents/__stories__/table-of-contents.stories.ts b/packages/web-components/src/components/table-of-contents/__stories__/table-of-contents.stories.ts
index a8a90230cee..d99b74099cf 100644
--- a/packages/web-components/src/components/table-of-contents/__stories__/table-of-contents.stories.ts
+++ b/packages/web-components/src/components/table-of-contents/__stories__/table-of-contents.stories.ts
@@ -10,7 +10,7 @@
 import { nothing } from 'lit-html';
 import { html } from 'lit-element';
 import { boolean, select, text } from '@storybook/addon-knobs';
-import ArrowLeft20 from 'carbon-web-components/es/icons/arrow--left/20.js';
+import ArrowLeft20 from '@carbon/carbon-web-components/es/icons/arrow--left/20.js';
 import '../table-of-contents';
 import '../../horizontal-rule/horizontal-rule';
 import '../../image/image';
diff --git a/packages/web-components/src/components/table-of-contents/table-of-contents.ts b/packages/web-components/src/components/table-of-contents/table-of-contents.ts
index 29301565f1e..bd798bb13a8 100644
--- a/packages/web-components/src/components/table-of-contents/table-of-contents.ts
+++ b/packages/web-components/src/components/table-of-contents/table-of-contents.ts
@@ -19,13 +19,13 @@ import {
   customElement,
   LitElement,
 } from 'lit-element';
-import CaretLeft20 from 'carbon-web-components/es/icons/caret--left/20.js';
-import CaretRight20 from 'carbon-web-components/es/icons/caret--right/20.js';
+import CaretLeft20 from '@carbon/carbon-web-components/es/icons/caret--left/20.js';
+import CaretRight20 from '@carbon/carbon-web-components/es/icons/caret--right/20.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
 import { baseFontSize, breakpoints } from '@carbon/layout';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
-import TableOfContents20 from 'carbon-web-components/es/icons/table-of-contents/20.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
+import TableOfContents20 from '@carbon/carbon-web-components/es/icons/table-of-contents/20.js';
 import throttle from 'lodash-es/throttle.js';
 import StickyHeader from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/StickyHeader/StickyHeader';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
diff --git a/packages/web-components/src/components/tabs-extended-media/__stories__/tabs-extended-media.stories.ts b/packages/web-components/src/components/tabs-extended-media/__stories__/tabs-extended-media.stories.ts
index c646f620daa..f62416246cb 100644
--- a/packages/web-components/src/components/tabs-extended-media/__stories__/tabs-extended-media.stories.ts
+++ b/packages/web-components/src/components/tabs-extended-media/__stories__/tabs-extended-media.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { boolean, select } from '@storybook/addon-knobs';
 import readme from './README.stories.mdx';
 import '../index';
diff --git a/packages/web-components/src/components/tabs-extended/__stories__/tabs-extended.stories.ts b/packages/web-components/src/components/tabs-extended/__stories__/tabs-extended.stories.ts
index 22d7f7faf6b..4d320f09a01 100644
--- a/packages/web-components/src/components/tabs-extended/__stories__/tabs-extended.stories.ts
+++ b/packages/web-components/src/components/tabs-extended/__stories__/tabs-extended.stories.ts
@@ -11,9 +11,9 @@ import { html } from 'lit-element';
 import '../index';
 import '../../content-block-media/index';
 import '../../card-group/index';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import { select } from '@storybook/addon-knobs';
-import ArrowRight20 from 'carbon-web-components/es/icons/arrow--right/20';
+import ArrowRight20 from '@carbon/carbon-web-components/es/icons/arrow--right/20';
 import { ORIENTATION } from '../defs';
 import readme from './README.stories.mdx';
 
diff --git a/packages/web-components/src/components/tabs-extended/tabs-extended.ts b/packages/web-components/src/components/tabs-extended/tabs-extended.ts
index 5e608f550bc..1cb13159aa2 100644
--- a/packages/web-components/src/components/tabs-extended/tabs-extended.ts
+++ b/packages/web-components/src/components/tabs-extended/tabs-extended.ts
@@ -18,7 +18,7 @@ import {
 } from 'lit-element';
 import { unsafeHTML } from 'lit-html/directives/unsafe-html.js';
 import { classMap } from 'lit-html/directives/class-map.js';
-import ChevronRight20 from 'carbon-web-components/es/icons/chevron--right/20.js';
+import ChevronRight20 from '@carbon/carbon-web-components/es/icons/chevron--right/20.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
 import DDSTab from './tab';
diff --git a/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.react.tsx b/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.react.tsx
index f677b853e59..8a9e00a8fdb 100644
--- a/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.react.tsx
+++ b/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.react.tsx
@@ -15,20 +15,29 @@ import DDSTagLink from '@carbon/ibmdotcom-web-components/es/components-react/tag
 // @ts-ignore
 import DDSTagGroup from '@carbon/ibmdotcom-web-components/es/components-react/tag-group/tag-group';
 import { Tag } from 'carbon-components-react';
-import 'carbon-web-components/es/components/tag/tag.js';
+import '@carbon/carbon-web-components/es/components/tag/tag.js';
 import readme from './README.stories.react.mdx';
 
-const tagTitles = ['Cloud', 'Blockchain', 'Supply chain', 'Watson health', 'IT Infrastructure', 'WebSphere'];
+const tagTitles = [
+  'Cloud',
+  'Blockchain',
+  'Supply chain',
+  'Watson health',
+  'IT Infrastructure',
+  'WebSphere',
+];
 
 const tagTypeOptions = ['Tag Link', 'Carbon tag'];
 
-export const Default = args => {
+export const Default = (args) => {
   const { tagType } = args?.TagGroup ?? {};
   return (
     <DDSTagGroup>
       {tagType === tagTypeOptions[0]
-        ? tagTitles.map(title => <DDSTagLink href={'https://example.com'}>{title}</DDSTagLink>)
-        : tagTitles.map(title => <Tag>{title}</Tag>)}
+        ? tagTitles.map((title) => (
+            <DDSTagLink href={'https://example.com'}>{title}</DDSTagLink>
+          ))
+        : tagTitles.map((title) => <Tag>{title}</Tag>)}
     </DDSTagGroup>
   );
 };
@@ -46,7 +55,7 @@ Default.story = {
 export default {
   title: 'Components/Tag group',
   decorators: [
-    story => {
+    (story) => {
       return (
         <div className="bx--grid">
           <div className="bx--row">
diff --git a/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.ts b/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.ts
index fb994f3095a..cfb57fa26d7 100644
--- a/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.ts
+++ b/packages/web-components/src/components/tag-group/__stories__/tag-group.stories.ts
@@ -11,7 +11,7 @@ import { html } from 'lit-element';
 import { select } from '@storybook/addon-knobs';
 import readme from './README.stories.mdx';
 import '../index';
-import 'carbon-web-components/es/components/tag/tag.js';
+import '@carbon/carbon-web-components/es/components/tag/tag.js';
 
 const tagTitles = [
   'Cloud',
diff --git a/packages/web-components/src/components/tag-group/__tests__/tag-group.test.ts b/packages/web-components/src/components/tag-group/__tests__/tag-group.test.ts
index b734130d146..7ea1d47e1a3 100644
--- a/packages/web-components/src/components/tag-group/__tests__/tag-group.test.ts
+++ b/packages/web-components/src/components/tag-group/__tests__/tag-group.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../tag-group';
 import '../../tag-link/tag-link';
 
diff --git a/packages/web-components/src/components/tag-link/__stories__/tag-link.stories.ts b/packages/web-components/src/components/tag-link/__stories__/tag-link.stories.ts
index ddd0a8270e2..a7f4de25788 100644
--- a/packages/web-components/src/components/tag-link/__stories__/tag-link.stories.ts
+++ b/packages/web-components/src/components/tag-link/__stories__/tag-link.stories.ts
@@ -8,7 +8,7 @@
  */
 
 import { html } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import '../tag-link';
 import textNullable from '../../../../.storybook/knob-text-nullable';
diff --git a/packages/web-components/src/components/tag-link/__tests__/tag-link.test.ts b/packages/web-components/src/components/tag-link/__tests__/tag-link.test.ts
index 1d0fe2be1c9..515f6959586 100644
--- a/packages/web-components/src/components/tag-link/__tests__/tag-link.test.ts
+++ b/packages/web-components/src/components/tag-link/__tests__/tag-link.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import '../tag-link';
 
 const template = (props?) => {
diff --git a/packages/web-components/src/components/tag-link/tag-link.ts b/packages/web-components/src/components/tag-link/tag-link.ts
index 63d813ea765..3e1d2fa8830 100644
--- a/packages/web-components/src/components/tag-link/tag-link.ts
+++ b/packages/web-components/src/components/tag-link/tag-link.ts
@@ -9,7 +9,7 @@
 
 import { html, property, customElement, LitElement } from 'lit-element';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import styles from './tag-link.scss';
 import StableSelectorMixin from '../../globals/mixins/stable-selector';
diff --git a/packages/web-components/src/components/video-player/__stories__/video-player.stories.ts b/packages/web-components/src/components/video-player/__stories__/video-player.stories.ts
index 8e78ed28438..948f1567890 100644
--- a/packages/web-components/src/components/video-player/__stories__/video-player.stories.ts
+++ b/packages/web-components/src/components/video-player/__stories__/video-player.stories.ts
@@ -9,7 +9,7 @@
 
 import { html } from 'lit-element';
 import { boolean, text } from '@storybook/addon-knobs';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import readme from './README.stories.mdx';
 import '../video-player-container';
 import '../../lightbox-media-viewer/lightbox-video-player-container';
diff --git a/packages/web-components/src/components/video-player/__tests__/video-player-composite.test.ts b/packages/web-components/src/components/video-player/__tests__/video-player-composite.test.ts
index 1a179916876..8bea92c21ed 100644
--- a/packages/web-components/src/components/video-player/__tests__/video-player-composite.test.ts
+++ b/packages/web-components/src/components/video-player/__tests__/video-player-composite.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import DDSVideoPlayer from '../video-player';
 import DDSVideoPlayerComposite from '../video-player-composite';
 // Above import is interface-only ref and thus code won't be brought into the build
diff --git a/packages/web-components/src/components/video-player/__tests__/video-player.test.ts b/packages/web-components/src/components/video-player/__tests__/video-player.test.ts
index 4c036d0650e..8820c1bb0d7 100644
--- a/packages/web-components/src/components/video-player/__tests__/video-player.test.ts
+++ b/packages/web-components/src/components/video-player/__tests__/video-player.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { html, render } from 'lit-html';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
 import {
   VIDEO_PLAYER_CONTENT_STATE,
   VIDEO_PLAYER_PLAYING_MODE,
diff --git a/packages/web-components/src/components/video-player/video-player-composite.ts b/packages/web-components/src/components/video-player/video-player-composite.ts
index 5dc7cd837d5..2b8b2c8a154 100644
--- a/packages/web-components/src/components/video-player/video-player-composite.ts
+++ b/packages/web-components/src/components/video-player/video-player-composite.ts
@@ -8,9 +8,9 @@
  */
 
 import { html, property, customElement, LitElement } from 'lit-element';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import HostListener from 'carbon-web-components/es/globals/decorators/host-listener.js';
-import HostListenerMixin from 'carbon-web-components/es/globals/mixins/host-listener.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import HostListener from '@carbon/carbon-web-components/es/globals/decorators/host-listener.js';
+import HostListenerMixin from '@carbon/carbon-web-components/es/globals/mixins/host-listener.js';
 import ddsSettings from '../../internal/vendor/@carbon/ibmdotcom-utilities/utilities/settings/settings';
 import KalturaPlayerAPI from '../../internal/vendor/@carbon/ibmdotcom-services/services/KalturaPlayer/KalturaPlayer';
 import HybridRenderMixin from '../../globals/mixins/hybrid-render';
diff --git a/packages/web-components/src/components/video-player/video-player.ts b/packages/web-components/src/components/video-player/video-player.ts
index 0de20fc7d87..e00049bd0c4 100644
--- a/packages/web-components/src/components/video-player/video-player.ts
+++ b/packages/web-components/src/components/video-player/video-player.ts
@@ -10,8 +10,8 @@
 import { html, property, customElement, LitElement } from 'lit-element';
 import { classMap } from 'lit-html/directives/class-map.js';
 import settings from 'carbon-components/es/globals/js/settings.js';
-import ifNonNull from 'carbon-web-components/es/globals/directives/if-non-null.js';
-import FocusMixin from 'carbon-web-components/es/globals/mixins/focus.js';
+import ifNonNull from '@carbon/carbon-web-components/es/globals/directives/if-non-null.js';
+import FocusMixin from '@carbon/carbon-web-components/es/globals/mixins/focus.js';
 import PlayVideo from '@carbon/ibmdotcom-styles/icons/svg/play-video.svg';
 import {
   formatVideoCaption,
diff --git a/packages/web-components/tools/babel-plugin-create-react-custom-element-type.js b/packages/web-components/tools/babel-plugin-create-react-custom-element-type.js
index b9f4b60b6b6..415400f6071 100644
--- a/packages/web-components/tools/babel-plugin-create-react-custom-element-type.js
+++ b/packages/web-components/tools/babel-plugin-create-react-custom-element-type.js
@@ -60,8 +60,8 @@ function createMetadataVisitor(api) {
       return parentPath
         .get('source')
         .node.value.replace(
-          /^carbon-web-components[\\/]es[\\/]components[\\/]/,
-          'carbon-web-components/es/components-react/'
+          /^@carbon\/carbon-web-components[\\/]es[\\/]components[\\/]/,
+          '@carbon/carbon-web-components/es/components-react/'
         );
     }
     return undefined;
@@ -374,7 +374,7 @@ module.exports = function generateCreateReactCustomElementType(
         ),
       ],
       t.stringLiteral(
-        'carbon-web-components/es/globals/wrappers/createReactCustomElementType.js'
+        '@carbon/carbon-web-components/es/globals/wrappers/createReactCustomElementType.js'
       )
     );
   };
diff --git a/packages/web-components/tools/babel-plugin-resource-cjs-paths.js b/packages/web-components/tools/babel-plugin-resource-cjs-paths.js
index 03383856313..9660973df6b 100644
--- a/packages/web-components/tools/babel-plugin-resource-cjs-paths.js
+++ b/packages/web-components/tools/babel-plugin-resource-cjs-paths.js
@@ -30,29 +30,31 @@ module.exports = function resourceCJSPaths(babel) {
           );
           path.replaceWith(declaration);
         } else if (
-          /^carbon-web-components\/es\/components-react/i.test(source) ||
-          (/^carbon-web-components\/es\/components/i.test(source) &&
+          /^@carbon\/carbon-web-components\/es\/components-react/i.test(
+            source
+          ) ||
+          (/^@carbon\/carbon-web-components\/es\/components/i.test(source) &&
             !/\/defs$/i.test(source))
         ) {
           const declaration = t.cloneNode(node);
           declaration.source.value = source
             .replace(
-              /^carbon-web-components\/es\/components-react/i,
-              'carbon-web-components/lib/components-react-node'
+              /^@carbon\/carbon-web-components\/es\/components-react/i,
+              '@carbon/carbon-web-components/lib/components-react-node'
             )
             .replace(
-              /^carbon-web-components\/es\/components/i,
-              'carbon-web-components/lib/components-react-node'
+              /^@carbon\/carbon-web-components\/es\/components/i,
+              '@carbon/carbon-web-components/lib/components-react-node'
             );
           path.replaceWith(declaration);
         } else if (
-          /^(carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i.test(
+          /^(@carbon\/carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i.test(
             source
           )
         ) {
           const declaration = t.cloneNode(node);
           declaration.source.value = source.replace(
-            /^(carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i,
+            /^(@carbon\/carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i,
             '$1/lib'
           );
           path.replaceWith(declaration);
@@ -75,29 +77,31 @@ module.exports = function resourceCJSPaths(babel) {
           );
           path.replaceWith(declaration);
         } else if (
-          /^carbon-web-components\/es\/components-react/i.test(source) ||
-          (/^carbon-web-components\/es\/components/i.test(source) &&
+          /^@carbon\/carbon-web-components\/es\/components-react/i.test(
+            source
+          ) ||
+          (/^@carbon\/carbon-web-components\/es\/components/i.test(source) &&
             !/\/defs$/i.test(source))
         ) {
           const declaration = t.cloneNode(node);
           declaration.source.value = source
             .replace(
-              /^carbon-web-components\/es\/components-react/i,
-              'carbon-web-components/lib/components-react-node'
+              /^@carbon\/carbon-web-components\/es\/components-react/i,
+              '@carbon/carbon-web-components/lib/components-react-node'
             )
             .replace(
-              /^carbon-web-components\/es\/components/i,
-              'carbon-web-components/lib/components-react-node'
+              /^@carbon\/carbon-web-components\/es\/components/i,
+              '@carbon/carbon-web-components/lib/components-react-node'
             );
           path.replaceWith(declaration);
         } else if (
-          /^(carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i.test(
+          /^(@carbon\/carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i.test(
             source
           )
         ) {
           const declaration = t.cloneNode(node);
           declaration.source.value = source.replace(
-            /^(carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i,
+            /^(@carbon\/carbon-web-components|@carbon\/ibmdotcom-utilities)\/es/i,
             '$1/lib'
           );
           path.replaceWith(declaration);
diff --git a/packages/web-components/tools/get-rollup-config.js b/packages/web-components/tools/get-rollup-config.js
index 78269a40f0b..c913d72393b 100644
--- a/packages/web-components/tools/get-rollup-config.js
+++ b/packages/web-components/tools/get-rollup-config.js
@@ -172,7 +172,7 @@ function getRollupConfig({
           '@carbon/ibmdotcom-utilities',
           '@carbon/ibmdotcom-services',
           '@carbon/ibmdotcom-styles',
-          'carbon-web-components',
+          '@carbon/carbon-web-components',
           'carbon-components',
         ],
         extensions: ['.js', '.ts'],
diff --git a/packages/web-components/tools/rollup-plugin-ibmdotcom-icon.js b/packages/web-components/tools/rollup-plugin-ibmdotcom-icon.js
index 6db06ca9b59..3fbc99d29df 100644
--- a/packages/web-components/tools/rollup-plugin-ibmdotcom-icon.js
+++ b/packages/web-components/tools/rollup-plugin-ibmdotcom-icon.js
@@ -51,7 +51,7 @@ function rollupPluginIBMdotcomIcon({ include = /\.svg$/i, exclude } = {}) {
 
       const code = [
         `import { svg } from 'lit-html'`,
-        `import spread from 'carbon-web-components/es/globals/directives/spread'`,
+        `import spread from '@carbon/carbon-web-components/es/globals/directives/spread'`,
         `export default ${createSVGResultFromIconDescriptor(
           await descriptorFromSVG(contents)
         )}`,
diff --git a/packages/web-components/tools/svg-result-ibmdotcom-icon-loader.js b/packages/web-components/tools/svg-result-ibmdotcom-icon-loader.js
index bb7ee312a76..46c2c3f8de7 100644
--- a/packages/web-components/tools/svg-result-ibmdotcom-icon-loader.js
+++ b/packages/web-components/tools/svg-result-ibmdotcom-icon-loader.js
@@ -71,7 +71,7 @@ function svgResultIBMDotcomIconLoader(content) {
           null,
           `
           import { svg } from 'lit-html';
-          import spread from 'carbon-web-components/es/globals/directives/spread.js';
+          import spread from '@carbon/carbon-web-components/es/globals/directives/spread.js';
           const svgResultCarbonIcon = ${createSVGResultFromIconDescriptor(
             convertAttrs(svgNode)
           )};
diff --git a/yarn.lock b/yarn.lock
index e162b43b02e..8b31ce5313c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8362,16 +8362,6 @@ carbon-components-react@7.59.5:
     wicg-inert "^3.1.1"
     window-or-global "^1.0.1"
 
-carbon-components@10.52.0:
-  version "10.52.0"
-  resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.52.0.tgz#07db35dddbc5f9e5042e8621a781e9cb96fce0fa"
-  integrity sha512-itiG52GdDGxGh4IyuIV7gsuQCE1LLD2FCTEp5bPGhF/Onn042QzGendjl+yE7kfUk3FVlWmHN216dh/mA2sdZg==
-  dependencies:
-    "@carbon/telemetry" "0.0.0-alpha.6"
-    flatpickr "4.6.1"
-    lodash.debounce "^4.0.8"
-    warning "^3.0.0"
-
 carbon-components@10.55.0:
   version "10.55.0"
   resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.55.0.tgz#d9c876f29bd99c67f50d751d200be4b32327f396"
@@ -8407,18 +8397,6 @@ carbon-icons@7.0.7:
   resolved "https://registry.yarnpkg.com/carbon-icons/-/carbon-icons-7.0.7.tgz#ebafe3e9fa25df973796a8eca06d8a7c501cc610"
   integrity sha512-3vgkdXJRgCViCrH3fLUdyAXo0I8wmohO6QETv7vWFx6yc7s+SirWFBSFL38zUx4MHtR8iTxIlLEzkeU6FlFtXg==
 
-carbon-web-components@1.21.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/carbon-web-components/-/carbon-web-components-1.21.0.tgz#038276cc7fc786919730d93a143c5255d23aa921"
-  integrity sha512-rSLmyiVTH4Ffz1Hq4QRHaCfy63y3AC9Er/k9COkmW73zkFOnyfIGQ+rZrvQof0z1jz0b1dfGdp7eRctbwVTcsA==
-  dependencies:
-    "@babel/runtime" "^7.16.3"
-    carbon-components "10.52.0"
-    flatpickr "4.6.1"
-    lit-element "^2.5.1"
-    lit-html "^1.4.1"
-    lodash-es "^4.17.21"
-
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"