diff --git a/ddspipe_participants/include/ddspipe_participants/reader/dds/CommonReader.hpp b/ddspipe_participants/include/ddspipe_participants/reader/dds/CommonReader.hpp
index 32af8a84..f1e33445 100644
--- a/ddspipe_participants/include/ddspipe_participants/reader/dds/CommonReader.hpp
+++ b/ddspipe_participants/include/ddspipe_participants/reader/dds/CommonReader.hpp
@@ -136,7 +136,7 @@ class CommonReader : public BaseReader, public fastdds::dds::DataReaderListener
     fastdds::dds::DataReaderQos
     reckon_reader_qos_() const;
 
-    //! Whether a change received should be processed
+    //! Whether a sample received should be processed
     virtual bool should_accept_sample_(
             const fastdds::dds::SampleInfo& info) noexcept;
 
diff --git a/ddspipe_yaml/src/cpp/YamlReader_types.cpp b/ddspipe_yaml/src/cpp/YamlReader_types.cpp
index 3ac08602..6339fb5f 100644
--- a/ddspipe_yaml/src/cpp/YamlReader_types.cpp
+++ b/ddspipe_yaml/src/cpp/YamlReader_types.cpp
@@ -92,10 +92,6 @@ YamlReaderVersion YamlReader::get<YamlReaderVersion>(
     return get_enumeration<YamlReaderVersion>(
         yml,
                 {
-                    {VERSION_TAG_V_1_0, YamlReaderVersion::V_1_0},
-                    {VERSION_TAG_V_2_0, YamlReaderVersion::V_2_0},
-                    {VERSION_TAG_V_3_0, YamlReaderVersion::V_3_0},
-                    {VERSION_TAG_V_3_1, YamlReaderVersion::V_3_1},
                     {VERSION_TAG_V_4_0, YamlReaderVersion::V_4_0},
                 });
 }
@@ -642,21 +638,9 @@ std::ostream& operator <<(
 {
     switch (version)
     {
-        case V_1_0:
-            os << VERSION_TAG_V_1_0;
-            break;
-
-        case V_2_0:
-            os << VERSION_TAG_V_2_0;
-            break;
-
-        case V_3_0:
-            os << VERSION_TAG_V_3_0;
-            break;
-
-        case V_3_1:
+        case V_4_0:
         case LATEST:
-            os << VERSION_TAG_V_3_1;
+            os << VERSION_TAG_V_4_0;
             break;
 
         default: