diff --git a/Code/MultiScale/otbWaveletForwardTransform.txx b/Code/MultiScale/otbWaveletForwardTransform.txx
index d968d61bdb37f634831178b8fd08a8c23d9e7083..45b68e1251eef1cbedbe5d8087c8276b07cb8842 100644
--- a/Code/MultiScale/otbWaveletForwardTransform.txx
+++ b/Code/MultiScale/otbWaveletForwardTransform.txx
@@ -103,7 +103,7 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
       GetFilter(nbDecomp)->GraftNthOutput( idx, this->GetOutput( outputIdxForGraft-- ) );
 
     if ( m_UseSubSampleImage == false )
-      GetFilter(nbDecomp)->SetUpSampleFactor( ++subSampleFactor );
+      GetFilter(nbDecomp)->SetUpSampleFilterFactor( ++subSampleFactor );
 
     GetFilter( nbDecomp )->Update();
 
@@ -128,7 +128,7 @@ WaveletForwardTransform< TInputImage, TOutputImage, TFilter >
     GetFilter(nbDecomp)->GraftNthOutput( idx, this->GetOutput( outputIdxForGraft-- ) );
 
   if ( m_UseSubSampleImage == false )
-      GetFilter(nbDecomp)->SetUpSampleFactor( ++subSampleFactor );
+      GetFilter(nbDecomp)->SetUpSampleFilterFactor( ++subSampleFactor );
 
   GetFilter( nbDecomp )->Update();
 
diff --git a/Code/MultiScale/otbWaveletPacketForwardTransform.txx b/Code/MultiScale/otbWaveletPacketForwardTransform.txx
index ab23c16fa2ac94b816d6c6722d84595bbb0fa9da..e12527f2fbf16945cb7f028017b3113f046b8980 100644
--- a/Code/MultiScale/otbWaveletPacketForwardTransform.txx
+++ b/Code/MultiScale/otbWaveletPacketForwardTransform.txx
@@ -72,7 +72,7 @@ WaveletPacketForwardTransform< TInputImage, TOutputImage, TFilter, TCost >
     this->GetFilterList()->PushBack( FilterType::New() );
     FilterType * filter = this->GetFilterList()->GetNthElement( this->GetFilterList()->Size()-1 );
     filter->SetInput( outputIt.Get() );
-    filter->SetUpSampleFactor( depth );
+    filter->SetUpSampleFilterFactor( depth );
     filter->Update();
 
     depth++;
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Code/Projections/otbGenericRSTransform.txx
index a57f8e2e59a68cc09d9e28816d29f0dbbd2fdb19..190a3122cad6599eb189c9dfaf4a76991bd7bd35 100644
--- a/Code/Projections/otbGenericRSTransform.txx
+++ b/Code/Projections/otbGenericRSTransform.txx
@@ -266,7 +266,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
       otbMsgDevMacro(<< "Input projection set to sensor model.");
       }
     }
-  catch(itk::ExceptionObject &err)
+  catch(itk::ExceptionObject &)
     {
     otbMsgDevMacro(<<" Input keyword list does not describe a sensor model.");
     }
@@ -310,7 +310,7 @@ GenericRSTransform<TScalarType, NInputDimensions, NOutputDimensions>
       otbMsgDevMacro(<< "Output projection set to sensor model");
       }
     }
-  catch(itk::ExceptionObject &err)
+  catch(itk::ExceptionObject &)
     {
     otbMsgDevMacro(<<" Output keyword list does not describe a sensor model.");
     }
diff --git a/Testing/Code/MultiScale/CMakeLists.txt b/Testing/Code/MultiScale/CMakeLists.txt
index 3ebb70ccff86f2d72e8a844789d158904f7f2037..7787c5ccc5aa1498cc9ddaee063a6713b54a55c6 100644
--- a/Testing/Code/MultiScale/CMakeLists.txt
+++ b/Testing/Code/MultiScale/CMakeLists.txt
@@ -397,23 +397,23 @@ ADD_TEST(msTvWaveletPacketTransform ${MULTISCALE_TESTS4}
           -out ${TEMP}/msTvWaveletPacketTransform
 )
 
-# -------            otb::StationaryFilterBankNew   ----------
-ADD_TEST(msTuStationaryFilterBankNew ${MULTISCALE_TESTS4}
-         otbStationaryFilterBankNew)
+# -------            otb::WaveletFilterBankNew   ----------
+ADD_TEST(msTuWaveletFilterBankNew ${MULTISCALE_TESTS4}
+         otbWaveletFilterBankNew)
 
