diff --git a/Applications/Segmentation/otbSegmentation.cxx b/Applications/Segmentation/otbSegmentation.cxx
index 83d786c3681bd4fe406a36ac212849dcf75960d8..443aea9bb3903f82c428c452a85ea950660126b0 100644
--- a/Applications/Segmentation/otbSegmentation.cxx
+++ b/Applications/Segmentation/otbSegmentation.cxx
@@ -31,11 +31,11 @@
 #include "otbWatershedSegmentationFilter.h"
 
 // Large scale vectorization framework
-#include "otbStreamingVectorizedSegmentationOGR.h"
+#include "otbStreamingImageToOGRDataSourceSegmentationFilter.h"
 #include "otbOGRDataSourceWrapper.h"
 
 // Fusion filter
-#include "otbFusionOGRTileFilter.h"
+#include "otbOGRDataSourceStreamStitchingFilter.h"
 
 namespace otb
 {
@@ -95,28 +95,28 @@ public:
 
   // Vectorize filters
   // Edison mean-shift
-  typedef otb::StreamingVectorizedSegmentationOGR
+  typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
   <FloatVectorImageType,
    EdisonSegmentationFilterType>          EdisontreamingVectorizedSegmentationOGRType;
 
   // Home made mean-shift
-  typedef otb::StreamingVectorizedSegmentationOGR
+  typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
   <FloatVectorImageType,
    MeanShiftSegmentationFilterType>       MeanShiftVectorizedSegmentationOGRType;
 
 
   // Connected components
-  typedef otb::StreamingVectorizedSegmentationOGR
+  typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
   <FloatVectorImageType,
    ConnectedComponentSegmentationFilterType>
   ConnectedComponentStreamingVectorizedSegmentationOGRType;
 
-  typedef otb::FusionOGRTileFilter
+  typedef otb::OGRDataSourceStreamStitchingFilter
   <FloatVectorImageType>                  FusionFilterType;
 
 
   // Watershed
-  typedef otb::StreamingVectorizedSegmentationOGR
+  typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
   <FloatImageType,
    WatershedSegmentationFilterType>      StreamingVectorizedWatershedFilterType;
 
@@ -322,12 +322,12 @@ private:
 
   template<class TInputImage, class TSegmentationFilter>
   FloatVectorImageType::SizeType
-  GenericApplySegmentation(otb::StreamingVectorizedSegmentationOGR<TInputImage,
+  GenericApplySegmentation(otb::StreamingImageToOGRDataSourceSegmentationFilter<TInputImage,
                                                                    TSegmentationFilter> * streamingVectorizedFilter, TInputImage * inputImage ,otb::ogr::DataSource::Pointer ogrDS, const unsigned int outputNb)
   {
     typedef  TSegmentationFilter             SegmentationFilterType;
     typedef  typename SegmentationFilterType::Pointer SegmentationFilterPointerType;
-    typedef otb::StreamingVectorizedSegmentationOGR
+    typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
       <FloatVectorImageType,
        SegmentationFilterType>          StreamingVectorizedSegmentationOGRType;
 
diff --git a/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h b/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
index cd5c87e3cd1aa913e334d2fc551f3ec8a7228bea..ac2d26ba8b541fa89c6d8f877236002c8cd219f1 100644
--- a/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
+++ b/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
@@ -93,12 +93,12 @@ class LabeledOutputAccessor<MeanShiftSmoothingImageFilter<TInputImage, TOutputIm
  */
 template <class TImageType,  class TSegmentationFilter>
 class PersistentStreamingLabelImageToOGRDataSourceFilter
-  : public otb::PersistentImageToOGRDataSourceFilter<TImageType>
+  : public otb::PersistentImageToOGRDataFilter<TImageType>
 {
 public:
   /** Standard Self typedef */
   typedef PersistentStreamingLabelImageToOGRDataSourceFilter     Self;
-  typedef PersistentImageToOGRDataSourceFilter<TImageType>       Superclass;
+  typedef PersistentImageToOGRDataFilter<TImageType>             Superclass;
   typedef itk::SmartPointer<Self>                          Pointer;
   typedef itk::SmartPointer<const Self>                    ConstPointer;