diff --git a/src/services/llm/chat/handlers/context-handler.ts b/src/services/llm/chat/handlers/context_handler.ts
similarity index 100%
rename from src/services/llm/chat/handlers/context-handler.ts
rename to src/services/llm/chat/handlers/context_handler.ts
diff --git a/src/services/llm/chat/handlers/stream-handler.ts b/src/services/llm/chat/handlers/stream_handler.ts
similarity index 98%
rename from src/services/llm/chat/handlers/stream-handler.ts
rename to src/services/llm/chat/handlers/stream_handler.ts
index 492345c24..688e44b20 100644
--- a/src/services/llm/chat/handlers/stream-handler.ts
+++ b/src/services/llm/chat/handlers/stream_handler.ts
@@ -4,7 +4,7 @@
 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 { LLMStreamMessage } from "../interfaces/ws_messages.js";
 import type { ChatSession } from "../interfaces/session.js";
 
 /**
@@ -50,7 +50,7 @@ export class StreamHandler {
 
         try {
             // Import the tool handler
-            const { ToolHandler } = await import('./tool-handler.js');
+            const { ToolHandler } = await import('./tool_handler.js');
 
             // Generate the LLM completion with streaming enabled
             const response = await service.generateChatCompletion(aiMessages, {
@@ -198,7 +198,7 @@ export class StreamHandler {
         service?: any
     ): Promise<void> {
         // Import tool handler lazily to avoid circular dependencies
-        const { ToolHandler } = await import('./tool-handler.js');
+        const { ToolHandler } = await import('./tool_handler.js');
 
         let messageContent = '';
 
diff --git a/src/services/llm/chat/handlers/tool-handler.ts b/src/services/llm/chat/handlers/tool_handler.ts
similarity index 99%
rename from src/services/llm/chat/handlers/tool-handler.ts
rename to src/services/llm/chat/handlers/tool_handler.ts
index 43f9101a3..7cbfd1316 100644
--- a/src/services/llm/chat/handlers/tool-handler.ts
+++ b/src/services/llm/chat/handlers/tool_handler.ts
@@ -3,7 +3,7 @@
  */
 import log from "../../../log.js";
 import type { Message } from "../../ai_interface.js";
-import SessionsStore from "../sessions-store.js";
+import SessionsStore from "../sessions_store.js";
 
 /**
  * Handles the execution of LLM tools
diff --git a/src/services/llm/chat/index.ts b/src/services/llm/chat/index.ts
index b311e2683..e29860cad 100644
--- a/src/services/llm/chat/index.ts
+++ b/src/services/llm/chat/index.ts
@@ -1,14 +1,14 @@
 /**
  * Chat module export
  */
-import restChatService from './rest-chat-service.js';
-import sessionsStore from './sessions-store.js';
-import { ContextHandler } from './handlers/context-handler.js';
-import { ToolHandler } from './handlers/tool-handler.js';
-import { StreamHandler } from './handlers/stream-handler.js';
+import restChatService from './rest_chat_service.js';
+import sessionsStore from './sessions_store.js';
+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 { LLMStreamMessage } from './interfaces/ws_messages.js';
 
 // Export components
 export {
diff --git a/src/services/llm/chat/interfaces/ws-messages.ts b/src/services/llm/chat/interfaces/ws_messages.ts
similarity index 100%
rename from src/services/llm/chat/interfaces/ws-messages.ts
rename to src/services/llm/chat/interfaces/ws_messages.ts
diff --git a/src/services/llm/chat/rest-chat-service.ts b/src/services/llm/chat/rest_chat_service.ts
similarity index 98%
rename from src/services/llm/chat/rest-chat-service.ts
rename to src/services/llm/chat/rest_chat_service.ts
index 04ed50d82..51834c4a3 100644
--- a/src/services/llm/chat/rest-chat-service.ts
+++ b/src/services/llm/chat/rest_chat_service.ts
@@ -11,13 +11,13 @@ import options from "../../options.js";
 import { SEARCH_CONSTANTS } from '../constants/search_constants.js';
 
 // Import our refactored modules
-import { ContextHandler } from "./handlers/context-handler.js";
-import { ToolHandler } from "./handlers/tool-handler.js";
-import { StreamHandler } from "./handlers/stream-handler.js";
-import SessionsStore from "./sessions-store.js";
+import { ContextHandler } from "./handlers/context_handler.js";
+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 { LLMStreamMessage } from "./interfaces/ws_messages.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
similarity index 100%
rename from src/services/llm/chat/sessions-store.ts
rename to src/services/llm/chat/sessions_store.ts
diff --git a/src/services/llm/rest_chat_service.ts b/src/services/llm/rest_chat_service.ts
index 4de711414..ee7462db8 100644
--- a/src/services/llm/rest_chat_service.ts
+++ b/src/services/llm/rest_chat_service.ts
@@ -5,6 +5,6 @@
  * See chat/rest-chat-service.ts for the actual implementation.
  */
 
-import restChatService from './chat/rest-chat-service.js';
+import restChatService from './chat/rest_chat_service.js';
 export * from './chat/interfaces/session.js';
 export default restChatService;