diff --git a/Core/Code/Algorithms/mitkInstantiateAccessFunctions.h b/Core/Code/Algorithms/mitkInstantiateAccessFunctions.h
index 76e3efa355..93b92827b1 100644
--- a/Core/Code/Algorithms/mitkInstantiateAccessFunctions.h
+++ b/Core/Code/Algorithms/mitkInstantiateAccessFunctions.h
@@ -1,159 +1,158 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 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.
 
 =========================================================================*/
 
 
 #ifndef MITKINSTANTIATEACCESSFUNCTIONS_H_HEADER_INCLUDED
 #define MITKINSTANTIATEACCESSFUNCTIONS_H_HEADER_INCLUDED
  
 #include <itkCastImageFilter.h>
 #include <mitkImageToItk.h>
 #include <mitkConfig.h>
 
 #include <mitkPPSeqForEach.h>
 #include <mitkPPSeqForEachProduct.h>
 #include <mitkPPSeqToTuple.h>
 #include <mitkPPCat.h>
 #include <mitkPPExpand.h>
 #include <mitkPPTupleRem.h>
 
 #ifndef DOXYGEN_SKIP
 
 #define InstantiateAccessFunctionImpl(r, itkImgFunc, type) \
   MITK_PP_CAT(InstantiateAccessFunction_, itkImgFunc) type
 
 // product is of the form (itkImgFunc)(short)(2)
 #ifdef _MSC_VER
 #define InstantiateAccessFunctionProductImpl(r, product) \
   MITK_PP_CAT(InstantiateAccessFunction_, MITK_PP_SEQ_HEAD(product)) \
   MITK_PP_EXPAND(MITK_PP_SEQ_TO_TUPLE(MITK_PP_SEQ_TAIL(product)))
 #else
 #define InstantiateAccessFunctionProductImpl(r, product) \
   MITK_PP_EXPAND(MITK_PP_CAT(InstantiateAccessFunction_, MITK_PP_SEQ_HEAD(product)) \
                  MITK_PP_SEQ_TO_TUPLE(MITK_PP_SEQ_TAIL(product)))
 #endif
 
 #endif // DOXYGEN_SKIP
 
 
 //--------------------------------- instantiation functions  ------------------------------
 
 /**
  * \brief Instantiate access function for the given pixel types and dimensions.
  *
  * Iteratively calls a macro named InstantiateAccessFunction_itkImgFunc
  * which you must define and which usually explicitly instantiates your access function.
  *
  * A call to InstantiateAccessFunctionForFixedPixelType(T, (a)(b), (d)(e)) results in calls
  *
  *   InstantiateAccessFunction_T(a, d) <br>
  *   InstantiateAccessFunction_T(a, e) <br>
  *   InstantiateAccessFunction_T(b, d) <br>
  *   InstantiateAccessFunction_T(b, e)
  *
  * That is, InstantiateAccessFunction_T is called for the cartesian product of the sequences pixelTypeSeq
  * and dimSeq.
  *
  * Example:
  * \code
  * template<typename TPixel, typename VDimension>
  * void MyImageAccessFunction(itk::Image<TPixel, VImageDimension>* itkImage)
  * { ... }
  *
  * #define InstantiateAccessFunction_MyImageAccessFunction(pixelType, dim) \
  *   template void MyImageAccessFunction(itk::Image<pixelType,dim>*);
  *
  * InstantiateAccessFunctionForFixedPixelType(MyImageAccessFunction, (int), (3))
  * \endcode
  *
  * Use this macro once after the definition of your access function.
  * Some compilers have memory problems without the explicit instantiation.
  * You may need to move the access function to a separate file. The CMake macro
  * MITK_MULTIPLEX_PICTYPE can help you with that. See \c mitk/CMake/mitkMacroMultiplexPicType.cmake
  * for documentation.
  *
  * \param itkImgFunc The custom part of the name of the macro to be called.
  * \param pixelTypeSeq a sequence of types, like (int)(short)(char).
  * \param dimSeq a sequence of dimensions, like (2)(3).
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunctionForFixedType(itkImgFunc, pixelTypeSeq, dimSeq)                           \
   MITK_PP_SEQ_FOR_EACH_PRODUCT(InstantiateAccessFunctionProductImpl, ((itkImgFunc))(pixelTypeSeq)(dimSeq))
 
 /**
  * \brief Instantiate access function for all datatypes and dimensions.
  *
  * \sa InstantiateAccessFunctionForFixedType
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunction(itkImgFunc)                                                             \
-  InstantiateAccessFunctionForFixedDimension(itkImgFunc, 2)                                               \
-  InstantiateAccessFunctionForFixedDimension(itkImgFunc, 3)
+  InstantiateAccessFunctionForFixedType(itkImgFunc, MITK_ACCESSBYITK_PIXEL_TYPES_SEQ, MITK_ACCESSBYITK_DIMENSIONS_SEQ)
 
 /**
  * \brief Instantiate access function for all datatypes and a specific dimension.
  *
  * \sa InstantiateAccessFunctionForFixedType
  *
  * \param itkImgFunc The custom part of the name of the macro to be called.
  * \param dimSeq a sequence of dimensions, like (2)(3).
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunctionForFixedDimension(itkImgFunc, dim)                                       \
-  InstantiateAccessFunctionForFixedType(itkImgFunc, MITK_ACCESSBYITK_TYPES_SEQ, (dim))
+  InstantiateAccessFunctionForFixedType(itkImgFunc, MITK_ACCESSBYITK_PIXEL_TYPES_SEQ, (dim))
 
 /**
  * \brief Instantiate access function for all given pixel types and all dimensions.
  *
  * \sa InstantiateAccessFunctionForFixedType
  *
  * \param itkImgFunc The custom part of the name of the macro to be called.
  * \param pixelTypeSeq a sequence of types, like (int)(short)(char).
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunctionForFixedPixelType(itkImgFunc, pixelTypeSeq)                              \
   InstantiateAccessFunctionForFixedType(itkImgFunc, pixelTypeSeq, MITK_ACCESSBYITK_DIMENSIONS_SEQ)
 
 /**
  * \brief Instantiate access function for integral datatypes and all dimensions.
  *
  * \sa InstantiateAccessFunctionForFixedType
  *
  * \param itkImgFunc The custom part of the name of the macro to be called.
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunctionForIntegralPixelTypes(itkImgFunc)                                        \
   InstantiateAccessFunctionForFixedType(itkImgFunc, MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES_SEQ, MITK_ACCESSBYITK_DIMENSIONS_SEQ)
 
 /**
  * \brief Instantiate access function for floating point datatypes and all dimensions.
  *
  * \sa InstantiateAccessFunctionForFixedType
  *
  * \param itkImgFunc The custom part of the name of the macro to be called.
  *
  * \ingroup Adaptor
  */
 #define InstantiateAccessFunctionForFloatingPixelTypes(itkImgFunc)                                        \
   InstantiateAccessFunctionForFixedType(itkImgFunc, MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES_SEQ, MITK_ACCESSBYITK_DIMENSIONS_SEQ)
 
 
 #endif // of MITKINSTANTIATEACCESSFUNCTIONS_H_HEADER_INCLUDED