diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
index 2053231886f..7402ec91f87 100644
--- a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
@@ -26,8 +26,7 @@ namespace fastdds {
 namespace rtps {
 
 struct CDRMessage_t;
-
-struct TestTransportOptions;
+struct TestUDPv4TransportOptions;
 
 /**
  * UDP v4 Test Transport configuration
@@ -41,7 +40,7 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor
     typedef std::function<bool (const Locator& destination)> DestinationLocatorFilter;
 
     //! Test transport options
-    std::shared_ptr<TestTransportOptions> test_transport_options = std::make_shared<TestTransportOptions>();
+    std::shared_ptr<TestUDPv4TransportOptions> test_transport_options = std::make_shared<TestUDPv4TransportOptions>();
 
     //! Test shim parameters
     //! Percentage of data messages being dropped
@@ -153,10 +152,10 @@ struct test_UDPv4TransportDescriptor : public SocketTransportDescriptor
             const test_UDPv4TransportDescriptor& t) const;
 };
 
-struct TestTransportOptions
+struct TestUDPv4TransportOptions
 {
-    FASTDDS_EXPORTED_API TestTransportOptions() = default;
-    ~TestTransportOptions() = default;
+    FASTDDS_EXPORTED_API TestUDPv4TransportOptions() = default;
+    ~TestUDPv4TransportOptions() = default;
 
     std::atomic<bool> test_UDPv4Transport_ShutdownAllNetwork{false};
     // Handle to a persistent log of dropped packets. Defaults to length 0 (no logging) to prevent wasted resources.
diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h
index bfa0b92255b..83a5fb90a00 100644
--- a/src/cpp/rtps/transport/test_UDPv4Transport.h
+++ b/src/cpp/rtps/transport/test_UDPv4Transport.h
@@ -53,7 +53,7 @@ class test_UDPv4Transport : public UDPv4Transport
     virtual LocatorList NormalizeLocator(
             const Locator& locator) override;
 
-    std::shared_ptr<TestTransportOptions> test_transport_options;
+    std::shared_ptr<TestUDPv4TransportOptions> test_transport_options;
 
 protected:
 
diff --git a/test/blackbox/common/BlackboxTests.hpp b/test/blackbox/common/BlackboxTests.hpp
index b6285e2901c..8ad5dbd201a 100644
--- a/test/blackbox/common/BlackboxTests.hpp
+++ b/test/blackbox/common/BlackboxTests.hpp
@@ -37,7 +37,7 @@
 #include "../types/HelloWorldPubSubTypes.h"
 #include "../types/KeyedData1mbPubSubTypes.h"
 #include "../types/KeyedHelloWorldPubSubTypes.h"
-#include "../types/rtps/core_typesPubSubTypes.h"
+#include "../types/core/core_typesPubSubTypes.h"
 #include "../types/StringTestPubSubTypes.h"
 #include "../types/UnboundedHelloWorldPubSubTypes.h"
 
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
index 5c400a818fb..de61fe1d6e6 100644
--- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -34,7 +34,6 @@
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
 #include <gtest/gtest.h>
 
 #include "../utils/filter_helpers.hpp"
diff --git a/test/blackbox/types/rtps/core_types.cxx b/test/blackbox/types/core/core_types.cxx
similarity index 100%
rename from test/blackbox/types/rtps/core_types.cxx
rename to test/blackbox/types/core/core_types.cxx
diff --git a/test/blackbox/types/rtps/core_types.h b/test/blackbox/types/core/core_types.h
similarity index 100%
rename from test/blackbox/types/rtps/core_types.h
rename to test/blackbox/types/core/core_types.h
diff --git a/test/blackbox/types/rtps/core_types.hpp b/test/blackbox/types/core/core_types.hpp
similarity index 100%
rename from test/blackbox/types/rtps/core_types.hpp
rename to test/blackbox/types/core/core_types.hpp
diff --git a/test/blackbox/types/rtps/core_types.idl b/test/blackbox/types/core/core_types.idl
similarity index 98%
rename from test/blackbox/types/rtps/core_types.idl
rename to test/blackbox/types/core/core_types.idl
index 9698226e9be..f987b8afe3d 100644
--- a/test/blackbox/types/rtps/core_types.idl
+++ b/test/blackbox/types/core/core_types.idl
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file test/blackbox/types/rtps/core_types.idl
+ * @file test/blackbox/types/core/core_types.idl
  */
 
 module eprosima {
diff --git a/test/blackbox/types/rtps/core_typesCdrAux.hpp b/test/blackbox/types/core/core_typesCdrAux.hpp
similarity index 100%
rename from test/blackbox/types/rtps/core_typesCdrAux.hpp
rename to test/blackbox/types/core/core_typesCdrAux.hpp
diff --git a/test/blackbox/types/rtps/core_typesCdrAux.ipp b/test/blackbox/types/core/core_typesCdrAux.ipp
similarity index 100%
rename from test/blackbox/types/rtps/core_typesCdrAux.ipp
rename to test/blackbox/types/core/core_typesCdrAux.ipp
diff --git a/test/blackbox/types/rtps/core_typesPubSubTypes.cxx b/test/blackbox/types/core/core_typesPubSubTypes.cxx
similarity index 100%
rename from test/blackbox/types/rtps/core_typesPubSubTypes.cxx
rename to test/blackbox/types/core/core_typesPubSubTypes.cxx
diff --git a/test/blackbox/types/rtps/core_typesPubSubTypes.h b/test/blackbox/types/core/core_typesPubSubTypes.h
similarity index 100%
rename from test/blackbox/types/rtps/core_typesPubSubTypes.h
rename to test/blackbox/types/core/core_typesPubSubTypes.h
diff --git a/test/blackbox/types/rtps/core_typesTypeObject.cxx b/test/blackbox/types/core/core_typesTypeObject.cxx
similarity index 100%
rename from test/blackbox/types/rtps/core_typesTypeObject.cxx
rename to test/blackbox/types/core/core_typesTypeObject.cxx
diff --git a/test/blackbox/types/rtps/core_typesTypeObject.h b/test/blackbox/types/core/core_typesTypeObject.h
similarity index 100%
rename from test/blackbox/types/rtps/core_typesTypeObject.h
rename to test/blackbox/types/core/core_typesTypeObject.h
diff --git a/test/blackbox/types/rtps/core_typesTypeObjectSupport.cxx b/test/blackbox/types/core/core_typesTypeObjectSupport.cxx
similarity index 100%
rename from test/blackbox/types/rtps/core_typesTypeObjectSupport.cxx
rename to test/blackbox/types/core/core_typesTypeObjectSupport.cxx
diff --git a/test/blackbox/types/rtps/core_typesTypeObjectSupport.hpp b/test/blackbox/types/core/core_typesTypeObjectSupport.hpp
similarity index 100%
rename from test/blackbox/types/rtps/core_typesTypeObjectSupport.hpp
rename to test/blackbox/types/core/core_typesTypeObjectSupport.hpp
diff --git a/test/blackbox/utils/filter_helpers.hpp b/test/blackbox/utils/filter_helpers.hpp
index 7a0f4fd5aed..1aea5e3aef4 100644
--- a/test/blackbox/utils/filter_helpers.hpp
+++ b/test/blackbox/utils/filter_helpers.hpp
@@ -18,7 +18,7 @@
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/rtps/common/Types.h>
 
-#include "../types/rtps/core_typesPubSubTypes.h"
+#include "../types/core/core_typesPubSubTypes.h"
 
 namespace eprosima {
 namespace fastdds {
diff --git a/utils/scripts/update_generated_code_from_idl.sh b/utils/scripts/update_generated_code_from_idl.sh
index ae6fc8af4b4..3ad1063362e 100755
--- a/utils/scripts/update_generated_code_from_idl.sh
+++ b/utils/scripts/update_generated_code_from_idl.sh
@@ -41,7 +41,7 @@ files_needing_output_dir=(
     './thirdparty/dds-types-test/IDL/strings.idl|../../../test/dds-types-test'
     './thirdparty/dds-types-test/IDL/structures.idl|../../../test/dds-types-test'
     './thirdparty/dds-types-test/IDL/unions.idl|../../../test/dds-types-test'
-    './test/blackbox/types/rtps/core_types.idl|.'
+    './test/blackbox/types/core/core_types.idl|.'
     )
 
 files_needing_no_typesupport=(
diff --git a/versions.md b/versions.md
index f975e58cd9a..8322e9ef91a 100644
--- a/versions.md
+++ b/versions.md
@@ -59,7 +59,7 @@ Forthcoming
   * `SenderResource` and Transport APIs now receive a collection of `NetworkBuffer` on their `send` method.
 * Migrate fastrtps namespace to fastdds
 * Migrate fastrtps `ResourceManagement` API from `rtps/resources` to `rtps/attributes`.
-* Make Blackbox tests not include any private API.
+* Remove all the private API include from Blackbox tests.
 
 Version 2.14.0
 --------------