diff --git a/Applications/CoreApp/MitkCoreApp.cpp b/Applications/CoreApp/MitkCoreApp.cpp
index 04c38fe431..8f02537b8d 100644
--- a/Applications/CoreApp/MitkCoreApp.cpp
+++ b/Applications/CoreApp/MitkCoreApp.cpp
@@ -1,93 +1,93 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <application/berryStarter.h>
 #include <Poco/Util/MapConfiguration.h>
 
 #include <QMessageBox>
 #include <QApplication>
 
 class QSafeApplication : public QApplication
 {
 
 public:
 
   QSafeApplication(int& argc, char** argv)
     : QApplication(argc, argv)
   {}
 
   /**
    * Reimplement notify to catch unhandled exceptions and open an error message.
    *
    * @param receiver
    * @param event
    * @return
    */
   bool notify(QObject* receiver, QEvent* event)
   {
     QString msg;
     try
     {
       return QApplication::notify(receiver, event);
     } catch (Poco::Exception& e)
     {
       msg = QString::fromStdString(e.displayText());
     } catch (std::exception& e)
     {
       msg = e.what();
     } catch (...)
     {
       msg = "Unknown exception";
     }
 
     QString
         text(
             "An error occurred. You should save all data and quit the program to prevent possible data loss.\nSee the error log for details.\n\n");
     text += msg;
     QMessageBox::critical(0, "Error", text);
     return false;
   }
 
 };
 
 int main(int argc, char** argv)
 {
   QSafeApplication safeApp(argc, argv);
-  safeApp.setApplicationName("CoreApp");
+  safeApp.setApplicationName("MitkCoreApp");
   safeApp.setOrganizationName("DKFZ");
 
   // These paths replace the .ini file and are tailored for installation
   // packages created with CPack. If a .ini file is presented, it will
   // overwrite the settings in MapConfiguration
   Poco::Path basePath(argv[0]);
   basePath.setFileName("");
 
   Poco::Path provFile(basePath);
-  provFile.setFileName("CoreApp.provisioning");
+  provFile.setFileName("MitkCoreApp.provisioning");
 
   Poco::Util::MapConfiguration* coreConfig(new Poco::Util::MapConfiguration());
   coreConfig->setString(berry::Platform::ARG_PROVISIONING, provFile.toString());
   coreConfig->setString(berry::Platform::ARG_APPLICATION, "org.mitk.qt.coreapplication");
 
   // Preload the org.mitk.gui.qt.common plug-in (and hence also Qmitk) to speed
   // up a clean-cache start. This also works around bugs in older gcc and glibc implementations,
   // which have difficulties with multiple dynamic opening and closing of shared libraries with
   // many global static initializers. It also helps if dependent libraries have weird static
   // initialization methods and/or missing de-initialization code.
   coreConfig->setString(berry::Platform::ARG_PRELOAD_LIBRARY, "liborg_mitk_gui_qt_common");
 
   return berry::Starter::Run(argc, argv, coreConfig);
 }
