diff --git a/Code/Common/otbHistogramStatisticFunction.h b/Code/Common/otbHistogramStatisticsFunction.h
similarity index 87%
rename from Code/Common/otbHistogramStatisticFunction.h
rename to Code/Common/otbHistogramStatisticsFunction.h
index 14e4971ab01d03bbc07bcfe5f5a95ff45e5979f6..14f49a669d8147b83f45185d6bb8acc470e8f967 100644
--- a/Code/Common/otbHistogramStatisticFunction.h
+++ b/Code/Common/otbHistogramStatisticsFunction.h
@@ -17,15 +17,15 @@
 =========================================================================*/
 
 
-#ifndef __otbHistogramStatisticFunction_h
-#define __otbHistogramStatisticFunction_h
+#ifndef __otbHistogramStatisticsFunction_h
+#define __otbHistogramStatisticsFunction_h
 
 #include "itkHistogramAlgorithmBase.h"
 
 namespace otb
 {
 
-/** \class HistogramStatisticFunction
+/** \class HistogramStatisticsFunction
  * \brief Computes parameters for a histogram.
  * 
  * You plug in the target histogram using SetInputHistogram method and 
@@ -36,12 +36,12 @@ namespace otb
  */
 
 template< class TInputHistogram, class TOutput >
-class HistogramStatisticFunction :
+class HistogramStatisticsFunction :
       public itk::HistogramAlgorithmBase< TInputHistogram >
 {
 public:
   /**Standard class typedefs. */
-  typedef HistogramStatisticFunction                      Self;
+  typedef HistogramStatisticsFunction                      Self;
   typedef itk::HistogramAlgorithmBase<TInputHistogram>    Superclass;
   typedef itk::SmartPointer<Self>                         Pointer;
   typedef itk::SmartPointer<const Self>                   ConstPointer;
@@ -52,7 +52,7 @@ public:
   typedef typename itk::NumericTraits<MeasurementType>::RealType EntropyType;
 
   /**Standard Macros */
-  itkTypeMacro(HistogramStatisticFunction, HistogramAlgorithmsBase);
+  itkTypeMacro(HistogramStatisticsFunction, HistogramAlgorithmsBase);
   itkNewMacro(Self) ;
                                                                                                                                       
   /** Typedef for the output type */
@@ -74,8 +74,8 @@ public:
 
 protected:
 
-  HistogramStatisticFunction() ;
-  virtual ~HistogramStatisticFunction() {}
+  HistogramStatisticsFunction() ;
+  virtual ~HistogramStatisticsFunction() {}
   void PrintSelf(std::ostream& os, itk::Indent indent) const;
                                                                                                                                       
   /** Calculates the thresholds and save them */
@@ -97,7 +97,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramStatisticFunction.txx"
+#include "otbHistogramStatisticsFunction.txx"
 #endif
 
 #endif
diff --git a/Code/Common/otbHistogramStatisticFunction.txx b/Code/Common/otbHistogramStatisticsFunction.txx
similarity index 81%
rename from Code/Common/otbHistogramStatisticFunction.txx
rename to Code/Common/otbHistogramStatisticsFunction.txx
index 9b7e9d0a5562f9d2db65fbb6d127333779b9fa59..b303863a6ebd8ec9abac43571a4d43a140fce89d 100644
--- a/Code/Common/otbHistogramStatisticFunction.txx
+++ b/Code/Common/otbHistogramStatisticsFunction.txx
@@ -16,24 +16,24 @@
 
 =========================================================================*/
 
-#ifndef _otbHistogramStatisticFunction_txx
-#define _otbHistogramStatisticFunction_txx
+#ifndef _otbHistogramStatisticsFunction_txx
+#define _otbHistogramStatisticsFunction_txx
 
-#include "otbHistogramStatisticFunction.h"
+#include "otbHistogramStatisticsFunction.h"
 
 namespace otb
 {
 
 template< class TInputHistogram, class TOutput >
-HistogramStatisticFunction< TInputHistogram, TOutput>
-::HistogramStatisticFunction()
+HistogramStatisticsFunction< TInputHistogram, TOutput>
+::HistogramStatisticsFunction()
 {
   m_IsModified = true;
 }
 
 template< class TInputHistogram, class TOutput >
-typename HistogramStatisticFunction< TInputHistogram, TOutput>::OutputType
-HistogramStatisticFunction< TInputHistogram, TOutput>
+typename HistogramStatisticsFunction< TInputHistogram, TOutput>::OutputType
+HistogramStatisticsFunction< TInputHistogram, TOutput>
 ::GetEntropy()
 {
   if(m_IsModified == true)
@@ -45,7 +45,7 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
 
 template< class TInputHistogram, class TOutput >
 void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
 ::CalculateEntropy()
 {
   typename TInputHistogram::ConstPointer histogram = m_InputHistogram;
@@ -81,9 +81,11 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
 }
 
 
+
+
 template< class TInputHistogram, class TOutput >
 void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
 ::GenerateData()
 {
 
@@ -94,7 +96,7 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
 
 template< class TInputHistogram, class TOutput >
 void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
 ::PrintSelf(std::ostream& os, itk::Indent indent) const
 {
   Superclass::PrintSelf(os,indent);
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 20d154ba1445a34e0bc606e0602ec9bcf913ac21..88dccfe845e70698deea02c2c1fb4aafa499e621 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -223,8 +223,8 @@ ADD_TEST(coTuPathListToHistogramGenerator ${COMMON_TESTS}
 
 # -------            otb::HistogramStatisticFunction   ---------------------------
 
-ADD_TEST(coTuHistogramStatisticFunction ${COMMON_TESTS} 
-         otbHistogramStatisticFunction 100)  
+ADD_TEST(coTuHistogramStatisticsFunction ${COMMON_TESTS} 
+         otbHistogramStatisticsFunction 100)  
          
 # -------       Fichiers sources CXX -----------------------------------
 SET(BasicCommon_SRCS
@@ -249,7 +249,7 @@ otbDrawLineSpatialObjectList.cxx
 otbImageToLineSpatialObjectListNew.cxx
 otbPathListToHistogramGeneratorNew.cxx
 otbPathListToHistogramGenerator.cxx
-otbHistogramStatisticFunction.cxx
+otbHistogramStatisticsFunction.cxx
 )
 
 
diff --git a/Testing/Code/Common/otbCommonTests.cxx b/Testing/Code/Common/otbCommonTests.cxx
index c14679bd50be13a8e049918c7e45586ba30f86c3..df6d72a7f26c8a90b27e1e0fb9f8920142d6e4e1 100644
--- a/Testing/Code/Common/otbCommonTests.cxx
+++ b/Testing/Code/Common/otbCommonTests.cxx
@@ -47,5 +47,5 @@ REGISTER_TEST(otbDrawLineSpatialObjectList);
 REGISTER_TEST(otbImageToLineSpatialObjectListNew);
 REGISTER_TEST(otbPathListToHistogramGeneratorNew);
 REGISTER_TEST(otbPathListToHistogramGenerator);
-REGISTER_TEST(otbHistogramStatisticFunction);
+REGISTER_TEST(otbHistogramStatisticsFunction);
 }
diff --git a/Testing/Code/Common/otbHistogramStatisticFunction.cxx b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
similarity index 79%
rename from Testing/Code/Common/otbHistogramStatisticFunction.cxx
rename to Testing/Code/Common/otbHistogramStatisticsFunction.cxx
index b0736a685c0702f03a4d6219fc17f504a1d921a3..b1ea12974cba983341e29ce45ce05a2726162691 100644
--- a/Testing/Code/Common/otbHistogramStatisticFunction.cxx
+++ b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
@@ -24,9 +24,9 @@
 
 
 #include "itkHistogram.h"
-#include "otbHistogramStatisticFunction.h"
+#include "otbHistogramStatisticsFunction.h"
 
-int otbHistogramStatisticFunction(int argc, char* argv[])
+int otbHistogramStatisticsFunction(int argc, char* argv[])
 {
   unsigned int  NbOfBins((unsigned int)::atoi(argv[1]));
 
@@ -51,14 +51,14 @@ int otbHistogramStatisticFunction(int argc, char* argv[])
         iter.SetFrequency(1.0);
     }
   
-  typedef otb::HistogramStatisticFunction<HistogramType,MeasurementType>  HistogramStatisticFunctionType;
-  HistogramStatisticFunctionType::Pointer HistogramStatisticFunction = HistogramStatisticFunctionType::New();
+  typedef otb::HistogramStatisticsFunction<HistogramType,MeasurementType>  HistogramStatisticsFunctionType;
+  HistogramStatisticsFunctionType::Pointer HistogramStatisticsFunction = HistogramStatisticsFunctionType::New();
 
-  HistogramStatisticFunction->SetInputHistogram(histogram.GetPointer());
+  HistogramStatisticsFunction->SetInputHistogram(histogram.GetPointer());
   
   
   MeasurementType Entropy;
-  Entropy = HistogramStatisticFunction->GetEntropy();
+  Entropy = HistogramStatisticsFunction->GetEntropy();
   std::cout << "Entropy 1 : " << Entropy << std::endl;
  
   if(fabs(Entropy-log(NbOfBins))>0.00001 ) 
@@ -80,8 +80,8 @@ int otbHistogramStatisticFunction(int argc, char* argv[])
 	}
     }
  
-  HistogramStatisticFunction->Update();
-  Entropy = HistogramStatisticFunction->GetEntropy();
+  HistogramStatisticsFunction->Update();
+  Entropy = HistogramStatisticsFunction->GetEntropy();
   std::cout << "Entropy 2 : " << Entropy << std::endl;
   if( Entropy!=0.0 ) 
   {