diff --git a/Wrapping/Common/mitk_swig_classes.i b/Wrapping/Common/mitk_swig_classes.i
index 6d1e2ccd69..b11586732f 100644
--- a/Wrapping/Common/mitk_swig_classes.i
+++ b/Wrapping/Common/mitk_swig_classes.i
@@ -1,155 +1,152 @@
 
 //
 // Defining some Macros that make problems with SWIG as the
 // corresponding definitions are not included by default.
 // Luckely, these includes are not necessary for SWIG.
 //
 #define ITK_NOEXCEPT
 #define ITKCommon_EXPORT
 #define ITK_OVERRIDE
 #define MITKCORE_EXPORT
 #define MITKCLCORE_EXPORT
 #define MITKCLUTILITIES_EXPORT
 #define ITKCommon_EXPORT
 #define MITKMATCHPOINTREGISTRATION_EXPORT
 #define MAPDeployment_EXPORT
 #define MAPAlgorithms_EXPORT
 #define MITKSEGMENTATION_EXPORT
 #define MITKMULTILABEL_EXPORT
 
 #define ITKCommon_EXPORT
 #define ITK_FORWARD_EXPORT
 #define ITK_OVERRIDE
 #define ITK_NOEXCEPT
 
 
 %include <itkMacro.h>
 %include <mitkCommon.h>
 %include <itkSmartPointer.h>
 %include <mitkPixelType.h>
 %include <mitkChannelDescriptor.h>
 %include <mitkIOUtil.h>
 
 #define DEPRECATED(func) func
 #undef ITK_DISALLOW_COPY_AND_ASSIGN
 #define ITK_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
 %pythoncode %{
  convertion_list = {}
 %}
 
 SWIG_ADD_MITK_CLASS(Object, itkObject.h, itk)
 SWIG_ADD_MITK_CLASS(DataObject, itkDataObject.h, itk)
 
 SWIG_ADD_MITK_CLASS(TimeGeometry, mitkTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ArbitraryTimeGeometry, mitkArbitraryTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ProportionalTimeGeometry, mitkProportionalTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(BaseGeometry, mitkBaseGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(Geometry3D, mitkGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedGeometry3D, mitkSlicedGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(PlaneGeometry , mitkPlaneGeometry.h, mitk)
 
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BoundingBox, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(TimeBounds, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(FixedArrayType, mitkBaseGeometry.h, mitk)
 
 SWIG_ADD_NONOBJECT_CLASS(Point2D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point2I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(VnlVector, mitkVector.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Vector2D, mitkVector.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Vector3D, mitkVector.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Vector4D, mitkVector.h, mitk)
 
 SWIG_ADD_MITK_CLASS(BaseData, mitkBaseData.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedData, mitkSlicedData.h, mitk)
 SWIG_ADD_MITK_CLASS(Image, mitkImage.h, mitk)
 SWIG_ADD_MITK_CLASS(LabelSetImage, mitkLabelSetImage.h, mitk)
 SWIG_ADD_MITK_CLASS(PointSet, mitkPointSet.h, mitk)
 %{
 using mitk::Message;
 %}
 
 //
 // Phenotyping Related Classes
 //
 SWIG_ADD_MITK_CLASS(AbstractGlobalImageFeature, mitkAbstractGlobalImageFeature.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFImageDescriptionFeatures, mitkGIFImageDescriptionFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderStatistics, mitkGIFFirstOrderStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderHistogramStatistics, mitkGIFFirstOrderHistogramStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricStatistics, mitkGIFVolumetricStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricDensityStatistics, mitkGIFVolumetricDensityStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCooccurenceMatrix2, mitkGIFCooccurenceMatrix2.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbouringGreyLevelDependenceFeature, mitkGIFNeighbouringGreyLevelDependenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelRunLength, mitkGIFGreyLevelRunLength.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelSizeZone, mitkGIFGreyLevelSizeZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelDistanceZone, mitkGIFGreyLevelDistanceZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFLocalIntensity, mitkGIFLocalIntensity.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFIntensityVolumeHistogramFeatures, mitkGIFIntensityVolumeHistogramFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbourhoodGreyToneDifferenceFeatures, mitkGIFNeighbourhoodGreyToneDifferenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCurvatureStatistic, mitkGIFCurvatureStatistic.h, mitk)
 
 //
 // Conversion and Segmentation based Classes
 //
 SWIG_ADD_MITK_CLASS(ContourModelSetToImageFilter, mitkContourModelSetToImageFilter.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BooleanOperation, mitkBooleanOperation.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(MorphologicalOperations, mitkMorphologicalOperations.h, mitk)
 %{
   #include <itkProcessObject.h>
   typedef itk::DataObject::DataObjectIdentifierType DataObjectIdentifierType;
   typedef itk::ProcessObject::DataObjectPointerArraySizeType DataObjectPointerArraySizeType;
 %}
 
 //
 // MatchPoint Related Classes
 //
-typedef std::string map::core::String;
-MITKSWIG_ADD_CLASS(MITKAlgorithmHelper, mitkAlgorithmHelper.h, mitk)
-MITKSWIG_ADD_CLASS(RegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
-MITKSWIG_ADD_CLASS(MITKRegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
-
 %ignore map::deployment::DLLHandle::New(const LibraryHandleType& libraryHandle, const map::algorithm::UID* pUID, const core::String& libraryFile, const core::String& profileStr);
 %ignore map::deployment::DLLHandle::New(const map::algorithm::UID* pUID,const core::String& libraryFilePath,const core::String& profileStr);
 %ignore map::deployment::DLLInfo::New(const map::algorithm::UID* pUID,const core::String& libraryFilePath,const core::String& profileStr);
 %ignore map::deployment::DLLHandle::New;
-
-SWIG_ADD_MITK_CLASS_VECTORFREE(DLLDirectoryBrowser, mapDeploymentDLLDirectoryBrowser.h, ::map::deployment)
 %{
-namespace mitk {
-  namespace map {
-    namespace deployment {
-      typedef ::map::deployment::DLLInfo DLLInfo;
-    }
-  }
+namespace core
+{
+  typedef std::string String;
 }
 %}
-MITKSWIG_ADD_CLASS(DLLInfo, mapDeploymentDLLInfo.h, mitk::map::deployment)
-%template(VectorDLLInfo) std::vector<mitk::map::deployment::DLLInfo::Self *>;
-%template(VectorDLLInfoPointer) std::vector<mitk::map::deployment::DLLInfo::Pointer>;
-SWIG_ADD_MITK_CLASS_VECTORFREE(DLLHandle, mapDeploymentDLLHandle.h, ::map::deployment)
-SWIG_ADD_MITK_CLASS_VECTORFREE(UID, mapUID.h, ::map::algorithm)
-%{
- namespace algorithm
- {
-   typedef map::algorithm::UID UID;
- }
- namespace core
- {
-   typedef map::core::String String;
- }
-%}
+namespace core
+{
+  typedef std::string String;
+}
+SWIG_ADD_MITK_CLASS_VECTORFREE(DLLDirectoryBrowser, mapDeploymentDLLDirectoryBrowser.h, ::map::deployment)
+MITKSWIG_ADD_HEADERFILE(mapString.h)
+
+MITKSWIG_ADD_CLASS(DLLInfo, mapDeploymentDLLInfo.h, ::map::deployment)
+SWIG_ADD_MITK_CLASS_VECTORFREE(DLLHandle, mapDeploymentDLLHandle.h, map::deployment)
+
+MITKSWIG_ADD_CLASS(MITKAlgorithmHelper, mitkAlgorithmHelper.h, mitk)
+MITKSWIG_ADD_CLASS(RegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
+MITKSWIG_ADD_CLASS(MITKRegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
+
+
+SWIG_ADD_MITK_CLASS_VECTORFREE(UID, mapUID.h, map::algorithm)
 
 MITKSWIG_ADD_HEADERFILE(mapDeploymentDLLAccess.h)
-SWIG_ADD_MITK_CLASS_VECTORFREE(DLLHandle, mapDeploymentDLLHandle.h, ::map::deployment)
+
+%{
+  namespace algorithm
+  {
+    typedef map::algorithm::UID UID;
+  }
+%}
 
 // SWIG_ADD_MITK_CLASS(FastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm, mitkFastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(LevelSetMotionMultiResDefaultRegistrationAlgorithm, mitkLevelSetMotionMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalAffineDefaultRegistrationAlgorithm, mitkMultiModalAffineDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalRigidDefaultRegistrationAlgorithm, mitkMultiModalRigidDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalTransDefaultRegistrationAlgorithm, mitkMultiModalTransDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidClosedFormPointsDefaultRegistrationAlgorithm, mitkRigidClosedFormPointsDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidICPDefaultRegistrationAlgorithm, mitkRigidICPDefaultRegistrationAlgorithm.h, mitk)
\ No newline at end of file
diff --git a/Wrapping/Common/mitk_swig_common.i b/Wrapping/Common/mitk_swig_common.i
index cdcbc58efa..63abd67832 100644
--- a/Wrapping/Common/mitk_swig_common.i
+++ b/Wrapping/Common/mitk_swig_common.i
@@ -1,37 +1,37 @@
 
 // Ignore common warnings:
 // 302 : Redefinition of Macro, usually not a problem
 // 362 : Operator= is ignored. Can't help it.
 // 503 : Can't wrap operator of type "*" unless renamed to a valid identifier, no problem as operator not needed.
 // 509 : Overloaded function ignored. Usually not a problem, as overloaded functions shouldn't give different results.
 // 511 : Can't use keyword arguments with overloaded functions
 #pragma SWIG nowarn=302,362,503,509,511
 
 // Splitted the information about the addition files into sub-files:
 
-%naturalvar;
+// %naturalvar;
 
 // Includes of STD-Files goes in here
 %include <mitk_swig_std.i>
 // Include c++ code in this file. It is basically a c++-header wrapped in the commands so it is included in the std-file
 %include <mitk_swig_cpp_include.i>
 // SWIG-Macro definition goes in here, for example SWIG_ADD_MITK_CLASS
 %include <mitk_swig_macros.i>
 // information about classes that are going to be wrapped are in here:
 %include <mitk_swig_classes.i>
 
 //
 // How to wrap a new class:
 // ------------------------------------
 // (1. Add the c++ include file to mitk_swig_cpp_include.i
 //    If the class is in a new module, make sure that this module is added as dependency in cmake )
 //    This step should no longer be necessary as the corresponding header is now included by
 //    the SWIG_ADD_MITK_CLASS macro.
 // 2. Add the class definition in mitk_swig_classes.i
 //    If the definition of the class needs new macros, for example because it is not in the core
 //    and has a new Export-Macro, be sure to define this macro first.
 //    If the class inherit from mitk::BaseData use the SWIG_ADD_MITK_CLASS macro, as it defines
 //    some redundante code.
 //
 
 std::vector<std::size_t> mitk::GetImageSize(mitk::Image::Pointer image);
\ No newline at end of file
diff --git a/Wrapping/Common/mitk_swig_macros.i b/Wrapping/Common/mitk_swig_macros.i
index 51288dd2cb..e2e44006b0 100644
--- a/Wrapping/Common/mitk_swig_macros.i
+++ b/Wrapping/Common/mitk_swig_macros.i
@@ -1,228 +1,228 @@
 //
 // This file contains macros for swig.
 //
 
 
 
 //
 // MITKSWIG_ADD_HEADERFILE includes a header-file into SWIG
 //
 %define MITKSWIG_ADD_HEADERFILE( classinclude )
   // Include the include file in the generated cpp file
   %{
    #include < ## classinclude ## >
   %}
 
   // Include the given header, where the class definition is found
   %include < ## classinclude ## >
 %enddef
 
 //
 // MITKSWIG_ADD_CLASS is a helper macro in order to do
 // all important stuff in order to wrap an existing
 // class
 //
 %define MITKSWIG_ADD_CLASS(classname, classinclude, nspace)
   MITKSWIG_ADD_HEADERFILE( classinclude )
   // Using class name in order to remove ambigiouties
   %{
     typedef nspace ## :: ## classname classname ## ;
     using nspace ## :: ## classname ;
   %}
   using nspace ##:: ## classname ;
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 %enddef
 
 
 //
 // MITKSWIG_AUTOMATED_CASTING is a helper macro in order to
 // provide a convinience interface for up/downcasting of
 // classes
 //
 %define MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 
   // Define a conversion method to convert from and to types
   %template(ConvertTo ## classname) ConvertTo< nspace ##:: ## classname ## >;
 
   // This extend is necessary to have the automatic cast methods available
 %extend itk::SmartPointer< nspace ## :: ## classname ## ::Self> {
   %pythoncode %{
       def _GetListOfValidItems(self):
-        return [str(k).replace("class itk::","") for k in self.GetClassHierarchy() if str(k).replace("class itk::","") in convertion_list.keys() ]
+        return [str(k) for k in self.GetClassHierarchy() if str(k) in convertion_list.keys() ]
   %}
   %pythoncode %{
     def __getattr__(self, item):
         if type(item)==str:
             if (len(item) > 9) and ('ConvertTo' in item):
                 searchString=item[9:]
                 if searchString in self._GetListOfValidItems():
                     def func_t():
                         return convertion_list[searchString](self)
                     return func_t
   %}
   %pythoncode %{
     def __dir__(self):
         return super().__dir__() + ['ConvertTo'+k for k in self._GetListOfValidItems()]
   %}
 }
 
 %extend  std::vector< nspace ## :: ## classname *>::value_type {
   %pythoncode %{
       def _GetListOfValidItems(self):
-        return [str(k).replace("class itk::","") for k in self.GetClassHierarchy() if str(k).replace("class itk::","") in convertion_list.keys() ]
+        return [str(k) for k in self.GetClassHierarchy() if str(k) in convertion_list.keys() ]
   %}
   %pythoncode %{
     def __getattr__(self, item):
         if type(item)==str:
             if (len(item) > 9) and ('ConvertTo' in item):
                 searchString=item[9:]
                 if searchString in self._GetListOfValidItems():
                     def func_t():
                         return convertion_list[searchString](self)
                     return func_t
   %}
   %pythoncode %{
     def __dir__(self):
         return super().__dir__() + ['ConvertTo'+k for k in self._GetListOfValidItems()]
   %}
 }
 
 %pythoncode %{
  convertion_list['classname'] = ConvertTo ## classname
 %}
 
 %enddef
 
 //
 // MITKSWIG_SMARTPOINTERVECTOR : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_SMARTPOINTERVECTOR(classname, classinclude, nspace)
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname ## ::Pointer >;
   %template(Vector ## classname) std::vector< nspace ## :: ## classname ## ::Self *>;
 %enddef
 
 //
 // MITKSWIG_POINTERVECTOR : Wrapper for Vectors of Classes
 //
 %define MITKSWIG_POINTERVECTOR(classname, classinclude, nspace)
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname * >;
   %template(Vector ## classname) std::vector< nspace ## :: ## classname  >;
 %enddef
 
 //
 // MITKSWIG_MITKSMARTPOINTER_INITIALIZATION : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   // Declaring that this class is a smart-pointer class, in order to handle
   // online upcasting where necessary (for example python)
   %feature("smartptr", noblock=1) nspace ##:: ## classname { itk::SmartPointer<nspace ## :: ## classname ## ::Self> }
 %enddef
 
 //
 // MITKSWIG_MITKSMARTPOINTER_TEMPLATE : Wrapper for Vectors of Smartpointer-Classes
 //
 %define MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
   // Defining the Smartpointer, allows easy access in target language
   %template(classname ## Pointer) itk::SmartPointer<nspace ## :: ## classname ## ::Self>;
 
 %enddef
 
 
 //
 // SWIG_ADD_MITK_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_MITK_CLASS_VECTORFREE(classname, classinclude, nspace)
   MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
   class nspace ## :: ## classname ## ;
   class nspace ## :: ## classname ## ::Pointer;
 
   MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
 
   MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 %enddef
 
 //
 // SWIG_ADD_MITK_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_MITK_CLASS(classname, classinclude, nspace)
   MITKSWIG_MITKSMARTPOINTER_INITIALIZATION(classname, classinclude, nspace)
 
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
 
   class nspace ## :: ## classname ## ;
-  //class nspace ## :: ## classname ## ::Pointer;
+  class nspace ## :: ## classname ## ::Pointer;
 
   // It is important to first define the Vectors and
   // then define the Smartpointer. Otherwise a SWIG-bug ...
   MITKSWIG_SMARTPOINTERVECTOR(classname, classinclude, nspace)
 
   MITKSWIG_MITKSMARTPOINTER_TEMPLATE(classname, classinclude, nspace)
 
   MITKSWIG_AUTOMATED_CASTING(classname, classinclude, nspace)
 %enddef
 
 
 //
 // SWIG_ADD_NONOBJECT_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_NONOBJECT_CLASS(classname, classinclude, nspace)
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 
   class nspace ## :: ## classname ## ;
 
   MITKSWIG_POINTERVECTOR(classname, classinclude, nspace)
 %enddef
 
 
 //
 // SWIG_ADD_NONOBJECT_CLASS is a helper macro in order to do
 // all important stuff before an mitk::Class is included.
 // Requires the name of the class as it is in c++ as classname
 // and the include file, in which the class is defined.
 // It is assumed that the class is somehow inherited from
 // mitk::BaseData, and supports smartpointers.
 //
 %define SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(classname, classinclude, nspace)
 
   MITKSWIG_ADD_CLASS( classname, classinclude, nspace )
 
   // Typedef is necessary to overcome ambigiouties resulting in the fact that SWIG
   // ignores namespaces. This can lead to some problems with templates.
   typedef nspace ## :: ## classname classname ## ;
 
   // Initianziation of std. vectors containing pointers to these classes. This allows to use
   // vectors of these types as target language arrays.
   %template(Vector ## classname ## Pointer) std::vector< nspace ## :: ## classname * >;
 
 %enddef