diff --git a/api/container.py b/api/container.py
index 9e47f087..41f0d11d 100644
--- a/api/container.py
+++ b/api/container.py
@@ -5,7 +5,7 @@ from typing import Dict, List
 
 from fastapi.templating import Jinja2Templates
 
-from swarms.agents.utils.AgentManager import AgentManager
+from swarms.agents.utils.agent_creator import AgentManager
 from swarms.utils.main import BaseHandler, FileHandler, FileType
 from swarms.tools.main import ExitConversation, RequestsGet, CodeEditor, Terminal
 
diff --git a/swarms/agents/utils/AgentManager.py b/swarms/agents/utils/agent_creator.py
similarity index 94%
rename from swarms/agents/utils/AgentManager.py
rename to swarms/agents/utils/agent_creator.py
index 47fd0c51..0704de89 100644
--- a/swarms/agents/utils/AgentManager.py
+++ b/swarms/agents/utils/agent_creator.py
@@ -9,8 +9,8 @@ from langchain.memory.chat_memory import BaseChatMemory
 from swarms.tools.main import BaseToolSet, ToolsFactory
 from swarms.prompts.prompts import EVAL_PREFIX, EVAL_SUFFIX
 
-from swarms.agents.utils.AgentBuilder import AgentSetup
-from swarms.agents.utils.EvalOutputParser import EVALCallbackHandler, ExecutionTracingCallbackHandler
+from swarms.agents.utils.agent_setup import AgentSetup
+from swarms.agents.utils.callback import EVALCallbackHandler, ExecutionTracingCallbackHandler
 
 callback_manager_instance = CallbackManager(EVALCallbackHandler())
 
diff --git a/swarms/agents/utils/AgentBuilder.py b/swarms/agents/utils/agent_setup.py
similarity index 98%
rename from swarms/agents/utils/AgentBuilder.py
rename to swarms/agents/utils/agent_setup.py
index bbfbb6ae..57811087 100644
--- a/swarms/agents/utils/AgentBuilder.py
+++ b/swarms/agents/utils/agent_setup.py
@@ -12,7 +12,7 @@ from langchain.callbacks.base import BaseCallbackManager
 from .ConversationalChatAgent import ConversationalChatAgent
 # from .ChatOpenAI import ChatOpenAI
 from langchain.chat_models import ChatOpenAI
-from .EvalOutputParser import EvalOutputParser
+from .callback import EvalOutputParser
 
 
 
diff --git a/swarms/agents/utils/EvalOutputParser.py b/swarms/agents/utils/callback.py
similarity index 100%
rename from swarms/agents/utils/EvalOutputParser.py
rename to swarms/agents/utils/callback.py
diff --git a/swarms/agents/workers/WorkerUltraNode.py b/swarms/agents/workers/WorkerUltraNode.py
index 4c2846a9..c9331bba 100644
--- a/swarms/agents/workers/WorkerUltraNode.py
+++ b/swarms/agents/workers/WorkerUltraNode.py
@@ -4,7 +4,7 @@ import logging
 from pathlib import Path
 from typing import Dict, List
 
-from swarms.agents.utils.AgentManager import AgentCreator
+from swarms.agents.utils.agent_creator import AgentCreator
 from swarms.utils.main import BaseHandler, FileHandler, FileType
 from swarms.tools.main import ExitConversation, RequestsGet, CodeEditor, Terminal
 from swarms.utils.main import CsvToDataframe