diff --git a/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp b/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp
index fb8fcd53..19a912b0 100644
--- a/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp
+++ b/fastddsspy_participants/test/blackbox/model/EndpointDatabaseTest.cpp
@@ -116,7 +116,7 @@ std::shared_ptr<DdsPipe> create_pipe(
     DdsPipeConfiguration ddspipe_configuration;
     ddspipe_configuration.init_enabled = true;
 
-    // Create the internal communication (built-in) topics
+    // Create a built-in topic to transmit endpoint information
     ddspipe_configuration.builtin_topics.insert(
         utils::Heritable<types::DistributedTopic>::make_heritable(
             spy::participants::endpoint_info_topic()));
diff --git a/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp b/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp
index 7f05956d..06390234 100644
--- a/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp
+++ b/fastddsspy_participants/test/blackbox/model/ParticipantDatabaseTest.cpp
@@ -117,7 +117,7 @@ std::shared_ptr<DdsPipe> create_pipe(
     DdsPipeConfiguration ddspipe_configuration;
     ddspipe_configuration.init_enabled = true;
 
-    // Create the internal communication (built-in) topics
+    // Create a built-in topic to transmit participant information
     ddspipe_configuration.builtin_topics.insert(
         utils::Heritable<types::DistributedTopic>::make_heritable(
             spy::participants::participant_info_topic()));
diff --git a/fastddsspy_tool/src/cpp/tool/Backend.cpp b/fastddsspy_tool/src/cpp/tool/Backend.cpp
index cf84a4b8..d7fe5037 100644
--- a/fastddsspy_tool/src/cpp/tool/Backend.cpp
+++ b/fastddsspy_tool/src/cpp/tool/Backend.cpp
@@ -62,11 +62,12 @@ Backend::Backend(
         spy_participant_
         );
 
-    // Create the internal communication (built-in) topics
+    // Create a built-in topic to transmit participant information
     configuration_.ddspipe_configuration.builtin_topics.insert(
         utils::Heritable<eprosima::ddspipe::core::types::DistributedTopic>::make_heritable(
             spy::participants::participant_info_topic()));
 
+    // Create a built-in topic to transmit endpoint information
     configuration_.ddspipe_configuration.builtin_topics.insert(
         utils::Heritable<eprosima::ddspipe::core::types::DistributedTopic>::make_heritable(
             spy::participants::endpoint_info_topic()));