diff --git a/etc/doxygen/mainpage.dox b/etc/doxygen/mainpage.dox
index 88851baf34b796f489dc262321f5db300241adf2..a5f924dd93e4438bd90eeb83a0b629f25a4ce536 100644
--- a/etc/doxygen/mainpage.dox
+++ b/etc/doxygen/mainpage.dox
@@ -1,18 +1,18 @@
/**
\mainpage
-\image html simulation-a-star.png ""
+ \image html simulation-a-star.png ""
- Navigation provides
+ ArmarX Navigation provides
- \li \subpage Navigation-Overview "Navigation Overview"
- \li \subpage Navigation-Tutorials "Navigation Tutorials"
- \li \subpage Navigation-HowTos "Navigation Howtos"
- \li \subpage Navigation-FAQ "Navigation FAQ"
- \li \subpage Navigation-Components "Navigation Components"
- \li \subpage Navigation-GuiPlugins "Navigation Gui Plugins"
- \li \subpage Navigation-About "Navigation About"
- \li \subpage Navigation-License "Navigation License"
+ \li \subpage armarx_navigation-Overview "armarx_navigation Overview"
+ \li \subpage armarx_navigation-Tutorials "armarx_navigation Tutorials"
+ \li \subpage armarx_navigation-HowTos "armarx_navigation Howtos"
+ \li \subpage armarx_navigation-FAQ "armarx_navigation FAQ"
+ \li \subpage armarx_navigation-Components "armarx_navigation Components"
+ \li \subpage armarx_navigation-GuiPlugins "armarx_navigation Gui Plugins"
+ \li \subpage armarx_navigation-About "armarx_navigation About"
+ \li \subpage armarx_navigation-License "armarx_navigation License"
*/
diff --git a/etc/doxygen/pages/Components.dox b/etc/doxygen/pages/Components.dox
index 90c1d98b49303f9d3bdd8a4146d97aefb3b3fff8..3e942555d41a1474902f73df4ca50879ae38dc9c 100644
--- a/etc/doxygen/pages/Components.dox
+++ b/etc/doxygen/pages/Components.dox
@@ -4,8 +4,8 @@ Components are the main building blocks of ArmarX and offer services for other a
Each component usually implements one Ice interface by which it offers its services.
They can be configured with \ref armarx-componentproperties via config files.
-\defgroup Navigation-Components Navigation Components
-\ingroup Navigation Components
+\defgroup armarx_navigation-Components armarx_navigation Components
+\ingroup armarx_navigation Components
*/
diff --git a/etc/doxygen/pages/FAQ.dox b/etc/doxygen/pages/FAQ.dox
index 3cf4a59758c3f31079a58d2e0047f6e07dbb1b69..6d68a4b0bceaa0d81bb77a3889eca49257847167 100644
--- a/etc/doxygen/pages/FAQ.dox
+++ b/etc/doxygen/pages/FAQ.dox
@@ -1,8 +1,8 @@
/**
-\page Navigation-FAQ Navigation FAQ
+\page armarx_navigation-FAQ armarx_navigation FAQ
-\section Navigation-FAQ-change_this FAQ Entry Title
+\section armarx_navigation-FAQ-change_this FAQ Entry Title
Description here
diff --git a/etc/doxygen/pages/GuiPlugins.dox b/etc/doxygen/pages/GuiPlugins.dox
index 60913c63725836b3f8d22f271473a9ceafdd3834..06b4c0b89f851b09f317c196c991b2f264eec673 100644
--- a/etc/doxygen/pages/GuiPlugins.dox
+++ b/etc/doxygen/pages/GuiPlugins.dox
@@ -1,10 +1,10 @@
/**
-\page Navigation-GuiPlugins Navigation Gui Plugins
+\page armarx_navigation-GuiPlugins armarx_navigation Gui Plugins
-This is a list of Gui Plugins available in Navigation
+This is a list of Gui Plugins available in armarx_navigation
-\subpage Navigation-GuiPlugins-WidgetName The page for WidgetName is defined in the WidgetNameWidgetController header file
+\subpage armarx_navigation-GuiPlugins-LocationGraphEditor
*/
diff --git a/etc/doxygen/pages/HowTos.dox b/etc/doxygen/pages/HowTos.dox
index 0db1f046dff853039ac44fdc845bb6773d99ea0a..78a15c4dfb1ceb6a463758fd40f29f9818dfb461 100644
--- a/etc/doxygen/pages/HowTos.dox
+++ b/etc/doxygen/pages/HowTos.dox
@@ -1,8 +1,8 @@
/**
-\page Navigation-HowTos Navigation HowTos
+\page armarx_navigation-HowTos armarx_navigation HowTos
-\section Navigation-HowTo-change_this HowTo Title
+\section armarx_navigation-HowTo-change_this HowTo Title
Description (the change_this part of the section identifier must be edited to be descriptive and unique)
diff --git a/etc/doxygen/pages/Overview.dox b/etc/doxygen/pages/Overview.dox
index 97aa2af715c25e39a927db9479f02e89a165ca8e..2f9ca7d5d890824657b3b6f6a82ea728a8e166a9 100644
--- a/etc/doxygen/pages/Overview.dox
+++ b/etc/doxygen/pages/Overview.dox
@@ -1,10 +1,10 @@
/**
-\page Navigation-Overview Navigation Overview
+\page armarx_navigation-Overview armarx_navigation Overview
-\section Navigation-Stack Navigation stack
+\section armarx_navigation-Stack armarx_navigation stack
It comprises four main layers:
@@ -17,7 +17,7 @@ It comprises four main layers:
-\addtogroup Navigation Navigation
+\addtogroup armarx_navigation armarx_navigation
*/
diff --git a/etc/doxygen/pages/Tutorials.dox b/etc/doxygen/pages/Tutorials.dox
index aedeb9c7da7c178de2a4a3f97bac44b015583697..3b4b234c980b80580413979193260437af51d5d5 100644
--- a/etc/doxygen/pages/Tutorials.dox
+++ b/etc/doxygen/pages/Tutorials.dox
@@ -1,9 +1,9 @@
/**
-\page Navigation-Tutorials Navigation Tutorials
+\page armarx_navigation-Tutorials armarx_navigation Tutorials
List of available tutorials:
- \li \subpage Navigation-Tutorials-change_this "Tutorial Title"
+ \li \subpage armarx_navigation-Tutorials-change_this "Tutorial Title"
*/
diff --git a/source/armarx/navigation/algorithms/algorithms.h b/source/armarx/navigation/algorithms/algorithms.h
index 0a0d7a21ab7d754b264ccda491976672993f82b1..e4ef97e71ef03b9d73052601ba38f889c1db2f24 100644
--- a/source/armarx/navigation/algorithms/algorithms.h
+++ b/source/armarx/navigation/algorithms/algorithms.h
@@ -27,7 +27,7 @@ namespace armarx
{
/**
* @defgroup Library-algorithms algorithms
- * @ingroup Navigation
+ * @ingroup armarx_navigation
* A description of the library algorithms.
*
* @class algorithms
diff --git a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.h b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.h
index a7e8225183389da315a2da83c4ada26e9646c63c..11bd41fd1785a347daf20aa516a7d8bb232f5754 100644
--- a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.h
+++ b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.h
@@ -40,7 +40,7 @@ namespace armarx::navigation
/**
* @defgroup Component-NavigationMemory NavigationMemory
- * @ingroup Navigation-Components
+ * @ingroup armarx_navigation-Components
* A description of the component NavigationMemory.
*
* @class NavigationMemory
diff --git a/source/armarx/navigation/components/Navigator/Navigator.h b/source/armarx/navigation/components/Navigator/Navigator.h
index e557ffff1cb4ae10290595d52843a5d304072eed..2d7411d8dee32e46afc81ae6221ee4203a70c001 100644
--- a/source/armarx/navigation/components/Navigator/Navigator.h
+++ b/source/armarx/navigation/components/Navigator/Navigator.h
@@ -68,7 +68,7 @@ namespace armarx::navigation::components
/**
* @defgroup Component-Navigator Navigator
- * @ingroup Navigation-Components
+ * @ingroup armarx_navigation-Components
* A description of the component Navigator.
*
* @class Navigator
diff --git a/source/armarx/navigation/components/example_client/Component.h b/source/armarx/navigation/components/example_client/Component.h
index 9f8ede9a42c2d46bef50709890384883501d2630..1864c62e8786f7470150ca5cad79e4b7768242a4 100644
--- a/source/armarx/navigation/components/example_client/Component.h
+++ b/source/armarx/navigation/components/example_client/Component.h
@@ -34,7 +34,7 @@ namespace armarx::navigation::components::example_client
/**
* @defgroup Component-ExampleClient ExampleClient
- * @ingroup Navigation-Components
+ * @ingroup armarx_navigation-Components
* A description of the component ExampleClient.
*
* @class ExampleClient
diff --git a/source/armarx/navigation/global_planning/core.h b/source/armarx/navigation/global_planning/core.h
index f94ca4aaf71002665dd8d9da3e1658545ebed8cc..a5d5aa31131614418dddd91967a6b0dbd68e891f 100644
--- a/source/armarx/navigation/global_planning/core.h
+++ b/source/armarx/navigation/global_planning/core.h
@@ -28,7 +28,7 @@ namespace armarx::navigation::glob_plan
{
/**
* @defgroup Library-GlobalPlanner GlobalPlanner
- * @ingroup Navigation
+ * @ingroup armarx_navigation
* A description of the library global_planner.
*/
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
index 4e06004dd64b61c38bc1aa8c6964ccd512146261..f06f0bde91993d7b98847138de4eea9797127c9b 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
@@ -64,7 +64,7 @@ namespace armarx::navigation::qt_plugins::location_graph_editor
/**
- \page Navigation-GuiPlugins-LocationGraphEditor LocationGraphEditor
+ \page armarx_navigation-GuiPlugins-LocationGraphEditor LocationGraphEditor
\brief The LocationGraphEditor allows visualizing ...
\image html LocationGraphEditor.png
diff --git a/source/armarx/navigation/memory/memory.h b/source/armarx/navigation/memory/memory.h
index 8d082c60b5e8315e4088079a2ccd7b49ae096c8d..c8db62901e36a9244e20e26a73e69324dcc9140e 100644
--- a/source/armarx/navigation/memory/memory.h
+++ b/source/armarx/navigation/memory/memory.h
@@ -27,7 +27,7 @@ namespace armarx
{
/**
* @defgroup Library-memory memory
- * @ingroup Navigation
+ * @ingroup armarx_navigation
* A description of the library memory.
*
* @class memory