diff --git a/iceoryx_dust/test/moduletests/test_utility_serialization.cpp b/iceoryx_hoofs/test/moduletests/test_utility_serialization.cpp
similarity index 100%
rename from iceoryx_dust/test/moduletests/test_utility_serialization.cpp
rename to iceoryx_hoofs/test/moduletests/test_utility_serialization.cpp
diff --git a/iceoryx_dust/test/moduletests/test_utility_std_chrono_support.cpp b/iceoryx_hoofs/test/moduletests/test_utility_std_chrono_support.cpp
similarity index 100%
rename from iceoryx_dust/test/moduletests/test_utility_std_chrono_support.cpp
rename to iceoryx_hoofs/test/moduletests/test_utility_std_chrono_support.cpp
diff --git a/iceoryx_dust/test/moduletests/test_utility_std_string_support.cpp b/iceoryx_hoofs/test/moduletests/test_utility_std_string_support.cpp
similarity index 100%
rename from iceoryx_dust/test/moduletests/test_utility_std_string_support.cpp
rename to iceoryx_hoofs/test/moduletests/test_utility_std_string_support.cpp
diff --git a/iceoryx_dust/utility/include/iox/detail/serialization.hpp b/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp
similarity index 97%
rename from iceoryx_dust/utility/include/iox/detail/serialization.hpp
rename to iceoryx_hoofs/utility/include/iox/detail/serialization.hpp
index 66a0b1a914..4b05e2e18e 100644
--- a/iceoryx_dust/utility/include/iox/detail/serialization.hpp
+++ b/iceoryx_hoofs/utility/include/iox/detail/serialization.hpp
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_UTILITY_SERIALIZATION_HPP
-#define IOX_DUST_UTILITY_SERIALIZATION_HPP
+#ifndef IOX_HOOFS_UTILITY_SERIALIZATION_HPP
+#define IOX_HOOFS_UTILITY_SERIALIZATION_HPP
 
 #include "iox/detail/convert.hpp"
 #include "iox/std_string_support.hpp"
@@ -141,4 +141,4 @@ class Serialization
 
 #include "iox/detail/serialization.inl"
 
-#endif // IOX_DUST_UTILITY_SERIALIZATION_HPP
+#endif // IOX_HOOFS_UTILITY_SERIALIZATION_HPP
diff --git a/iceoryx_dust/utility/include/iox/detail/serialization.inl b/iceoryx_hoofs/utility/include/iox/detail/serialization.inl
similarity index 95%
rename from iceoryx_dust/utility/include/iox/detail/serialization.inl
rename to iceoryx_hoofs/utility/include/iox/detail/serialization.inl
index e1380f7c0f..bbee4acfc5 100644
--- a/iceoryx_dust/utility/include/iox/detail/serialization.inl
+++ b/iceoryx_hoofs/utility/include/iox/detail/serialization.inl
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_UTILITY_SERIALIZATION_INL
-#define IOX_DUST_UTILITY_SERIALIZATION_INL
+#ifndef IOX_HOOFS_UTILITY_SERIALIZATION_INL
+#define IOX_HOOFS_UTILITY_SERIALIZATION_INL
 
 #include "iox/detail/serialization.hpp"
 
@@ -65,7 +65,7 @@ template <typename T>
 inline typename std::enable_if<std::is_convertible<T, Serialization>::value, std::string>::type
 Serialization::getString(const T& t) noexcept
 {
-    Serialization serial = static_cast<Serialization>(t);
+    const auto serial = static_cast<Serialization>(t);
     return serial.toString();
 }
 
@@ -144,4 +144,4 @@ inline bool Serialization::getNth(const unsigned int index, T& t) const noexcept
 }
 } // namespace iox
 
-#endif // IOX_DUST_CXX_SERIALIZATION_INL
+#endif // IOX_HOOFS_UTILITY_SERIALIZATION_INL
diff --git a/iceoryx_dust/utility/include/iox/detail/std_chrono_support.inl b/iceoryx_hoofs/utility/include/iox/detail/std_chrono_support.inl
similarity index 91%
rename from iceoryx_dust/utility/include/iox/detail/std_chrono_support.inl
rename to iceoryx_hoofs/utility/include/iox/detail/std_chrono_support.inl
index 8e6b46f9d5..0df0ee208b 100644
--- a/iceoryx_dust/utility/include/iox/detail/std_chrono_support.inl
+++ b/iceoryx_hoofs/utility/include/iox/detail/std_chrono_support.inl
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_INL
-#define IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_INL
+#ifndef IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_INL
+#define IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_INL
 
 #include "iox/std_chrono_support.hpp"
 
