diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp b/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
index e007e8f5e3ad47c57f9bb71c75e517d57af1addf..8412e2aeb339d16fd256b81ea85470c060a91026 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp
@@ -70,7 +70,11 @@ namespace armarx
         bool trim = true;
         p.core.defaultCoreSegments = simox::alg::split(p.core._defaultSegmentsStr, ",", trim);
         p.core._defaultSegmentsStr.clear();
-        workingMemory.addCoreSegments(p.core.defaultCoreSegments);
+
+        for (const std::string& name : p.core.defaultCoreSegments)
+        {
+            workingMemory.addCoreSegment(name);
+        }
     }
 
     void ExampleMemory::onConnectComponent()
diff --git a/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp b/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
index 4395b55fd45e6bdb019ee1285fbc5cc3dac648f9..cbacda1eb33a06e8ce202e2716f61adf4e53b1f6 100644
--- a/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
+++ b/source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
@@ -272,11 +272,11 @@ namespace armarx::armem::client
                     {
                         if (id.hasInstanceIndex())
                         {
-                            result[id] = queryResult.memory.getEntityInstance(id);
+                            result[id] = queryResult.memory.getInstance(id);
                         }
                         else if (id.hasTimestamp())
                         {
-                            result[id] = queryResult.memory.getEntitySnapshot(id).getInstance(0);
+                            result[id] = queryResult.memory.getSnapshot(id).getInstance(0);
                         }
                         else if (id.hasEntityName())
                         {
diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp
index 1f0e2ee51717e011de75f9fad4dd9c2c598ada88..5052a37b8e80ce14028e2cf07cfaa9494c1ea666 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem/client/Reader.cpp
@@ -116,7 +116,7 @@ namespace armarx::armem::client
             {
                 try
                 {
-                    wm::EntitySnapshot& snapshot = result.memory.getEntitySnapshot(snapshotID);
+                    wm::EntitySnapshot& snapshot = result.memory.getSnapshot(snapshotID);
                     return snapshot;
                 }
                 catch (const armem::error::ArMemError&)
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index 802de477cdd143051b6e45f8f2c4d995ebfa4e29..bdb2597e0c7592fc1eb885be667dbcb36d61b095 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -325,7 +325,7 @@ namespace armarx::armem::gui
                 {
                     try
                     {
-                        snapshot = &data->getEntitySnapshot(id);
+                        snapshot = &data->getSnapshot(id);
                     }
                     catch (const armem::error::ArMemError& e)
                     {
@@ -373,11 +373,11 @@ namespace armarx::armem::gui
 
                 if (id.hasInstanceIndex())
                 {
-                    instance = data->getEntityInstance(id);
+                    instance = data->getInstance(id);
                 }
                 else if (id.hasTimestamp())
                 {
-                    instance = data->getEntitySnapshot(id).getInstance(0);
+                    instance = data->getSnapshot(id).getInstance(0);
                 }
                 else
                 {
diff --git a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
index 2b4ab121dabc7d52188f1d10b8adb501f2c72d32..2c788d698b967250e73103305fc284f2283b1486 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
@@ -104,7 +104,7 @@ namespace armarx::armem::gui::instance
         const armem::wm::EntityInstance* instance = nullptr;
         try
         {
-            instance = &memory.getEntityInstance(id);
+            instance = &memory.getInstance(id);
             if (useTypeInfo)
             {
                 aronType = memory.getProviderSegment(id).aronType();
diff --git a/source/RobotAPI/libraries/armem_objects/server/class/FloorVis.cpp b/source/RobotAPI/libraries/armem_objects/server/class/FloorVis.cpp
index 1e9957aff7b0d093d3bd1d6e16f289d6a2a04afd..cb0088285ca161ddc9283f3a024b65a86809fb1b 100644
--- a/source/RobotAPI/libraries/armem_objects/server/class/FloorVis.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/class/FloorVis.cpp
@@ -32,7 +32,7 @@ namespace armarx::armem::server::obj::clazz
         viz::Layer layer = arviz.layer(properties.layerName);
         if (properties.show)
         {
-            const wm::Entity* entity = classCoreSegment.findEntity(MemoryID().withEntityName(properties.entityName));
+            const wm::Entity* entity = classCoreSegment.findEntity(properties.entityName);
             if (entity)
             {
                 ARMARX_INFO << "Drawing floor class '" << properties.entityName << "'.";