diff --git a/Modules/DiffusionImaging/Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h b/Modules/DiffusionImaging/Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h
index fcb68786ba..f7d059086a 100644
--- a/Modules/DiffusionImaging/Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h
+++ b/Modules/DiffusionImaging/Algorithms/itkDiffusionQballPrepareVisualizationImageFilter.h
@@ -1,136 +1,136 @@
 /*=========================================================================
 
   Program:   Insight Segmentation & Registration Toolkit
   Module:    $RCSfile: itkDiffusionTensor3DReconstructionImageFilter.h,v $
   Language:  C++
   Date:      $Date: 2006-03-27 17:01:06 $
   Version:   $Revision: 1.12 $
 
   Copyright (c) Insight Software Consortium. All rights reserved.
   See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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 __itkDiffusionQballPrepareVisualizationImageFilter_h_
 #define __itkDiffusionQballPrepareVisualizationImageFilter_h_
 
-#include "MitkDiffusionImagingMBIExports.h"
+#include "MitkDiffusionImagingExports.h"
 #include "itkImageToImageFilter.h"
 //#include "vnl/vnl_matrix.h"
 #include "vnl/vnl_vector_fixed.h"
 #include "vnl/vnl_matrix.h"
 #include "vnl/algo/vnl_svd.h"
 #include "itkVectorContainer.h"
 #include "itkVectorImage.h"
 #include "itkDiffusionQballGeneralizedFaImageFilter.h"
 
 namespace itk{
 /** \class DiffusionQballPrepareVisualizationImageFilter
  */
 
 template< class TOdfPixelType, 
           int NrOdfDirections>
-class MitkDiffusionImagingMBI_EXPORT DiffusionQballPrepareVisualizationImageFilter :
+class MitkDiffusionImaging_EXPORT DiffusionQballPrepareVisualizationImageFilter :
   public ImageToImageFilter< Image< Vector< TOdfPixelType, NrOdfDirections >, 3 >, 
                               Image< Vector< TOdfPixelType, NrOdfDirections >, 3 > >
 {
 
 public:
 
   enum NormalizationMethods
   {
     PV_NONE,
     PV_MAX,
     PV_MIN_MAX,
     PV_GLOBAL_MAX,
     PV_MIN_MAX_INVERT
   };
 
   typedef DiffusionQballPrepareVisualizationImageFilter Self;
   typedef SmartPointer<Self>                      Pointer;
   typedef SmartPointer<const Self>                ConstPointer;
   typedef ImageToImageFilter< Image< Vector< TOdfPixelType, NrOdfDirections >, 3 >, 
     Image< Vector< TOdfPixelType, NrOdfDirections >, 3 > >
                           Superclass;
   
   typedef DiffusionQballGeneralizedFaImageFilter<TOdfPixelType,TOdfPixelType,NrOdfDirections>
                                                   GfaFilterType;
   typedef typename GfaFilterType::OutputImageType          GfaImageType;
   typedef typename GfaFilterType::GfaComputationMethod     GfaComputationMethod;
 
    /** Method for creation through the object factory. */
   itkNewMacro(Self);  
 
   /** Runtime information support. */
   itkTypeMacro(DiffusionQballPrepareVisualizationImageFilter, 
                                                    ImageToImageFilter);
  
   typedef TOdfPixelType                 OdfComponentType;
 
   typedef typename Superclass::InputImageType      InputImageType;
 
   typedef typename Superclass::OutputImageType      OutputImageType;
 
   typedef typename Superclass::OutputImageRegionType
                                                    OutputImageRegionType;
 
   itkStaticConstMacro(NOdfDirections,int,NrOdfDirections);
 
   itkSetMacro( Threshold, OdfComponentType );
   itkGetMacro( Threshold, OdfComponentType );
 
   itkSetMacro( NormalizationMethod, NormalizationMethods );
   itkGetMacro( NormalizationMethod, NormalizationMethods );
 
   itkSetMacro( ScaleByGfaType, GfaComputationMethod );
   itkGetMacro( ScaleByGfaType, GfaComputationMethod );
 
   itkSetMacro( DoScaleGfa, bool );
   itkGetMacro( DoScaleGfa, bool );
 
   itkSetMacro( GfaParam1, double );
   itkGetMacro( GfaParam1, double );
 
   itkSetMacro( GfaParam2, double );
   itkGetMacro( GfaParam2, double );
 
 protected:
   DiffusionQballPrepareVisualizationImageFilter();
   ~DiffusionQballPrepareVisualizationImageFilter() {};
   void PrintSelf(std::ostream& os, Indent indent) const;
   
   void BeforeThreadedGenerateData();
   void ThreadedGenerateData( const 
       OutputImageRegionType &outputRegionForThread, int);
 
 private:
 
   /** Threshold on the reference image data */
   OdfComponentType                                m_Threshold;
 
   NormalizationMethods                            m_NormalizationMethod;
 
   OdfComponentType                                m_GlobalInputMaximum;
 
   GfaComputationMethod                            m_ScaleByGfaType;
 
   bool                                            m_DoScaleGfa;
 
   typename GfaImageType::Pointer                  m_GfaImage;
 
   double                                          m_GfaParam1;
 
   double                                          m_GfaParam2;
 };
 
 }
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkDiffusionQballPrepareVisualizationImageFilter.cpp"
 #endif
 
 #endif //__itkDiffusionQballPrepareVisualizationImageFilter_h_
 
