diff --git a/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.cpp b/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.cpp
similarity index 85%
rename from Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.cpp
rename to Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.cpp
index 5e9bc6d6f1..ead0295511 100644
--- a/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.cpp
+++ b/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.cpp
@@ -1,75 +1,75 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 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.
  
 =========================================================================*/
 
-#include "mitkNrrdQBallImageSerializer.h"
+#include "mitkQBallImageSerializer.h"
 #include "mitkQBallImage.h"
 #include "mitkNrrdQBallImageWriter.h"
 
 #include <itksys/SystemTools.hxx>
 
 
-MITK_REGISTER_SERIALIZER(NrrdQBallImageSerializer)
+MITK_REGISTER_SERIALIZER(QBallImageSerializer)
 
 
-mitk::NrrdQBallImageSerializer::NrrdQBallImageSerializer()
+mitk::QBallImageSerializer::QBallImageSerializer()
 {
 }
 
 
-mitk::NrrdQBallImageSerializer::~NrrdQBallImageSerializer()
+mitk::QBallImageSerializer::~QBallImageSerializer()
 {
 }
 
 
-std::string mitk::NrrdQBallImageSerializer::Serialize()
+std::string mitk::QBallImageSerializer::Serialize()
 {
   const QBallImage* image = dynamic_cast<const QBallImage*>( m_Data.GetPointer() );
   if (image == NULL)
   {
     MITK_ERROR << " Object at " << (const void*) this->m_Data
               << " is not an mitk::NrrdQBallImage. Cannot serialize as NrrdQBallImage.";
     return "";
   }
 
   std::string filename( this->GetUniqueFilenameInWorkingDirectory() );
   filename += "_";
   filename += m_FilenameHint;
-  filename += ".dwi";
+  filename += ".qbi";
 
   std::string fullname(m_WorkingDirectory);
   fullname += "/";
   fullname += itksys::SystemTools::ConvertToOutputPath(filename.c_str());
 
   try
   {
     NrrdQBallImageWriter::Pointer writer = NrrdQBallImageWriter::New();
     writer->SetFileName(fullname);
     writer->SetInput(const_cast<QBallImage*>(image));
     writer->Write();
   }
   catch (std::exception& e)
   {
     MITK_ERROR << " Error serializing object at " << (const void*) this->m_Data
               << " to " 
               << fullname 
               << ": " 
               << e.what();
     return "";
   }
   return filename;
 }
 
diff --git a/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.h b/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.h
similarity index 73%
rename from Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.h
rename to Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.h
index 7ce68581fb..9745e79c17 100644
--- a/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkNrrdQBallImageSerializer.h
+++ b/Modules/DiffusionImaging/IODataStructures/QBallImages/mitkQBallImageSerializer.h
@@ -1,40 +1,40 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 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 mitkNrrdQBallImageSerializer_h_included
-#define mitkNrrdQBallImageSerializer_h_included
+#ifndef mitkQBallImageSerializer_h_included
+#define mitkQBallImageSerializer_h_included
 
 #include "MitkDiffusionImagingExports.h"
 #include "mitkBaseDataSerializer.h"
 
 namespace mitk
 {
 /**
   \brief Serializes mitk::Surface for mitk::SceneIO
 */
-class MitkDiffusionImaging_EXPORT NrrdQBallImageSerializer : public BaseDataSerializer
+class MitkDiffusionImaging_EXPORT QBallImageSerializer : public BaseDataSerializer
 {
   public:
-    mitkClassMacro( NrrdQBallImageSerializer, BaseDataSerializer );
+    mitkClassMacro( QBallImageSerializer, BaseDataSerializer );
     itkNewMacro(Self);
     virtual std::string Serialize();
   protected:
-    NrrdQBallImageSerializer();
-    virtual ~NrrdQBallImageSerializer();
+    QBallImageSerializer();
+    virtual ~QBallImageSerializer();
 };
 } // namespace
 #endif
