diff --git a/submodules/moragents_dockers/agents/src/agents/crypto_data/routes.py b/submodules/moragents_dockers/agents/src/agents/crypto_data/routes.py
index bde94c4..1fd2d8e 100644
--- a/submodules/moragents_dockers/agents/src/agents/crypto_data/routes.py
+++ b/submodules/moragents_dockers/agents/src/agents/crypto_data/routes.py
@@ -13,7 +13,7 @@ async def process_data(data: dict):
     """Process crypto data"""
     logger.info("Data Agent: Received process_data request")
     try:
-        crypto_agent = agent_manager_instance.get_agent("crypto data agent")
+        crypto_agent = agent_manager_instance.get_agent("crypto data")
         if not crypto_agent:
             return JSONResponse(
                 status_code=400,
diff --git a/submodules/moragents_dockers/agents/src/agents/default/agent.py b/submodules/moragents_dockers/agents/src/agents/default/agent.py
index 8579ff5..c76d8cb 100644
--- a/submodules/moragents_dockers/agents/src/agents/default/agent.py
+++ b/submodules/moragents_dockers/agents/src/agents/default/agent.py
@@ -23,7 +23,7 @@ def chat(self, request: ChatRequest):
                 # Build list of human readable names for selected agents
                 selected_agents_info = []
                 for agent in available_agents:
-                    if agent["name"] in selected_agent_names and agent["name"] != "default agent":
+                    if agent["name"] in selected_agent_names and agent["name"] != "default":
                         human_name = agent.get("human_readable_name", agent["name"])
                         selected_agents_info.append(f"- {human_name}: {agent['description']}")
 
diff --git a/submodules/moragents_dockers/agents/src/agents/mor_claims/routes.py b/submodules/moragents_dockers/agents/src/agents/mor_claims/routes.py
index 593f57d..7f6b710 100644
--- a/submodules/moragents_dockers/agents/src/agents/mor_claims/routes.py
+++ b/submodules/moragents_dockers/agents/src/agents/mor_claims/routes.py
@@ -13,7 +13,7 @@ async def claim(request: Request):
     """Process a claim request"""
     logger.info("Received claim request")
     try:
-        claim_agent = agent_manager_instance.get_agent("claim agent")
+        claim_agent = agent_manager_instance.get_agent("claim")
         if not claim_agent:
             return JSONResponse(
                 status_code=400,
diff --git a/submodules/moragents_dockers/agents/src/agents/rag/routes.py b/submodules/moragents_dockers/agents/src/agents/rag/routes.py
index 11c419b..b9dfe37 100644
--- a/submodules/moragents_dockers/agents/src/agents/rag/routes.py
+++ b/submodules/moragents_dockers/agents/src/agents/rag/routes.py
@@ -13,7 +13,7 @@ async def upload_file(file: UploadFile = File(...)):
     """Upload a file for RAG processing"""
     logger.info("Received upload request")
     try:
-        rag_agent = agent_manager_instance.get_agent("rag agent")
+        rag_agent = agent_manager_instance.get_agent("rag")
         if not rag_agent:
             return JSONResponse(
                 status_code=400,
diff --git a/submodules/moragents_dockers/agents/src/agents/token_swap/routes.py b/submodules/moragents_dockers/agents/src/agents/token_swap/routes.py
index 4f62300..499efee 100644
--- a/submodules/moragents_dockers/agents/src/agents/token_swap/routes.py
+++ b/submodules/moragents_dockers/agents/src/agents/token_swap/routes.py
@@ -13,7 +13,7 @@ async def tx_status(request: Request):
     """Check transaction status"""
     logger.info("Received tx_status request")
     try:
-        swap_agent = agent_manager_instance.get_agent("crypto swap agent")
+        swap_agent = agent_manager_instance.get_agent("crypto swap")
         if not swap_agent:
             return JSONResponse(
                 status_code=400,
@@ -36,7 +36,7 @@ async def allowance(request: Request):
     """Get token allowance"""
     logger.info("Received allowance request")
     try:
-        swap_agent = agent_manager_instance.get_agent("crypto swap agent")
+        swap_agent = agent_manager_instance.get_agent("crypto swap")
         if not swap_agent:
             return JSONResponse(
                 status_code=400,
@@ -58,7 +58,7 @@ async def approve(request: Request):
     """Approve token spending"""
     logger.info("Received approve request")
     try:
-        swap_agent = agent_manager_instance.get_agent("crypto swap agent")
+        swap_agent = agent_manager_instance.get_agent("crypto swap")
         if not swap_agent:
             return JSONResponse(
                 status_code=400,
@@ -80,7 +80,7 @@ async def swap(request: Request):
     """Execute token swap"""
     logger.info("Received swap request")
     try:
-        swap_agent = agent_manager_instance.get_agent("crypto swap agent")
+        swap_agent = agent_manager_instance.get_agent("crypto swap")
         if not swap_agent:
             return JSONResponse(
                 status_code=400,
diff --git a/submodules/moragents_dockers/agents/src/agents/tweet_sizzler/routes.py b/submodules/moragents_dockers/agents/src/agents/tweet_sizzler/routes.py
index 5255a4b..e188e0e 100644
--- a/submodules/moragents_dockers/agents/src/agents/tweet_sizzler/routes.py
+++ b/submodules/moragents_dockers/agents/src/agents/tweet_sizzler/routes.py
@@ -13,7 +13,7 @@ async def regenerate_tweet():
     """Regenerate a tweet"""
     logger.info("Received regenerate tweet request")
     try:
-        tweet_agent = agent_manager_instance.get_agent("tweet sizzler agent")
+        tweet_agent = agent_manager_instance.get_agent("tweet sizzler")
         if not tweet_agent:
             return JSONResponse(
                 status_code=400,
@@ -36,7 +36,7 @@ async def post_tweet(request: Request):
     """Post a tweet"""
     logger.info("Received post tweet request")
     try:
-        tweet_agent = agent_manager_instance.get_agent("tweet sizzler agent")
+        tweet_agent = agent_manager_instance.get_agent("tweet sizzler")
         if not tweet_agent:
             return JSONResponse(
                 status_code=400,