diff --git a/Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h b/Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h
index ea9cb42ca5..c24872d208 100644
--- a/Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h
+++ b/Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper3D.h
@@ -1,103 +1,103 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2009-05-12 19:56:03 +0200 (Di, 12 Mai 2009) $
 Version:   $Revision: 17179 $
 
 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 FiberBundleMapper3D_H_HEADER_INCLUDED
 #define FiberBundleMapper3D_H_HEADER_INCLUDED
 
 //#include "mitkCommon.h"
 //#include "mitkBaseRenderer.h"
 
 #include "mitkFiberBundle.h"
 #include <vtkSmartPointer.h>
 #include "mitkVtkMapper3D.h"
-#include "MitkDiffusionImagingMBIExports.h"
+#include "MitkDiffusionImagingExports.h"
 #include "mitkBaseData.h"
 #include "vtkAppendPolyData.h"
 #include "vtkOpenGLPolyDataMapper.h"
 #include "vtkOpenGLActor.h"
 #include "vtkPropAssembly.h"
 #include "vtkProperty.h"
 #include "vtkUnsignedCharArray.h"
 #include "vtkTubeFilter.h"
 
 
 namespace mitk {
 
   //##Documentation
   //## @brief Mapper for FiberBundles
   //## @ingroup Mapper
 //  template<class TPixelType>
-  class MitkDiffusionImagingMBI_EXPORT FiberBundleMapper3D : public VtkMapper3D
+  class MitkDiffusionImaging_EXPORT FiberBundleMapper3D : public VtkMapper3D
   {
   public:
 
     mitkClassMacro(FiberBundleMapper3D, VtkMapper3D);
     itkNewMacro(Self);
 
     
     const mitk::FiberBundle* GetInput();
 
     virtual vtkProp *GetVtkProp(mitk::BaseRenderer *renderer); //looks like depricated.. should be replaced bz GetViewProp()
     static void SetDefaultProperties(DataNode* node, BaseRenderer* renderer = NULL, bool overwrite = false );
 
     virtual void ApplyProperties(mitk::BaseRenderer* renderer);
     static void SetVtkMapperImmediateModeRendering(vtkMapper *mapper);
     
     virtual void GenerateData(mitk::BaseRenderer* renderer);
     virtual void GenerateData();
 
     
   protected:
 
     FiberBundleMapper3D();
     virtual ~FiberBundleMapper3D();
 
     void UpdateVtkObjects();
     
     
     vtkAppendPolyData *m_vtkFiberList;
     //vtkSmartPointer<vtkAppendPolyData> m_vtkFiberList;
     
     vtkOpenGLPolyDataMapper *m_VtkFiberDataMapperGL;
     //vtkPainterPolyDataMapper *m_VtkFiberDataMapperGL;
     //vtkSmartPointer<vtkOpenGLPolyDataMapper> m_VtkFiberDataMapperGL;
     
     //vtkOpenGLPolyDataMapper *m_VtkFiberDataMapper;
     //vtkSmartPointer<vtkPolyDataMapper> m_VtkFiberDataMapper;
     
     vtkOpenGLActor *m_FiberActor;
     //vtkSmartPointer<vtkActor> m_FiberActor;
     
     vtkTubeFilter *m_tubes;
     vtkOpenGLActor *m_TubeActor;
     vtkOpenGLPolyDataMapper *m_vtkTubeMapper;
     
     
     vtkPropAssembly *m_FiberAssembly;
     
 
 
   };
 
 } // namespace mitk
 
 
 
 
 #endif /* FiberBundleMapper3D_H_HEADER_INCLUDED */