diff --git a/ci/data_extractor/src/benchmark_specs.py b/ci/data_extractor/src/benchmark_specs.py
index 72bcb95a6..632032560 100644
--- a/ci/data_extractor/src/benchmark_specs.py
+++ b/ci/data_extractor/src/benchmark_specs.py
@@ -238,6 +238,9 @@ class ErrorFailureProbability(enum.IntEnum):
                     f"error failure probability str conversion '{self}' not supported yet"
                 )
 
+    def __str__(self):
+        return self.to_str()
+
 
 class BenchType(enum.Enum):
     Latency = 0
diff --git a/ci/data_extractor/src/data_extractor.py b/ci/data_extractor/src/data_extractor.py
index 3b7c94d57..9a0cd33a7 100644
--- a/ci/data_extractor/src/data_extractor.py
+++ b/ci/data_extractor/src/data_extractor.py
@@ -313,7 +313,10 @@ def perform_data_extraction(
         conversion_func,
     )
 
-    file_suffix = f"_{operand_type.lower()}"
+    if layer != Layer.CoreCrypto:
+        file_suffix = f"-{operand_type.lower()}"
+    else:
+        file_suffix = ""
     filename = utils.append_suffix_to_filename(output_filename, file_suffix, ".csv")
 
     utils.write_to_csv(
@@ -332,8 +335,10 @@ def perform_data_extraction(
     for array in generic_arrays:
         metadata_suffix = ""
         if array.metadata:
-            for key, value in array.metadata.items():
-                metadata_suffix += f"_{key}_{value}"
+            for value in array.metadata.values():
+                # In recent Python, dict keep insert order.
+                # This call won't change metadata order in the suffix between runs.
+                metadata_suffix += f"-{value}".lower()
 
         current_suffix = file_suffix + metadata_suffix
 
diff --git a/ci/data_extractor/src/formatter.py b/ci/data_extractor/src/formatter.py
index 1af144409..31a6f2216 100644
--- a/ci/data_extractor/src/formatter.py
+++ b/ci/data_extractor/src/formatter.py
@@ -508,7 +508,10 @@ class GenericFormatter:
                 BenchArray(
                     array,
                     self.layer,
-                    metadata={"pfail": key.pfail, "noise": key.noise_distribution},
+                    metadata={
+                        "noise": key.noise_distribution,
+                        "pfail": key.pfail,
+                    },
                 )
             )