diff --git a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
index 6ad1e88da4d6233d4be926aa19207f787a58716a..8ae42e00bd5385886696dd6ead35feb927665947 100644
--- a/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
+++ b/source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
@@ -92,12 +92,12 @@ namespace armarx
 
         // Subscribe to example_entity updates
         // Using a lambda:
-        memoryReader.subscribe(exampleEntityID, [&](const armem::MemoryID & exampleEntityID, const std::vector<armem::MemoryID>& snapshotIDs)
+        memoryNameSystem.subscribe(exampleEntityID, [&](const armem::MemoryID & exampleEntityID, const std::vector<armem::MemoryID>& snapshotIDs)
         {
             ARMARX_INFO << "Entity " << exampleEntityID << " was updated by " << snapshotIDs.size() << " snapshots.";
         });
         // Using a member function:
-        memoryReader.subscribe(exampleEntityID, this, &ExampleMemoryClient::processExampleEntityUpdate);
+        memoryNameSystem.subscribe(exampleEntityID, this, &ExampleMemoryClient::processExampleEntityUpdate);
 
 
         task = new RunningTask<ExampleMemoryClient>(this, &ExampleMemoryClient::run);
diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
index 33e1e104294fd829c45a8362f2e1652cc3962d1e..e412bfefccf2b7e5a0a80a54bc86c6bd84a962c7 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
@@ -41,7 +41,7 @@ namespace armarx::armem::client::util
         /**
          * Subscribe with a class member function:
          * @code
-         * reader.subscribe(entityID, this, &This::myCallback);
+         * listener.subscribe(entityID, this, &This::myCallback);
          * @endcode
          */
         template <class CalleeT>
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
index f7ba4898f46ca303e45accff465426e97b96cf79..8824b1e7f8b172b0c837a3441b7db97480a7e3e1 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
@@ -60,7 +60,7 @@ namespace armarx::armem::articulated_object
         id.coreSegmentName = properties.coreClassSegmentName;
         // listen to all provider segments!
 
-        memoryReader.subscribe(id, this, &Reader::updateKnownObjects);
+        memoryNameSystem.subscribe(id, this, &Reader::updateKnownObjects);
     }
 
     void Reader::updateKnownObject(const armem::MemoryID& snapshotId)
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
index f89283202fd756e773229911ca9b2db40c8741c3..f351382f36d94372154116327dc3e65e38eb0dfc 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp
@@ -70,7 +70,7 @@ namespace armarx::armem::articulated_object
         id.setCoreSegmentID(refId); // listen to all provider segments!
 
         updateKnownObjects();
-        memoryReader.subscribe(id, this, &Writer::updateKnownObjects);
+        memoryNameSystem.subscribe(id, this, &Writer::updateKnownObjects);
     }
 
     void Writer::updateKnownObject(const armem::MemoryID& snapshotId)