diff --git a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
index 9159575470f6101bf2f58ca22d5e5a43ec1ddf5e..975b37fc884354f127b0c0316fa73a62ec853cec 100644
--- a/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
+++ b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
@@ -140,6 +140,9 @@ private:
     AddParameter(ParameterType_StringList, "plasup", "Plausibility Support");
     SetParameterDescription("plasup", "Dempster Shafer study hypothesis to compute plausibility");
 
+    AddParameter(ParameterType_OutputFilename, "out", "Output filename");
+    SetParameterDescription("out", "Output model file name (xml file) contains the optimal model to perform information fusion.");
+
     AddParameter(ParameterType_String, "cri", "Criterion");
     SetParameterDescription("cri", "Dempster Shafer criterion (by default (belief+plausibility)/2)");
     MandatoryOff("cri");
@@ -167,9 +170,6 @@ private:
     AddParameter(ParameterType_Bool,"optobs","Optimizer Observer");
     SetParameterDescription("optobs","Activate the optimizer observer");
 
-    AddParameter(ParameterType_OutputFilename,"out","Output filename");
-    SetParameterDescription("out","Output model file name (xml file) contains the optimal model to perform information fusion.");
-
     // Doc example parameter settings
     SetDocExampleParameterValue("psin", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
     SetDocExampleParameterValue("nsin", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_wr.shp");
diff --git a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
index a8dd7f071069a626f0571de89db6b5f334cf3f48..554edc2407ec481df0d1c1559f820cc190ef4385 100644
--- a/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
+++ b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
@@ -119,6 +119,9 @@ private:
     AddParameter(ParameterType_InputImageList, "il", "Input classifications");
     SetParameterDescription( "il", "List of input classification maps to fuse. Labels in each classification image must represent the same class." );
 
+    AddParameter(ParameterType_OutputImage, "out", "The output classification image");
+    SetParameterDescription("out", "The output classification image resulting from the fusion of the input classification images.");
+    SetDefaultOutputPixelType("out", ImagePixelType_uint8);
 
     /** GROUP FUSION METHOD */
     AddParameter(ParameterType_Choice, "method", "Fusion method");
@@ -157,10 +160,6 @@ private:
         "labels in the input classifications. By default, 'undecidedlabel = 0'.");
     SetDefaultParameterInt("undecidedlabel",0);
 
-    AddParameter(ParameterType_OutputImage,"out","The output classification image");
-    SetParameterDescription("out","The output classification image resulting from the fusion of the input classification images.");
-    SetDefaultOutputPixelType("out",ImagePixelType_uint8);
-
     // Doc example parameter settings
     SetDocExampleParameterValue("il", "classification1.tif classification2.tif classification3.tif");
     SetDocExampleParameterValue("method", "dempstershafer");
diff --git a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
index 9b4c8212658bd6b71ad45d4a42bfab1799a082a2..dd055e13ea4a9dead60c36d6a06aa3183a7388b3 100644
--- a/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
+++ b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
@@ -84,6 +84,9 @@ private:
     AddParameter(ParameterType_StringList, "plasup", "Plausibility Support");
     SetParameterDescription("plasup", "Dempster Shafer study hypothesis to compute plausibility");
 
+    AddParameter(ParameterType_OutputVectorData, "out", "Output Vector Data");
+    SetParameterDescription("out", "Output VectorData containing only the validated samples");
+
     AddParameter(ParameterType_String, "cri", "Criterion");
     SetParameterDescription("cri", "Dempster Shafer criterion (by default (belief+plausibility)/2)");
     MandatoryOff("cri");
@@ -94,9 +97,6 @@ private:
     MandatoryOff("thd");
     SetParameterFloat("thd",0.5);
 
-    AddParameter(ParameterType_OutputVectorData, "out", "Output Vector Data");
-    SetParameterDescription("out", "Output VectorData containing only the validated samples");
-
     // Doc example parameter settings
     SetDocExampleParameterValue("in", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
     SetDocExampleParameterValue("belsup", "cdbTvComputePolylineFeatureFromImage_LI_NOBUIL_gt.shp");
diff --git a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
index 8a5463e6b8758a93b724148b965c34db79653746..d367a97ec1b422403325bed89759064c6e338b44 100644
--- a/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
+++ b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
@@ -124,6 +124,14 @@ private:
     SetMinimumParameterIntValue("band2",1);
     SetDefaultParameterInt("band2",1);
 
+    AddParameter(ParameterType_OutputFilename, "out", "Output file with tie points");
+    SetParameterDescription("out", "File containing the list of tie points");
+
+    AddParameter(ParameterType_OutputFilename, "outvector", "Output vector file with tie points");
+    SetParameterDescription("outvector", "File containing segments representing matches ");
+    MandatoryOff("outvector");
+    DisableParameter("outvector");
+
     AddParameter(ParameterType_Choice,"algorithm","Keypoints detection algorithm");
     SetParameterDescription("algorithm","Choice of the detection algorithm to use");
 
@@ -183,14 +191,6 @@ private:
     // Elevation
     ElevationParametersHandler::AddElevationParameters(this, "elev");
 
-    AddParameter(ParameterType_OutputFilename,"out","Output file with tie points");
-    SetParameterDescription("out","File containing the list of tie points");
-
-    AddParameter(ParameterType_OutputFilename,"outvector","Output vector file with tie points");
-    SetParameterDescription("outvector","File containing segments representing matches ");
-    MandatoryOff("outvector");
-    DisableParameter("outvector");
-
     // Doc example parameter settings
     SetDocExampleParameterValue("in1", "sensor_stereo_left.tif");
     SetDocExampleParameterValue("in2","sensor_stereo_right.tif");
diff --git a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
index 7b570f058d6c0da5ed057a7071330669315afbbc..20be637f3db3a1656e48916d6150f385bd3c6a36 100644
--- a/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
+++ b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
@@ -79,6 +79,9 @@ private:
     AddParameter(ParameterType_InputImage, "in", "Input Image");
     SetParameterDescription("in", "The input image on which the features are computed.");
 
+    AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
+    SetParameterDescription("out", "Output image containing the edge features.");
+
     AddParameter(ParameterType_Int, "channel", "Selected Channel");
     SetParameterDescription("channel", "The selected channel index");
     SetDefaultParameterInt("channel", 1);
@@ -123,9 +126,6 @@ private:
     SetDefaultParameterFloat("filter.canny.lowerthreshold", 3.0);
     */
 
-    AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
-    SetParameterDescription("out", "Output image containing the edge features.");
-
     // Doc example parameter settings
     SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
     SetDocExampleParameterValue("channel", "1");
diff --git a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
index 818c433a09c84e5ad0489f2a35b7a89c25ec4356..7c9b4260768728fcd3f84c7ab813bfce63f7fa0b 100644
--- a/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
+++ b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
@@ -77,11 +77,6 @@ private:
     AddParameter(ParameterType_InputImage,  "in",   "Input Image");
     SetParameterDescription("in","Input hyperspectral data cube");
 
-    AddParameter(ParameterType_Int, "ne", "Number of endmembers");
-    SetParameterDescription("ne","The number of endmembers to extract from the hyperspectral image.");
-    SetParameterInt("ne",1);
-    MandatoryOn("ne");
-
     AddParameter(ParameterType_OutputImage, "outendm", "Output Endmembers");
     SetParameterDescription("outendm","Endmembers, stored in a"
     "one-line multi-spectral image.Each pixel corresponds to one"
@@ -89,6 +84,11 @@ private:
     "signature of the corresponding endmember.");
     MandatoryOn("outendm");
 
+    AddParameter(ParameterType_Int, "ne", "Number of endmembers");
+    SetParameterDescription("ne", "The number of endmembers to extract from the hyperspectral image.");
+    SetParameterInt("ne", 1);
+    MandatoryOn("ne");
+
     AddRANDParameter();
     // Doc example parameter settings
     SetDocExampleParameterValue("in", "cupriteSubHsi.tif");
diff --git a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
index 095da8b17f0c1a4bbce2b64ad4dcdb82fe816eea..388a96d55ae98537ddfc1933d39f4f87acf65278 100644
--- a/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
+++ b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
@@ -71,6 +71,9 @@ AddDocTag("Statistics");
 AddParameter(ParameterType_InputImage, "in",  "Input Image");
 SetParameterDescription("in", "The input image to compute the features on.");
 
+AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
+SetParameterDescription("out", "Output image containing the local statistical moments.");
+
 AddParameter(ParameterType_Int,  "channel",  "Selected Channel");
 SetParameterDescription("channel", "The selected channel index");
 SetDefaultParameterInt("channel", 1);
@@ -83,9 +86,6 @@ SetParameterDescription("radius", "The computational window radius.");
 SetMinimumParameterIntValue("radius",1);
 SetDefaultParameterInt("radius",3);
 
-AddParameter(ParameterType_OutputImage, "out", "Feature Output Image");
-SetParameterDescription("out", "Output image containing the local statistical moments.");
-
 // Doc example parameter settings
 SetDocExampleParameterValue("in", "qb_RoadExtract.tif");
 SetDocExampleParameterValue("channel", "1");
diff --git a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
index 13481a950ce16699ebab60f976673bc9c5d9450d..757ad47487014bf871c50ffab2aa37f7a2391d78 100644
--- a/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
+++ b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
@@ -101,6 +101,9 @@ private:
     AddParameter(ParameterType_InputImage,   "inm",   "The image to reproject");
     SetParameterDescription("inm","The image to reproject into the geometry of the reference input.");
 
+    AddParameter(ParameterType_OutputImage, "out", "Output image");
+    SetParameterDescription("out", "Output reprojected image.");
+
     // Elevation
     ElevationParametersHandler::AddElevationParameters(this, "elev");
 
@@ -115,9 +118,6 @@ private:
     SetDefaultParameterFloat("fv", 0.);
     MandatoryOff("fv");
 
-    AddParameter(ParameterType_OutputImage,  "out",   "Output image");
-    SetParameterDescription("out","Output reprojected image.");
-
     // Superposition mode
     AddParameter(ParameterType_Choice,"mode", "Mode");
     SetParameterDescription("mode", "Superimposition mode");
diff --git a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
index c6a4122b0bb8c9e36e0ad727bbe839c5566f7fa8..f11d6384eb813df4ddfb224e675f5f7e8948b3eb 100644
--- a/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
+++ b/Modules/Applications/AppSARPolarMatrixConvert/app/otbSARPolarMatrixConvert.cxx
@@ -232,28 +232,28 @@ private:
 
     AddDocTag(Tags::SAR);
 
-    AddParameter(ParameterType_InputImage,  "inc",   "Input : multi-band complex image");
+    AddParameter(ParameterType_InputImage, "inc", "Input: multi-band complex image");
     SetParameterDescription("inc", "Input : multi-band complex image");
     MandatoryOff("inc");
-    
-    AddParameter(ParameterType_InputImage,  "inf",   "Input : multi-band real image");
+
+    AddParameter(ParameterType_InputImage, "inf", "Input: multi-band real image");
     SetParameterDescription("inf", "Input : multi-band real image");
     MandatoryOff("inf");
 
 
-    AddParameter(ParameterType_InputImage,  "inhh",   "Input : one-band complex image (HH)");
+    AddParameter(ParameterType_InputImage, "inhh", "Input: one-band complex image (HH)");
     SetParameterDescription("inhh", "Input : one-band complex image (HH)");
     MandatoryOff("inhh");
-    
-    AddParameter(ParameterType_InputImage,  "inhv",   "Input : one-band complex image (HV)");
+
+    AddParameter(ParameterType_InputImage, "inhv", "Input: one-band complex image (HV)");
     SetParameterDescription("inhv", "Input : one-band complex image (HV)");
     MandatoryOff("inhv");
-    
-    AddParameter(ParameterType_InputImage,  "invh",   "Input : one-band complex image (VH)");
+
+    AddParameter(ParameterType_InputImage, "invh", "Input: one-band complex image (VH)");
     SetParameterDescription("invh", "Input : one-band complex image (VH)");
     MandatoryOff("invh");
-    
-    AddParameter(ParameterType_InputImage,  "invv",   "Input : one-band complex image (VV)");
+
+    AddParameter(ParameterType_InputImage, "invv", "Input: one-band complex image (VV)");
     SetParameterDescription("invv", "Input : one-band complex image (VV)");
     MandatoryOff("invv");