diff --git a/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.cpp b/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.cpp
similarity index 85%
rename from Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.cpp
rename to Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.cpp
index dacbd2de8b..56c505cf94 100644
--- a/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.cpp
+++ b/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.cpp
@@ -1,75 +1,75 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 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.
  
 =========================================================================*/
 
-#include "mitkNrrdTensorImageSerializer.h"
+#include "mitkTensorImageSerializer.h"
 #include "mitkTensorImage.h"
 #include "mitkNrrdTensorImageWriter.h"
 
 #include <itksys/SystemTools.hxx>
 
 
-MITK_REGISTER_SERIALIZER(NrrdTensorImageSerializer)
+MITK_REGISTER_SERIALIZER(TensorImageSerializer)
 
 
-mitk::NrrdTensorImageSerializer::NrrdTensorImageSerializer()
+mitk::TensorImageSerializer::TensorImageSerializer()
 {
 }
 
 
-mitk::NrrdTensorImageSerializer::~NrrdTensorImageSerializer()
+mitk::TensorImageSerializer::~TensorImageSerializer()
 {
 }
 
 
-std::string mitk::NrrdTensorImageSerializer::Serialize()
+std::string mitk::TensorImageSerializer::Serialize()
 {
   const TensorImage* image = dynamic_cast<const TensorImage*>( m_Data.GetPointer() );
   if (image == NULL)
   {
     MITK_ERROR << " Object at " << (const void*) this->m_Data
               << " is not an mitk::NrrdTensorImage. Cannot serialize as NrrdTensorImage.";
     return "";
   }
 
   std::string filename( this->GetUniqueFilenameInWorkingDirectory() );
   filename += "_";
   filename += m_FilenameHint;
-  filename += ".dwi";
+  filename += ".dti";
 
   std::string fullname(m_WorkingDirectory);
   fullname += "/";
   fullname += itksys::SystemTools::ConvertToOutputPath(filename.c_str());
 
   try
   {
     NrrdTensorImageWriter::Pointer writer = NrrdTensorImageWriter::New();
     writer->SetFileName(fullname);
     writer->SetInput(const_cast<TensorImage*>(image));
     writer->Write();
   }
   catch (std::exception& e)
   {
     MITK_ERROR << " Error serializing object at " << (const void*) this->m_Data
               << " to " 
               << fullname 
               << ": " 
               << e.what();
     return "";
   }
   return filename;
 }
 
diff --git a/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.h b/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.h
similarity index 73%
rename from Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.h
rename to Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.h
index 428f3d02be..61cd9b90cb 100644
--- a/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkNrrdTensorImageSerializer.h
+++ b/Modules/DiffusionImaging/IODataStructures/TensorImages/mitkTensorImageSerializer.h
@@ -1,40 +1,40 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 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 mitkNrrdTensorImageSerializer_h_included
-#define mitkNrrdTensorImageSerializer_h_included
+#ifndef mitkTensorImageSerializer_h_included
+#define mitkTensorImageSerializer_h_included
 
 #include "MitkDiffusionImagingExports.h"
 #include "mitkBaseDataSerializer.h"
 
 namespace mitk
 {
 /**
   \brief Serializes mitk::Surface for mitk::SceneIO
 */
-class MitkDiffusionImaging_EXPORT NrrdTensorImageSerializer : public BaseDataSerializer
+class MitkDiffusionImaging_EXPORT TensorImageSerializer : public BaseDataSerializer
 {
   public:
-    mitkClassMacro( NrrdTensorImageSerializer, BaseDataSerializer );
+    mitkClassMacro( TensorImageSerializer, BaseDataSerializer );
     itkNewMacro(Self);
     virtual std::string Serialize();
   protected:
-    NrrdTensorImageSerializer();
-    virtual ~NrrdTensorImageSerializer();
+    TensorImageSerializer();
+    virtual ~TensorImageSerializer();
 };
 } // namespace
 #endif