diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out b/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out
index c8c07fb8c5..65b7fb8fbf 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.basic/out
@@ -1,8 +1,8 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 ### zeek_session_metrics |2|
-Telemetry::INT_GAUGE, zeek, active-sessions, [protocol], [tcp], 500.0
+Telemetry::INT_GAUGE, zeek, active_sessions, [protocol], [tcp], 500.0
 count_value, 500
-Telemetry::INT_COUNTER, zeek, total-sessions, [protocol], [tcp], 500.0
+Telemetry::INT_COUNTER, zeek, total_sessions, [protocol], [tcp], 500.0
 count_value, 500
 ### bt* metrics |5|
 Telemetry::DOUBLE_COUNTER, btest, a_test, [x, y], [a, b], 1.0
diff --git a/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out b/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out
index bc1ab6859b..792488e7af 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out
+++ b/testing/btest/Baseline/scripts.base.frameworks.telemetry.event-handler-invocations/out
@@ -1,4 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-zeek, event-handler-invocations, [zeek_init], 1
-zeek, event-handler-invocations, [connection_state_remove], 500
-zeek, event-handler-invocations, [zeek_done], 1
+zeek, event_handler_invocations, [zeek_init], 1
+zeek, event_handler_invocations, [connection_state_remove], 500
+zeek, event_handler_invocations, [zeek_done], 1
diff --git a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log/telemetry.log.filtered b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log/telemetry.log.filtered
index 654ba3bb99..b7b4071151 100644
--- a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log/telemetry.log.filtered
+++ b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.log/telemetry.log.filtered
@@ -1,5 +1,5 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-XXXXXXXXXX.XXXXXX	zeek	gauge	zeek	active-sessions	-	protocol	tcp	1.0
-XXXXXXXXXX.XXXXXX	zeek	counter	zeek	total-sessions	-	protocol	tcp	1.0
-XXXXXXXXXX.XXXXXX	zeek	gauge	zeek	active-sessions	-	protocol	tcp	500.0
-XXXXXXXXXX.XXXXXX	zeek	counter	zeek	total-sessions	-	protocol	tcp	500.0
+XXXXXXXXXX.XXXXXX	zeek	gauge	zeek	active_sessions	(empty)	protocol	tcp	1.0
+XXXXXXXXXX.XXXXXX	zeek	counter	zeek	total_sessions	-	protocol	tcp	1.0
+XXXXXXXXXX.XXXXXX	zeek	gauge	zeek	active_sessions	(empty)	protocol	tcp	500.0
+XXXXXXXXXX.XXXXXX	zeek	counter	zeek	total_sessions	-	protocol	tcp	500.0
diff --git a/testing/btest/scripts/base/frameworks/telemetry/event-handler-invocations.zeek b/testing/btest/scripts/base/frameworks/telemetry/event-handler-invocations.zeek
index e1a52792f5..e39becd2d4 100644
--- a/testing/btest/scripts/base/frameworks/telemetry/event-handler-invocations.zeek
+++ b/testing/btest/scripts/base/frameworks/telemetry/event-handler-invocations.zeek
@@ -12,7 +12,7 @@
 
 event zeek_done() &priority=-100
 	{
-	local ms = Telemetry::collect_metrics("zeek", "event-handler-invocations");
+	local ms = Telemetry::collect_metrics("zeek", "event_handler_invocations");
 	for ( _, m in ms )
 		{
 		if ( /zeek_.*|connection_.*/ in cat(m$labels))