diff --git a/CLAUDE.md b/CLAUDE.md
index acec2fb..b3af99b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -20,7 +20,7 @@ claudius/
 │   │   │   ├── ChatWindow.tsx       # Chat UI container
 │   │   │   ├── ChatInput.tsx        # Message input form
 │   │   │   ├── ChatToggleButton.tsx # Floating action button
-│   │   │   └── MessageBubble.tsx    # Individual message display
+│   │   │   └── ChatMessage.tsx      # Individual message display
 │   │   ├── hooks/
 │   │   │   └── useChat.ts           # Chat state management
 │   │   ├── index.ts                 # Public exports
@@ -99,7 +99,7 @@ pnpm test             # Run tests
 | `ChatWindow` | Chat UI container with message list and input |
 | `ChatInput` | Message input form with submit handling |
 | `ChatToggleButton` | Floating button to open/close chat |
-| `MessageBubble` | Renders individual messages with URL linking |
+| `ChatMessage` | Renders individual messages with URL linking |
 | `ChatSources` | Slide-out sidebar displaying grouped source links |
 | `SourceIcon` | Icon button with badge count to trigger source sidebar |
 
diff --git a/docs/plans/2026-03-27-chatmessage-rename.md b/docs/plans/2026-03-27-chatmessage-rename.md
new file mode 100644
index 0000000..be49de7
--- /dev/null
+++ b/docs/plans/2026-03-27-chatmessage-rename.md
@@ -0,0 +1,85 @@
+# ChatMessage Rename Implementation Plan
+
+> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
+
+**Goal:** Rename `MessageBubble` to `ChatMessage` for naming consistency with other `Chat*` components.
+
+**Architecture:** Pure rename/refactor. No logic changes. Rename the component, file, test file, and update all imports.
+
+**Tech Stack:** React, TypeScript, Vitest
+
+---
+
+### Task 1: Rename component file
+
+**Files:**
+- Rename: `widget/src/components/MessageBubble.tsx` -> `widget/src/components/ChatMessage.tsx`
+
+**Step 1: Create ChatMessage.tsx with renamed exports**
+
+Copy `MessageBubble.tsx` to `ChatMessage.tsx`. Rename:
+- Interface: `MessageBubbleProps` -> `ChatMessageProps`
+- Component: `MessageBubble` -> `ChatMessage`
+- `memo` display name: `MessageBubble` -> `ChatMessage`
+
+**Step 2: Delete old MessageBubble.tsx**
+
+**Step 3: Run tests to verify they fail (imports broken)**
+
+Run: `cd widget && pnpm test -- --run`
+Expected: FAIL - cannot find `MessageBubble`
+
+### Task 2: Update test file
+
+**Files:**
+- Rename: `widget/src/components/__tests__/MessageBubble.test.tsx` -> `widget/src/components/__tests__/ChatMessage.test.tsx`
+
+**Step 1: Create ChatMessage.test.tsx**
+
+Copy test file, update:
+- Import: `from "../MessageBubble"` -> `from "../ChatMessage"`
+- References: `MessageBubble` -> `ChatMessage`
+- Describe block: `"MessageBubble"` -> `"ChatMessage"`
+
+**Step 2: Delete old MessageBubble.test.tsx**
+
+### Task 3: Update ChatWindow import
+
+**Files:**
+- Modify: `widget/src/components/ChatWindow.tsx`
+
+**Step 1: Update import and JSX usage**
+
+Change:
+```tsx
+import { MessageBubble } from "./MessageBubble";
+```
+to:
+```tsx
+import { ChatMessage } from "./ChatMessage";
+```
+
+Change JSX `<MessageBubble` to `<ChatMessage` (and closing tag).
+
+### Task 4: Update CLAUDE.md references
+
+**Files:**
+- Modify: `CLAUDE.md`
+
+**Step 1: Update component table and file listing**
+
+Replace `MessageBubble` with `ChatMessage` in the project structure and component table.
+
+### Task 5: Run tests and verify
+
+**Step 1: Run all widget tests**
+
+Run: `cd widget && pnpm test -- --run`
+Expected: All tests PASS
+
+**Step 2: Commit**
+
+```bash
+git add -A
+git commit -m "refactor: rename MessageBubble to ChatMessage for naming consistency"
+```
diff --git a/widget/src/components/MessageBubble.tsx b/widget/src/components/ChatMessage.tsx
similarity index 96%
rename from widget/src/components/MessageBubble.tsx
rename to widget/src/components/ChatMessage.tsx
index b57c5de..1f2d7e6 100644
--- a/widget/src/components/MessageBubble.tsx
+++ b/widget/src/components/ChatMessage.tsx
@@ -2,7 +2,7 @@ import { memo, type ReactNode } from "react";
 import { SourceIcon } from "./SourceIcon";
 import type { Source } from "../api/types";
 
-interface MessageBubbleProps {
+interface ChatMessageProps {
   role: "user" | "assistant";
   content: string;
   sources?: Source[];
@@ -87,13 +87,13 @@ function renderFormattedContent(content: string): ReactNode[] {
   ));
 }
 
