diff --git a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
index 79781232cc..75ad2c7710 100644
--- a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
+++ b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
@@ -1,84 +1,84 @@
 /**
 \page PluginListPage MITK Plugin Manuals
 
 The plugins 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 plugins as needed.
 
 
 \subpage PluginListGeneralPage
 
 <ul>
   <li> \ref  org_mitk_views_basicimageprocessing </li>
   <li> \ref  org_mitk_views_datamanager </li>
   <li> \ref  org_mitk_editors_dicombrowser </li>
   <li> \ref  org_mitk_gui_qt_dicominspector </li>
   <li> \ref  org_mitk_gui_qt_flowapplication </li>
   <li> \ref  org_mitk_views_imagecropper </li>
   <li> \ref  org_mitk_views_imagenavigator </li>
   <li> \ref  org_blueberry_views_logview </li>
   <li> \ref  org_mitk_views_matchpoint_algorithm_browser</li>
   <li> \ref  org_mitk_views_matchpoint_algorithm_control</li>
   <li> \ref  org_mitk_views_matchpoint_evaluator</li>
   <li> \ref  org_mitk_views_matchpoint_framereg</li>
   <li> \ref  org_mitk_views_matchpoint_manipulator</li>
   <li> \ref  org_mitk_views_matchpoint_mapper</li>
   <li> \ref  org_mitk_views_matchpoint_visualizer</li>
   <li> \ref  org_mitk_gui_qt_measurementtoolbox </li>
   <li> \ref  org_mitk_views_moviemaker </li>
   <li> \ref  org_mitk_views_multilabelsegmentation </li>
   <li> \ref  org_mitk_views_pointsetinteraction </li>
   <li> \ref  org_mitk_gui_qt_python </li>
   <li> \ref  org_mitk_gui_qt_remeshing </li>
   <li> \ref  org_mitk_views_screenshotmaker </li>
   <li> \ref  org_mitk_views_segmentation </li>
   <li> \ref  org_mitk_gui_qt_flow_segmentation </li>
   <li> \ref  org_mitk_gui_qt_viewnavigator </li>
   <li> \ref  org_mitk_views_volumevisualization</li>
 
 </ul>
 
 \subpage PluginListSpecificPage
 
 <ul>
   <li> \ref  org_mitk_views_properties </li>
   <li> \ref  org_mitk_gui_qt_aicpregistration </li>
   <li> \ref  org_mitk_gui_qt_cest </li>
   <li> \ref  org_mitk_gui_qt_classificationsegmentation </li>
   <li> \ref  org_mitk_views_cmdlinemodules </li>
   <li> \ref  org_mitk_views_pharmacokinetics_concentration_mri</li>
   <li> \ref  org_mitk_views_pharmacokinetics_mri</li>
   <li> \ref  org_mitk_gui_qt_pharmacokinetics_pet</li>
   <li> \ref  org_mitk_gui_qt_eventrecorder </li>
   <li> \ref  org_mitk_gui_qt_examples </li>
   <li> \ref  org_mitk_gui_qt_geometrytools </li>
   <li> \ref  org_mitk_gui_qt_igtexample </li>
   <li> \ref  org_mitk_gui_qt_igtlplugin</li>
   <li> \ref  org_mitk_gui_qt_igttracking</li>
   <li> \ref  org_mitk_gui_qt_igttrackingsemiautomaticmeasurement</li>
   <li> \ref  org_mitk_views_imagestatistics</li>
   <li> \ref  org_mitk_gui_qt_lasercontrol</li>
-  <li> \ref  org_mitk_gui_qt_fit_demo </li>
+  <li> \ref  org_mitk_views_fit_demo </li>
   <li> \ref  org_mitk_gui_qt_fit_genericfitting </li>
   <li> \ref  org_mitk_gui_qt_fit_inspector </li>
   <li> \ref  org_mitkexamplesopencv</li>
   <li> \ref  org_mitk_gui_qt_overlaymanager</li>
   <li> \ref  org_mitk_gui_qt_mitkphenotyping</li>
   <li> \ref  org_mitk_gui_qt_photoacoustics_pausmotioncompensation</li>
   <li> \ref  org_mitk_example_gui_pcaexample</li>
   <li>  \ref org_mitk_gui_qt_preprocessing_resampling</li>
   <li> \ref  org_mitk_views_pharmacokinetics_curvedescriptor</li>
   <li> \ref  org_mitk_gui_qt_photoacoustics_imageprocessing</li>
   <li> \ref  org_mitk_gui_qt_pharmacokinetics_simulation</li>
   <li> \ref  org_mitk_gui_qt_pointsetinteractionmultispectrum</li>
   <li> \ref  org_mitk_gui_qt_renderwindowmanager</li>
   <li> \ref  org_mitk_gui_qt_photoacoustics_spectralunmixing</li>
   <li> \ref  org_mitk_gui_qt_spectrocamrecorder</li>
   <li> \ref  org_surfacematerialeditor</li>
   <li> \ref  org_toftutorial</li>
   <li> \ref  org_blueberry_ui_qt_objectinspector</li>
   <li> \ref  org_mitk_gui_qt_ultrasound</li>
   <li> \ref  org_mitk_gui_qt_igt_app_echotrack </li>
   <li> \ref  org_mitk_gui_qt_xnat</li>
 </ul>
 
 
 */
