diff --git a/tracetools_test/test/test_service_callback.py b/tracetools_test/test/test_service_callback.py
index 40c8b87..7a1f928 100644
--- a/tracetools_test/test/test_service_callback.py
+++ b/tracetools_test/test/test_service_callback.py
@@ -9,8 +9,8 @@ from tracetools_test.utils import (
 BASE_PATH = '/tmp'
 PKG = 'tracetools_test'
 service_callback_events = [
-    'ros2:rclcpp_service_callback_start',
-    'ros2:rclcpp_service_callback_end',
+    'ros2:callback_start',
+    'ros2:callback_end',
 ]
 
 
diff --git a/tracetools_test/test/test_subscription_callback.py b/tracetools_test/test/test_subscription_callback.py
index eb3e7d1..7e80437 100644
--- a/tracetools_test/test/test_subscription_callback.py
+++ b/tracetools_test/test/test_subscription_callback.py
@@ -9,8 +9,8 @@ from tracetools_test.utils import (
 BASE_PATH = '/tmp'
 PKG = 'tracetools_test'
 subscription_callback_events = [
-    'ros2:rclcpp_subscription_callback_start',
-    'ros2:rclcpp_subscription_callback_end',
+    'ros2:callback_start',
+    'ros2:callback_end',
 ]
 
 
diff --git a/tracetools_test/test/test_timer.py b/tracetools_test/test/test_timer.py
index 999f78e..c577efc 100644
--- a/tracetools_test/test/test_timer.py
+++ b/tracetools_test/test/test_timer.py
@@ -11,8 +11,8 @@ PKG = 'tracetools_test'
 timer_events = [
     'ros2:rcl_timer_init',
     'ros2:rclcpp_timer_callback_added',
-    'ros2:rclcpp_timer_callback_start',
-    'ros2:rclcpp_timer_callback_end',
+    'ros2:callback_start',
+    'ros2:callback_end',
 ]