diff --git a/Applications/Diffusion/MitkDiffusion.cpp b/Applications/Diffusion/MitkDiffusion.cpp
index 3b026c226b..46f3729715 100644
--- a/Applications/Diffusion/MitkDiffusion.cpp
+++ b/Applications/Diffusion/MitkDiffusion.cpp
@@ -1,134 +1,134 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <application/berryStarter.h>
 #include <Poco/Util/MapConfiguration.h>
 
 #include <QApplication>
 #include <QMessageBox>
 #include <QtSingleApplication>
 
 #include <QSplashScreen>
 #include <QPixmap>
 #include <QBitmap>
 #include <QTimer>
 
 class QtSafeApplication : public QtSingleApplication
 {
 
 public:
 
   QtSafeApplication(int& argc, char** argv) : QtSingleApplication(argc, argv)
   {}
 
   /**
    * Reimplement notify to catch unhandled exceptions and open an error message.
    *
    * @param receiver
    * @param event
    * @return
    */
   bool notify(QObject* receiver, QEvent* event)
   {
     QString msg;
     try
     {
       return QApplication::notify(receiver, event);
     }
     catch (Poco::Exception& e)
     {
       msg = QString::fromStdString(e.displayText());
     }
     catch (std::exception& e)
     {
       msg = e.what();
     }
     catch (...)
     {
       msg = "Unknown exception";
     }
 
     QString text("An error occurred. You should save all data and quit the program to "
                  "prevent possible data loss.\nSee the error log for details.\n\n");
     text += msg;
 
     QMessageBox::critical(0, "Error", text);
     return false;
   }
 
 };
 
 
 int main(int argc, char** argv)
 {
   // Create a QApplication instance first
   QtSafeApplication qSafeApp(argc, argv);
-  qSafeApp.setApplicationName("mitkDiffusion");
+  qSafeApp.setApplicationName("MitkDiffusion");
   qSafeApp.setOrganizationName("DKFZ");
 
   bool showSplashScreen(true);
 
   QPixmap pixmap( ":/splash/splashscreen.png" );
   QSplashScreen splash( pixmap );
   splash.setMask( pixmap.mask() );
   splash.setWindowFlags( Qt::SplashScreen | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint );
 
   if (showSplashScreen)
   {
     splash.show();
 
     qSafeApp.sendPostedEvents();
     qSafeApp.processEvents();
     qSafeApp.flush();
 
     QTimer::singleShot(4000, &splash, SLOT(close()) );
   }
 
   // This function checks if an instance is already running
   // and either sends a message to it (containing the command
   // line arguments) or checks if a new instance was forced by
   // providing the BlueBerry.newInstance command line argument.
   // In the latter case, a path to a temporary directory for
   // the new application's storage directory is returned.
   QString storageDir = handleNewAppInstance(&qSafeApp, argc, argv, "BlueBerry.newInstance");
 
   // These paths replace the .ini file and are tailored for installation
   // packages created with CPack. If a .ini file is presented, it will
   // overwrite the settings in MapConfiguration
   Poco::Path basePath(argv[0]);
   basePath.setFileName("");
 
   Poco::Path provFile(basePath);
-  provFile.setFileName("mitkDiffusion.provisioning");
+  provFile.setFileName("MitkDiffusion.provisioning");
 
   Poco::Util::MapConfiguration* diffConfig(new Poco::Util::MapConfiguration());
   if (!storageDir.isEmpty())
   {
     diffConfig->setString(berry::Platform::ARG_STORAGE_DIR, storageDir.toStdString());
   }
 
   diffConfig->setString(berry::Platform::ARG_PROVISIONING, provFile.toString());
   diffConfig->setString(berry::Platform::ARG_APPLICATION, "org.mitk.qt.diffusionimagingapp");
 
   // Preload the org.mitk.gui.qt.ext plug-in (and hence also QmitkExt) to speed
   // up a clean-cache start. This also works around bugs in older gcc and glibc implementations,
   // which have difficulties with multiple dynamic opening and closing of shared libraries with
   // many global static initializers. It also helps if dependent libraries have weird static
   // initialization methods and/or missing de-initialization code.
   diffConfig->setString(berry::Platform::ARG_PRELOAD_LIBRARY, "liborg_mitk_gui_qt_ext");
 
   return berry::Starter::Run(argc, argv, diffConfig);
 }
