diff --git a/performance-metrics/src/main.rs b/performance-metrics/src/main.rs
index 9b3d17fe7..4ab82f873 100644
--- a/performance-metrics/src/main.rs
+++ b/performance-metrics/src/main.rs
@@ -202,7 +202,7 @@ fn std_deviation(data: &[f64]) -> Option<f64> {
 
 const TEST_LIST: [PerformanceTest; 15] = [
     PerformanceTest {
-        name: "performance_boot_time",
+        name: "performance_boot_time_s",
         func_ptr: performance_boot_time,
         control: PerformanceTestControl {
             test_timeout: 2,
@@ -211,7 +211,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_boot_time_pmem",
+        name: "performance_boot_time_pmem_s",
         func_ptr: performance_boot_time_pmem,
         control: PerformanceTestControl {
             test_timeout: 2,
@@ -220,12 +220,12 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_virtio_net_latency",
+        name: "performance_virtio_net_latency_ns",
         func_ptr: performance_net_latency,
         control: PerformanceTestControl::default(),
     },
     PerformanceTest {
-        name: "performance_virtio_net_throughput_bps_single_queue_rx",
+        name: "performance_virtio_net_throughput_bps_single_queue_rx_bps",
         func_ptr: performance_net_throughput,
         control: PerformanceTestControl {
             num_queues: Some(1), // used as 'queue_pairs'
@@ -235,7 +235,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_virtio_net_throughput_bps_single_queue_tx",
+        name: "performance_virtio_net_throughput_single_queue_tx_bps",
         func_ptr: performance_net_throughput,
         control: PerformanceTestControl {
             num_queues: Some(1), // used as 'queue_pairs'
@@ -245,7 +245,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_virtio_net_throughput_bps_multi_queue_rx",
+        name: "performance_virtio_net_throughput_multi_queue_rx_bps",
         func_ptr: performance_net_throughput,
         control: PerformanceTestControl {
             num_queues: Some(2), // used as 'queue_pairs'
@@ -255,7 +255,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_virtio_net_throughput_bps_multi_queue_tx",
+        name: "performance_virtio_net_throughput_multi_queue_tx_bps",
         func_ptr: performance_net_throughput,
         control: PerformanceTestControl {
             num_queues: Some(2), // used as 'queue_pairs'
@@ -265,7 +265,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_read",
+        name: "performance_block_read_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(1),
@@ -275,7 +275,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_write",
+        name: "performance_block_write_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(1),
@@ -285,7 +285,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_random_read",
+        name: "performance_block_random_read_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(1),
@@ -295,7 +295,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_random_write",
+        name: "performance_block_random_write_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(1),
@@ -305,7 +305,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_multi_queue_read",
+        name: "performance_block_multi_queue_read_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(2),
@@ -315,7 +315,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_multi_queue_write",
+        name: "performance_block_multi_queue_write_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(2),
@@ -325,7 +325,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_multi_queue_random_read",
+        name: "performance_block_multi_queue_random_read_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(2),
@@ -335,7 +335,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
         },
     },
     PerformanceTest {
-        name: "performance_block_io_bps_multi_queue_random_write",
+        name: "performance_block_multi_queue_random_write_Bps",
         func_ptr: performance_block_io,
         control: PerformanceTestControl {
             num_queues: Some(2),