diff --git a/Modules/Applications/AppClassification/test/CMakeLists.txt b/Modules/Applications/AppClassification/test/CMakeLists.txt
index 05a834ae61eb8b106a2de005cc4f728566f4bc81..2bc24e7161831fe9a2bc0ee9426291ba5a8b0a22 100644
--- a/Modules/Applications/AppClassification/test/CMakeLists.txt
+++ b/Modules/Applications/AppClassification/test/CMakeLists.txt
@@ -606,10 +606,10 @@ otb_test_application(NAME apTvClKMeansImageClassification
                              -maxit 10000
                              -ct 0.0000001
                              -rand 121212
-                             -out ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif
+                             -out ${TEMP}/apTvClKMeansImageClassificationFilterOutput.tif
                      VALID   --compare-image ${NOTOL}
-                             ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOuptut.tif
-                             ${TEMP}/apTvClKMeansImageClassificationFilterOuptut.tif )
+                             ${OTBAPP_BASELINE}/apTvClKMeansImageClassificationFilterOutput.tif
+                             ${TEMP}/apTvClKMeansImageClassificationFilterOutput.tif )
 
 
 #----------- TrainImagesClassifier TESTS ----------------
diff --git a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
index 0428b2dfda3fae1ea314236405af024b22a11afc..045b6b321d445a75680f607a277b1c61f645c9a3 100644
--- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
+++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
@@ -73,7 +73,7 @@ private:
     AddParameter(ParameterType_InputVectorData,  "in",   "Input vector dataset");
     SetParameterDescription( "in", "The input vector dataset to be rasterized" );
 
-    AddParameter(ParameterType_OutputImage,  "out",   "Ouptut image");
+    AddParameter(ParameterType_OutputImage,  "out",   "Output image");
     SetParameterDescription( "out", "An output image containing the rasterized vector dataset" );
 
     AddParameter(ParameterType_InputImage,  "im",   "Input reference image");
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
index 727fd0240e2b31c42847e1913767395692405296..e1d1c6afe9b6dbe269f63cb3731840dfe40fea39 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
@@ -154,7 +154,7 @@ NeighborhoodScalarProductFilter<TInputImage, TOutputModulus, TOutputDirection>
         angle -= CONST_PI;
         }
 
-      // Set the ouptut values
+      // Set the output values
       outputIt.Set(scalarMaxValue);
       outputDirIt.Set(angle);
       ++neighInputIt;
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
index 8bf96a5035db4f9801e3d7d34606f7956de06cff..b19a1919f173d843771a8dbef9de7ef6cf7035e0 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
@@ -265,7 +265,7 @@ OverlapSaveConvolutionImageFilter<TInputImage, TOutputImage, TBoundaryCondition>
     norm = 1.0;
     }
 