-ADD_TEST(msTvStationaryFilterBank ${MULTISCALE_TESTS4}
+ADD_TEST(msTvWaveletFilterBank ${MULTISCALE_TESTS4}
         --compare-n-images ${TOL} 4
               ${BASELINE}/msTvStationaryFilterBank-0.tif
-              ${TEMP}/msTvStationaryFilterBank-0.tif
+              ${TEMP}/msTvWaveletFilterBank-0.tif
               ${BASELINE}/msTvStationaryFilterBank-1.tif
-              ${TEMP}/msTvStationaryFilterBank-1.tif
+              ${TEMP}/msTvWaveletFilterBank-1.tif
               ${BASELINE}/msTvStationaryFilterBank-2.tif
-              ${TEMP}/msTvStationaryFilterBank-2.tif
+              ${TEMP}/msTvWaveletFilterBank-2.tif
               ${BASELINE}/msTvStationaryFilterBank-3.tif
-              ${TEMP}/msTvStationaryFilterBank-3.tif
-         otbStationaryFilterBank
+              ${TEMP}/msTvWaveletFilterBank-3.tif
+         otbWaveletFilterBank
           -in ${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
-          -out ${TEMP}/msTvStationaryFilterBank
+          -out ${TEMP}/msTvWaveletFilterBank
 )
 
 # -------       Fichiers sources CXX -----------------------------------
@@ -458,8 +458,8 @@ otbWaveletTransformNew.cxx
 otbWaveletTransform.cxx
 otbWaveletPacketTransformNew.cxx
 otbWaveletPacketTransform.cxx
-otbStationaryFilterBankNew.cxx
-otbStationaryFilterBank.cxx
+otbWaveletFilterBankNew.cxx
+otbWaveletFilterBank.cxx
 )
 
 INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
diff --git a/Testing/Code/MultiScale/otbMultiScaleTests4.cxx b/Testing/Code/MultiScale/otbMultiScaleTests4.cxx
index 59f8d11c2aeb5747d8a6d6fcd8770efc87a63c05..af0eb97b747fa6013795fbf61f3ad9cc1dbed6f2 100644
--- a/Testing/Code/MultiScale/otbMultiScaleTests4.cxx
+++ b/Testing/Code/MultiScale/otbMultiScaleTests4.cxx
@@ -30,6 +30,6 @@ void RegisterTests()
   REGISTER_TEST(otbWaveletTransform);
   REGISTER_TEST(otbWaveletPacketTransformNew);
   REGISTER_TEST(otbWaveletPacketTransform);
-  REGISTER_TEST(otbStationaryFilterBankNew);
-  REGISTER_TEST(otbStationaryFilterBank);
+  REGISTER_TEST(otbWaveletFilterBankNew);
+  REGISTER_TEST(otbWaveletFilterBank);
 }
diff --git a/Testing/Code/MultiScale/otbStationaryFilterBank.cxx b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
similarity index 82%
rename from Testing/Code/MultiScale/otbStationaryFilterBank.cxx
rename to Testing/Code/MultiScale/otbWaveletFilterBank.cxx
index fec501f425c7e997c47a385bf94d0e2b2eb5890d..3022a30fef62247419e784b94485802b2f4e458a 100644
--- a/Testing/Code/MultiScale/otbStationaryFilterBank.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBank.cxx
@@ -25,15 +25,15 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbStationaryFilterBank.h"
+#include "otbWaveletFilterBank.h"
 
 #include "otbHaarOperator.h"
-#include "otb_9_7_Operator.h"
+#include "otbSplineBiOrthogonalOperator.h"
 
 #include "otbCommandLineArgumentParser.h"
 #include "otbCommandProgressUpdate.h"
 
