diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9a9749e69ef..555e067d6db 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -109,13 +109,13 @@ apps/desktop/src/services/duckduckgo-message-handler.service.ts @bitwarden/team-
 # SSH Agent
 apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-dev @bitwarden/wg-ssh-keys
 
-## Component Library ##
-.storybook @bitwarden/team-design-system
-libs/components @bitwarden/team-design-system
-libs/ui @bitwarden/team-design-system
-apps/browser/src/platform/popup/layout @bitwarden/team-design-system
-apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-design-system
-apps/web/src/app/layouts @bitwarden/team-design-system
+## UI Foundation ##
+.storybook @bitwarden/team-ui-foundation
+libs/components @bitwarden/team-ui-foundation
+libs/ui @bitwarden/team-ui-foundation
+apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
+apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
+apps/web/src/app/layouts @bitwarden/team-ui-foundation
 
 ## Desktop native module ##
 apps/desktop/desktop_native @bitwarden/team-platform-dev
diff --git a/.github/renovate.json b/.github/renovate.json
index 9afe308b329..8e2ef2cf80c 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -225,9 +225,9 @@
         "tailwindcss",
         "zone.js"
       ],
-      "description": "Component library owned dependencies",
-      "commitMessagePrefix": "[deps] Design System:",
-      "reviewers": ["team:team-design-system"]
+      "description": "UI Foundation owned dependencies",
+      "commitMessagePrefix": "[deps] UI Foundation:",
+      "reviewers": ["team:team-ui-foundation"]
     },
     {
       "matchPackageNames": [