From d40cddd97b9a153eac90e1524ba0b63863cf8398 Mon Sep 17 00:00:00 2001
From: "Ithier Jeff (CC-AD/EYF1)" <jeff.ithier@de.bosch.com>
Date: Thu, 24 Sep 2020 10:20:44 +0200
Subject: [PATCH] iox-#218 Rename experimental api to modern api.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <jeff.ithier@de.bosch.com>
---
 iceoryx_examples/icedelivery/CMakeLists.txt          | 12 ++++++------
 ...perimental.cpp => iox_publisher_typed_modern.cpp} |  2 +-
 ...rimental.cpp => iox_publisher_untyped_modern.cpp} |  2 +-
 .../popo/modern_api}/base_publisher.inl              |  0
 .../popo/modern_api}/base_subscriber.inl             |  0
 .../popo => internal/popo/modern_api}/sample.inl     |  0
 .../popo/modern_api}/typed_publisher.inl             |  0
 .../popo/modern_api}/typed_subscriber.inl            |  0
 .../popo/modern_api}/untyped_publisher.inl           |  0
 .../popo/modern_api}/untyped_subscriber.inl          |  0
 .../popo => popo/modern_api}/base_publisher.hpp      |  6 ++++--
 .../popo => popo/modern_api}/base_subscriber.hpp     |  4 ++--
 .../popo => popo/modern_api}/publisher.hpp           |  4 ++--
 .../popo => popo/modern_api}/sample.hpp              |  2 +-
 .../popo => popo/modern_api}/subscriber.hpp          |  4 ++--
 .../popo => popo/modern_api}/typed_publisher.hpp     |  6 +++---
 .../popo => popo/modern_api}/typed_subscriber.hpp    |  4 ++--
 .../popo => popo/modern_api}/untyped_publisher.hpp   |  6 +++---
 .../popo => popo/modern_api}/untyped_subscriber.hpp  |  4 ++--
 iceoryx_posh/test/mocks/publisher_mock.hpp           |  4 ++--
 iceoryx_posh/test/mocks/subscriber_mock.hpp          |  3 ++-
 .../test/moduletests/test_popo_base_publisher.cpp    |  2 +-
 .../test/moduletests/test_popo_base_subscriber.cpp   |  2 +-
 iceoryx_posh/test/moduletests/test_popo_sample.cpp   |  2 +-
 .../test/moduletests/test_popo_typed_publisher.cpp   |  2 +-
 .../test/moduletests/test_popo_typed_subscriber.cpp  |  2 +-
 .../test/moduletests/test_popo_untyped_publisher.cpp |  2 +-
 .../moduletests/test_popo_untyped_subscriber.cpp     |  2 +-
 28 files changed, 40 insertions(+), 37 deletions(-)
 rename iceoryx_examples/icedelivery/{iox_publisher_typed_experimental.cpp => iox_publisher_typed_modern.cpp} (98%)
 rename iceoryx_examples/icedelivery/{iox_publisher_untyped_experimental.cpp => iox_publisher_untyped_modern.cpp} (96%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/base_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/base_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/sample.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/typed_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/typed_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/untyped_publisher.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/internal/popo => internal/popo/modern_api}/untyped_subscriber.inl (100%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/base_publisher.hpp (95%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/base_subscriber.hpp (96%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/publisher.hpp (86%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/sample.hpp (97%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/subscriber.hpp (85%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/typed_publisher.hpp (93%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/typed_subscriber.hpp (93%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/untyped_publisher.hpp (91%)
 rename iceoryx_posh/include/iceoryx_posh/{experimental/popo => popo/modern_api}/untyped_subscriber.hpp (93%)

diff --git a/iceoryx_examples/icedelivery/CMakeLists.txt b/iceoryx_examples/icedelivery/CMakeLists.txt
index d82103d26b..d3aad88991 100644
--- a/iceoryx_examples/icedelivery/CMakeLists.txt
+++ b/iceoryx_examples/icedelivery/CMakeLists.txt
@@ -52,21 +52,21 @@ set_target_properties(iox-ex-subscriber-simple PROPERTIES
 )
 
 
-add_executable(iox-ex-publisher-typed-experimental ./iox_publisher_typed_experimental.cpp)
-target_link_libraries(iox-ex-publisher-typed-experimental
+add_executable(iox-ex-publisher-typed-modern ./iox_publisher_typed_modern.cpp)
+target_link_libraries(iox-ex-publisher-typed-modern
     iceoryx_posh::iceoryx_posh
 )
-set_target_properties(iox-ex-publisher-typed-experimental PROPERTIES
+set_target_properties(iox-ex-publisher-typed-modern PROPERTIES
     CXX_STANDARD_REQUIRED ON
     CXX_STANDARD ${ICEORYX_CXX_STANDARD}
     POSITION_INDEPENDENT_CODE ON
 )
 
-add_executable(iox-ex-publisher-untyped-experimental ./iox_publisher_untyped_experimental.cpp)
-target_link_libraries(iox-ex-publisher-untyped-experimental
+add_executable(iox-ex-publisher-untyped-modern ./iox_publisher_untyped_modern.cpp)
+target_link_libraries(iox-ex-publisher-untyped-modern
     iceoryx_posh::iceoryx_posh
 )
-set_target_properties(iox-ex-publisher-untyped-experimental PROPERTIES
+set_target_properties(iox-ex-publisher-untyped-modern PROPERTIES
     CXX_STANDARD_REQUIRED ON
     CXX_STANDARD ${ICEORYX_CXX_STANDARD}
     POSITION_INDEPENDENT_CODE ON
diff --git a/iceoryx_examples/icedelivery/iox_publisher_typed_experimental.cpp b/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
similarity index 98%
rename from iceoryx_examples/icedelivery/iox_publisher_typed_experimental.cpp
rename to iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
index 4e663ab2f9..895273a5ee 100644
--- a/iceoryx_examples/icedelivery/iox_publisher_typed_experimental.cpp
+++ b/iceoryx_examples/icedelivery/iox_publisher_typed_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/experimental/popo/publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>
diff --git a/iceoryx_examples/icedelivery/iox_publisher_untyped_experimental.cpp b/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
similarity index 96%
rename from iceoryx_examples/icedelivery/iox_publisher_untyped_experimental.cpp
rename to iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
index f8d60ad733..1150c9d1dc 100644
--- a/iceoryx_examples/icedelivery/iox_publisher_untyped_experimental.cpp
+++ b/iceoryx_examples/icedelivery/iox_publisher_untyped_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/experimental/popo/publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/base_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/base_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/base_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/base_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/base_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/sample.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/sample.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/sample.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/sample.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/typed_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/typed_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/typed_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/typed_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/untyped_publisher.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/untyped_publisher.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/untyped_subscriber.inl b/iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl
similarity index 100%
rename from iceoryx_posh/include/iceoryx_posh/experimental/internal/popo/untyped_subscriber.inl
rename to iceoryx_posh/include/iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/base_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp
similarity index 95%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/base_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp
index a19bd5f3ec..0d77bff165 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/base_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_publisher.hpp
@@ -15,8 +15,10 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
+#include "iceoryx_utils/cxx/expected.hpp"
+#include "iceoryx_utils/cxx/optional.hpp"
 
 namespace iox
 {
@@ -120,6 +122,6 @@ class BasePublisher : public PublisherInterface<T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/base_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/base_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/base_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp
similarity index 96%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/base_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp
index 8c9eb69073..df772903e6 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/base_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/base_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
 #include "iceoryx_posh/popo/condition.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
@@ -102,6 +102,6 @@ class BaseSubscriber : public Condition
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/base_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/base_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp
similarity index 86%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp
index 51e7a89fd8..ee9d763774 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/publisher.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/typed_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/sample.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp
similarity index 97%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/sample.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp
index f647e8d7af..1316a1d0b8 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/sample.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/sample.hpp
@@ -99,6 +99,6 @@ class Sample<const T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/sample.inl"
+#include "iceoryx_posh/internal/popo/modern_api/sample.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_SAMPLE_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp
similarity index 85%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp
index 2d60d04e65..593bb30803 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/typed_subscriber.hpp"
-#include "iceoryx_posh/experimental/popo/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp
similarity index 93%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp
index 68332adce6..8ce788f13e 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_utils/cxx/type_traits.hpp"
 
 namespace iox
@@ -67,6 +67,6 @@ class TypedPublisher : public base_publisher_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/typed_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/typed_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp
similarity index 93%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp
index 3ff4221582..9c468c7a27 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/typed_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/typed_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 
 namespace iox
 {
@@ -49,6 +49,6 @@ class TypedSubscriber : public base_subscriber_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/typed_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_publisher.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp
similarity index 91%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_publisher.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp
index 7aaae13dcc..fdf2cb7804 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_publisher.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 
 namespace iox
 {
@@ -56,6 +56,6 @@ using UntypedPublisher = UntypedPublisherImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/untyped_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
diff --git a/iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_subscriber.hpp b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp
similarity index 93%
rename from iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_subscriber.hpp
rename to iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp
index a754c5f7f3..5d87ecad4b 100644
--- a/iceoryx_posh/include/iceoryx_posh/experimental/popo/untyped_subscriber.hpp
+++ b/iceoryx_posh/include/iceoryx_posh/popo/modern_api/untyped_subscriber.hpp
@@ -16,7 +16,7 @@
 #define IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
 
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 
@@ -53,6 +53,6 @@ using UntypedSubscriber = UntypedSubscriberImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/untyped_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/test/mocks/publisher_mock.hpp b/iceoryx_posh/test/mocks/publisher_mock.hpp
index 01b2f61347..58cc55cb8a 100644
--- a/iceoryx_posh/test/mocks/publisher_mock.hpp
+++ b/iceoryx_posh/test/mocks/publisher_mock.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/mocks/subscriber_mock.hpp b/iceoryx_posh/test/mocks/subscriber_mock.hpp
index 737676dee7..ebf6082a05 100644
--- a/iceoryx_posh/test/mocks/subscriber_mock.hpp
+++ b/iceoryx_posh/test/mocks/subscriber_mock.hpp
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
index cc7944982d..707bee99bf 100644
--- a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
index 6e9c52e10c..29a0d7dc36 100644
--- a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_sample.cpp b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
index 8e30d3bb9b..d1a43660a7 100644
--- a/iceoryx_posh/test/moduletests/test_popo_sample.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "test.hpp"
 
 using namespace ::testing;
diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
index 9313c24b4b..4f253c1474 100644
--- a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
index 487efbd7a6..eba84f6be3 100644
--- a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
index dc54205657..251e00948e 100644
--- a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"
diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
index 6fe210e72e..3d6818a1b9 100644
--- a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
+++ b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"