diff --git a/Applications/Workbench/MitkWorkbench.cpp b/Applications/Workbench/MitkWorkbench.cpp
index 921a3f2a34..53ee077936 100644
--- a/Applications/Workbench/MitkWorkbench.cpp
+++ b/Applications/Workbench/MitkWorkbench.cpp
@@ -1,173 +1,173 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <application/berryStarter.h>
 #include <Poco/Util/MapConfiguration.h>
 
 #include <QApplication>
 #include <QMessageBox>
 #include <QtSingleApplication>
 #include <QtGlobal>
 #include <QTime>
 #include <QDesktopServices>
 
 #include <usModuleSettings.h>
 
 #include <mitkCommon.h>
 #include <mitkException.h>
 
 class QtSafeApplication : public QtSingleApplication
 {
 
 public:
 
   QtSafeApplication(int& argc, char** argv) : QtSingleApplication(argc, argv)
   {}
 
   /**
    * Reimplement notify to catch unhandled exceptions and open an error message.
    *
    * @param receiver
    * @param event
    * @return
    */
   bool notify(QObject* receiver, QEvent* event)
   {
     QString msg;
     try
     {
       return QApplication::notify(receiver, event);
     }
     catch (mitk::Exception& e)
     {
       msg = QString("MITK Exception:\n\n")
             + QString("Description: ")
             + QString(e.GetDescription()) + QString("\n\n")
             + QString("Filename: ") + QString(e.GetFile()) + QString("\n\n")
             + QString("Line: ") + QString::number(e.GetLine());
     }
     catch (Poco::Exception& e)
     {
       msg = QString::fromStdString(e.displayText());
     }
     catch (std::exception& e)
     {
       msg = e.what();
     }
     catch (...)
     {
       msg = "Unknown exception";
     }
     MITK_ERROR << "An error occurred: " << msg.toStdString();
 
     QMessageBox msgBox;
     msgBox.setText("An error occurred. You should save all data and quit the program to prevent possible data loss.");
     msgBox.setDetailedText(msg);
     msgBox.setIcon(QMessageBox::Critical);
     msgBox.addButton(trUtf8("Exit immediately"), QMessageBox::YesRole);
     msgBox.addButton(trUtf8("Ignore"), QMessageBox::NoRole);
 
     int ret = msgBox.exec();
 
     switch(ret)
       {
       case 0:
         MITK_ERROR << "The program was closed.";
         this->closeAllWindows();
         break;
       case 1:
         MITK_ERROR << "The error was ignored by the user. The program may be in a corrupt state and don't behave like expected!";
         break;
       }
 
     return false;
   }
 
 };
 
 
 int main(int argc, char** argv)
 {
   // Create a QApplication instance first
   QtSafeApplication qSafeApp(argc, argv);
   qSafeApp.setApplicationName("MITK Workbench");
   qSafeApp.setOrganizationName("DKFZ");
 
   // This function checks if an instance is already running
   // and either sends a message to it (containing the command
   // line arguments) or checks if a new instance was forced by
   // providing the BlueBerry.newInstance command line argument.
   // In the latter case, a path to a temporary directory for
   // the new application's storage directory is returned.
   QString storageDir = handleNewAppInstance(&qSafeApp, argc, argv, "BlueBerry.newInstance");
 
   if (storageDir.isEmpty())
   {
     // This is a new instance and no other instance is already running. We specify
     // the storage directory here (this is the same code as in berryInternalPlatform.cpp
     // so that we can re-use the location for the persistent data location of the
     // the CppMicroServices library.
 
     // Append a hash value of the absolute path of the executable to the data location.
     // This allows to start the same application from different build or install trees.
     storageDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + '_';
     storageDir += QString::number(qHash(QCoreApplication::applicationDirPath())) + "/";
   }
   us::ModuleSettings::SetStoragePath((storageDir + "us/").toStdString());
 
   // These paths replace the .ini file and are tailored for installation
   // packages created with CPack. If a .ini file is presented, it will
   // overwrite the settings in MapConfiguration
   Poco::Path basePath(argv[0]);
   basePath.setFileName("");
 
   Poco::Path provFile(basePath);
-  provFile.setFileName("mitkWorkbench.provisioning");
+  provFile.setFileName("MitkWorkbench.provisioning");
 
   Poco::Path extPath(basePath);
   extPath.pushDirectory("ExtBundles");
 
   std::string pluginDirs = extPath.toString();
 
   Poco::Util::MapConfiguration* extConfig(new Poco::Util::MapConfiguration());
   if (!storageDir.isEmpty())
   {
     extConfig->setString(berry::Platform::ARG_STORAGE_DIR, storageDir.toStdString());
   }
   extConfig->setString(berry::Platform::ARG_PLUGIN_DIRS, pluginDirs);
   extConfig->setString(berry::Platform::ARG_PROVISIONING, provFile.toString());
   extConfig->setString(berry::Platform::ARG_APPLICATION, "org.mitk.qt.extapplication");
 
 #ifdef Q_OS_WIN
 #define CTK_LIB_PREFIX
 #else
 #define CTK_LIB_PREFIX "lib"
 #endif
 
   // Preload the org.mitk.gui.qt.ext plug-in (and hence also QmitkExt) to speed
   // up a clean-cache start. This also works around bugs in older gcc and glibc implementations,
   // which have difficulties with multiple dynamic opening and closing of shared libraries with
   // many global static initializers. It also helps if dependent libraries have weird static
   // initialization methods and/or missing de-initialization code.
   extConfig->setString(berry::Platform::ARG_PRELOAD_LIBRARY, "liborg_mitk_gui_qt_ext," CTK_LIB_PREFIX "CTKDICOMCore:0.1");
 
   // Seed the random number generator, once at startup.
   QTime time = QTime::currentTime();
   qsrand((uint)time.msec());
 
   // Run the workbench.
   return berry::Starter::Run(argc, argv, extConfig);
 }
