diff --git a/iceoryx2-ffi/cxx/include/iox2/sample.hpp b/iceoryx2-ffi/cxx/include/iox2/sample.hpp
index 30c850c8a..4a1f8e5f7 100644
--- a/iceoryx2-ffi/cxx/include/iox2/sample.hpp
+++ b/iceoryx2-ffi/cxx/include/iox2/sample.hpp
@@ -55,7 +55,7 @@ class Sample {
 
     /// Returns a reference to the payload of the [`Sample`]
     template <typename T = Payload, typename = std::enable_if_t<!iox::IsSlice<T>::VALUE, void>>
-    auto payload() const -> const Payload&;
+    auto payload() const -> const ValueType&;
 
     /// Returns a slice to navigate the payload of the [`Sample`]
     template <typename T = Payload, typename = std::enable_if_t<iox::IsSlice<T>::VALUE, void>>
@@ -132,12 +132,12 @@ inline auto Sample<S, Payload, UserHeader>::operator->() const -> const Payload*
 
 template <ServiceType S, typename Payload, typename UserHeader>
 template <typename T, typename>
-inline auto Sample<S, Payload, UserHeader>::payload() const -> const Payload& {
+inline auto Sample<S, Payload, UserHeader>::payload() const -> const ValueType& {
     const void* ptr = nullptr;
 
     iox2_sample_payload(&m_handle, &ptr, nullptr);
 
-    return *static_cast<const Payload*>(ptr);
+    return *static_cast<const ValueType*>(ptr);
 }
 
 template <ServiceType S, typename Payload, typename UserHeader>
diff --git a/iceoryx2-ffi/cxx/include/iox2/sample_mut.hpp b/iceoryx2-ffi/cxx/include/iox2/sample_mut.hpp
index 9264d5e34..2451d3797 100644
--- a/iceoryx2-ffi/cxx/include/iox2/sample_mut.hpp
+++ b/iceoryx2-ffi/cxx/include/iox2/sample_mut.hpp
@@ -81,11 +81,11 @@ class SampleMut {
 
     /// Returns a reference to the const payload of the sample.
     template <typename T = Payload, typename = std::enable_if_t<!iox::IsSlice<T>::VALUE, void>>
-    auto payload() const -> const Payload&;
+    auto payload() const -> const ValueType&;
 
     /// Returns a reference to the payload of the sample.
     template <typename T = Payload, typename = std::enable_if_t<!iox::IsSlice<T>::VALUE, void>>
-    auto payload_mut() -> Payload&;
+    auto payload_mut() -> ValueType&;
 
     template <typename T = Payload, typename = std::enable_if_t<iox::IsSlice<T>::VALUE, void>>
     auto payload() const -> iox::ImmutableSlice<ValueType>;
@@ -199,22 +199,22 @@ inline auto SampleMut<S, Payload, UserHeader>::user_header_mut() -> T& {
 
 template <ServiceType S, typename Payload, typename UserHeader>
 template <typename T, typename>
-inline auto SampleMut<S, Payload, UserHeader>::payload() const -> const Payload& {
+inline auto SampleMut<S, Payload, UserHeader>::payload() const -> const ValueType& {
     const void* ptr = nullptr;
 
     iox2_sample_mut_payload(&m_handle, &ptr, nullptr);
 
-    return *static_cast<const Payload*>(ptr);
+    return *static_cast<const ValueType*>(ptr);
 }
 
 template <ServiceType S, typename Payload, typename UserHeader>
 template <typename T, typename>
-inline auto SampleMut<S, Payload, UserHeader>::payload_mut() -> Payload& {
+inline auto SampleMut<S, Payload, UserHeader>::payload_mut() -> ValueType& {
     void* ptr = nullptr;
 
     iox2_sample_mut_payload_mut(&m_handle, &ptr, nullptr);
 
-    return *static_cast<Payload*>(ptr);
+    return *static_cast<ValueType*>(ptr);
 }
 
 template <ServiceType S, typename Payload, typename UserHeader>
diff --git a/iceoryx2-ffi/cxx/include/iox2/sample_mut_uninit.hpp b/iceoryx2-ffi/cxx/include/iox2/sample_mut_uninit.hpp
index faaa2e9c2..b90dc6489 100644
--- a/iceoryx2-ffi/cxx/include/iox2/sample_mut_uninit.hpp
+++ b/iceoryx2-ffi/cxx/include/iox2/sample_mut_uninit.hpp
@@ -59,11 +59,11 @@ class SampleMutUninit {
 
     /// Returns a reference to the const payload of the sample.
     template <typename T = Payload, typename = std::enable_if_t<!iox::IsSlice<T>::VALUE, void>>
-    auto payload() const -> const Payload&;
+    auto payload() const -> const ValueType&;
 
     /// Returns a reference to the payload of the sample.
     template <typename T = Payload, typename = std::enable_if_t<!iox::IsSlice<T>::VALUE, void>>
-    auto payload_mut() -> Payload&;
+    auto payload_mut() -> ValueType&;
 
     template <typename T = Payload, typename = std::enable_if_t<iox::IsSlice<T>::VALUE, void>>
     auto payload() const -> iox::ImmutableSlice<ValueType>;
@@ -143,13 +143,13 @@ inline auto SampleMutUninit<S, Payload, UserHeader>::user_header_mut() -> T& {
 
 template <ServiceType S, typename Payload, typename UserHeader>
 template <typename T, typename>
-inline auto SampleMutUninit<S, Payload, UserHeader>::payload() const -> const Payload& {
+inline auto SampleMutUninit<S, Payload, UserHeader>::payload() const -> const ValueType& {
     return m_sample.payload();
 }
 
 template <ServiceType S, typename Payload, typename UserHeader>
 template <typename T, typename>
-inline auto SampleMutUninit<S, Payload, UserHeader>::payload_mut() -> Payload& {
+inline auto SampleMutUninit<S, Payload, UserHeader>::payload_mut() -> ValueType& {
     return m_sample.payload_mut();
 }