diff --git a/Documentation/Doxygen/ModuleList.dox b/Documentation/Doxygen/ModuleList.dox
index b886ee2b64..a478914fbc 100644
--- a/Documentation/Doxygen/ModuleList.dox
+++ b/Documentation/Doxygen/ModuleList.dox
@@ -1,39 +1,39 @@
 /**
 \page ModuleListPage MITK Modules
 
 \section ModuleListPageOverview Overview
 
 The modules and bundles provide much of the extended functionality of MITK. Each encapsulates a solution to a problem and associated features. This way one can easily assemble the necessary capabilites for a workflow without adding a lot of bloat, by combining modules as needed.
 
 The distinction between developer and end user use is for convenience only and mainly distinguishes which group a module is primarily aimed at.
 
 \section ModuleListPageEndUserModuleList List of Modules for End User Use
 
   \li \subpage org_basicimageprocessing
   \li \subpage org_colourimageprocessing
   \li \subpage org_datamanager
   \li \subpage org_diffusion
   \li \subpage IGTGeneralModulePage
   \li \subpage org_imagecropper
   \li \subpage org_imagenavigator
   \li \subpage org_imagestatistics
   \li \subpage org_isosurface
   \li \subpage org_measure
   \li \subpage org_moviemaker
   \li \subpage org_pointsetinteraction
   \li \subpage RegistrationModuleOverviewPage
   \li \subpage org_segment
   \li \subpage org_simplemeasurement
   \li \subpage org_volvis
   
 \section ModuleListPageDevModuleList List of Modules for Developer Use and Examples
 
   \li \subpage org_regiongrowing
   \li \subpage org_simpleexample
   \li \subpage org_surfacematerialeditor
-  \li \subpage org_mitk_gui_qt_toftutorial
+  \li \subpage org_toftutorial
   \li \subpage org_videoplayer
   \li \subpage org_viewinitialitzation
 
   
 */
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox b/Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox
index da5fc0a8f0..366088579e 100644
--- a/Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox
+++ b/Modules/Bundles/org.mitk.gui.qt.navigationdataplayer/documentation/Manual/Manual.dox
@@ -1,13 +1,13 @@
 /**
-\bundlemainpage{org_mitk_gui_qt_navigationdataplayer} NavigationData Player
+\bundlemainpage{org_navigationdataplayer} NavigationData Player
 
 \image html icon.png "Icon of NavigationData Player"
 
 Available sections:
   - \ref NavigationDataPlayerOverview
 
 \section NavigationDataPlayerOverview
 This is the description for the NavigationData Player.
 
 */
 
diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox b/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox
index cb5130ba5a..d63ec1f100 100644
--- a/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox
+++ b/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox
@@ -1,13 +1,13 @@
 /**
-\bundlemainpage{org.mitk.gui.qt.toftutorial} ToFTutorial
+\bundlemainpage{org_toftutorial} ToFTutorial
 
 \image html icon.png "Icon of ToFTutorial"
 
 Available sections:
   - \ref ToFTutorialOverview
 
 \section ToFTutorialOverview
 This is the description for the ToFTutorial.
 
 */
 
diff --git a/Modules/IGT/Documentation/doxygen/IGTModule.dox b/Modules/IGT/Documentation/doxygen/IGTModule.dox
index 70b59287fc..c48ec6e59a 100644
--- a/Modules/IGT/Documentation/doxygen/IGTModule.dox
+++ b/Modules/IGT/Documentation/doxygen/IGTModule.dox
@@ -1,15 +1,15 @@
 /**
 \page IGTGeneralModulePage The IGT Modules
 
 \section IGTGeneralModulePageOverview Overview
 
 These modules for image guided therapy contain functionalities for the tracking for instruments and the subsequent rendering of these instruments within MITK.
 
 \section IGTGeneralModulePageModuleList List of IGT Modules
 
-  \li \subpage org_mitk_gui_qt_igtnavigationtoolmanager
+  \li \subpage org_igtnavigationtoolmanager
   \li \subpage org_toolpairnavigation
-  \li \subpage org_mitk_gui_qt_igttrackingtoolbox
+  \li \subpage org_igttrackingtoolbox
   \li \subpage org_igttutorial
-  \li \subpage org_mitk_gui_qt_navigationdataplayer
+  \li \subpage org_navigationdataplayer
 */
\ No newline at end of file