diff --git a/CMake/mitkMacroCreateCTKPlugin.cmake b/CMake/mitkMacroCreateCTKPlugin.cmake
index 29e1e7c028..b8c4ca5ff9 100644
--- a/CMake/mitkMacroCreateCTKPlugin.cmake
+++ b/CMake/mitkMacroCreateCTKPlugin.cmake
@@ -1,86 +1,87 @@
 macro(MACRO_CREATE_MITK_CTK_PLUGIN)
 
   MACRO_PARSE_ARGUMENTS(_PLUGIN "EXPORT_DIRECTIVE;EXPORTED_INCLUDE_SUFFIXES;MODULE_DEPENDENCIES;MODULE_DEPENDS;PACKAGE_DEPENDS;SUBPROJECTS" "TEST_PLUGIN;NO_INSTALL" ${ARGN})
 
   mitk_check_module_dependencies(MODULES MitkCore ${_PLUGIN_MODULE_DEPENDENCIES} ${_PLUGIN_MODULE_DEPENDS}
                                  PACKAGES ${_PLUGIN_PACKAGE_DEPENDS}
                                  MISSING_DEPENDENCIES_VAR _missing_deps
+                                 MODULE_DEPENDENCIES_VAR _module_deps
                                  PACKAGE_DEPENDENCIES_VAR _package_deps)
 
   if(_PLUGIN_MODULE_DEPENDENCIES)
     message(WARNING "The MODULE_DEPENDENCIES argument is deprecated since 2014.03. Please use MODULE_DEPENDS instead.")
   endif()
 
   if(NOT _missing_deps)
 
     if(_PLUGIN_TEST_PLUGIN)
       set(is_test_plugin "TEST_PLUGIN")
       set(_PLUGIN_NO_INSTALL 1)
     else()
       set(is_test_plugin)
     endif()
 
     if(_PLUGIN_NO_INSTALL)
       set(plugin_no_install "NO_INSTALL")
     else()
       set(plugin_no_install)
     endif()
 
     _link_directories_for_packages(${_package_deps})
 
     MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE ${_PLUGIN_EXPORT_DIRECTIVE}
                             EXPORTED_INCLUDE_SUFFIXES ${_PLUGIN_EXPORTED_INCLUDE_SUFFIXES}
                             DOXYGEN_TAGFILES ${_PLUGIN_DOXYGEN_TAGFILES}
                             MOC_OPTIONS -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
                             ${is_test_plugin} ${plugin_no_install})
 
     mitk_use_modules(TARGET ${PLUGIN_TARGET}
       MODULES MitkCore ${_PLUGIN_MODULE_DEPENDENCIES} ${_PLUGIN_MODULE_DEPENDS}
       PACKAGES ${_PLUGIN_PACKAGE_DEPENDS}
      )
 
     if(ALL_META_DEPENDENCIES)
       add_dependencies(${PLUGIN_TARGET} ${ALL_META_DEPENDENCIES})
     endif()
 
     if(MITK_DEFAULT_SUBPROJECTS AND NOT MY_SUBPROJECTS)
       set(MY_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS})
     endif()
 
     if(MY_SUBPROJECTS)
       set_property(TARGET ${PLUGIN_TARGET} PROPERTY LABELS ${MY_SUBPROJECTS})
       foreach(subproject ${MY_SUBPROJECTS})
         add_dependencies(${subproject} ${PLUGIN_TARGET})
       endforeach()
     endif()
 
     #------------------------------------------------------------#
     #------------------ Installer support -----------------------#
     if(NOT _PLUGIN_NO_INSTALL)
 
       set(_autoload_targets )
-      foreach(_dependency ${ALL_DEPENDENCIES})
+      foreach(_dependency ${_module_deps})
         get_target_property(_dep_autoloads ${_dependency} MITK_AUTOLOAD_TARGETS)
         if (_dep_autoloads)
           list(APPEND _autoload_targets ${_dep_autoloads})
         endif()
       endforeach()
 
       # The MITK_AUTOLOAD_TARGETS property is used in the mitkFunctionInstallAutoLoadModules
       # macro which expects a list of plug-in targets.
       if (_autoload_targets)
         list(REMOVE_DUPLICATES _autoload_targets)
         set_target_properties(${PLUGIN_TARGET} PROPERTIES MITK_AUTOLOAD_TARGETS "${_autoload_targets}")
       endif()
 
     endif()
 
   else()
     if(NOT MITK_BUILD_ALL_PLUGINS)
       message(SEND_ERROR "${PROJECT_NAME} is missing requirements and won't be built. Missing: ${_missing_deps}")
     else()
       message(STATUS "${PROJECT_NAME} is missing requirements and won't be built. Missing: ${_missing_deps}")
     endif()
   endif()
 endmacro()