diff --git a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
index 872d18db7ebcce79d957abe04917c5d92f605002..9cd332ae48e7e4762f2cbc13e50401ddd2a1d1e1 100644
--- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
@@ -29,7 +29,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "otbCommandProgressUpdate.h"
 
 // Software Guide : BeginLatex
@@ -173,10 +173,10 @@ int main(int argc, char* argv[] )
   // Software Guide : BeginCodeSnippet  
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>    OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>    OutputImageType;
   // Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
diff --git a/Examples/ChangeDetection/CorrelChDet.cxx b/Examples/ChangeDetection/CorrelChDet.cxx
index 69bb05c9d6cbaef5c3119704eea89be9a4afe0eb..b2b88c2dcb60b314ea6c2e36c9603d3b44f541fe 100644
--- a/Examples/ChangeDetection/CorrelChDet.cxx
+++ b/Examples/ChangeDetection/CorrelChDet.cxx
@@ -12,7 +12,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkShiftScaleImageFilter.h"
 #include "otbCorrelationChangeDetector.h"
 #include "otbCommandProgressUpdate.h"
@@ -33,10 +33,10 @@ int main(int argc, char* argv[] )
   // Declare the types of the images
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>  OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>  OutputImageType;
 
   typedef otb::ImageFileReader< InputImageType1 >  ReaderType1;
   typedef otb::ImageFileReader< InputImageType2 >  ReaderType2;
diff --git a/Examples/ChangeDetection/DiffChDet.cxx b/Examples/ChangeDetection/DiffChDet.cxx
index ef526ea8d7db4fd5a1b01a8f399ac9db963e71a9..3556c4558bdd4dcf168e6bf8b728d7114941d4ab 100755
--- a/Examples/ChangeDetection/DiffChDet.cxx
+++ b/Examples/ChangeDetection/DiffChDet.cxx
@@ -55,7 +55,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkAbsImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
@@ -85,10 +85,10 @@ int main(int argc, char* argv[] )
   //  Software Guide : BeginCodeSnippet
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>  OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>  OutputImageType;
 
   //  Software Guide : EndCodeSnippet
   
diff --git a/Examples/ChangeDetection/JHMIChDet.cxx b/Examples/ChangeDetection/JHMIChDet.cxx
index 04c5101e4d4ac174986b02778a190c15e8655ed0..81117ce395cda6585bbe9dd0bc7b4257b1df1d3f 100644
--- a/Examples/ChangeDetection/JHMIChDet.cxx
+++ b/Examples/ChangeDetection/JHMIChDet.cxx
@@ -12,7 +12,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkShiftScaleImageFilter.h"
 #include "otbJoinHistogramMIImageFilter.h"
 #include "otbCommandProgressUpdate.h"
@@ -33,10 +33,10 @@ int main(int argc, char* argv[] )
   // Declare the types of the images
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>  OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>  OutputImageType;
 
   typedef otb::ImageFileReader< InputImageType1 >  ReaderType1;
   typedef otb::ImageFileReader< InputImageType2 >  ReaderType2;
diff --git a/Examples/ChangeDetection/LHMIChDet.cxx b/Examples/ChangeDetection/LHMIChDet.cxx
index e21c28ac4c0b9a4f0f2120af564ef5a9568f9f64..b98b9778d9429f2eec3a38a7f5c2f80576806eea 100644
--- a/Examples/ChangeDetection/LHMIChDet.cxx
+++ b/Examples/ChangeDetection/LHMIChDet.cxx
@@ -12,7 +12,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkShiftScaleImageFilter.h"
 #include "otbLHMIChangeDetector.h"
 #include "otbCommandProgressUpdate.h"
@@ -33,10 +33,10 @@ int main(int argc, char* argv[] )
   // Declare the types of the images
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>  OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>  OutputImageType;
 
   typedef otb::ImageFileReader< InputImageType1 >  ReaderType1;
   typedef otb::ImageFileReader< InputImageType2 >  ReaderType2;
