diff --git a/tracetools/include/tracetools/tracetools.h b/tracetools/include/tracetools/tracetools.h
index f8c3f59..d04ead3 100644
--- a/tracetools/include/tracetools/tracetools.h
+++ b/tracetools/include/tracetools/tracetools.h
@@ -40,8 +40,8 @@ void TRACEPOINT(
  */
 void TRACEPOINT(
   rcl_publisher_init,
-  const void * node_handle,
   const void * publisher_handle,
+  const void * node_handle,
   const void * rmw_publisher_handle,
   const char * topic_name,
   const size_t depth);
@@ -51,8 +51,8 @@ void TRACEPOINT(
  */
 void TRACEPOINT(
   rcl_subscription_init,
-  const void * node_handle,
   const void * subscription_handle,
+  const void * node_handle,
   const void * rmw_subscription_handle,
   const char * topic_name,
   const size_t depth);
@@ -85,8 +85,8 @@ void TRACEPOINT(
  */
 void TRACEPOINT(
   rcl_service_init,
-  const void * node_handle,
   const void * service_handle,
+  const void * node_handle,
   const void * rmw_service_handle,
   const char * service_name);
 
@@ -117,8 +117,8 @@ void TRACEPOINT(
  */
 void TRACEPOINT(
   rcl_client_init,
-  const void * node_handle,
   const void * client_handle,
+  const void * node_handle,
   const void * rmw_client_handle,
   const char * service_name);
 
diff --git a/tracetools/src/tp_call.tp b/tracetools/src/tp_call.tp
index cb419f9..5f62f3e 100644
--- a/tracetools/src/tp_call.tp
+++ b/tracetools/src/tp_call.tp
@@ -32,15 +32,15 @@ TRACEPOINT_EVENT(
   ros2,
   rcl_publisher_init,
   TP_ARGS(
-    const void *, node_handle_arg,
     const void *, publisher_handle_arg,
+    const void *, node_handle_arg,
     const void *, rmw_publisher_handle_arg,
     const char *, topic_name_arg,
     const size_t, depth_arg
   ),
   TP_FIELDS(
-    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, publisher_handle, publisher_handle_arg)
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, rmw_publisher_handle, rmw_publisher_handle_arg)
     ctf_string(topic_name, topic_name_arg)
     ctf_integer(const size_t, depth, depth_arg)
@@ -51,15 +51,15 @@ TRACEPOINT_EVENT(
   ros2,
   rcl_subscription_init,
   TP_ARGS(
-    const void *, node_handle_arg,
     const void *, subscription_handle_arg,
+    const void *, node_handle_arg,
     const void *, rmw_subscription_handle_arg,
     const char *, topic_name_arg,
     const size_t, depth_arg
   ),
   TP_FIELDS(
-    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, subscription_handle, subscription_handle_arg)
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, rmw_subscription_handle, rmw_subscription_handle_arg)
     ctf_string(topic_name, topic_name_arg)
     ctf_integer(const size_t, depth, depth_arg)
@@ -107,14 +107,14 @@ TRACEPOINT_EVENT(
   ros2,
   rcl_service_init,
   TP_ARGS(
-    const void *, node_handle_arg,
     const void *, service_handle_arg,
+    const void *, node_handle_arg,
     const void *, rmw_service_handle_arg,
     const char *, service_name_arg
   ),
   TP_FIELDS(
-    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, service_handle, service_handle_arg)
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, rmw_service_handle, rmw_service_handle_arg)
     ctf_string(service_name, service_name_arg)
   )
@@ -159,14 +159,14 @@ TRACEPOINT_EVENT(
   ros2,
   rcl_client_init,
   TP_ARGS(
-    const void *, node_handle_arg,
     const void *, client_handle_arg,
+    const void *, node_handle_arg,
     const void *, rmw_client_handle_arg,
     const char *, service_name_arg
   ),
   TP_FIELDS(
-    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, client_handle, client_handle_arg)
+    ctf_integer_hex(const void *, node_handle, node_handle_arg)
     ctf_integer_hex(const void *, rmw_client_handle, rmw_client_handle_arg)
     ctf_string(service_name, service_name_arg)
   )
diff --git a/tracetools/src/tracetools.c b/tracetools/src/tracetools.c
index 8203706..948929b 100644
--- a/tracetools/src/tracetools.c
+++ b/tracetools/src/tracetools.c
@@ -45,8 +45,8 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   rcl_publisher_init,
-  const void * node_handle,
   const void * publisher_handle,
+  const void * node_handle,
   const void * rmw_publisher_handle,
   const char * topic_name,
   const size_t depth)
@@ -54,8 +54,8 @@ void TRACEPOINT(
   CONDITIONAL_TP(
     ros2,
     rcl_publisher_init,
-    node_handle,
     publisher_handle,
+    node_handle,
     rmw_publisher_handle,
     topic_name,
     depth);
@@ -63,8 +63,8 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   rcl_subscription_init,
-  const void * node_handle,
   const void * subscription_handle,
+  const void * node_handle,
   const void * rmw_subscription_handle,
   const char * topic_name,
   const size_t depth)
@@ -72,8 +72,8 @@ void TRACEPOINT(
   CONDITIONAL_TP(
     ros2,
     rcl_subscription_init,
-    node_handle,
     subscription_handle,
+    node_handle,
     rmw_subscription_handle,
     topic_name,
     depth);
@@ -115,16 +115,16 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   rcl_service_init,
-  const void * node_handle,
   const void * service_handle,
+  const void * node_handle,
   const void * rmw_service_handle,
   const char * service_name)
 {
   CONDITIONAL_TP(
     ros2,
     rcl_service_init,
-    node_handle,
     service_handle,
+    node_handle,
     rmw_service_handle,
     service_name);
 }
@@ -163,16 +163,16 @@ void TRACEPOINT(
 
 void TRACEPOINT(
   rcl_client_init,
-  const void * node_handle,
   const void * client_handle,
+  const void * node_handle,
   const void * rmw_client_handle,
   const char * service_name)
 {
   CONDITIONAL_TP(
     ros2,
     rcl_client_init,
-    node_handle,
     client_handle,
+    node_handle,
     rmw_client_handle,
     service_name);
 }