diff --git a/src/services/llm/chat/handlers/context_handler.ts b/src/services/llm/chat/handlers/context_handler.ts
index 6466dd231..c5af21116 100644
--- a/src/services/llm/chat/handlers/context_handler.ts
+++ b/src/services/llm/chat/handlers/context_handler.ts
@@ -6,7 +6,7 @@ import becca from "../../../../becca/becca.js";
 import vectorStore from "../../embeddings/index.js";
 import providerManager from "../../providers/providers.js";
 import contextService from "../../context/services/context_service.js";
-import type { NoteSource } from "../interfaces/session.js";
+import type { NoteSource } from "../../interfaces/chat_session.js";
 import { SEARCH_CONSTANTS } from '../../constants/search_constants.js';
 
 /**
diff --git a/src/services/llm/chat/handlers/stream_handler.ts b/src/services/llm/chat/handlers/stream_handler.ts
index 688e44b20..7efe5d4bb 100644
--- a/src/services/llm/chat/handlers/stream_handler.ts
+++ b/src/services/llm/chat/handlers/stream_handler.ts
@@ -4,8 +4,8 @@
 import log from "../../../log.js";
 import type { Response } from "express";
 import type { StreamChunk } from "../../ai_interface.js";
-import type { LLMStreamMessage } from "../interfaces/ws_messages.js";
-import type { ChatSession } from "../interfaces/session.js";
+import type { LLMStreamMessage } from "../../interfaces/chat_ws_messages.js";
+import type { ChatSession } from "../../interfaces/chat_session.js";
 
 /**
  * Handles streaming of LLM responses via WebSocket
diff --git a/src/services/llm/chat/index.ts b/src/services/llm/chat/index.ts
index f7b750104..d82554229 100644
--- a/src/services/llm/chat/index.ts
+++ b/src/services/llm/chat/index.ts
@@ -7,8 +7,8 @@ import { ContextHandler } from './handlers/context_handler.js';
 import { ToolHandler } from './handlers/tool_handler.js';
 import { StreamHandler } from './handlers/stream_handler.js';
 import * as messageFormatter from './utils/message_formatter.js';
-import type { ChatSession, ChatMessage, NoteSource } from './interfaces/session.js';
-import type { LLMStreamMessage } from './interfaces/ws_messages.js';
+import type { ChatSession, ChatMessage, NoteSource } from '../interfaces/chat_session.js';
+import type { LLMStreamMessage } from '../interfaces/chat_ws_messages.js';
 
 // Export components
 export {
diff --git a/src/services/llm/chat/rest_chat_service.ts b/src/services/llm/chat/rest_chat_service.ts
index 3890f31c7..7a2b476b7 100644
--- a/src/services/llm/chat/rest_chat_service.ts
+++ b/src/services/llm/chat/rest_chat_service.ts
@@ -16,10 +16,10 @@ import { ToolHandler } from "./handlers/tool_handler.js";
 import { StreamHandler } from "./handlers/stream_handler.js";
 import SessionsStore from "./sessions_store.js";
 import * as MessageFormatter from "./utils/message_formatter.js";
-import type { NoteSource } from "./interfaces/session.js";
-import type { LLMStreamMessage } from "./interfaces/ws_messages.js";
-import type { ChatMessage } from '../chat/interfaces/session.js';
-import type { ChatSession } from '../chat/interfaces/session.js';
+import type { NoteSource } from "../interfaces/chat_session.js";
+import type { LLMStreamMessage } from "../interfaces/chat_ws_messages.js";
+import type { ChatMessage } from '../interfaces/chat_session.js';
+import type { ChatSession } from '../interfaces/chat_session.js';
 
 /**
  * Service to handle chat API interactions
diff --git a/src/services/llm/chat/sessions_store.ts b/src/services/llm/chat/sessions_store.ts
index 711a00269..4f242c5da 100644
--- a/src/services/llm/chat/sessions_store.ts
+++ b/src/services/llm/chat/sessions_store.ts
@@ -5,7 +5,7 @@ import log from "../../log.js";
 import { LLM_CONSTANTS } from '../constants/provider_constants.js';
 import { SEARCH_CONSTANTS } from '../constants/search_constants.js';
 import { randomString } from "../../utils.js";
-import type { ChatSession, ChatMessage } from './interfaces/session.js';
+import type { ChatSession, ChatMessage } from '../interfaces/chat_session.js';
 
 // In-memory storage for sessions
 const sessions = new Map<string, ChatSession>();
diff --git a/src/services/llm/chat/interfaces/session.ts b/src/services/llm/interfaces/chat_session.ts
similarity index 92%
rename from src/services/llm/chat/interfaces/session.ts
rename to src/services/llm/interfaces/chat_session.ts
index bb5d9c440..f5dfc1db3 100644
--- a/src/services/llm/chat/interfaces/session.ts
+++ b/src/services/llm/interfaces/chat_session.ts
@@ -1,7 +1,7 @@
 /**
  * Interfaces for chat sessions and related data
  */
-import type { Message } from "../../ai_interface.js";
+import type { Message } from "../ai_interface.js";
 
 /**
  * Represents a source note from which context is drawn
diff --git a/src/services/llm/chat/interfaces/ws_messages.ts b/src/services/llm/interfaces/chat_ws_messages.ts
similarity index 100%
rename from src/services/llm/chat/interfaces/ws_messages.ts
rename to src/services/llm/interfaces/chat_ws_messages.ts
diff --git a/src/services/llm/rest_chat_service.ts b/src/services/llm/rest_chat_service.ts
index ee7462db8..1cc6f56ba 100644
--- a/src/services/llm/rest_chat_service.ts
+++ b/src/services/llm/rest_chat_service.ts
@@ -6,5 +6,5 @@
  */
 
 import restChatService from './chat/rest_chat_service.js';
-export * from './chat/interfaces/session.js';
+export * from './interfaces/chat_session.js';
 export default restChatService;