diff --git a/Examples/ChangeDetection/RatioChDet.cxx b/Examples/ChangeDetection/RatioChDet.cxx
index 2949bd3bf37af698277ac56971d8b0fa392e0b10..f09a839d1a7ecf1a5fed450c6a68c0ec086090bb 100644
--- a/Examples/ChangeDetection/RatioChDet.cxx
+++ b/Examples/ChangeDetection/RatioChDet.cxx
@@ -51,7 +51,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkShiftScaleImageFilter.h"
 #include "otbCommandProgressUpdate.h"
 
@@ -77,10 +77,10 @@ int main(int argc, char* argv[] )
   //  Software Guide : BeginCodeSnippet
   typedef float InternalPixelType;
   typedef unsigned char OutputPixelType;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType1;
-  typedef itk::Image<InternalPixelType, Dimension>  InputImageType2;
-  typedef itk::Image<InternalPixelType, Dimension>  ChangeImageType;
-  typedef itk::Image<OutputPixelType, Dimension>  OutputImageType;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType1;
+  typedef otb::Image<InternalPixelType, Dimension>  InputImageType2;
+  typedef otb::Image<InternalPixelType, Dimension>  ChangeImageType;
+  typedef otb::Image<OutputPixelType, Dimension>  OutputImageType;
   //  Software Guide : EndCodeSnippet
   
   //  Software Guide : BeginLatex
diff --git a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
index dfe25740033afa5870edc4c11aca6358253b1325..e34af82f4b5d99583c17de0c29534b0a0e87ec73 100644
--- a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
@@ -70,8 +70,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-//FIXME : itk::image --> otb
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/FeatureExtraction/ComplexMomentImageExample.cxx b/Examples/FeatureExtraction/ComplexMomentImageExample.cxx
index 30673627c126971c74ffcdfde3e96e5f9790260b..7919f1e6c8ece2209d992e50990895f2d3fd4466 100644
--- a/Examples/FeatureExtraction/ComplexMomentImageExample.cxx
+++ b/Examples/FeatureExtraction/ComplexMomentImageExample.cxx
@@ -53,8 +53,7 @@ int main(int argc, char ** argv )
 	        
     typedef unsigned char     InputPixelType;
     const   unsigned int      Dimension = 2;
-//FIXME : itk::image --> otb	
-    typedef itk::Image< InputPixelType,  Dimension >   InputImageType;
+    typedef otb::Image< InputPixelType,  Dimension >   InputImageType;
 
     typedef otb::ImageFileReader< InputImageType  >    ReaderType;
 
diff --git a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
index 0f5477a70942223b92f75121cf5a8706548123aa..1154edf5341a3b5dfa22b0e5be62c577d084deb0 100644
--- a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
@@ -74,8 +74,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  //FIXME : itk::image --> otb
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
index 80142b5245145ec6c5193268d697dadeb1a97425..e7752ca51c03593aa29672005229abcd59d1d7de 100644
--- a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
@@ -85,9 +85,8 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  //>FIXME itk::image-->OTB
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
-  typedef itk::Image< OutputPixelType,  2 >   OutputImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
   typedef otb::LineSpatialObjectList	 LinesListType;
diff --git a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
index 0f244045cca9bbc4cff5a8f4a74efba400c0ff47..0b36a7202fa4035349e637f84e89d78c21d20b9e 100644
--- a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
@@ -79,8 +79,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  //FIXME --> itk to otb image
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/FeatureExtraction/HuMomentImageExample.cxx b/Examples/FeatureExtraction/HuMomentImageExample.cxx
index e74fd4a15e018b7be43ee8faecc9ab02335fe237..b0b4a5c1adc49e98b8842e8e1be6e3cba673b94e 100644
--- a/Examples/FeatureExtraction/HuMomentImageExample.cxx
+++ b/Examples/FeatureExtraction/HuMomentImageExample.cxx
@@ -53,8 +53,7 @@ int main(int argc, char ** argv )
     typedef unsigned char     InputPixelType;
     const   unsigned int      Dimension = 2;
 