@@ -47,4 +47,4 @@ FromImpl<std::chrono::seconds, units::Duration>::fromImpl(const std::chrono::sec
 
 } // namespace iox
 
-#endif // IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_INL
+#endif // IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_INL
diff --git a/iceoryx_dust/utility/include/iox/detail/std_string_support.inl b/iceoryx_hoofs/utility/include/iox/detail/std_string_support.inl
similarity index 94%
rename from iceoryx_dust/utility/include/iox/detail/std_string_support.inl
rename to iceoryx_hoofs/utility/include/iox/detail/std_string_support.inl
index 471550c21c..ea5c5aba5d 100644
--- a/iceoryx_dust/utility/include/iox/detail/std_string_support.inl
+++ b/iceoryx_hoofs/utility/include/iox/detail/std_string_support.inl
@@ -13,8 +13,9 @@
 // limitations under the License.
 //
 // SPDX-License-Identifier: Apache-2.0
-#ifndef IOX_DUST_UTILITY_STD_STRING_SUPPORT_INL
-#define IOX_DUST_UTILITY_STD_STRING_SUPPORT_INL
+
+#ifndef IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_INL
+#define IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_INL
 
 #include "iox/std_string_support.hpp"
 
@@ -66,4 +67,4 @@ inline std::ostream& operator<<(std::ostream& stream, const string<Capacity>& st
 }
 } // namespace iox
 
-#endif // IOX_DUST_UTILITY_STD_STRING_SUPPORT_INL
+#endif // IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_INL
diff --git a/iceoryx_dust/utility/include/iox/std_chrono_support.hpp b/iceoryx_hoofs/utility/include/iox/std_chrono_support.hpp
similarity index 93%
rename from iceoryx_dust/utility/include/iox/std_chrono_support.hpp
rename to iceoryx_hoofs/utility/include/iox/std_chrono_support.hpp
index 4669743bc0..750454642f 100644
--- a/iceoryx_dust/utility/include/iox/std_chrono_support.hpp
+++ b/iceoryx_hoofs/utility/include/iox/std_chrono_support.hpp
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_HPP
-#define IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_HPP
+#ifndef IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_HPP
+#define IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_HPP
 
 #include "iox/duration.hpp"
 #include "iox/into.hpp"
@@ -63,4 +63,4 @@ struct FromImpl<std::chrono::seconds, units::Duration>
 
 #include "iox/detail/std_chrono_support.inl"
 
-#endif // IOX_DUST_UTILITY_STD_CHRONO_SUPPORT_HPP
+#endif // IOX_HOOFS_UTILITY_STD_CHRONO_SUPPORT_HPP
diff --git a/iceoryx_dust/utility/include/iox/std_string_support.hpp b/iceoryx_hoofs/utility/include/iox/std_string_support.hpp
similarity index 93%
rename from iceoryx_dust/utility/include/iox/std_string_support.hpp
rename to iceoryx_hoofs/utility/include/iox/std_string_support.hpp
index 73c459b299..28f1a89173 100644
--- a/iceoryx_dust/utility/include/iox/std_string_support.hpp
+++ b/iceoryx_hoofs/utility/include/iox/std_string_support.hpp
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_UTILITY_STD_STRING_SUPPORT_HPP
-#define IOX_DUST_UTILITY_STD_STRING_SUPPORT_HPP
+#ifndef IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_HPP
+#define IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_HPP
 
 #include "iox/into.hpp"
 #include "iox/optional.hpp"
@@ -92,4 +92,4 @@ std::ostream& operator<<(std::ostream& stream, const string<Capacity>& str) noex
 
 #include "iox/detail/std_string_support.inl"
 
-#endif // IOX_DUST_UTILITY_STD_STRING_SUPPORT_HPP
+#endif // IOX_HOOFS_UTILITY_STD_STRING_SUPPORT_HPP