diff --git a/Modules/MatchPointRegistration/CMakeLists.txt b/Modules/MatchPointRegistration/CMakeLists.txt
index 9c34e0a376..e13fa5eedc 100644
--- a/Modules/MatchPointRegistration/CMakeLists.txt
+++ b/Modules/MatchPointRegistration/CMakeLists.txt
@@ -1,13 +1,13 @@
 MITK_CREATE_MODULE(
-  INCLUDE_DIRS Rendering IO Helper
+  INCLUDE_DIRS PUBLIC Rendering Helper
   DEPENDS MitkCore MitkSceneSerializationBase
   PACKAGE_DEPENDS
    PRIVATE ITK VTK
    PUBLIC MatchPoint
 )
 
 ADD_SUBDIRECTORY(autoload/IO)
 ADD_SUBDIRECTORY(algorithms)
 if(BUILD_TESTING)
   ADD_SUBDIRECTORY(Testing)
 endif(BUILD_TESTING)
diff --git a/Modules/MatchPointRegistration/algorithms/mitkMultiModalTrans_default.cpp b/Modules/MatchPointRegistration/algorithms/mitkMultiModalTrans_default.cpp
index a70c576f51..4cc0bea6b3 100644
--- a/Modules/MatchPointRegistration/algorithms/mitkMultiModalTrans_default.cpp
+++ b/Modules/MatchPointRegistration/algorithms/mitkMultiModalTrans_default.cpp
@@ -1,109 +1,109 @@
 /*===================================================================
 
 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 "mapDeploymentDLLHelper.h"
 #include "mapDiscreteElements.h"
 #include "mapITKTransMattesMIMultiResRegistrationAlgorithm.h"
 #include "mapConfigure.h"
 
 #include "MITK_MultiModal_translation_default_ProfileResource.h"
 
 namespace mitk
 {
         typedef map::core::discrete::Elements<3>::InternalImageType ImageType;
 
         /** \class MultiModalTranslationDefaultRegistrationAlgorithm
         * Algorithm is used as default solution for multimodal 3-degrees of freedom (translation) problem statements in DIPP.
         * Uses 3 Resolution levels. By default initializes via image centers
         */
         class MultiModalTranslationDefaultRegistrationAlgorithm :
           public map::algorithm::boxed::ITKTransMattesMIMultiResRegistrationAlgorithm<ImageType, ImageType, ::map::algorithm::MITK_MultiModal_translation_defaultUIDPolicy, SealedFixedInterpolatorPolicyMacro< ::itk::LinearInterpolateImageFunction<ImageType, map::core::continuous::ScalarType> >, map::algorithm::itk::NoComponentInitializationPolicy>
         {
         public:
           typedef MultiModalTranslationDefaultRegistrationAlgorithm Self;
 
-          typedef ITKTransMattesMIMultiResRegistrationAlgorithm<ImageType, ImageType, DIPP_MultiModal_translation_defaultUIDPolicy, SealedFixedInterpolatorPolicyMacro< ::itk::LinearInterpolateImageFunction<ImageType, map::core::continuous::ScalarType> >, map::algorithm::itk::NoComponentInitializationPolicy>
+          typedef ITKTransMattesMIMultiResRegistrationAlgorithm<ImageType, ImageType, ::map::algorithm::MITK_MultiModal_translation_defaultUIDPolicy, SealedFixedInterpolatorPolicyMacro< ::itk::LinearInterpolateImageFunction<ImageType, map::core::continuous::ScalarType> >, map::algorithm::itk::NoComponentInitializationPolicy>
           Superclass;
 
           typedef ::itk::SmartPointer<Self>                                     Pointer;
           typedef ::itk::SmartPointer<const Self>                               ConstPointer;
 
           itkTypeMacro(MultiModalTranslationDefaultRegistrationAlgorithm,
                        ITKEuler3DMattesMIMultiResRegistrationAlgorithm);
           mapNewAlgorithmMacro(Self);
 
         protected:
           MultiModalTranslationDefaultRegistrationAlgorithm()
           {
           };
 
           virtual ~MultiModalTranslationDefaultRegistrationAlgorithm()
           {
           };
 
           void configureAlgorithm()
           {
             Superclass::configureAlgorithm();
 
             this->setResolutionLevels(3);
             this->_preInitialize = true;
             this->_useCenterOfGravity = false;
 
             //optimizer
             ConcreteOptimizerType::ScalesType scales(3);
             scales[0] = 1.0;
             scales[1] = 1.0;
             scales[2] = 1.0;
 
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetScales(scales);
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetMaximumStepLength(3.00);
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetMinimumStepLength(0.5);
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetNumberOfIterations(200);
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetRelaxationFactor(0.8);
             this->getConcreteOptimizerControl()->getConcreteOptimizer()->SetGradientMagnitudeTolerance(1e-4);
 
             //metric
             this->getConcreteMetricControl()->getConcreteMetric()->SetNumberOfHistogramBins(30);
             this->getConcreteMetricControl()->getConcreteMetric()->SetUseAllPixels(true);
             this->getConcreteMetricControl()->getConcreteMetric()->ReinitializeSeed();
             this->getConcreteMetricControl()->getConcreteMetric()->UseExplicitPDFDerivativesOn();
           }
 
           void
           doInterLevelSetup()
           {
             Superclass::doInterLevelSetup();
 
             if (this->getCurrentLevel() != 0)
             {
               getConcreteMetricControl()->getConcreteMetric()->SetUseAllPixels(false);
 
               unsigned int nrOfSmpl = ::itk::Math::Round<unsigned int, double>
                                       (this->getMovingImage()->GetLargestPossibleRegion().GetNumberOfPixels() * 0.15);
 
               getConcreteMetricControl()->getConcreteMetric()->SetNumberOfSpatialSamples(nrOfSmpl);
             }
           };
 
         private:
 
           MultiModalTranslationDefaultRegistrationAlgorithm(const Self& source);  //purposely not implemented
           void operator=(const Self&); //purposely not implemented
         };
 
 }
 
 mapDeployAlgorithmMacro(  mitk::MultiModalTranslationDefaultRegistrationAlgorithm);