diff --git a/source/armarx/navigation/components/ExampleClient/CMakeLists.txt b/source/armarx/navigation/components/ExampleClient/CMakeLists.txt
index 47fafce9c5fce215c4af6b3c6698809513107870..bd79c68290033f2c42785d1994b98139f8500c0f 100644
--- a/source/armarx/navigation/components/ExampleClient/CMakeLists.txt
+++ b/source/armarx/navigation/components/ExampleClient/CMakeLists.txt
@@ -1,21 +1,13 @@
-set(LIB_NAME ExampleClient)
-
-armarx_component_set_name("${LIB_NAME}")
-armarx_set_target("Library: ${LIB_NAME}")
-
-# Add the component
-armarx_add_component(
-    COMPONENT_LIBS
-        # ArmarXCore
+armarx__add_component(ExampleClient
+    DEPENDENCIES
         ArmarXCore
         # ArmarXCoreComponentPlugins  # For DebugObserver plugin. ArmarXGui
         # ArmarXGuiComponentPlugins  # For RemoteGui plugin. RobotAPI
         # RobotAPICore RobotAPIInterfaces RobotAPIArmarXObjects
         # RobotAPIComponentPlugins  # For ArViz and other plugins. Navigation
         armarx_navigation::client
-    SOURCES ExampleClient.cpp
-    HEADERS ExampleClient.h
+    SOURCES
+        ExampleClient.cpp
+    HEADERS
+        ExampleClient.h
 )
-
-# Generate the application
-armarx_generate_and_add_component_executable(COMPONENT_NAMESPACE exns)
diff --git a/source/armarx/navigation/components/NavigationMemory/CMakeLists.txt b/source/armarx/navigation/components/NavigationMemory/CMakeLists.txt
index 19721ffb181564c579749cd4dce0730d98b7fccf..6ca81d43cffaabdd84877553220bb3c00e92fcc3 100644
--- a/source/armarx/navigation/components/NavigationMemory/CMakeLists.txt
+++ b/source/armarx/navigation/components/NavigationMemory/CMakeLists.txt
@@ -1,21 +1,5 @@
-set(LIB_NAME       NavigationMemory)
-
-armarx_component_set_name("${LIB_NAME}")
-armarx_set_target("Library: ${LIB_NAME}")
-
-
-# If your component needs a special ice interface, define it here:
-# armarx_add_component_interface_lib(
-#     SLICE_FILES
-#         NavigationMemory.ice
-#     ICE_LIBS
-#         # RobotAPI
-#)
-
-
-# Add the component
-armarx_add_component(
-    COMPONENT_LIBS
+armarx__add_component(NavigationMemory
+    DEPENDENCIES
         # ArmarXCore
         ArmarXCore
         ## ArmarXCoreComponentPlugins  # For DebugObserver plugin.
@@ -31,40 +15,8 @@ armarx_add_component(
         ## ${PROJECT_NAME}Interfaces  # For ice interfaces from this package.
         # This component
         ## NavigationMemoryInterfaces  # If you defined a component ice interface above.
-
     SOURCES
         NavigationMemory.cpp
-
     HEADERS
         NavigationMemory.h
 )
-
-
-# Add dependencies
-#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(NavigationMemory PUBLIC ${MyLib_INCLUDE_DIRS})
-#endif()
-
-
-# Add ARON files
-#armarx_enable_aron_file_generation_for_target(
-#    TARGET_NAME
-#        ${ARMARX_COMPONENT_NAME}
-#    ARON_FILES
-#        aron/ExampleData.xml
-#)
-
-
-# Add unit tests
-add_subdirectory(test)
-
-# Generate the application
-armarx_generate_and_add_component_executable(
-    # If your component is not defined in ::armarx, specify its namespace here:
-    # COMPONENT_NAMESPACE "armarx::mynamespace"
-)
diff --git a/source/armarx/navigation/components/NavigationMemory/test/CMakeLists.txt b/source/armarx/navigation/components/NavigationMemory/test/CMakeLists.txt
deleted file mode 100644
index 29060d4c361fc573e99b5e73796da5ae6086a209..0000000000000000000000000000000000000000
--- a/source/armarx/navigation/components/NavigationMemory/test/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-armarx_add_test(
-    TEST_NAME NavigationMemoryTest
-    TEST_FILE NavigationMemoryTest.cpp
-    DEPENDEND_LIBS
-        ArmarXCore
-        armarx_navigation::memory
-)
diff --git a/source/armarx/navigation/components/NavigationMemory/test/NavigationMemoryTest.cpp b/source/armarx/navigation/components/NavigationMemory/test/NavigationMemoryTest.cpp
deleted file mode 100644
index 54bec0012611a9728eef23b50421b607a8870428..0000000000000000000000000000000000000000
--- a/source/armarx/navigation/components/NavigationMemory/test/NavigationMemoryTest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of ArmarX.
- *
- * ArmarX is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * ArmarX is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    Navigation::ArmarXObjects::NavigationMemory
- * @author     Fabian Reister ( fabian dot reister at kit dot edu )
- * @date       2021
- * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
- *             GNU General Public License
- */
-
-#define BOOST_TEST_MODULE Navigation::ArmarXObjects::NavigationMemory
-
-#define ARMARX_BOOST_TEST
-
-#include "../NavigationMemory.h"
-
-#include <iostream>
-
-#include <armarx/navigation/Test.h>
-
-BOOST_AUTO_TEST_CASE(testExample)
-{
-    armarx::NavigationMemory instance;
-
-    BOOST_CHECK_EQUAL(true, true);
-}
diff --git a/source/armarx/navigation/components/Navigator/CMakeLists.txt b/source/armarx/navigation/components/Navigator/CMakeLists.txt
index d4e90f5e3679ccc95589827f48123b67c4cf6dd7..56f45414e14e9c21c842049bc2ab86db055e7720 100644
--- a/source/armarx/navigation/components/Navigator/CMakeLists.txt
+++ b/source/armarx/navigation/components/Navigator/CMakeLists.txt
@@ -1,19 +1,10 @@
-set(LIB_NAME Navigator)
-
-armarx_component_set_name("${LIB_NAME}")
-armarx_set_target("Library: ${LIB_NAME}")
-
-armarx_add_component_interface_lib(
-    SLICE_FILES
+armarx__add_component(Navigator
+    ICE_FILES
         NavigatorInterface.ice
-    ICE_LIBS
-        ArmarXCore
-        RobotAPI
-)
-
-# Add the component
-armarx_add_component(
-    COMPONENT_LIBS
+    ICE_DEPENDENCIES
+        ArmarXCoreInterfaces
+        RobotAPIInterfaces
+    DEPENDENCIES
         # ArmarXCore
         ArmarXCore
         # ArmarXCoreComponentPlugins  # For DebugObserver plugin. ArmarXGui
@@ -30,13 +21,10 @@ armarx_add_component(
         armarx_navigation::client
         armarx_navigation::util
         armarx_navigation::factories
-    SOURCES Navigator.cpp
-            RemoteGui.cpp
-    HEADERS Navigator.h
-            RemoteGui.h
-)
-
-# Generate the application
-armarx_generate_and_add_component_executable(
-    COMPONENT_NAMESPACE armarx::navigation::components
+    SOURCES
+        Navigator.cpp
+        RemoteGui.cpp
+    HEADERS
+        Navigator.h
+        RemoteGui.h
 )