-  // Fill the ouptut image
+  // Fill the output image
   outputIt.GoToBegin();
   while (!outputIt.IsAtEnd())
     {
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index 9aa1e9e57e30e455a9a1479711fa91fb43b8c57e..e755f1f3503847f40d81fcb6039b97e513ccc83c 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -198,7 +198,7 @@ public:
   void SetOutputParametersFromImage(const ImageBaseType * image);
 
   /** Useful to set output parmaters form an existing image with type
-    * different from input or ouptut image
+    * different from input or output image
     */
   template <class TImageType> void SetOutputParametersFromImage(const TImageType * image);
 
diff --git a/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx b/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
index bfd574776151b371a20b2231af6da383437749c7..1af2a5cf296e788c8ed1711c0ef8f957d4d04145 100644
--- a/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
+++ b/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
@@ -34,7 +34,7 @@ int otbGenericRSTransformGenericTest(int argc, char * argv[])
 {
   if(argc<14)
     {
-    std::cerr<<"Usage: "<<argv[0]<<"input_point_x input_point_y output_point_x output_point_y input_projection_type[IMAGE, WKT, EPSG] input_projection_source output_projection_type[IMAGE, WKT, EPSG] output_projection_source input_distance[PHYSICAL, GEO] input_threshold output_distance[PHYSICAL, GEO] ouptut_threshold elevation_flag[NOELEV, AVERAGE, DEM] elevation_source";
+    std::cerr<<"Usage: "<<argv[0]<<"input_point_x input_point_y output_point_x output_point_y input_projection_type[IMAGE, WKT, EPSG] input_projection_source output_projection_type[IMAGE, WKT, EPSG] output_projection_source input_distance[PHYSICAL, GEO] input_threshold output_distance[PHYSICAL, GEO] output_threshold elevation_flag[NOELEV, AVERAGE, DEM] elevation_source";
     return EXIT_FAILURE;
     }
 
diff --git a/Modules/Learning/LearningBase/test/CMakeLists.txt b/Modules/Learning/LearningBase/test/CMakeLists.txt
index 598c6e980656924d4be9b4e268de5240eedd30a5..a069af08ffcfbbc3c9c1596595b95c011a1bde7e 100644
--- a/Modules/Learning/LearningBase/test/CMakeLists.txt
+++ b/Modules/Learning/LearningBase/test/CMakeLists.txt
@@ -28,11 +28,11 @@ otb_add_test(NAME leTvDecisionTreeWithRealValues COMMAND otbLearningBaseTestDriv
 
 otb_add_test(NAME leTvKMeansImageClassificationFilter COMMAND otbLearningBaseTestDriver
   --compare-image ${NOTOL}
-  ${BASELINE}/leKMeansImageClassificationFilterOuptut.hdr
-  ${TEMP}/leKMeansImageClassificationFilterOuptut.hdr
+  ${BASELINE}/leKMeansImageClassificationFilterOutput.hdr
+  ${TEMP}/leKMeansImageClassificationFilterOutput.hdr
   otbKMeansImageClassificationFilter
   ${INPUTDATA}/poupees_sub.png
-  ${TEMP}/leKMeansImageClassificationFilterOuptut.hdr
+  ${TEMP}/leKMeansImageClassificationFilterOutput.hdr
   2
   0 0 0 0
   255 255 255 255
diff --git a/Modules/Learning/SOM/test/CMakeLists.txt b/Modules/Learning/SOM/test/CMakeLists.txt
index 50b0cea9685bb72c226e2eba7606c6572ed9ab6b..f0be8a6188bcc4669b85465e8c397803a35ec5ac 100644
--- a/Modules/Learning/SOM/test/CMakeLists.txt
+++ b/Modules/Learning/SOM/test/CMakeLists.txt
@@ -41,11 +41,11 @@ otb_add_test(NAME leTvSOM COMMAND otbSOMTestDriver
 otb_add_test(NAME leTvSOMImageClassificationFilter COMMAND otbSOMTestDriver
   --compare-image ${NOTOL}
   ${BASELINE}/leSOMPoupeesClassified.hdr
-  ${TEMP}/leSOMImageClassificationFilterOuptut.hdr
+  ${TEMP}/leSOMImageClassificationFilterOutput.hdr
   otbSOMImageClassificationFilter
   ${INPUTDATA}/poupees_sub.png
   ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr
-  ${TEMP}/leSOMImageClassificationFilterOuptut.hdr
+  ${TEMP}/leSOMImageClassificationFilterOutput.hdr
   )
 
 otb_add_test(NAME leTvSOMActivationBuilder COMMAND otbSOMTestDriver
@@ -112,11 +112,11 @@ otb_add_test(NAME leTvSOMClassifier COMMAND otbSOMTestDriver
 
 otb_add_test(NAME leTvSOMbasedImageFilter COMMAND otbSOMTestDriver
   --compare-image ${NOTOL}
-  ${BASELINE}/leSOMbasedImageFilterOuptut.hdr
-  ${TEMP}/leSOMbasedImageFilterOuptut.hdr
+  ${BASELINE}/leSOMbasedImageFilterOutput.hdr
+  ${TEMP}/leSOMbasedImageFilterOutput.hdr
   otbSOMbasedImageFilterTest
   ${INPUTDATA}/poupees_sub.png
   ${BASELINE}/leSOMPoupeesSubOutputMap1.hdr
-  ${TEMP}/leSOMbasedImageFilterOuptut.hdr
+  ${TEMP}/leSOMbasedImageFilterOutput.hdr
   )
 
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
index fd25930bc7b48d87af48f9913e7db57eeeb563c8..605a8ace1a1b40067dd43cf0d6794cec8bf92217 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
@@ -133,7 +133,7 @@ ImageMultiSegmentationToRCC8GraphFilter<TInputImage, TOutputGraph>
   // Input image list pointer
   InputImageListPointerType segList = this->GetInput();
 
-  // Ouptut graph pointer
+  // Output graph pointer
   OutputGraphPointerType graph = this->GetOutput();
 
   // invert value vector
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
index bc110e0a0d379e10e4a3da0a11a5508f75e89955..4bcb28a02a93cf180d5c441b03b65ed356ab5f9b 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
@@ -179,7 +179,7 @@ void
 PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
 ::BeforeThreadedGenerateData()
 {
-  // Ouptut graph pointer
+  // Output graph pointer
   OutputGraphPointerType      graph = this->GetOutput();
   PolygonListConstPointerType inputPtr = this->GetInput();
 
@@ -227,7 +227,7 @@ PolygonListToRCC8GraphFilter<TPolygonList, TOutputGraph>
 {
   //std::cout<<"Starting thread "<<threadId <<" to work on range ["<<startIndex<<", "<<stopIndex<<"]"<<std::endl;
 
-  // Ouptut graph pointer
+  // Output graph pointer
   OutputGraphPointerType      graph = this->GetOutput();
   PolygonListConstPointerType inputPtr = this->GetInput();
 
diff --git a/Modules/OBIA/RCC8/test/CMakeLists.txt b/Modules/OBIA/RCC8/test/CMakeLists.txt
index 5454c85c35cc1540abee4e2bc2bdcce663d1f174..4b3e5bfafb833e9f2a3470299e41077ee573a3fa 100644
--- a/Modules/OBIA/RCC8/test/CMakeLists.txt
+++ b/Modules/OBIA/RCC8/test/CMakeLists.txt
@@ -53,10 +53,10 @@ otb_add_test(NAME srTvRCC8GraphIOEndToEnd COMMAND otbRCC8TestDriver
 
 otb_add_test(NAME srTvPolygonListToRCC8GraphFilter COMMAND otbRCC8TestDriver
   --compare-ascii ${NOTOL}
-  ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOuptut.dot
-  ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot
+  ${BASELINE_FILES}/srTvPolygonListToRCC8GraphFilterOutput.dot
+  ${TEMP}/srTvPolygonListToRCC8GraphFilterOutput.dot
   otbPolygonListToRCC8GraphFilter
-  ${TEMP}/srTvPolygonListToRCC8GraphFilterOuptut.dot)
+  ${TEMP}/srTvPolygonListToRCC8GraphFilterOutput.dot)
 
 otb_add_test(NAME srTvRCC8VertexBase COMMAND otbRCC8TestDriver
   otbRCC8VertexBase
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index ded18110e7aca6ee33b543c9340179c4f47c7e64..99c547e07e73759eac80f9c0fd9e02509f2fc440 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -33,7 +33,7 @@ namespace otb
  *
  *  It uses the ITK registration framework locally for each point and thus
  *  provides the flexibility of this framework. The parameters of each transform
- *  are stored in the ouptut point set associated data. Optimizer, metric,
+ *  are stored in the output point set associated data. Optimizer, metric,
  *  interpolator and transform fixed parameters have to be set by the user.
  *
  *  This filters returns the pointset enriched with a set of value as PointData, in order of apparition :
@@ -77,7 +77,7 @@ public:
   typedef typename MovingImageType::Pointer   MovingImagePointerType;
   typedef typename MovingImageType::PixelType MovingPixelType;
 
-  /** Typedef for the input and ouptut point set */
+  /** Typedef for the input and output point set */
   typedef TPointSet                      PointSetType;
   typedef typename PointSetType::Pointer PointSetPointerType;
 
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
index 40a3289c2b76c0215993cdd8282a168017127797..253a73496a2097d125086d044f10b91350df0f3a 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
@@ -284,7 +284,7 @@ StereoSensorModelToElevationFilter<TInputImage, TOutputHeight>
   rsTransform->SetInputKeywordList(outputPtr->GetImageKeywordlist());
   rsTransform->InstanciateTransform();
 
-  // Fill ouptut
+  // Fill output
   itk::ImageRegionIteratorWithIndex<OutputImageType> outputIt(outputPtr, outputPtr->GetBufferedRegion());
 
   for(outputIt.GoToBegin(); !outputIt.IsAtEnd(); ++outputIt)
diff --git a/Modules/ThirdParty/6S/src/main.c b/Modules/ThirdParty/6S/src/main.c
index 6475b72f7d2eaca32e7206d43d9b74c69829ed66..7c6bf6ecd1d9193dad38689e5c67f95b2259be15 100644
--- a/Modules/ThirdParty/6S/src/main.c
+++ b/Modules/ThirdParty/6S/src/main.c
@@ -4877,7 +4877,7 @@ L34:
  */
 /*                                                                      c 
 */
-/*       irapp   that input parameter allows to activate atmospheric    c 
+/*       irapp   that input parameter allows activating atmospheric     c 
 */
 /*               correction mode                                        c 
 */
diff --git a/Modules/ThirdParty/6S/src/main.f b/Modules/ThirdParty/6S/src/main.f
index 718509233795011c892ae7848816d8cdbe5b39ee..5a60d980f83294fdc43588505a775d2ee04baa4d 100644
--- a/Modules/ThirdParty/6S/src/main.f
+++ b/Modules/ThirdParty/6S/src/main.f
@@ -2163,7 +2163,7 @@ c**********************************************************************c
  
 c**********************************************************************c
 c                                                                      c
-c       irapp   that input parameter allows to activate atmospheric    c
+c       irapp   that input parameter allows activating atmospheric     c
 c               correction mode                                        c
 c                                                                      c
 c		-1: No atmospheric Correction is performed             c
diff --git a/Modules/ThirdParty/6S/src/otb_main6S_function.c b/Modules/ThirdParty/6S/src/otb_main6S_function.c
index e59d02e4af82e555fb73fe080a094bc3ca49cd98..af18dffe850da0e4c6c8a7642a467e5b9ee636b5 100644
--- a/Modules/ThirdParty/6S/src/otb_main6S_function.c
+++ b/Modules/ThirdParty/6S/src/otb_main6S_function.c
@@ -3617,7 +3617,7 @@ rguments*/
  */
 /*                                                                      c 
 */
-/*       irapp   that input parameter allows to activate atmospheric    c 
+/*       irapp   that input parameter allows activating atmospheric     c 
 */
 /*               correction mode                                        c 
 */
diff --git a/Modules/ThirdParty/6S/src/otb_main6S_function.f b/Modules/ThirdParty/6S/src/otb_main6S_function.f
index 5bad2a4178d78d60b477bfe56ddbdb92504e83cc..ce73bba98953ba4eec04d481cdf7c3e86d227af0 100644
--- a/Modules/ThirdParty/6S/src/otb_main6S_function.f
+++ b/Modules/ThirdParty/6S/src/otb_main6S_function.f
@@ -2282,7 +2282,7 @@ C_otb_adaptation End: inhomo=0 idirec=0 igroun=0 ro=0
  
 c**********************************************************************c
 c                                                                      c
-c       irapp   that input parameter allows to activate atmospheric    c
+c       irapp   that input parameter allows activating atmospheric     c
 c               correction mode                                        c
 c                                                                      c
 c		-1: No atmospheric Correction is performed             c