diff --git a/source/Navigation/components/NavigationMemory/NavigationMemory.cpp b/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
index e3b6f0b75bd6daceb7c764a1b9336fe5ac24a25b..7b4bb34fa588459c42dd294eccbd322474624813 100644
--- a/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
+++ b/source/Navigation/components/NavigationMemory/NavigationMemory.cpp
@@ -73,8 +73,7 @@ namespace armarx
         // (Requies the armarx::DebugObserverComponentPluginUser.)
         // setDebugObserverBatchModeEnabled(true);
 
-        workingMemory.name() = p.memoryName;
-        longtermMemory.name() = p.memoryName;
+        setMemoryName(p.memoryName);
 
         workingMemory.addCoreSegment("Parameterization");
 
diff --git a/source/Navigation/libraries/memory/client/parameterization/Writer.cpp b/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
index 19053f789cd90e5cb07fab6537a0b7faf8481f19..dc6a0348221212284cccbf34c93cacc9c8c9152a 100644
--- a/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
+++ b/source/Navigation/libraries/memory/client/parameterization/Writer.cpp
@@ -1,12 +1,15 @@
 #include "Writer.h"
 
-#include "Navigation/libraries/core/constants.h"
+#include <Navigation/libraries/core/constants.h>
+
+#include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
+
 
 namespace armarx::nav::mem::client::param
 {
     bool
     Writer::store(const std::unordered_map<core::StackLayer,
-                                           aron::datanavigator::DictNavigator::PointerType>& stack,
+                                           aron::datanavigator::DictNavigatorPtr>& stack,
                   const std::string& clientID,
                   const core::TimestampUs& timestamp)
     {
diff --git a/source/Navigation/libraries/memory/client/parameterization/Writer.h b/source/Navigation/libraries/memory/client/parameterization/Writer.h
index ca69dab0c83578703594c94cef7e3c727842eb56..b98b7daf2e4507ed277613e3993fe2f04db77c23 100644
--- a/source/Navigation/libraries/memory/client/parameterization/Writer.h
+++ b/source/Navigation/libraries/memory/client/parameterization/Writer.h
@@ -21,10 +21,11 @@
 
 #pragma once
 
-#include "RobotAPI/libraries/armem/client/util/SimpleWriterBase.h"
+#include <RobotAPI/libraries/aron/core/navigator/data/forward_declarations.h>
+#include <RobotAPI/libraries/armem/client/util/SimpleWriterBase.h>
 
-#include "Navigation/libraries/core/constants.h"
-#include "Navigation/libraries/core/types.h"
+#include <Navigation/libraries/core/constants.h>
+#include <Navigation/libraries/core/types.h>
 
 
 namespace armarx::nav::mem::client::param
@@ -37,7 +38,7 @@ namespace armarx::nav::mem::client::param
 
 
         bool store(const std::unordered_map<core::StackLayer,
-                                            aron::datanavigator::DictNavigator::PointerType>& stack,
+                                            aron::datanavigator::DictNavigatorPtr>& stack,
                    const std::string& clientID,
                    const core::TimestampUs& timestamp);