-export const MessageBubble = memo(function MessageBubble({
+export const ChatMessage = memo(function ChatMessage({
   role,
   content,
   sources,
   onSourceClick,
   isSourceActive,
-}: MessageBubbleProps) {
+}: ChatMessageProps) {
   const isUser = role === "user";
 
   return (
diff --git a/widget/src/components/ChatWindow.tsx b/widget/src/components/ChatWindow.tsx
index 477d81c..3d7348c 100644
--- a/widget/src/components/ChatWindow.tsx
+++ b/widget/src/components/ChatWindow.tsx
@@ -1,21 +1,14 @@
 import { useEffect, useRef, useState } from "react";
-import { MessageBubble } from "./MessageBubble";
+import { ChatMessage } from "./ChatMessage";
 import { ChatInput } from "./ChatInput";
 import { ChatSources } from "./ChatSources";
 import { useSwipeToDismiss } from "../hooks/useSwipeToDismiss";
 import type { WidgetPosition } from "./ChatWidget";
 import type { ClaudiusTranslations } from "../i18n";
-import type { Source } from "../api/types";
-
-interface ChatMessage {
-  id: string;
-  role: "user" | "assistant";
-  content: string;
-  sources?: Source[];
-}
+import type { ChatMessage as ChatMessageData, Source } from "../api/types";
 
 interface ChatWindowProps {
-  messages: ChatMessage[];
+  messages: ChatMessageData[];
   isLoading: boolean;
   error: string | null;
   onSend: (message: string) => void;
@@ -165,7 +158,7 @@ export function ChatWindow({
           )}
 
           {messages.map((msg) => (
-            <MessageBubble
+            <ChatMessage
               key={msg.id}
               role={msg.role}
               content={msg.content}
diff --git a/widget/src/components/__tests__/MessageBubble.test.tsx b/widget/src/components/__tests__/ChatMessage.test.tsx
similarity index 88%
rename from widget/src/components/__tests__/MessageBubble.test.tsx
rename to widget/src/components/__tests__/ChatMessage.test.tsx
index abef288..18c6e7c 100644
--- a/widget/src/components/__tests__/MessageBubble.test.tsx
+++ b/widget/src/components/__tests__/ChatMessage.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { describe, it, expect, vi } from "vitest";
-import { MessageBubble } from "../MessageBubble";
+import { ChatMessage } from "../ChatMessage";
 import type { Source } from "../../api/types";
 
 const mockSources: Source[] = [
@@ -9,9 +9,9 @@ const mockSources: Source[] = [
   { url: "https://pmds.info/services", title: "Services", type: "page" },
 ];
 
-describe("MessageBubble", () => {
+describe("ChatMessage", () => {
   it("renders user message with correct styling", () => {
-    render(<MessageBubble role="user" content="Hello!" />);
+    render(<ChatMessage role="user" content="Hello!" />);
     const bubble = screen.getByText("Hello!");
     expect(bubble).toBeInTheDocument();
     // ml-auto is on the outer wrapper div (parent of the bubble div)
@@ -20,7 +20,7 @@ describe("MessageBubble", () => {
   });
 
   it("renders assistant message with correct styling", () => {
-    render(<MessageBubble role="assistant" content="How can I help?" />);
+    render(<ChatMessage role="assistant" content="How can I help?" />);
     const bubble = screen.getByText("How can I help?");
     expect(bubble).toBeInTheDocument();
     // mr-auto is on the outer wrapper div (parent of the bubble div)
@@ -30,7 +30,7 @@ describe("MessageBubble", () => {
 
   it("renders links as clickable anchors", () => {
     render(
-      <MessageBubble
+      <ChatMessage
         role="assistant"
         content="Visit https://pmds.info/contact to get started!"
       />
@@ -43,7 +43,7 @@ describe("MessageBubble", () => {
 
   it("renders source icon for assistant messages with sources", () => {
     render(
-      <MessageBubble
+      <ChatMessage
         role="assistant"
         content="Here are resources."
         sources={mockSources}
@@ -57,7 +57,7 @@ describe("MessageBubble", () => {
 
   it("does not render source icon for user messages", () => {
     render(
-      <MessageBubble
+      <ChatMessage
         role="user"
         content="Hello"
         sources={mockSources}
@@ -70,7 +70,7 @@ describe("MessageBubble", () => {
 
   it("does not render source icon when no sources", () => {
     render(
-      <MessageBubble role="assistant" content="No sources here." />
+      <ChatMessage role="assistant" content="No sources here." />
     );
     expect(screen.queryByRole("button", { name: /view sources/i })).not.toBeInTheDocument();
   });
@@ -79,7 +79,7 @@ describe("MessageBubble", () => {
     const user = userEvent.setup();
     const onSourceClick = vi.fn();
     render(
-      <MessageBubble
+      <ChatMessage
         role="assistant"
         content="Resources."
         sources={mockSources}