diff --git a/source/armarx/navigation/conversions/CMakeLists.txt b/source/armarx/navigation/conversions/CMakeLists.txt
index b00dce4550063b9209315ab726012b7b8325358b..fee96c52e6f5074f0a3db5e7bdc1bb99f340f739 100644
--- a/source/armarx/navigation/conversions/CMakeLists.txt
+++ b/source/armarx/navigation/conversions/CMakeLists.txt
@@ -1,15 +1,17 @@
 armarx_add_library(conversions
+    SOURCES
+        eigen.cpp
+    HEADERS
+        eigen.h
     DEPENDENCIES
         ArmarXCoreInterfaces
         ArmarXCore
-    SOURCES ./eigen.cpp
-    HEADERS ./eigen.h
 )
 
-armarx_add_test(
-    TEST_NAME conversions_test
-    TEST_FILE test/conversionsTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(conversions_test
+    TEST_FILES
+        test/conversionsTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::conversions
 )
diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index 88ca66a03b72cfe15c6fed392159b06013307e88..ae8992b50622e15d9fb7ce6ff30b280bea8fbe32 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -8,17 +8,6 @@ armarx_add_aron_library(core_aron
 )
 
 armarx_add_library(core
-    DEPENDENCIES
-        ArmarXCoreInterfaces
-        ArmarXCore
-        ArmarXCoreObservers # variant
-        # RobotAPI
-        aron
-        aroncommon
-        RobotAPIInterfaces
-        Simox::VirtualRobot
-        range-v3
-        armarx_navigation::core_aron
     SOURCES
         StaticScene.cpp
         Trajectory.cpp
@@ -37,12 +26,23 @@ armarx_add_library(core
         aron_conversions.h
         time/ChronoMonotonicTimeServer.h
         time/TimeServerInterface.h
+    DEPENDENCIES
+        ArmarXCoreInterfaces
+        ArmarXCore
+        ArmarXCoreObservers # variant
+        # RobotAPI
+        aron
+        aroncommon
+        RobotAPIInterfaces
+        Simox::VirtualRobot
+        range-v3
+        armarx_navigation::core_aron
 )
 
-armarx_add_test(
-    TEST_NAME core_test
-    TEST_FILE test/coreTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(core_test
+    TEST_FILES
+        test/coreTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::core
 )
diff --git a/source/armarx/navigation/factories/CMakeLists.txt b/source/armarx/navigation/factories/CMakeLists.txt
index 6b90e4854ce9677cb7604b4c1116618eac276813..46a75023537d7d83c0ad9a94b96cb338865b89fa 100644
--- a/source/armarx/navigation/factories/CMakeLists.txt
+++ b/source/armarx/navigation/factories/CMakeLists.txt
@@ -1,12 +1,4 @@
 armarx_add_library(factories
-    DEPENDENCIES
-        ArmarXCoreInterfaces
-        ArmarXCore
-        armarx_navigation::core
-        armarx_navigation::global_planning
-        armarx_navigation::local_planning
-        armarx_navigation::trajectory_control
-        armarx_navigation::safety_control
     SOURCES
         ./GlobalPlannerFactory.cpp
         ./LocalPlannerFactory.cpp
@@ -19,12 +11,20 @@ armarx_add_library(factories
         ./SafetyControllerFactory.h
         ./TrajectoryControllerFactory.h
         ./NavigationStackFactory.h
+    DEPENDENCIES
+        ArmarXCoreInterfaces
+        ArmarXCore
+        armarx_navigation::core
+        armarx_navigation::global_planning
+        armarx_navigation::local_planning
+        armarx_navigation::trajectory_control
+        armarx_navigation::safety_control
 )
 
-armarx_add_test(
-    TEST_NAME factories_test
-    TEST_FILE test/factoriesTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(factories_test
+    TEST_FILES
+        test/factoriesTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::factories
         armarx_navigation::client
diff --git a/source/armarx/navigation/memory/CMakeLists.txt b/source/armarx/navigation/memory/CMakeLists.txt
index 8ae407ee36efcd461edccc80fae21267fdd41027..18b8f00913336123bdf078a7877395b04985fae8 100644
--- a/source/armarx/navigation/memory/CMakeLists.txt
+++ b/source/armarx/navigation/memory/CMakeLists.txt
@@ -1,9 +1,4 @@
 armarx_add_library(memory
-    DEPENDENCIES
-        ArmarXCoreInterfaces
-        ArmarXCore
-        armem
-        armarx_navigation::core
     SOURCES
         #./memory.cpp
         ./client/stack_result/Writer.cpp
@@ -16,12 +11,17 @@ armarx_add_library(memory
         ./client/parameterization/Writer.h
         ./client/parameterization/Reader.h
         ./client/events/Writer.h
+    DEPENDENCIES
+        ArmarXCoreInterfaces
+        ArmarXCore
+        armem
+        armarx_navigation::core
 )
 
-armarx_add_test(
-    TEST_NAME memory_test
-    TEST_FILE test/memoryTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(memory_test
+    TEST_FILES
+        test/memoryTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::memory
 )
diff --git a/source/armarx/navigation/server/CMakeLists.txt b/source/armarx/navigation/server/CMakeLists.txt
index 01d668ad9bcf937a80ef406bf04368a79d4fe616..3613d8aa45af2acc5ed1649d96569be5db233ed3 100644
--- a/source/armarx/navigation/server/CMakeLists.txt
+++ b/source/armarx/navigation/server/CMakeLists.txt
@@ -1,14 +1,4 @@
 armarx_add_library(server
-    DEPENDENCIES
-        ArmarXCoreInterfaces
-        ArmarXCore
-        ArViz # RobotAPI
-        armarx_navigation::core
-        armarx_navigation::global_planning
-        armarx_navigation::local_planning
-        armarx_navigation::trajectory_control
-        armarx_navigation::safety_control
-        armarx_navigation::memory
     SOURCES
         ./Navigator.cpp
         ./StackResult.cpp
@@ -42,12 +32,22 @@ armarx_add_library(server
         ./monitoring/GoalReachedMonitor.h
         # parameterization
         ./parameterization/MemoryParameterizationService.h
+    DEPENDENCIES
+        ArmarXCoreInterfaces
+        ArmarXCore
+        ArViz # RobotAPI
+        armarx_navigation::core
+        armarx_navigation::global_planning
+        armarx_navigation::local_planning
+        armarx_navigation::trajectory_control
+        armarx_navigation::safety_control
+        armarx_navigation::memory
 )
 
-armarx_add_test(
-    TEST_NAME server_test
-    TEST_FILE test/serverTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(server_test
+    TEST_FILES
+        test/serverTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::client
         armarx_navigation::factories
diff --git a/source/armarx/navigation/trajectory_control/CMakeLists.txt b/source/armarx/navigation/trajectory_control/CMakeLists.txt
index c0fe1f698ce793d45c6a838aa1db1debc4b82b4b..b72691518e496158b5028a1fd2ef80b6c7cafbca 100644
--- a/source/armarx/navigation/trajectory_control/CMakeLists.txt
+++ b/source/armarx/navigation/trajectory_control/CMakeLists.txt
@@ -6,12 +6,6 @@ armarx_add_aron_library(trajectory_control_aron
 )
 
 armarx_add_library(trajectory_control
-    DEPENDENCIES
-        ArmarXCoreInterfaces
-        ArmarXCore
-        RobotAPICore
-        armarx_navigation::core
-        armarx_navigation::trajectory_control_aron
     SOURCES
         ./TrajectoryController.cpp
         ./TrajectoryFollowingController.cpp
@@ -22,12 +16,18 @@ armarx_add_library(trajectory_control
         ./TrajectoryFollowingController.h
         ./WaypointController.h
         ./aron_conversions.h
+    DEPENDENCIES
+        ArmarXCoreInterfaces
+        ArmarXCore
+        RobotAPICore
+        armarx_navigation::core
+        armarx_navigation::trajectory_control_aron
 )
 
-armarx_add_test(
-    TEST_NAME trajectory_control_test
-    TEST_FILE test/trajectory_controlTest.cpp
-    DEPENDEND_LIBS
+armarx_add_test(trajectory_control_test
+    TEST_FILES
+        test/trajectory_controlTest.cpp
+    DEPENDENCIES
         ArmarXCore
         armarx_navigation::trajectory_control
 )