diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
index 2d9a433f506d4827fd86b45a3c46b07c64c976b8..91f728949ad2065b9788f7ee83f2da0b14ca72d0 100644
--- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
@@ -49,8 +49,7 @@ int otbMatrixTransposeMatrixImageFilter(int argc, char * argv[])
   reader1->SetFileName(infname1);
   reader2->SetFileName(infname2);
 
-  // filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
   filter->SetFirstInput(reader1->GetOutput());
   filter->SetSecondInput(reader2->GetOutput());
   filter->SetUsePadFirstInput(true);
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
index bf4c392613c74d4c7786a4d823b0391e0c797bf2..842fde27ecac9a100baad9058c6ea2471932672c 100644
--- a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
@@ -39,8 +39,7 @@ int otbStreamingInnerProductVectorImageFilter(int argc, char* argv[])
 
   // Instantiation object
   FilterType::Pointer filter = FilterType::New();
-
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(10);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(10);
   filter->SetCenterData(centerdata);
   filter->SetInput(reader->GetOutput());
   filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
index 5f59b2d7f794a45b011c71968eb507af71c54355..8cb67d368012f70209198445bf2ddf1dc34319c2 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingMinMaxImageFilter(int argc, char * argv[])
   ReaderType::Pointer reader = ReaderType::New();
   reader->SetFileName(infname);
 
-  //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
   filter->SetInput(reader->GetOutput());
   otb::StandardFilterWatcher watcher(filter, "Min Max Computation");
   filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
index f8f2e265fec84ee19cb7547e1ee2e4f52ca303a4..d114e5d7a0d89ecd86b1d70033843bdbd0850126 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingMinMaxVectorImageFilter(int argc, char * argv[])
   ReaderType::Pointer reader = ReaderType::New();
   reader->SetFileName(infname);
 
-  //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
   filter->SetInput(reader->GetOutput());
   otb::StandardFilterWatcher watcher(filter, "Min Max Computation");
   filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
index 22fae71fb8c86d644fc9d2c273cfb4b75d8fcacb..474097031e76b937fca9336ec1b2084ea68e249a 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingStatisticsImageFilter(int argc, char * argv[])
   ReaderType::Pointer reader = ReaderType::New();
   reader->SetFileName(infname);
 
-  //filter->GetStreamer()->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
   filter->SetInput(reader->GetOutput());
   filter->Update();
 
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
index 8316823fb3a819eeac2e09edf5de9099875fd64f..6ff493c558e7fa82c7b61fafb3d4675028808e0a 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
@@ -41,8 +41,7 @@ int otbStreamingStatisticsVectorImageFilter(int argc, char * argv[])
   ReaderType::Pointer reader = ReaderType::New();
   reader->SetFileName(infname);
 
-  //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
-  //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+  filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
   filter->SetInput(reader->GetOutput());
   filter->Update();
 
diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
index e52c587fc6da2f835a318a49af06f379b3915c7e..c4a7b9af956898cf608886499a3d2040dc6ccd92 100644
--- a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
@@ -157,15 +157,7 @@ int otbDescriptorsListSampleGenerator(int argc, char* argv[])
   descriptorsGenerator->SetDescriptorsFunction(descriptorsFunction.GetPointer());
   descriptorsGenerator->SetNeighborhoodRadius(neighborhood);
 
-  if (streaming == 0)
-    {
-    descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(1);
-    }
-  else
-    {
-    descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(streaming);
-    }
-
+  descriptorsGenerator->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
   descriptorsGenerator->Update();
 
 
@@ -240,16 +232,7 @@ int otbDescriptorsSVMModelCreation(int argc, char* argv[])
   descriptorsGenerator->SetSamplesLocations(vectorDataReader->GetOutput());
   descriptorsGenerator->SetDescriptorsFunction(descriptorsFunction.GetPointer());
   descriptorsGenerator->SetNeighborhoodRadius(5);
-
-  if (streaming == 0)
-    {
-    descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(1);
-    }
-  else
-    {
-    descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(streaming);
-    }
-
+  descriptorsGenerator->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
   descriptorsGenerator->Update();
 
   // Normalize the samples
diff --git a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
index fe3846df055eec4a684eaf7f6594ad4f6f2b7004..e394c2ea2b8c1114090f54b02b368c02a62f4cb9 100644
--- a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
+++ b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
@@ -135,15 +135,8 @@ int otbObjectDetectionClassifier(int argc, char* argv[])
   classifier->SetShifts(statisticsReader->GetStatisticVectorByName("mean"));
   classifier->SetScales(statisticsReader->GetStatisticVectorByName("stddev"));
 
-  if (streaming == 0)
-    {
-    classifier->GetStreamer()->SetNumberOfStreamDivisions(1);
-    }
-  else
-    {
-    classifier->GetStreamer()->SetNumberOfStreamDivisions(streaming);
-    }
-
+  // 0 means no streaming
+  classifier->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
   classifier->Update();
 
   std::vector<ObjectDetectionClassifierType::PointType> points;