diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
index 96a2eda81bce998e0dc158df2c0fe887ea2f3e5c..37a59b28d5649cad9ed539857d9a19ffcc5de1fc 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
@@ -138,7 +138,7 @@ namespace armarx
         sleep(2);
         ARMARX_IMPORTANT << "Running now.";
 
-        armem::Writer writer(memory);
+        armem::client::Writer writer(memory);
 
 
         armem::MemoryID snapshotID;
@@ -301,7 +301,7 @@ namespace armarx
     }
 
 
-    bool ArMemExampleClient::primitives(armem::Writer& writer)
+    bool ArMemExampleClient::primitives(armem::client::Writer& writer)
     {
         ARMARX_IMPORTANT << "Adding segment " << "Primitive" << "/" << getName();
 
diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
index fdcc34ef427763116780048448cb67460cc105e7..5fffaebff03b9b89f9b620a895ba74af012d8af4 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
@@ -109,7 +109,7 @@ namespace armarx
         void example_entityUpdated(const armem::MemoryID& id);
 
         // Examples
-        bool primitives(armem::Writer& writer);
+        bool primitives(armem::client::Writer& writer);
 
 
     private:
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
index f121e160a9a99af932784cb11d84440fecef1e1a..7fd18a174502d8ff9fbe22ff0a60bd4122e2ca2c 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
@@ -142,7 +142,7 @@ namespace armarx
         if (memoryName.size() > 0)
         {
             getProxy(memory, memoryName);
-            memoryReader = armem::Reader(memory);
+            memoryReader = armem::client::Reader(memory);
         }
         // DebugObserver is optional (check for null on every call)
         if (!debugObserverName.empty())
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
index aad49aecd1514e1595bc7c39be36504c2fa08841..7f5b2ac810a6a86dfe464ecf19a46480bc98c34c 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
@@ -126,7 +126,7 @@ namespace armarx
 
         std::string memoryName;
         armem::MemoryInterfacePrx memory;
-        armem::Reader memoryReader;
+        armem::client::Reader memoryReader;
 
         armem::MemoryPtr memoryData;
 
diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp
index 5e46975b52c1f3a653c9aaff60cf9f3f41bfe5e4..0a0985bd2fea1f47a7ce0bed55c49721636db1fd 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem/client/Reader.cpp
@@ -5,7 +5,7 @@
 #include "../memory/ice_conversions.h"
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     Reader::Reader(ReadingInterfacePrx memory) : memory(memory)
diff --git a/source/RobotAPI/libraries/armem/client/Reader.h b/source/RobotAPI/libraries/armem/client/Reader.h
index 4bfe94d0eebf3005925862241d6b2d4a7481d8c0..3ab4b5e4500ceeff464c3fb66a83b360852a0eb9 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.h
+++ b/source/RobotAPI/libraries/armem/client/Reader.h
@@ -13,7 +13,7 @@
 #include <RobotAPI/libraries/armem/memory/Memory.h>
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     /**
diff --git a/source/RobotAPI/libraries/armem/client/Writer.cpp b/source/RobotAPI/libraries/armem/client/Writer.cpp
index 3d9fb1b8191ce07ef4c4aed598ade1a1280f661e..cd6b409f8880c41eee3e7f66a39e88dd08afe0ac 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.cpp
+++ b/source/RobotAPI/libraries/armem/client/Writer.cpp
@@ -5,7 +5,7 @@
 #include "../error.h"
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     Writer::Writer(WritingInterfacePrx memory) : memory(memory)
diff --git a/source/RobotAPI/libraries/armem/client/Writer.h b/source/RobotAPI/libraries/armem/client/Writer.h
index f2f493d4a9935d1525d24048be08fc893f3305f6..e7c7d67c17e63ae2f801eb99053391aba5ce5b87 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.h
+++ b/source/RobotAPI/libraries/armem/client/Writer.h
@@ -5,7 +5,7 @@
 #include <RobotAPI/libraries/armem/core/ice_conversions.h>
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     /**