diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index e9651077a0d5cd979921e810de834d9d8fcafc38..10be2df4b08cdced54c016040df7b77385025388 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -32,17 +32,19 @@ for given system architecture and MPSD software stack version.\n
 The toolchains
 are built using the bash script spack_setup.sh, and the results are logged. """
 
-call_date_iso = datetime.datetime.now().replace(microsecond=0).isoformat()
+call_date_iso = (
+    datetime.datetime.now().replace(microsecond=0).isoformat().replace(":", "-")
+)
 config_vars = {
     #  kept inside the mpsd_release folder
-    "cmd_log_file": "install.log",
+    "cmd_log_file": "script_execution_summary.log",
     #  Placeholder installer log file name, placed at mpsd_microarch/logs
     "installer_log_template": Template(
-        "${mpsd_release}_${mpsd_microarch}_${date}_${action}.log"
+        "${mpsd_release}_${mpsd_microarch}_${date}_APEX_${action}.log"
     ),
     #  Placeholder build log file name, placed at mpsd_microarch/logs
     "build_log_template": Template(
-        "${mpsd_release}_${mpsd_microarch}_${date}_${toolchain}_${action}.log"
+        "${mpsd_release}_${mpsd_microarch}_${date}_BUILD_${toolchain}_${action}.log"
     ),
     "metadata_tag_open": "!<meta>",
     "metadata_tag_close": "</meta>!",
@@ -151,8 +153,8 @@ def read_metadata_from_logfile(logfile: Union[str, Path]) -> dict:
     }
 
 
-def get_installer_log_file(mpsd_release: str, cmd: str, script_dir: str) -> str:
-    """Get installer log file name."""
+def get_installer_log_file_path(mpsd_release: str, cmd: str, script_dir: str) -> str:
+    """Get installer log file path."""
     # Get machine configs
     os.environ.get("MPSD_OS", "UNKNOWN_OS")
     mpsd_microarch = get_native_microarchitecture()
@@ -173,7 +175,7 @@ def get_installer_log_file(mpsd_release: str, cmd: str, script_dir: str) -> str:
     return installer_log_file
 
 
-def set_up_logging(loglevel="warning", filename=None):
+def set_up_logging(loglevel="warning", file_path=None):
     """Set up logging.
 
     This function sets up the logging configuration for the script.
@@ -188,7 +190,7 @@ def set_up_logging(loglevel="warning", filename=None):
          - warning (default): only print statements if something is unexpected
          - info (show more detailed progress)
          - debug (show very detailed output)
-    filename : str
+    file_path : str
          - filename to save logging messages into
 
     If loglevel is 'debug', save line numbers in log messages.
@@ -278,8 +280,8 @@ def set_up_logging(loglevel="warning", filename=None):
     logger.handlers = [shell_handler]
 
     # if filename provided, write log messages to that file, too.
-    if filename:
-        file_handler = logging.FileHandler(filename)
+    if file_path:
+        file_handler = logging.FileHandler(file_path)
         # if we have a file, we write all information in there.
         # We could change the level, for example restrict to only DEBUG and above with
         # file_handler.setLevel(logging.DEBUG)
@@ -303,9 +305,9 @@ def set_up_logging(loglevel="warning", filename=None):
     print_log.addHandler(ch)
 
     # if filename provided, write output of print_log to that file, too
-    if filename:
+    if file_path:
         # create, format and add file handler
-        fh = logging.FileHandler(filename)
+        fh = logging.FileHandler(file_path)
         fh.setFormatter(formatter)
         print_log.addHandler(fh)
 
@@ -314,7 +316,7 @@ def set_up_logging(loglevel="warning", filename=None):
     #
     logging.debug(
         f"Logging has been setup, loglevel={loglevel.upper()} "
-        + f"{filename=} {rich_available=}"
+        + f"{file_path=} {rich_available=}"
     )
 
 
@@ -788,7 +790,7 @@ def install_environment(
                 mpsd_release, mpsd_microarch, "install", toolchain=toolchain
             )
             build_log_folder = release_base_dir / "logs"
-            build_log_file = build_log_folder / build_log_file_name
+            build_log_path = build_log_folder / build_log_file_name
             # if logs folder dosent exist, create it
             if not os.path.exists(build_log_folder):
                 os.makedirs(build_log_folder)
