diff --git a/source/Navigation/libraries/algorithms/CMakeLists.txt b/source/Navigation/libraries/algorithms/CMakeLists.txt
index aaa8dfec305066fffa5003e23e18e66f8bf5e096..ca05cc52c769838f1b5cf662117a866fc6a2196d 100644
--- a/source/Navigation/libraries/algorithms/CMakeLists.txt
+++ b/source/Navigation/libraries/algorithms/CMakeLists.txt
@@ -1,29 +1,28 @@
-set(LIB_NAME       algorithms)
+set(LIB_NAME ${PROJECT_NAME}Algorithms)
 
 armarx_component_set_name("${LIB_NAME}")
 armarx_set_target("Library: ${LIB_NAME}")
 
 armarx_add_library(
-    LIBS     
+    LIBS
         ArmarXCoreInterfaces
         ArmarXCore
         Navigation::core
-
-    SOURCES  
+    SOURCES
         ./algorithms.cpp
-    HEADERS  
+    HEADERS
         ./algorithms.h
 )
 
-add_library(Navigation::algorithms ALIAS algorithms)
+add_library(
+    Navigation::algorithms
+    ALIAS
+    ${PROJECT_NAME}Algorithms
+)
 
-#find_package(MyLib QUIET)
-#armarx_build_if(MyLib_FOUND "MyLib not available")
-# all target_include_directories must be guarded by if(Xyz_FOUND)
-# for multiple libraries write: if(X_FOUND AND Y_FOUND)....
-#if(MyLib_FOUND)
-#    target_include_directories(algorithms PUBLIC ${MyLib_INCLUDE_DIRS})
-#endif()
+# find_package(MyLib QUIET) armarx_build_if(MyLib_FOUND "MyLib not available")
+# all target_include_directories must be guarded by if(Xyz_FOUND) for multiple
+# libraries write: if(X_FOUND AND Y_FOUND).... if(MyLib_FOUND)
+# target_include_directories(algorithms PUBLIC ${MyLib_INCLUDE_DIRS}) endif()
 
-# add unit tests
-# add_subdirectory(test)
+# add unit tests add_subdirectory(test)
diff --git a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
index da1915068ba7f8e12cb0bf2c17071ffac12e5f05..be4e3d0fabcbc8209cb4a6d136515ef82ae4cef5 100644
--- a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
+++ b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
@@ -1,6 +1,5 @@
 #include <Navigation/libraries/server/execution/PlatformUnitExecutor.h>
 
-
 namespace armarx::nav::server
 {
 
@@ -17,7 +16,7 @@ namespace armarx::nav::server
 
     void PlatformUnitExecutor::move(const core::Twist& twist)
     {
-        if (enabled.get())
+        if (enabled)
         {
             platformUnit->move(twist.linear.x(), twist.linear.y(), twist.angular.z());
         }
@@ -25,13 +24,13 @@ namespace armarx::nav::server
 
     void PlatformUnitExecutor::disableAndStop()
     {
-        enabled.set(false);
-        platformUnit->move(0, 0, 0);
+        enabled = false;
+        platformUnit->stopPlatform();
     }
 
     void PlatformUnitExecutor::enable()
     {
-        enabled.set(true);
+        enabled = true;
     }
 
-}
+} // namespace armarx::nav::server
diff --git a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.h b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.h
index 218304c48d147fb3b1e0c966ad427152c0935801..bccc7a91337d341f2f9699daa8ef4a757a3a8087 100644
--- a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.h
+++ b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.h
@@ -20,7 +20,7 @@ namespace armarx::nav::server
         PlatformUnitExecutor(PlatformUnitInterfacePrx platformUnit);
         ~PlatformUnitExecutor() override;
 
-        void move(const core::Twist &twist);
+        void move(const core::Twist& twist) override;
 
         void disableAndStop();
         void enable();
@@ -33,4 +33,4 @@ namespace armarx::nav::server
 
     };
 
-}
+}  // namespace armarx::nav::server