diff --git a/llama_stack/ui/app/chat-playground/page.test.tsx b/llama_stack/ui/app/chat-playground/page.test.tsx
index 983225f00..54c15f95a 100644
--- a/llama_stack/ui/app/chat-playground/page.test.tsx
+++ b/llama_stack/ui/app/chat-playground/page.test.tsx
@@ -74,7 +74,7 @@ jest.mock("@/components/chat-playground/chat", () => ({
   ),
 }));
 
-jest.mock("@/components/chat-playground/session-manager", () => ({
+jest.mock("@/components/chat-playground/conversations", () => ({
   SessionManager: jest.fn(({ selectedAgentId, onNewSession }) => (
     <div data-testid="session-manager">
       {selectedAgentId && (
diff --git a/llama_stack/ui/app/chat-playground/page.tsx b/llama_stack/ui/app/chat-playground/page.tsx
index f924a0ba2..f26791a41 100644
--- a/llama_stack/ui/app/chat-playground/page.tsx
+++ b/llama_stack/ui/app/chat-playground/page.tsx
@@ -21,7 +21,7 @@ import type { TurnCreateParams } from "llama-stack-client/resources/agents/turn"
 import {
   SessionUtils,
   type ChatSession,
-} from "@/components/chat-playground/session-manager";
+} from "@/components/chat-playground/conversations";
 export default function ChatPlaygroundPage() {
   const [currentSession, setCurrentSession] = useState<ChatSession | null>(
     null
diff --git a/llama_stack/ui/components/chat-playground/session-manager.test.tsx b/llama_stack/ui/components/chat-playground/conversations.test.tsx
similarity index 96%
rename from llama_stack/ui/components/chat-playground/session-manager.test.tsx
rename to llama_stack/ui/components/chat-playground/conversations.test.tsx
index bcbeed6a7..f4172004a 100644
--- a/llama_stack/ui/components/chat-playground/session-manager.test.tsx
+++ b/llama_stack/ui/components/chat-playground/conversations.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen, waitFor, act } from "@testing-library/react";
 import "@testing-library/jest-dom";
-import { SessionManager, SessionUtils } from "./session-manager";
+import { Conversations, SessionUtils } from "./conversations";
 import type { Message } from "@/components/chat-playground/chat-message";
 
 interface ChatSession {
@@ -36,8 +36,8 @@ jest.mock("@/hooks/use-auth-client", () => ({
 }));
 
 // Mock additional SessionUtils methods that are now being used
-jest.mock("./session-manager", () => {
-  const actual = jest.requireActual("./session-manager");
+jest.mock("./conversations", () => {
+  const actual = jest.requireActual("./conversations");
   return {
     ...actual,
     SessionUtils: {
@@ -130,7 +130,7 @@ describe("SessionManager", () => {
     test("does not render when no agent is selected", async () => {
       const { container } = await act(async () => {
         return render(
-          <SessionManager
+          <Conversations
             selectedAgentId=""
             currentSession={null}
             onSessionChange={mockOnSessionChange}
@@ -149,7 +149,7 @@ describe("SessionManager", () => {
 
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={null}
             onSessionChange={mockOnSessionChange}
@@ -166,7 +166,7 @@ describe("SessionManager", () => {
     test("renders session selector when agent sessions are loaded", async () => {
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={null}
             onSessionChange={mockOnSessionChange}
@@ -183,7 +183,7 @@ describe("SessionManager", () => {
     test("renders current session name when session is selected", async () => {
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={mockSession}
             onSessionChange={mockOnSessionChange}
@@ -202,7 +202,7 @@ describe("SessionManager", () => {
     test("loads sessions from agent API on mount", async () => {
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={mockSession}
             onSessionChange={mockOnSessionChange}
@@ -226,7 +226,7 @@ describe("SessionManager", () => {
 
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={mockSession}
             onSessionChange={mockOnSessionChange}
@@ -257,7 +257,7 @@ describe("SessionManager", () => {
 
       await act(async () => {
         render(
-          <SessionManager
+          <Conversations
             selectedAgentId="agent_123"
             currentSession={mockSession}
             onSessionChange={mockOnSessionChange}
diff --git a/llama_stack/ui/components/chat-playground/session-manager.tsx b/llama_stack/ui/components/chat-playground/conversations.tsx
similarity index 99%
rename from llama_stack/ui/components/chat-playground/session-manager.tsx
rename to llama_stack/ui/components/chat-playground/conversations.tsx
index 6b61eab34..1a9c960fe 100644
--- a/llama_stack/ui/components/chat-playground/session-manager.tsx
+++ b/llama_stack/ui/components/chat-playground/conversations.tsx
@@ -73,7 +73,7 @@ const generateSessionId = (): string => {
   return globalThis.crypto.randomUUID();
 };
 
-export function SessionManager({
+export function Conversations({
   currentSession,
   onSessionChange,
   selectedAgentId,