diff --git a/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox b/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
index 2736e969cf..24671b2800 100644
--- a/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
+++ b/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
@@ -1,45 +1,45 @@
 /**
 \page PluginListSpecificPage List of Application-specific Plugins
 
   \li \subpage org_mitk_gui_qt_aicpregistration
   \li \subpage org_mitk_gui_qt_cest
   \li \subpage org_mitk_gui_qt_classificationsegmentation
   \li \subpage org_mitk_gui_qt_flowapplication
   \li \subpage org_mitk_views_cmdlinemodules
   \li \subpage org_mitk_views_pharmacokinetics_concentration_mri
   \li \subpage org_mitk_views_pharmacokinetics_mri
   \li \subpage org_mitk_gui_qt_pharmacokinetics_pet
   \li \subpage org_mitk_gui_qt_eventrecorder
   \li \subpage org_mitk_gui_qt_examples
   \li \subpage org_mitk_gui_qt_geometrytools
   \li \subpage org_mitk_gui_qt_igtexample
   \li \subpage org_mitk_gui_qt_igtlplugin
   \li \subpage org_mitk_gui_qt_igttracking
   \li \subpage org_mitk_gui_qt_igttrackingsemiautomaticmeasurement
   \li \subpage org_mitk_views_imagestatistics
   \li \subpage org_mitk_gui_qt_lasercontrol
-  \li \subpage org_mitk_gui_qt_fit_demo
+  \li \subpage org_mitk_views_fit_demo
   \li \subpage org_mitk_gui_qt_fit_genericfitting
   \li \subpage org_mitk_gui_qt_fit_inspector
   \li \subpage org_mitkexamplesopencv
   \li \subpage org_mitk_gui_qt_overlaymanager
   \li \subpage org_mitk_gui_qt_mitkphenotyping
   \li \subpage org_mitk_gui_qt_photoacoustics_pausmotioncompensation
   \li \subpage org_mitk_example_gui_pcaexample
   \li \subpage org_mitk_gui_qt_preprocessing_resampling
   \li \subpage org_mitk_views_pharmacokinetics_curvedescriptor
   \li \subpage org_mitk_gui_qt_photoacoustics_imageprocessing
   \li \subpage org_mitk_gui_qt_pharmacokinetics_simulation
   \li \subpage org_mitk_gui_qt_pointsetinteractionmultispectrum
   \li \subpage org_mitk_gui_qt_renderwindowmanager
   \li \subpage org_mitk_gui_qt_photoacoustics_spectralunmixing
   \li \subpage org_mitk_gui_qt_spectrocamrecorder
   \li \subpage org_surfacematerialeditor
   \li \subpage org_blueberry_ui_qt_objectinspector
   \li \subpage org_toftutorial
   \li \subpage org_mitk_gui_qt_ultrasound
   \li \subpage org_mitk_gui_qt_igt_app_echotrack
   \li \subpage org_mitk_gui_qt_xnat
 
 
 */
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.fit.demo/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.fit.demo/documentation/UserManual/Manual.dox
index 9460060acb..c1da7391ae 100644
--- a/Plugins/org.mitk.gui.qt.fit.demo/documentation/UserManual/Manual.dox
+++ b/Plugins/org.mitk.gui.qt.fit.demo/documentation/UserManual/Manual.dox
@@ -1,17 +1,17 @@
 /**
-\page org_mitk_gui_qt_fit_demo The Model Fit Demo View
+\page org_mitk_views_fit_demo The Model Fit Demo View
 
 \imageMacro{fit_demo_doc.svg,"Icon of the Fit Demo View",3.0}
 
 \tableofcontents
 
 \section FIT_DEMO_Introduction Introduction
 This plugin is a very simple demo plugin that allows 1) to generate a demo 3D+t image (with linear increasing values) and 2) to perform a linear fit on a selected node.
 It was/is use to demonstrate basic principle and to generate example fit sessions for demo and testing purposes (e.g. functionality of the fit inspector).
 
 \section FIT_DEMO_Contact Contact information
 This plug-in is being developed by the SIDT group (Software development for Integrated Diagnostics
 and Therapy) at the German Cancer Research Center (DKFZ). If you have any questions, need support,
 find a bug or have a feature request, feel free to contact us at www.mitk.org.
 
 */
diff --git a/Plugins/org.mitk.gui.qt.fit.demo/plugin.xml b/Plugins/org.mitk.gui.qt.fit.demo/plugin.xml
index 1ac84c636b..f428eeb193 100644
--- a/Plugins/org.mitk.gui.qt.fit.demo/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.fit.demo/plugin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
-    <view id="org.mitk.gui.qt.fit.demo"
+    <view id="org.mitk.views.fit.demo"
           name="Fit Generator Demo"
 		  category="Fitting"
           class="FitGeneratorDemoView"
           icon="resources/icon.svg" />
   </extension>
 
 </plugin>