diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h b/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
index d8d8ae3834fee00c46f2f9215db6163d6b7fe795..4ea5bfed9d9db84c832ac14d135077545942286e 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/ReaderInterface.h
@@ -1,11 +1,11 @@
 #pragma once
 
 
-#include <RobotAPI/libraries/armem/core/forward_declarations.h>
 #include <RobotAPI/libraries/armem/core/Time.h>
+#include <RobotAPI/libraries/armem/core/forward_declarations.h>
 #include <RobotAPI/libraries/armem_robot_state/types.h>
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     class ReaderInterface
     {
@@ -21,4 +21,4 @@ namespace armarx::armem::robot_state::client::common
     };
 
 
-} // namespace armarx::armem::robot_state::client::common
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
index c7dc200af0fbd4b921d869474bda8d71da1ddb20..1b4b0dd2ea571562291ddffcdf70b1c438b15fef 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
@@ -28,7 +28,7 @@
 
 namespace fs = ::std::filesystem;
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     RobotReader::RobotReader(const RobotReader& r) :
         properties(r.properties),
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
index 30032e0c9aee340632319de2e3089734f90c4a6c..5b4700a003fddaafc548811e1a983e4a4e95e03a 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h
@@ -32,7 +32,7 @@
 #include <RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h>
 #include <RobotAPI/libraries/armem_robot_state/types.h>
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     /**
      * @brief The RobotReader class.
@@ -163,12 +163,7 @@ namespace armarx::armem::robot_state::client::common
         armem::client::Reader memoryReader;
         mutable std::mutex memoryReaderMutex;
 
-        localization::TransformReader transformReader;
+        client::localization::TransformReader transformReader;
     };
 
-} // namespace armarx::armem::robot_state::client::common
-
-namespace armarx::armem::robot_state
-{
-    using client::common::RobotReader;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
index 5d6f6a0f88f420b578ad53f3753dfec414d413de..89caaa7826d69c454761d515092e0d72c58c8ca4 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.cpp
@@ -31,7 +31,7 @@
 
 namespace fs = ::std::filesystem;
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     RobotWriter::RobotWriter(const RobotWriter& r) :
         properties(r.properties), propertyPrefix(r.propertyPrefix), memoryWriter(r.memoryWriter)
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
index 511845de0359b9e618662727783c03bd91d8e890..1095363fd7497bc4ba676e493fd87452f9e1786f 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotWriter.h
@@ -32,7 +32,7 @@
 #include <RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h>
 #include <RobotAPI/libraries/armem_robot_state/types.h>
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     /**
      * @brief The RobotReader class.
@@ -83,10 +83,4 @@ namespace armarx::armem::robot_state::client::common
         armem::client::Writer memoryWriter;
     };
 
-} // namespace armarx::armem::robot_state::client::common
-
-
-namespace armarx::armem::robot_state
-{
-    using client::common::RobotWriter;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index b57642a1e45a04b4edd7fd55ed584546848a16cc..529aeba908795871d1690ef937dbecf0736b1a8f 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -13,7 +13,7 @@
 #include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
 #include <ArmarXCore/core/time/Clock.h>
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
 
     bool
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
index f4f7f2f44252d3adf1250efa521628079b2186c3..0c0eb05aa6cd8f96bec6acdeb90c0261aca43c80 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h
@@ -27,7 +27,7 @@
 
 #include "RobotReader.h"
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
     /**
      * @brief The VirtualRobotReader class.
@@ -78,9 +78,4 @@ namespace armarx::armem::robot_state::client::common
                               bool blocking = true);
     };
 
-} // namespace armarx::armem::robot_state::client::common
-
-namespace armarx::armem::robot_state
-{
-    using client::common::VirtualRobotReader;
-}
+} // namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h b/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
index d4974452245a9156508d907acafda474418d6d49..b4543e2cfd8bf3d6488c1685158d0c907f4bfb13 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/WriterInterface.h
@@ -5,7 +5,7 @@
 #include <RobotAPI/libraries/armem/core/Time.h>
 #include <RobotAPI/libraries/armem_robot_state/types.h>
 
-namespace armarx::armem::robot_state::client::common
+namespace armarx::armem::robot_state
 {
 
     class WriterInterface
@@ -24,4 +24,4 @@ namespace armarx::armem::robot_state::client::common
                                 const std::string& robotRootNodeName) = 0;
     };
 
-} // namespace armarx::armem::robot_state::client::common
+} // namespace armarx::armem::robot_state