diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
index a38e5f6dec7245edd334b589937c5c6f7ee451bb..109bde61068e7dd2a4c4e1466228ee0ff20e4375 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
@@ -47,8 +47,8 @@ SurfaceAdjacencyEffectCorrectionSchemeFilter<TInputImage, TOutputImage>
  m_IsSetAtmosphericRadiativeTerms(false),
  m_IsSetAtmoCorrectionParameters(false),
  m_IsSetAcquiCorrectionParameters(false),
- m_FunctorParametersHaveBeenComputed(false),
  m_WindowRadius(1),
+ m_FunctorParametersHaveBeenComputed(false),
  m_PixelSpacingInKilometers(1.),
  m_ZenithalViewingAngle(361.)
 {
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index da844d416e6145347454165f9feb2cf4362fa208..fe7d08fd8c7832d0ba850fb0003856af0ab63e73 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -58,7 +58,7 @@ namespace Wrapper
 {
 
 CommandLineLauncher::CommandLineLauncher() :
-  /*m_Expression(""),*/ m_WatcherList(), m_ReportProgress(true), m_MaxKeySize(0),m_VExpression()
+  /*m_Expression(""),*/m_VExpression(), m_WatcherList(), m_ReportProgress(true), m_MaxKeySize(0)
 {
   m_Application = NULL;
   m_Parser = CommandLineParser::New();
diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
index 6403506c19c6993377caa5c4e9c48b4d8059cb9a..8a348a4dea6725fb249e8a596d0b22487c9478f7 100644
--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -58,7 +58,7 @@
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
-#include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
+#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 // Software Guide : EndCodeSnippet
 
 // Software Guide : BeginLatex
@@ -71,7 +71,8 @@
 
 // Software Guide : BeginCodeSnippet
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h"
+#include "otbImageMetadataCorrectionParameters.h"
+#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericRadiativeTerms.h"
 // Software Guide : EndCodeSnippet
 
@@ -265,17 +266,17 @@ int main(int argc, char *argv[])
 
 //-------------------------------
 // Software Guide : BeginLatex
-//
+// TODO : need an update
 // At this step of the chain, radiometric informations are nedeed. Those informations
 // will be computed from different parameters stored in a
 // \doxygen{otb}{AtmosphericCorrectionParameters} class intance.
 // This {\em container} will be given to an
-// \doxygen{otb}{AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms}
+// \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms}
 // class instance which will call a 6S routine that will compute the needed
 // radiometric informations and store them in a
 // \doxygen{otb}{AtmosphericRadiativeTerms} class instance.
 // For this,
-// \doxygen{otb}{AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms}
+// \doxygen{otb}{RadiometryCorrectionParametersToAtmosphericRadiativeTerms}
 // \doxygen{otb}{AtmosphericCorrectionParameters} and
 // \doxygen{otb}{AtmosphericRadiativeTerms}
 // types are defined and instancied.
@@ -283,12 +284,15 @@ int main(int argc, char *argv[])
 // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
-  typedef otb::AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms
-  AtmosphericCorrectionParametersTo6SRadiativeTermsType;
+  typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms
+  RadiometryCorrectionParametersToRadiativeTermsType;
 
   typedef otb::AtmosphericCorrectionParameters
   AtmosphericCorrectionParametersType;
 
+  typedef otb::ImageMetadataCorrectionParameters
+  AcquisitionCorrectionParametersType;
+
   typedef otb::AtmosphericRadiativeTerms
   AtmosphericRadiativeTermsType;
   // Software Guide : EndCodeSnippet
@@ -302,6 +306,9 @@ int main(int argc, char *argv[])
   AtmosphericCorrectionParametersType::Pointer
     dataAtmosphericCorrectionParameters =
     AtmosphericCorrectionParametersType::New();
+  AcquisitionCorrectionParametersType::Pointer
+    dataAcquisitionCorrectionParameters =
+    AcquisitionCorrectionParametersType::New();
   AtmosphericRadiativeTermsType::Pointer dataAtmosphericRadiativeTerms =
     AtmosphericRadiativeTermsType::New();
 
@@ -336,7 +343,7 @@ int main(int argc, char *argv[])
     functionValues->SetMinSpectralValue(minSpectralValue);
     functionValues->SetMaxSpectralValue(maxSpectralValue);
     functionValues->SetUserStep(userStep);
-    dataAtmosphericCorrectionParameters->SetWavelengthSpectralBandWithIndex(
+    dataAcquisitionCorrectionParameters->SetWavelengthSpectralBandWithIndex(
       i,
       functionValues);
     }
@@ -344,7 +351,7 @@ int main(int argc, char *argv[])
   fin.close();
 
   // Software Guide : BeginLatex
-  //
+  // TODO : need an update
   // The \doxygen{otb}{AtmosphericCorrectionParameters} class needs several parameters :
   //  \begin{itemize}
   // \item The zenithal and azimutal solar angles that describe the solar incidence
@@ -370,21 +377,21 @@ int main(int argc, char *argv[])
 
   // Set parameters
   // Software Guide : BeginCodeSnippet
-  dataAtmosphericCorrectionParameters->SetSolarZenithalAngle(
+  dataAcquisitionCorrectionParameters->SetSolarZenithalAngle(
     static_cast<double>(atof(argv[6])));
 
-  dataAtmosphericCorrectionParameters->SetSolarAzimutalAngle(
+  dataAcquisitionCorrectionParameters->SetSolarAzimutalAngle(
     static_cast<double>(atof(argv[9])));
 
-  dataAtmosphericCorrectionParameters->SetViewingZenithalAngle(
+  dataAcquisitionCorrectionParameters->SetViewingZenithalAngle(
     static_cast<double>(atof(argv[10])));
 
-  dataAtmosphericCorrectionParameters->SetViewingAzimutalAngle(
+  dataAcquisitionCorrectionParameters->SetViewingAzimutalAngle(
     static_cast<double>(atof(argv[11])));
 
-  dataAtmosphericCorrectionParameters->SetMonth(atoi(argv[8]));
+  dataAcquisitionCorrectionParameters->SetMonth(atoi(argv[8]));
 
-  dataAtmosphericCorrectionParameters->SetDay(atoi(argv[7]));
+  dataAcquisitionCorrectionParameters->SetDay(atoi(argv[7]));
 
   dataAtmosphericCorrectionParameters->SetAtmosphericPressure(
     static_cast<double>(atof(argv[12])));
@@ -408,20 +415,16 @@ int main(int argc, char *argv[])
   //
   // Once those parameters are loaded and stored in the AtmosphericCorrectionParameters
   // instance class, it is given in input of an instance of
-  // AtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms that will compute
+  // RadiometryCorrectionParametersToAtmosphericRadiativeTerms that will compute
   // the needed radiometric informations.
   //
   // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-  AtmosphericCorrectionParametersTo6SRadiativeTermsType::Pointer
-    filterAtmosphericCorrectionParametersTo6SRadiativeTerms =
-    AtmosphericCorrectionParametersTo6SRadiativeTermsType::New();
-
-  filterAtmosphericCorrectionParametersTo6SRadiativeTerms->SetInput(
-    dataAtmosphericCorrectionParameters);
-
-  filterAtmosphericCorrectionParametersTo6SRadiativeTerms->Update();
+  AtmosphericRadiativeTermsType::Pointer atmosphericRadiativeTerms =
+    RadiometryCorrectionParametersToRadiativeTermsType::Compute(
+      dataAtmosphericCorrectionParameters,
+      dataAcquisitionCorrectionParameters);
   // Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
@@ -481,20 +484,19 @@ int main(int argc, char *argv[])
   // \item $T(\mu_{S})$ is the downward transmittance;
   // \item $T(\mu_{V})$ is the upward transmittance.
   // \end{itemize}
-  // All those parameters are contained in the AtmosphericCorrectionParametersTo6SRadiativeTerms
+  // All those parameters are contained in the RadiometryCorrectionParametersToRadiativeTerms
   // output.
   // Software Guide : EndLatex
 
   // Software Guide : BeginCodeSnippet
   filterReflectanceToSurfaceReflectanceImageFilter->
-  SetAtmosphericRadiativeTerms(
-    filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
+    SetAtmosphericRadiativeTerms(atmosphericRadiativeTerms);
   // Software Guide : EndCodeSnippet
 
 //-------------------------------
 // Software Guide : BeginLatex
 // Next (and last step) is the neighborhood correction.
-// For this, the SurfaceAdjacencyEffect6SCorrectionSchemeFilter class is used.
+// For this, the SurfaceAdjacencyEffectCorrectionSchemeFilter class is used.
 // The previous surface reflectance inversion is performed under the assumption of a
 // homogeneous ground environment. The following step allows to correct the adjacency
 // effect on the radiometry of pixels. The method is based on the decomposition of
@@ -525,37 +527,36 @@ int main(int argc, char *argv[])
 // \end{itemize}
 // \end{itemize}
 // The neighborhood consideration window size is given by the window radius.
-// An instance of \doxygen{otb}{SurfaceAdjacencyEffect6SCorrectionSchemeFilter} is created.
+// An instance of \doxygen{otb}{SurfaceAdjacencyEffectCorrectionSchemeFilter} is created.
 // Software Guide : EndLatex
 
   //  Software Guide : BeginCodeSnippet
-  typedef otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter<ImageType,
+  typedef otb::SurfaceAdjacencyEffectCorrectionSchemeFilter<ImageType,
       ImageType>
-  SurfaceAdjacencyEffect6SCorrectionSchemeFilterType;
-  SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::Pointer
-    filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter
-    = SurfaceAdjacencyEffect6SCorrectionSchemeFilterType::New();
+  SurfaceAdjacencyEffectCorrectionSchemeFilterType;
+  SurfaceAdjacencyEffectCorrectionSchemeFilterType::Pointer
+    filterSurfaceAdjacencyEffectCorrectionSchemeFilter
+    = SurfaceAdjacencyEffectCorrectionSchemeFilterType::New();
   //  Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
   //
   // The needs four input informations:
   // \begin{itemize}
-  // \item Radiometric informations (the output of the AtmosphericCorrectionParametersTo6SRadiativeTerms filter);
+  // \item Radiometric informations (the output of the RadiometryCorrectionParametersToRadiativeTerms filter);
   // \item The zenithal viewing angle;
   // \item The neighborhood window radius;
   // \item The pixel spacing in kilometers.
   // \end{itemize}
   //
   // Software Guide : EndLatex
-  filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
-  SetAtmosphericRadiativeTerms(
-    filterAtmosphericCorrectionParametersTo6SRadiativeTerms->GetOutput());
-  filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetZenithalViewingAngle(
-    dataAtmosphericCorrectionParameters->GetViewingZenithalAngle());
-  filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetWindowRadius(atoi(argv
+  filterSurfaceAdjacencyEffectCorrectionSchemeFilter->
+    SetAtmosphericRadiativeTerms(atmosphericRadiativeTerms);
+  filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetZenithalViewingAngle(
+    dataAcquisitionCorrectionParameters->GetViewingZenithalAngle());
+  filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetWindowRadius(atoi(argv
                                                                              [17]));
-  filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->
+  filterSurfaceAdjacencyEffectCorrectionSchemeFilter->
   SetPixelSpacingInKilometers(static_cast<double>(atof(argv[18])));
 
 //-------------------------------
@@ -575,11 +576,11 @@ int main(int argc, char *argv[])
   filterLuminanceToReflectance->SetInput(filterImageToLuminance->GetOutput());
   filterReflectanceToSurfaceReflectanceImageFilter->SetInput(
     filterLuminanceToReflectance->GetOutput());
-  filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->SetInput(
+  filterSurfaceAdjacencyEffectCorrectionSchemeFilter->SetInput(
     filterReflectanceToSurfaceReflectanceImageFilter->GetOutput());
 
   writer->SetInput(
-    filterSurfaceAdjacencyEffect6SCorrectionSchemeFilter->GetOutput());
+    filterSurfaceAdjacencyEffectCorrectionSchemeFilter->GetOutput());
 // Software Guide : EndCodeSnippet
 
 //  Software Guide : BeginLatex
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 7141b8f3ba374fe7dd5f114c862d28638082bab8..535875b228aea7fac07f5644d826b90ef38df0ef 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -135,21 +135,21 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
   typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
 
   typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
-  typedef typename AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
+  typedef AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
   typedef AtmoCorrectionParametersType::AerosolModelType                    AerosolModelType;
 
   typedef otb::ImageMetadataCorrectionParameters                            AcquiCorrectionParametersType;
-  typedef typename AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
+  typedef AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
 
   typedef otb::AtmosphericRadiativeTerms                                    AtmosphericRadiativeTermsType;
-  typedef typename AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;
+  typedef AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;
   typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
 
   typedef otb::FilterFunctionValues                                         FilterFunctionValuesType;
   typedef FilterFunctionValuesType::WavelengthSpectralBandType              ValueType;                //float
   typedef FilterFunctionValuesType::ValuesVectorType                        ValuesVectorType;         //std::vector<float>
 
-  typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
+  typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
 
   AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New();
   AtmoCorrectionParametersPointerType  paramAtmo = AtmoCorrectionParametersType::New();
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index 58484a15d1772ae25201a7a806a29e12062f9a84..4fbbbd41510e6362b2e144b011b611e71dbd1d0d 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -55,21 +55,21 @@ int otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter(int itkNotUsed(a
   typedef FilterFunctionValuesType::ValuesVectorType           ValuesVectorType;*/
 
   typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
-  typedef typename AtmoCorrectionParametersType::Pointer                    AtmoCorrectionParametersPointerType;
+  typedef AtmoCorrectionParametersType::Pointer                    AtmoCorrectionParametersPointerType;
   typedef AtmoCorrectionParametersType::AerosolModelType                    AerosolModelType;
 
   typedef otb::ImageMetadataCorrectionParameters                             AcquiCorrectionParametersType;
-  typedef typename AcquiCorrectionParametersType::Pointer                   AcquiCorrectionParametersPointerType;
+  typedef AcquiCorrectionParametersType::Pointer                   AcquiCorrectionParametersPointerType;
 
   typedef otb::AtmosphericRadiativeTerms                                    AtmosphericRadiativeTermsType;
-  typedef typename AtmosphericRadiativeTermsType::Pointer                   AtmosphericRadiativeTermsPointerType;
+  typedef AtmosphericRadiativeTermsType::Pointer                   AtmosphericRadiativeTermsPointerType;
   typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
 
   typedef otb::FilterFunctionValues                                     FilterFunctionValuesType;
   typedef FilterFunctionValuesType::WavelengthSpectralBandType          ValueType;                //float
   typedef FilterFunctionValuesType::ValuesVectorType                    ValuesVectorType;         //std::vector<float>
 
-  typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
+  typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
 
 
 
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
index 6ab37a000516338e3d13354b9282ad18f146f817..549b33e92e6722bf39d36c85f7179e5aab499f9f 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
@@ -49,21 +49,21 @@ int otbSurfaceAdjacencyEffectCorrectionSchemeFilter(int argc, char * argv[])
   typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
 
   typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
-  typedef typename AtmoCorrectionParametersType::Pointer                    AtmoCorrectionParametersPointerType;
+  typedef AtmoCorrectionParametersType::Pointer                    AtmoCorrectionParametersPointerType;
   typedef AtmoCorrectionParametersType::AerosolModelType                    AerosolModelType;
 
   typedef otb::ImageMetadataCorrectionParameters                             AcquiCorrectionParametersType;
-  typedef typename AcquiCorrectionParametersType::Pointer                   AcquiCorrectionParametersPointerType;
+  typedef AcquiCorrectionParametersType::Pointer                   AcquiCorrectionParametersPointerType;
 
   typedef otb::AtmosphericRadiativeTerms                                    AtmosphericRadiativeTermsType;
-  typedef typename AtmosphericRadiativeTermsType::Pointer                   AtmosphericRadiativeTermsPointerType;
+  typedef AtmosphericRadiativeTermsType::Pointer                   AtmosphericRadiativeTermsPointerType;
   typedef otb::AtmosphericRadiativeTerms::DataVectorType DataVectorType;
 
   typedef otb::FilterFunctionValues                                     FilterFunctionValuesType;
   typedef FilterFunctionValuesType::WavelengthSpectralBandType          ValueType;                //float
   typedef FilterFunctionValuesType::ValuesVectorType                    ValuesVectorType;         //std::vector<float>
 
-  typedef typename AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
+  typedef AcquiCorrectionParametersType::WavelengthSpectralBandVectorType        WavelengthSpectralBandVectorType;
 
 
   AcquiCorrectionParametersPointerType paramAcqui = AcquiCorrectionParametersType::New();
diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
index 3bf630d0a929f775baf33e79f3f523ca58602c60..11c1416099919dcd1e02ef277ff16e2c1d55847d 100644
--- a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
@@ -53,15 +53,15 @@ int otbAtmosphericCorrectionsRSRSVMClassifier(int argc, char * argv[])
   typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
 
   typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
-  typedef typename AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
+  typedef AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
 
   typedef AtmoCorrectionParametersType::AerosolModelType                    AerosolModelType;
 
   typedef otb::ImageMetadataCorrectionParameters                            AcquiCorrectionParametersType;
-  typedef typename AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
+  typedef AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
 
   typedef otb::AtmosphericRadiativeTerms                                    AtmosphericRadiativeTermsType;
-  typedef typename AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;
+  typedef AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;
 
 
   typedef itk::VariableLengthVector<double> SampleType;
diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
index 3b61df91a11d6ecfd0e4c1f77a65b3242d516cac..5c2507c92a9131dca7ce3c27db8fc10be3109e9c 100644
--- a/Testing/Code/Simulation/otbAtmosphericEffects.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
@@ -42,15 +42,15 @@ int otbAtmosphericEffects(int argc, char * argv[])
     typedef otb::RadiometryCorrectionParametersToAtmosphericRadiativeTerms     CorrectionParametersToRadiativeTermsType;
 
     typedef otb::AtmosphericCorrectionParameters                              AtmoCorrectionParametersType;
-    typedef typename AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
+    typedef AtmoCorrectionParametersType::Pointer                   AtmoCorrectionParametersPointerType;
 
     typedef AtmoCorrectionParametersType::AerosolModelType                    AerosolModelType;
 
     typedef otb::ImageMetadataCorrectionParameters                            AcquiCorrectionParametersType;
-    typedef typename AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
+    typedef AcquiCorrectionParametersType::Pointer                  AcquiCorrectionParametersPointerType;
 
     typedef otb::AtmosphericRadiativeTerms                                    AtmosphericRadiativeTermsType;
-    typedef typename AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;
+    typedef AtmosphericRadiativeTermsType::Pointer                  AtmosphericRadiativeTermsPointerType;