-    //FIXME itk-->otb image
-    typedef itk::Image< InputPixelType,  Dimension >   InputImageType;
+    typedef otb::Image< InputPixelType,  Dimension >   InputImageType;
 
     typedef otb::ImageFileReader< InputImageType  >    ReaderType;
 
diff --git a/Examples/FeatureExtraction/LocalHoughExample.cxx b/Examples/FeatureExtraction/LocalHoughExample.cxx
index 11006c9b0b099178761133fe58201e5805ea0c51..1b18c0dfc1ebe597db7847fad84f7b0a2f7a14a5 100644
--- a/Examples/FeatureExtraction/LocalHoughExample.cxx
+++ b/Examples/FeatureExtraction/LocalHoughExample.cxx
@@ -57,8 +57,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  // FIXME itk to otb image
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
index 89187029ddd8f7a22d33a7563f2600c88809d0bd..7150f0c1f145954c4bff3c7d3bc2941ab64376bf 100644
--- a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
@@ -74,8 +74,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  // FIXME itk to otb image
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
index b317be13504e00017b756d9e0247814196c628d9..eb4b46fe0a6db3ffadc8f21ac8ed6d833c3001c4 100644
--- a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
+++ b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
@@ -84,8 +84,7 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  // FiXME itk to otb image
-  typedef itk::Image< InternalPixelType,  2 >   InternalImageType;
+  typedef otb::Image< InternalPixelType,  2 >   InternalImageType;
   typedef otb::Image< OutputPixelType,  2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
diff --git a/Examples/Filtering/BinaryThresholdImageFilter.cxx b/Examples/Filtering/BinaryThresholdImageFilter.cxx
index 57c812f83d7e234ce6744c80300666c26e0d2020..6e934e766daef15250b5ec4d64b5ccf83f7ee86e 100644
--- a/Examples/Filtering/BinaryThresholdImageFilter.cxx
+++ b/Examples/Filtering/BinaryThresholdImageFilter.cxx
@@ -59,7 +59,7 @@
 #include "itkBinaryThresholdImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
@@ -95,8 +95,8 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  typedef itk::Image< InputPixelType,  2 >   InputImageType;
-  typedef itk::Image< OutputPixelType, 2 >   OutputImageType;
+  typedef otb::Image< InputPixelType,  2 >   InputImageType;
+  typedef otb::Image< OutputPixelType, 2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
 
diff --git a/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx b/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
index 64d2d68a2f854b60f724c831a0f94f6c7da5e41e..2c176e72dc7c3b73116cb3654d52ff833a608709 100755
--- a/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
+++ b/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
@@ -85,8 +85,7 @@ int main(int argc, char* argv[])
   const   unsigned int     Dimension = 2;
 
   typedef otb::Image<CharPixelType, Dimension>    CharImageType;
-  //FIXME itk to otb image
-  typedef itk::Image<RealPixelType, Dimension>    RealImageType;
+  typedef otb::Image<RealPixelType, Dimension>    RealImageType;
 
   typedef otb::ImageFileReader< CharImageType >  ReaderType;
   typedef otb::ImageFileWriter< CharImageType >  WriterType;
diff --git a/Examples/IO/ImageReadRegionOfInterestWrite.cxx b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
index 9e7e6ffaebd9f70f9ce52ddbe3d68fb05ba9a625..78dc4f6d95b5aa08cef967f8c36588c9ff68ae1a 100644
--- a/Examples/IO/ImageReadRegionOfInterestWrite.cxx
+++ b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
@@ -79,9 +79,8 @@ int main( int argc, char ** argv )
   typedef unsigned char        InputPixelType;
   typedef unsigned char        OutputPixelType;
   const   unsigned int        Dimension = 2;
-//FIXME itk to otb image
-  typedef itk::Image< InputPixelType,  Dimension >    InputImageType;
-  typedef itk::Image< OutputPixelType, Dimension >    OutputImageType;
+  typedef otb::Image< InputPixelType,  Dimension >    InputImageType;
+  typedef otb::Image< OutputPixelType, Dimension >    OutputImageType;
   // Software Guide : EndCodeSnippet
 
 
