diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index bc4c018..f8c3f59 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -23,7 +23,7 @@ bool ros_trace_compile_status();
  */
 void TRACEPOINT(
   rcl_init,
-  const void * context);
+  const void * context_handle);
 
 /**
  * tp: rcl_node_init
diff --git a/tracetools/src/tp_call.tp b/tracetools/src/tp_call.tp
index cf4ecac..76ba9a8 100644
--- a/tracetools/src/tp_call.tp
+++ b/tracetools/src/tp_call.tp
@@ -4,10 +4,10 @@ TRACEPOINT_EVENT(
   ros2,
   rcl_init,
   TP_ARGS(
-    const void *, context_arg
+    const void *, context_handle_arg
   ),
   TP_FIELDS(
-    ctf_integer_hex(const void *, context, context_arg)
+    ctf_integer_hex(const void *, context_handle, context_handle_arg)
   )
 )
 
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index d1063b2..8203706 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -19,12 +19,12 @@ bool ros_trace_compile_status()
 
 void TRACEPOINT(
   rcl_init,
-  const void * context)
+  const void * context_handle)
 {
   CONDITIONAL_TP(
     ros2,
     rcl_init,
-    context);
+    context_handle);
 }
 
 void TRACEPOINT(