diff --git a/mdagent/utils/path_registry.py b/mdagent/utils/path_registry.py
index 4d06bd0a..84d75d96 100644
--- a/mdagent/utils/path_registry.py
+++ b/mdagent/utils/path_registry.py
@@ -293,7 +293,12 @@ def write_file_name(self, type: FileType, **kwargs):
                 else:
                     file_name += f"FIG_{fig_analysis}_{time_stamp}.{file_format}"
             else:
-                file_name += f"FIG_{time_stamp}.{file_format}"
+                if Sim_id:
+                    file_name += f"FIG_{Sim_id}_{time_stamp}.{file_format}"
+                elif Log_id:
+                    file_name += f"FIG_{Log_id}_{time_stamp}.{file_format}"
+                else:
+                    file_name += f"FIG_{time_stamp}.{file_format}"
 
         if file_name == "":
             file_name += "ErrorDuringNaming_error.py"
diff --git a/tests/test_util_tools.py b/tests/test_util_tools.py
index 8ef97644..796c5a52 100644
--- a/tests/test_util_tools.py
+++ b/tests/test_util_tools.py
@@ -97,6 +97,7 @@ def test_write_file_name_figure_1(path_registry, todays_date):
         protein_file_id="123",
         Sim_id="SIM456",
         time_stamp=todays_date,
+        file_format="png",
         irrelevant="irrelevant",
     )
     assert "FIG_SIM456_123_" in file_name