diff --git a/Examples/Segmentation/ConnectedThresholdImageFilter.cxx b/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
index 008d47f87bae924e963e59172ba2b87a2cf96364..855bad3ab53caef64cdea76c070aada202b43fc1 100644
--- a/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
+++ b/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
@@ -63,7 +63,7 @@
 // Software Guide : EndCodeSnippet
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "itkCastImageFilter.h"
 
 
@@ -110,13 +110,12 @@ int main( int argc, char *argv[])
   // Software Guide : BeginCodeSnippet
   typedef   float           InternalPixelType;
   const     unsigned int    Dimension = 2;
-  typedef itk::Image< InternalPixelType, Dimension >  InternalImageType;
+  typedef otb::Image< InternalPixelType, Dimension >  InternalImageType;
   // Software Guide : EndCodeSnippet
 
 
   typedef unsigned char OutputPixelType;
-  //FIXME : OTBIMAGE
-  typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
+  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
   typedef itk::CastImageFilter< InternalImageType, OutputImageType >
     CastingFilterType;
   CastingFilterType::Pointer caster = CastingFilterType::New();
diff --git a/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx b/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
index 781a2b6c8e39f1d399474e9d7c84abb6a56dd247..6e1a5565d283876fb6cdbbf0eed623430398a721 100644
--- a/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
+++ b/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
@@ -92,12 +92,11 @@ int main( int argc, char *argv[] )
   // Software Guide : BeginCodeSnippet
   typedef   float           InternalPixelType;
   const     unsigned int    Dimension = 2;
-  typedef itk::Image< InternalPixelType, Dimension >  InternalImageType;
+  typedef otb::Image< InternalPixelType, Dimension >  InternalImageType;
   // Software Guide : EndCodeSnippet
 
-  //FIXME : OTBIMAGE
   typedef unsigned char OutputPixelType;
-  typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
+  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
 
   typedef itk::CastImageFilter< InternalImageType, OutputImageType >
     CastingFilterType;
diff --git a/Examples/Segmentation/OtsuThresholdImageFilter.cxx b/Examples/Segmentation/OtsuThresholdImageFilter.cxx
index 70819639315caad4cf75f1ae2ce69fe838e52b72..f362601b32982cf96f65784a702c8ba95581b091 100755
--- a/Examples/Segmentation/OtsuThresholdImageFilter.cxx
+++ b/Examples/Segmentation/OtsuThresholdImageFilter.cxx
@@ -57,8 +57,8 @@ int main( int argc, char * argv[] )
   //  Software Guide : EndLatex 
 
   // Software Guide : BeginCodeSnippet
-  typedef itk::Image< InputPixelType,  2 >   InputImageType;
-  typedef itk::Image< OutputPixelType, 2 >   OutputImageType;
+  typedef otb::Image< InputPixelType,  2 >   InputImageType;
+  typedef otb::Image< OutputPixelType, 2 >   OutputImageType;
   // Software Guide : EndCodeSnippet
 
 
diff --git a/Examples/StartExamples/MeanImageFilter.cxx b/Examples/StartExamples/MeanImageFilter.cxx
index 657d33914099ae8bb3fee1b156fb6ab2184adb68..f56a4663bb585f03da42123240d25099a0d167ff 100644
--- a/Examples/StartExamples/MeanImageFilter.cxx
+++ b/Examples/StartExamples/MeanImageFilter.cxx
@@ -83,8 +83,7 @@ int main( int argc, char * argv[] )
   typedef   unsigned char  InputPixelType;
   typedef   unsigned char  OutputPixelType;
 
-  //FIXME itk to otb image
-  typedef itk::Image< InputPixelType,  2 >   InputImageType;
+  typedef otb::Image< InputPixelType,  2 >   InputImageType;
   typedef otb::Image< OutputPixelType, 2 >   OutputImageType;
   // Software Guide : EndCodeSnippet