-int otbStationaryFilterBank( int argc, char * argv[] )
+int otbWaveletFilterBank( int argc, char * argv[] )
 {
   typedef otb::CommandLineArgumentParser ParserType;
   ParserType::Pointer parser = ParserType::New();
@@ -74,15 +74,16 @@ int otbStationaryFilterBank( int argc, char * argv[] )
   reader->SetFileName( inputFileName );
 
   /* Transformation */
-  //typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
-  //typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
-  typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator;
+  typedef otb::LowPassHaarOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassHaarOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
+  //typedef otb::LowPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  //typedef otb::HighPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
 
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator >
-      FilterType;
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
+    FilterType;
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( reader->GetOutput() );
+  filter->SetSubsampleImageFactor(1);
 
   /* Observer */
   typedef otb::CommandProgressUpdate< FilterType > CommandType;
diff --git a/Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
similarity index 62%
rename from Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx
rename to Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
index e8e6ee39e1e0e3850dbf32e1dbaa0725baf5fb9c..f8e58603e4d253e0fa771c0ba4371ee92820331b 100644
--- a/Testing/Code/MultiScale/otbStationaryFilterBankNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
@@ -17,18 +17,19 @@ PURPOSE.  See the above copyright notices for more information.
 =========================================================================*/
 
 #include "otbImage.h"
-#include "otb_9_7_Operator.h"
-#include "otbStationaryFilterBank.h"
+#include "otbSplineBiOrthogonalOperator.h"
+#include "otbWaveletFilterBank.h"
 
-int otbStationaryFilterBankNew(int argc, char * argv[])
+int otbWaveletFilterBankNew(int argc, char * argv[])
 {
   const int Dimension = 2;
   typedef double PixelType;
   typedef otb::Image< PixelType, Dimension >  ImageType;
-  typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator;
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > FilterType;
+  typedef otb::LowPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
 
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
+    FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   return EXIT_SUCCESS;
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index b94319a4d14c76aae91211a86dff0792718e7419..2a6d7058291e3db97806722a8ebaba1fb2016dfd 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -25,12 +25,12 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbStationaryFilterBank.h"
+#include "otbWaveletFilterBank.h"
 #include "otbWaveletPacketForwardTransform.h"
 #include "otbWPCost.h"
 
 #include "otbHaarOperator.h"
-#include "otb_9_7_Operator.h"
+#include "otbSplineBiOrthogonalOperator.h"
 
 #include "otbCommandLineArgumentParser.h"
 #include "otbCommandProgressUpdate.h"
@@ -74,12 +74,10 @@ int otbWaveletPacketTransform( int argc, char * argv[] )
   reader->SetFileName( inputFileName );
 
   /* Transformation */
-  //typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
-  //typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
-  typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator;
+  typedef otb::LowPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
 
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator >
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
       WaveletFilterType;
   typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType;
 
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
index 13e9e69263716d228cfe791faf9339adaf40f82b..71fabd3980ecb43d316585f8b4f8beebf1b6dc60 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
@@ -18,7 +18,7 @@ PURPOSE.  See the above copyright notices for more information.
 
 #include "otbImage.h"
 #include "otbHaarOperator.h"
-#include "otbStationaryFilterBank.h"
+#include "otbWaveletFilterBank.h"
 #include "otbWaveletPacketForwardTransform.h"
 #include "otbWPCost.h"
 
@@ -27,15 +27,14 @@ int otbWaveletPacketTransformNew(int argc, char * argv[])
   const int Dimension = 2;
   typedef double PixelType;
   typedef otb::Image< PixelType, Dimension >  ImageType;
-  typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType;
+  typedef otb::LowPassHaarOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassHaarOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
+    WaveletFilterType;
   typedef otb::FullyDecomposedWaveletPacketCost< ImageType > CostType;
   typedef otb::WaveletPacketForwardTransform< ImageType, ImageType, WaveletFilterType, CostType >
       FilterType;
 
-
-
   FilterType::Pointer filter = FilterType::New();
 
   return EXIT_SUCCESS;
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Testing/Code/MultiScale/otbWaveletTransform.cxx
index f1ce9a627863363f5d2e073bce90e1c652b61719..4181562a7e64bce4e13ab66ea2e8b13974f57762 100644
--- a/Testing/Code/MultiScale/otbWaveletTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransform.cxx
@@ -25,11 +25,11 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbStationaryFilterBank.h"
+#include "otbWaveletFilterBank.h"
 #include "otbWaveletForwardTransform.h"
 
 #include "otbHaarOperator.h"
-#include "otb_9_7_Operator.h"
+#include "otbSplineBiOrthogonalOperator.h"
 
 #include "otbCommandLineArgumentParser.h"
 #include "otbCommandProgressUpdate.h"
@@ -73,12 +73,13 @@ int otbWaveletTransform( int argc, char * argv[] )
   reader->SetFileName( inputFileName );
 
   /* Transformation */
-  //typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
-  //typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
-  typedef otb::LowPass_9_7_Operator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPass_9_7_Operator< PixelType, Dimension > HighPassOperator;
+  //typedef otb::LowPassHaarOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  //typedef otb::HighPassHaarOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
+  typedef otb::LowPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassSplineBiOrthogonalOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
 
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType;
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
+    WaveletFilterType;
   typedef otb::WaveletForwardTransform< ImageType, ImageType, WaveletFilterType > FilterType;
   FilterType::Pointer filter = FilterType::New();
   filter->SetInput( reader->GetOutput() );
diff --git a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
index ebc38a7c32a8940e3176d7c70310845938c4ea5b..b2ebffe933f4fcede92c1d719af181d88c6a1405 100644
--- a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletTransformNew.cxx
@@ -19,16 +19,17 @@ PURPOSE.  See the above copyright notices for more information.
 #include "otbImage.h"
 #include "otbWaveletForwardTransform.h"
 #include "otbHaarOperator.h"
-#include "otbStationaryFilterBank.h"
+#include "otbWaveletFilterBank.h"
 
 int otbWaveletTransformNew(int argc, char * argv[])
 {
   const int Dimension = 2;
   typedef double PixelType;
   typedef otb::Image< PixelType, Dimension >  ImageType;
-  typedef otb::LowPassHaarOperator< PixelType, Dimension > LowPassOperator;
-  typedef otb::HighPassHaarOperator< PixelType, Dimension > HighPassOperator;
-  typedef otb::StationaryFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator > WaveletFilterType;
+  typedef otb::LowPassHaarOperator< otb::FORWARD, PixelType, Dimension > LowPassOperator;
+  typedef otb::HighPassHaarOperator< otb::FORWARD, PixelType, Dimension > HighPassOperator;
+  typedef otb::WaveletFilterBank< ImageType, ImageType, LowPassOperator, HighPassOperator, otb::FORWARD >
+    WaveletFilterType;
   typedef otb::WaveletForwardTransform< ImageType, ImageType, WaveletFilterType > FilterType;