diff --git a/pyros.py b/pyros.py
index df51c13..c323deb 100755
--- a/pyros.py
+++ b/pyros.py
@@ -57,11 +57,11 @@ _previous_dir = None
 # List of all agents that pyros can start, with this format :
 # agent-name : agent-folder-name
 AGENTS = {
-    "AgentM": "env_monitor",
-    "AgentSP": "scientific_programs",
+    "A_EnvMonitor": "env_monitor",
+    "A_SCP_Manager": "scientific_programs",
     "AgentScheduler": "scheduling",
-    "AgentImagesProcessor": "img_process",
-    "AgentImagesCalibrator": "img_analysis",
+    "A_ImgProcessor": "img_process",
+    "A_ImgCalibrator": "img_analysis",
     "A_SST": "majordome/agent",
     "Agent": "majordome/agent",
     "Agent2": "majordome/agent",
@@ -80,10 +80,11 @@ AGENTS = {
     "majordome": "majordome",
     #"scheduler": "scheduler",
     "alert_manager": "alert_mgmt",
-    "AgentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent",
-    "agentBasic": "majordome/agent",
-    "AgentTriton": "majordome/agent",
-    "AgentMCO":"majordome/agent",
+    "A_ImagesProcessor_tnc_up1": "../PYROS_OBSERVATORY/pyros_observatory_tnc/agents",
+    "A_Basic": "majordome/agent",
+    "A_Triton": "majordome/agent",
+    "A_MCO":"majordome/agent",
+    "A_Majordome":"majordome/agent"
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
@@ -1031,7 +1032,7 @@ def start(agent: str, configfile: str, observatory: str, unit: str, computer_hos
             # if not test_mode(): execProcessFromVenv("start_agent.py " + agent_name + " " + configfile)
 
             # Agent "agentM", "agentA", "agentB", "agentX", ...
-            elif agent_name.startswith("agent") or agent_name.startswith("Agent"):
+            elif agent_name.startswith("A_") or agent_name.startswith("A_"):
                 # Run agent without actual commands sent to devices (FOR_REAL=False)
                 # agentX.run(FOR_REAL=True)
                 '''
@@ -1049,7 +1050,7 @@ def start(agent: str, configfile: str, observatory: str, unit: str, computer_hos
                 os.chdir(PYROS_DJANGO_BASE_DIR + os.sep + agent_folder)
                 # cmd = "-m AgentX"
                 # cmd = f" Agent{agent_name[5:]}.py {configfile}"
-                cmd = f"Agent{agent_name[5:]}.py"
+                cmd = f"{agent_name}.py"
                 if debug_mode():
                     cmd += " -d"
                 if sim_mode():
--
libgit2 0.21.2