diff --git a/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
index a802629d..c6c74e0d 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
@@ -51,7 +51,7 @@ class NodeData final
   // Get the id of this node.
   std::size_t id() const;
 
-  // Create a new PublisherData for a publisher in this node.
+  // Create a new PublisherData for a given rmw_publisher_t.
   bool create_pub_data(
     const rmw_publisher_t * const publisher,
     z_session_t session,
@@ -66,7 +66,7 @@ class NodeData final
   // Delete the PublisherData for a given rmw_publisher_t if present.
   void delete_pub_data(const rmw_publisher_t * const publisher);
 
-  // Create a new SubscriptionData for a publisher in this node.
+  // Create a new SubscriptionData for a given rmw_subscription_t.
   bool create_sub_data(
     const rmw_subscription_t * const subscription,
     z_session_t session,
@@ -82,7 +82,7 @@ class NodeData final
   // Delete the SubscriptionData for a given rmw_subscription_t if present.
   void delete_sub_data(const rmw_subscription_t * const subscription);
 
-  // Create a new ServiceData for a publisher in this node.
+  // Create a new ServiceData for a given rmw_service_t.
   bool create_service_data(
     const rmw_service_t * const service,
     z_session_t session,
@@ -91,11 +91,11 @@ class NodeData final
     const rosidl_service_type_support_t * type_support,
     const rmw_qos_profile_t * qos_profile);
 
-  // Retrieve the ServiceData for a given rmw_subscription_t if present.
+  // Retrieve the ServiceData for a given rmw_service_t if present.
   ServiceDataPtr get_service_data(const rmw_service_t * const service);
 
-  // Delete the ServiceData for a given rmw_subscription_t if present.
-  void delete_service_data(const rmw_service_t * const subscription);
+  // Delete the ServiceData for a given rmw_service_t if present.
+  void delete_service_data(const rmw_service_t * const service);
 
   // Shutdown this NodeData.
   rmw_ret_t shutdown();