diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp
index 8b5f28bc87..5efb4d200f 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp
@@ -1,50 +1,50 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppConnectomicsPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppConnectomicsPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
 
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.brainnetworkanalysis");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.brainnetworkanalysis");
   lo->SetCloseable(false);
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp
index 6fd4e8c27c..baac1e86b0 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp
@@ -1,50 +1,50 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppDicomImportPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppDicomImportPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.diffusiondicomimport");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.diffusiondicomimport");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp
index fcc6cc766f..addad485c7 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp
@@ -1,57 +1,57 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
 
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
 
 #include "QmitkDIAppFiberTractographyPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppFiberTractographyPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.gibbstracking");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.gibbstracking");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.stochasticfibertracking");
   lo = layout->GetViewLayout("org.mitk.views.stochasticfibertracking");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.fiberprocessing");
   lo = layout->GetViewLayout("org.mitk.views.fiberprocessing");
   lo->SetCloseable(false);
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp
index 6b8499e30f..4312801f92 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp
@@ -1,49 +1,49 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppIVIMPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppIVIMPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.ivim");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.ivim");
   lo->SetCloseable(false);
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp
index 8776da767e..348c0140ff 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp
@@ -1,62 +1,62 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppPreprocessingReconstructionPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppPreprocessingReconstructionPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.diffusionpreprocessing");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.diffusionpreprocessing");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.tensorreconstruction");
   lo = layout->GetViewLayout("org.mitk.views.tensorreconstruction");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.qballreconstruction");
   lo = layout->GetViewLayout("org.mitk.views.qballreconstruction");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.odfdetails");
   lo = layout->GetViewLayout("org.mitk.views.odfdetails");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp
index 88ac0b9685..fe24f22c44 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp
@@ -1,66 +1,66 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppQuantificationPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppQuantificationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.segmentation");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.segmentation");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.partialvolumeanalysisview");
   lo = layout->GetViewLayout("org.mitk.views.partialvolumeanalysisview");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.diffusionquantification");
   lo = layout->GetViewLayout("org.mitk.views.diffusionquantification");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.measurement");
   lo = layout->GetViewLayout("org.mitk.views.measurement");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.imagestatistics");
   lo = layout->GetViewLayout("org.mitk.views.imagestatistics");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp
index ba2f646e40..23496a7508 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp
@@ -1,54 +1,54 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppScreenshotsMoviesPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppScreenshotsMoviesPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.screenshotmaker");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.screenshotmaker");
   lo->SetCloseable(false);
 
   left->AddView("org.mitk.views.moviemaker");
   lo = layout->GetViewLayout("org.mitk.views.moviemaker");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp
index edc9d6d945..a54aac2f96 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp
@@ -1,50 +1,50 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppTBSSPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppTBSSPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.tractbasedspatialstatistics");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.tractbasedspatialstatistics");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp
index 2e0d85d447..658cade236 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp
@@ -1,50 +1,50 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDIAppVolumeVisualizationPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDIAppVolumeVisualizationPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
   left->AddView("org.mitk.views.volumevisualization");
   berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.volumevisualization");
   lo->SetCloseable(false);
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp
index 943b3861d2..7698b378f6 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp
@@ -1,50 +1,50 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDiffusionImagingAppPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDiffusionImagingAppPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   /////////////////////////////////////////////////////
   // all di-app perspectives should have the following:
   /////////////////////////////////////////////////////
 
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .2f, "org.mitk.views.datamanager");
 
   berry::IFolderLayout::Pointer left =
-    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
     berry::IPageLayout::BOTTOM, 0.15f, "org.mitk.views.controlvisualizationpropertiesview");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
-    false, berry::IPageLayout::BOTTOM, .4f, "org.mitk.diffusionimaginginternal.leftcontrols");
+    false, berry::IPageLayout::BOTTOM, .4f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   /////////////////////////////////////////////
   // here goes the perspective specific stuff
   /////////////////////////////////////////////
 
 
 
 
 
 }
diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp b/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp
index 91cdbf59f2..afe9359a71 100644
--- a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp
@@ -1,90 +1,90 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fr, 23 Okt 2009) $
  Version:   $Revision: 19652 $
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDTIAtlasAppPerspective.h"
 #include "berryIViewLayout.h"
 
 void QmitkDTIAtlasAppPerspective::CreateInitialLayout(berry::IPageLayout::Pointer layout)
 {
   std::string editorArea = layout->GetEditorArea();
 
   layout->AddStandaloneView("org.mitk.views.datamanager",
     false, berry::IPageLayout::LEFT, 0.3f, editorArea);
 
   layout->AddStandaloneView("org.mitk.views.controlvisualizationpropertiesview",
     false, berry::IPageLayout::BOTTOM, .5f, "org.mitk.views.datamanager");
 
   layout->AddStandaloneView("org.mitk.views.imagenavigator",
     false, berry::IPageLayout::BOTTOM, .8f, "org.mitk.views.controlvisualizationpropertiesview");
 
 
 //  berry::IFolderLayout::Pointer left =
-//    layout->CreateFolder("org.mitk.diffusionimaginginternal.leftcontrols",
+//    layout->CreateFolder("org.mbi.diffusionimaginginternal.leftcontrols",
 //    berry::IPageLayout::BOTTOM, 0.2f, "org.mitk.views.controlvisualizationpropertiesview");
 
 //  layout->AddStandaloneView("org.mitk.views.perspectiveswitcher",
-//    false, berry::IPageLayout::BOTTOM, 0.99f, "org.mitk.diffusionimaginginternal.leftcontrols");
+//    false, berry::IPageLayout::BOTTOM, 0.99f, "org.mbi.diffusionimaginginternal.leftcontrols");
 
   ////////////////////////////////////////
   // public views go here
   ////////////////////////////////////////
 //  left->AddView("org.mitk.views.fiberbundleoperations");
 //  berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.fiberbundleoperations");
 //  lo->SetCloseable(false);
 
 //  left->AddView("org.mitk.views.diffusionpreprocessing");
 //  berry::IViewLayout::Pointer lo = layout->GetViewLayout("org.mitk.views.diffusionpreprocessing");
 //  lo->SetCloseable(true);
 
 //  left->AddView("org.mitk.views.tensorreconstruction");
 //  lo = layout->GetViewLayout("org.mitk.views.tensorreconstruction");
 //  lo->SetCloseable(true);
 
 //  left->AddView("org.mitk.views.qballreconstruction");
 //  lo = layout->GetViewLayout("org.mitk.views.qballreconstruction");
 //  lo->SetCloseable(true);
 
 //  left->AddView("org.mitk.views.diffusionquantification");
 //  lo = layout->GetViewLayout("org.mitk.views.diffusionquantification");
 //  lo->SetCloseable(true);
 
 //  left->AddView("org.mitk.views.diffusiondicomimport");
 //  lo = layout->GetViewLayout("org.mitk.views.diffusiondicomimport");
 //  lo->SetCloseable(true);
 
   ////////////////////////////////////////
   // end public views
   ////////////////////////////////////////
 
 
 //  berry::IFolderLayout::Pointer right =
-//    layout->CreateFolder("org.mitk.diffusionimaginginternal.rightcontrols", berry::IPageLayout::RIGHT, 0.5f, editorArea);
+//    layout->CreateFolder("org.mbi.diffusionimaginginternal.rightcontrols", berry::IPageLayout::RIGHT, 0.5f, editorArea);
 
   ////////////////////////////////////////
   // internal views go here
   ////////////////////////////////////////
 //  right->AddView("org.mitk.views.globalfibertracking");
 //  right->AddView("org.mitk.views.partialvolumeanalysis");
 //  right->AddView("org.mitk.views.ivim");
 //  right->AddView("org.mitk.views.tractbasedspatialstatistics");
 //  right->AddView("org.mitk.views.fibertracking");
 
   ////////////////////////////////////////
   // end internal views
   ////////////////////////////////////////
 
 }