@@ -799,7 +801,7 @@ def install_environment(
             setup_log_cmd(
                 mpsd_release,
                 script_dir,
-                msg=f"installing {toolchain} and logging at {build_log_file}",
+                msg=f"installing {toolchain} and logging at {build_log_path}",
             )
             setup_log_cmd(
                 mpsd_release,
@@ -811,7 +813,7 @@ def install_environment(
             )
             run(
                 f"bash {spack_setup_script} {' '.join(install_flags)} {toolchain} 2>&1 "
-                f"| tee -a {build_log_file} ",
+                f"| tee -a {build_log_path} ",
                 shell=True,
                 check=True,
             )
@@ -916,7 +918,8 @@ def main():
     script_dir = Path(os.path.dirname(os.path.realpath(__file__)))
 
     set_up_logging(
-        args.loglevel, get_installer_log_file(args.release, args.action, script_dir)
+        args.loglevel,
+        get_installer_log_file_path(args.release, args.action, script_dir),
     )
 
     # Check the command and run related function
diff --git a/tests.py b/tests.py
index 3ebc8d4f992044a39891428bcbcd0ee91aba36af..01be0fd7124654763f17c7ebbd9cd6c3149283d2 100644
--- a/tests.py
+++ b/tests.py
@@ -14,7 +14,7 @@ mod = importlib.import_module("mpsd-software-environment")
 
 # set loglevel to debug - useful for understanding problems.
 # (if the tests pass, pytest doesn't show any output)
-mod.set_up_logging(loglevel="debug", filename="tests.log")
+mod.set_up_logging(loglevel="debug", file_path="tests.log")
 logging.debug(f"We have set up logging from {__file__}")
 
 
@@ -164,13 +164,13 @@ def test_setup_log_cmd(tmp_path):
 
     Check that logs/install-software-environment.log is updated when the module is run
     """
-    log_file = "install.log"
+    cmd_log_file = mod.config_vars["cmd_log_file"]
 
     script_dir = tmp_path / "test_prepare_env"
     mpsd_release_to_test = "dev-23a"
     release_base_dir = script_dir / mpsd_release_to_test
-    if os.path.exists(release_base_dir / log_file):
-        initial_bytes = os.path.getsize(log_file)
+    if os.path.exists(release_base_dir / cmd_log_file):
+        initial_bytes = os.path.getsize(cmd_log_file)
     else:
         initial_bytes = 0
 
@@ -179,11 +179,11 @@ def test_setup_log_cmd(tmp_path):
     mod.prepare_environment(mpsd_release=mpsd_release_to_test, script_dir=(script_dir))
 
     # check that logs/install-software-environment.log is updated
-    assert os.path.exists(release_base_dir / log_file)
-    assert os.path.getsize(release_base_dir / log_file) > initial_bytes
+    assert os.path.exists(release_base_dir / cmd_log_file)
+    assert os.path.getsize(release_base_dir / cmd_log_file) > initial_bytes
 
     # Check that the log file has "Spack environments branch: dev-23a " in the last line
-    with open(release_base_dir / log_file, "r") as f:
+    with open(release_base_dir / cmd_log_file, "r") as f:
         last_line = f.readlines()[-1]
         assert "Spack environments branch: dev-23a " in last_line
 
@@ -227,6 +227,7 @@ def test_install_environment_zlib():
     script_dir.mkdir(exist_ok=True, parents=True)
     mpsd_release_to_test = "dev-23a"
     toolchain_to_test = "global_generic"
+    cmd_log_file = mod.config_vars["cmd_log_file"]
     mpsd_microarch = mod.get_native_microarchitecture()
     release_base_dir = script_dir / mpsd_release_to_test
     create_mock_git_repository(target_directory=script_dir, create_directory=False)
@@ -272,7 +273,7 @@ def test_install_environment_zlib():
     # install global_generic toolchain
     mod.set_up_logging(
         "WARNING",
-        mod.get_installer_log_file(mpsd_release_to_test, "install", script_dir),
+        mod.get_installer_log_file_path(mpsd_release_to_test, "install", script_dir),
     )
     mod.install_environment(
         mpsd_release=mpsd_release_to_test,
@@ -293,7 +294,7 @@ def test_install_environment_zlib():
     )
     assert len(build_log) == 2
     # take the most recent build log
-    build_log = sorted(build_log)[0]
+    build_log = sorted(build_log)[1]
     # check that the build log contains statement ##### Installation finished
     with open(build_log, "r") as f:
         lines = f.read()
@@ -301,11 +302,11 @@ def test_install_environment_zlib():
     os.path.basename(build_log)
 
     # assert that install log files exists
-    assert os.path.exists(release_base_dir / "install.log")
+    assert os.path.exists(release_base_dir / cmd_log_file)
 
     # assert that the build log is written to the install log file
     os.path.basename(build_log)
-    with open(release_base_dir / "install.log", "r") as f:
+    with open(release_base_dir / cmd_log_file, "r") as f:
         lines = f.read()
         assert (
             f"installing {toolchain_to_test} and logging at {str(build_log)}" in lines
@@ -327,7 +328,7 @@ def test_install_environment_zlib():
     importlib.reload(mod)
     mod.set_up_logging(
         "WARNING",
-        mod.get_installer_log_file(mpsd_release_to_test, "install", script_dir),
+        mod.get_installer_log_file_path(mpsd_release_to_test, "install", script_dir),
     )
     mod.install_environment(
         mpsd_release=mpsd_release_to_test,
@@ -348,7 +349,7 @@ def test_metadata_logging(tmp_path):
     # Test that the metadata is logged correctly
     filename = tmp_path / "test-metadata.log"
     print(f"Writing to {filename}")
-    mod.set_up_logging(loglevel="debug", filename=filename)
+    mod.set_up_logging(loglevel="debug", file_path=filename)
 
     # our test data
     keys = ["important_key", "important_key2"]
@@ -382,8 +383,12 @@ def test_metadata_logging(tmp_path):
     assert len(read_dict) == len(keys)
 
 
+@pytest.mark.skip(
+    reason="This function is redundant in the next version of the script."
+)
 def test_create_log_file_names():
     """Test that the log file names are created correctly."""
+    pass
     create_log_file_names = mod.create_log_file_names
     mpsd_release = "dev-23a"
     mpsd_microarch = "sandybridge"