diff --git a/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap
index 1fc8166ebbac..ad5ad8c2a28b 100644
--- a/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap
+++ b/packages/elements/src/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -76,7 +76,7 @@ Array [
   "chatAvatarBot",
   "chatAvatarUser",
   "chatBubbleAgent",
-  "chatBubbleAgentBorder",
+  "chatBubbleBorder",
   "chatBubbleUser",
   "chatButton",
   "chatButtonActive",
diff --git a/packages/styles/scss/__tests__/theme-test.js b/packages/styles/scss/__tests__/theme-test.js
index eae3e255b227..765be3fee29b 100644
--- a/packages/styles/scss/__tests__/theme-test.js
+++ b/packages/styles/scss/__tests__/theme-test.js
@@ -153,7 +153,7 @@ describe('@carbon/styles/scss/theme', () => {
         "chat-prompt-border-end",
         "chat-bubble-user",
         "chat-bubble-agent",
-        "chat-bubble-agent-border",
+        "chat-bubble-border",
         "chat-avatar-bot",
         "chat-avatar-agent",
         "chat-avatar-user",
diff --git a/packages/themes/src/g10.js b/packages/themes/src/g10.js
index 2df9616ef9f4..49872d193201 100644
--- a/packages/themes/src/g10.js
+++ b/packages/themes/src/g10.js
@@ -243,7 +243,7 @@ export const chatPromptBorderStart = gray10;
 export const chatPromptBorderEnd = rgba(gray10, 0);
 export const chatBubbleUser = gray20;
 export const chatBubbleAgent = white;
-export const chatBubbleAgentBorder = gray20;
+export const chatBubbleBorder = gray20;
 export const chatAvatarBot = gray60;
 export const chatAvatarAgent = gray80;
 export const chatAvatarUser = blue60;
diff --git a/packages/themes/src/g100.js b/packages/themes/src/g100.js
index 2d86267ea5ae..c5a5eca2ebdb 100644
--- a/packages/themes/src/g100.js
+++ b/packages/themes/src/g100.js
@@ -246,7 +246,7 @@ export const chatPromptBorderStart = gray90;
 export const chatPromptBorderEnd = rgba(gray90, 0);
 export const chatBubbleUser = gray80;
 export const chatBubbleAgent = gray90;
-export const chatBubbleAgentBorder = gray70;
+export const chatBubbleBorder = gray70;
 export const chatAvatarBot = gray50;
 export const chatAvatarAgent = gray30;
 export const chatAvatarUser = blue50;
diff --git a/packages/themes/src/g90.js b/packages/themes/src/g90.js
index 536c68cb6a8d..7bf4cad32134 100644
--- a/packages/themes/src/g90.js
+++ b/packages/themes/src/g90.js
@@ -247,7 +247,7 @@ export const chatPromptBorderStart = gray90;
 export const chatPromptBorderEnd = rgba(gray90, 0);
 export const chatBubbleUser = gray80;
 export const chatBubbleAgent = gray90;
-export const chatBubbleAgentBorder = gray70;
+export const chatBubbleBorder = gray70;
 export const chatAvatarBot = gray50;
 export const chatAvatarAgent = gray30;
 export const chatAvatarUser = blue50;
diff --git a/packages/themes/src/tokens/__tests__/__snapshots__/v11-test.js.snap b/packages/themes/src/tokens/__tests__/__snapshots__/v11-test.js.snap
index 1aa1b511d58d..05d8a0b8830b 100644
--- a/packages/themes/src/tokens/__tests__/__snapshots__/v11-test.js.snap
+++ b/packages/themes/src/tokens/__tests__/__snapshots__/v11-test.js.snap
@@ -264,7 +264,7 @@ Array [
   "chat-prompt-border-end",
   "chat-bubble-user",
   "chat-bubble-agent",
-  "chat-bubble-agent-border",
+  "chat-bubble-border",
   "chat-avatar-bot",
   "chat-avatar-agent",
   "chat-avatar-user",
diff --git a/packages/themes/src/tokens/__tests__/metadata-test.js b/packages/themes/src/tokens/__tests__/metadata-test.js
index ab0aefab1ee0..d1ed7c374108 100644
--- a/packages/themes/src/tokens/__tests__/metadata-test.js
+++ b/packages/themes/src/tokens/__tests__/metadata-test.js
@@ -1030,7 +1030,7 @@ test('metadata', () => {
           "type": "color",
         },
         Object {
-          "name": "chat-bubble-agent-border",
+          "name": "chat-bubble-border",
           "type": "color",
         },
         Object {
diff --git a/packages/themes/src/tokens/v11TokenGroup.js b/packages/themes/src/tokens/v11TokenGroup.js
index 04f251c07539..667124ec4114 100644
--- a/packages/themes/src/tokens/v11TokenGroup.js
+++ b/packages/themes/src/tokens/v11TokenGroup.js
@@ -375,7 +375,7 @@ export const ai = TokenGroup.create({
     'chat-prompt-border-end',
     'chat-bubble-user',
     'chat-bubble-agent',
-    'chat-bubble-agent-border',
+    'chat-bubble-border',
     'chat-avatar-bot',
     'chat-avatar-agent',
     'chat-avatar-user',
diff --git a/packages/themes/src/white.js b/packages/themes/src/white.js
index ad0a72000e48..ade70122eda4 100644
--- a/packages/themes/src/white.js
+++ b/packages/themes/src/white.js
@@ -243,7 +243,7 @@ export const chatPromptBorderStart = gray10;
 export const chatPromptBorderEnd = rgba(gray10, 0);
 export const chatBubbleUser = gray20;
 export const chatBubbleAgent = white;
-export const chatBubbleAgentBorder = gray20;
+export const chatBubbleBorder = gray20;
 export const chatAvatarBot = gray60;
 export const chatAvatarAgent = gray80;
 export const chatAvatarUser = blue60;