diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__3.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__3.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__3.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu__3.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block:contentions:count:block:count.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block_contentions_count_block_count.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block:contentions:count:block:count.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block_contentions_count_block_count.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block:delay:nanoseconds:block:count.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block_delay_nanoseconds_block_count.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block:delay:nanoseconds:block:count.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.block_delay_nanoseconds_block_count.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_outside_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_outside_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_outside_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_outside_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_outside_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_outside_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory:alloc_outside_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.memory_alloc_outside_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex:contentions:count:mutex:count.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex_contentions_count_mutex_count.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex:contentions:count:mutex:count.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex_contentions_count_mutex_count.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex:delay:nanoseconds:mutex:count.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex_delay_nanoseconds_mutex_count.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex:delay:nanoseconds:mutex:count.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.mutex_delay_nanoseconds_mutex_count.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.15666661103234080825.pb.gz b/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.15666661103234080825.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.15666661103234080825.pb.gz
rename to pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.15666661103234080825.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.16370823494798218517.pb.gz b/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.16370823494798218517.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.16370823494798218517.pb.gz
rename to pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.16370823494798218517.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.2539015855607244867.pb.gz b/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.2539015855607244867.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.2539015855607244867.pb.gz
rename to pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.2539015855607244867.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.5571933481434853072.pb.gz b/pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.5571933481434853072.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.5571933481434853072.pb.gz
rename to pkg/og/convert/jfr/testdata/dump1.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.5571933481434853072.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:alloc_in_new_tlab_bytes:bytes:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_alloc_in_new_tlab_bytes_bytes_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:alloc_in_new_tlab_objects:count:space:bytes.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_alloc_in_new_tlab_objects_count_space_bytes.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:live:count:objects:count.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_live_count_objects_count.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory:live:count:objects:count.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.memory_live_count_objects_count.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.10784330302778997279.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.10784330302778997279.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.10784330302778997279.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.10784330302778997279.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.14685508092873724845.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.14685508092873724845.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.14685508092873724845.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.14685508092873724845.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.15666661103234080825.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.15666661103234080825.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.15666661103234080825.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.15666661103234080825.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.16370823494798218517.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.16370823494798218517.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.16370823494798218517.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.16370823494798218517.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.2539015855607244867.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.2539015855607244867.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.2539015855607244867.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.2539015855607244867.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.302387572117411911.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.302387572117411911.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.302387572117411911.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.302387572117411911.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.5571933481434853072.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.5571933481434853072.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.5571933481434853072.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.5571933481434853072.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.6511396920643364271.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.6511396920643364271.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu:cpu:nanoseconds:cpu:nanoseconds.6511396920643364271.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.process_cpu_cpu_nanoseconds_cpu_nanoseconds.6511396920643364271.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.10784330302778997279.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.10784330302778997279.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.10784330302778997279.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.10784330302778997279.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.14685508092873724845.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.14685508092873724845.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.14685508092873724845.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.14685508092873724845.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.15666661103234080825.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.15666661103234080825.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.15666661103234080825.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.15666661103234080825.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.16370823494798218517.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.16370823494798218517.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.16370823494798218517.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.16370823494798218517.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.17241709254077376921.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.17241709254077376921.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.17241709254077376921.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.17241709254077376921.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.2539015855607244867.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.2539015855607244867.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.2539015855607244867.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.2539015855607244867.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.302387572117411911.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.302387572117411911.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.302387572117411911.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.302387572117411911.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.5571933481434853072.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.5571933481434853072.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.5571933481434853072.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.5571933481434853072.pb.gz
diff --git a/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.6511396920643364271.pb.gz b/pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.6511396920643364271.pb.gz
similarity index 100%
rename from pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall:wall:nanoseconds:wall:nanoseconds.6511396920643364271.pb.gz
rename to pkg/og/convert/jfr/testdata/dump2.jfr.gz.wall_wall_nanoseconds_wall_nanoseconds.6511396920643364271.pb.gz
diff --git a/pkg/test/integration/ingest_jfr_test.go b/pkg/test/integration/ingest_jfr_test.go
index 1756844fc1..5b68517c46 100644
--- a/pkg/test/integration/ingest_jfr_test.go
+++ b/pkg/test/integration/ingest_jfr_test.go
@@ -3,6 +3,7 @@ package integration
 import (
 	"fmt"
 	"os"
+	"strings"
 	"testing"
 
 	"connectrpc.com/connect"
@@ -180,7 +181,7 @@ func expectedPPROFFile(testdatum jfrTestData, metric expectedMetric) string {
 	ls := lbls.Labels()
 	h := ls.Hash()
 
-	return fmt.Sprintf("%s.%s.%d.pb.gz", testdatum.jfr, metric.name, h)
+	return fmt.Sprintf("%s.%s.%d.pb.gz", testdatum.jfr, strings.ReplaceAll(metric.name, ":", "_"), h)
 }
 
 func TestCorruptedJFR422(t *testing.T) {