diff --git a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
index 10c2b5116c7cfef829c57dd5101abcf664ef817c..f3e716b9264e337adc71011b3eebd7b04bdf005c 100644
--- a/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
+++ b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
@@ -54,7 +54,7 @@ private:
     SetDocSeeAlso("OGRLayerClassifier,TrainOGRLayersClassifier");
     AddDocTag(Tags::Segmentation);
 
-    AddParameter(ParameterType_InputFilename, "inshp", "Name of the input shapefile");
+    AddParameter(ParameterType_InputVectorData, "inshp", "Name of the input shapefile");
     SetParameterDescription("inshp","Name of the input shapefile");
 
     AddParameter(ParameterType_InputFilename, "outstats", "XML file containing mean and variance of each feature.");
diff --git a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
index 21cdb07bcd27d2821ee4e1383ec44917dad542d7..0eda56b748a6119bc637b5a5689bb5e41f9dd350 100644
--- a/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
@@ -63,7 +63,7 @@ private:
     SetDocSeeAlso("ComputeOGRLayersFeaturesStatistics,TrainOGRLayersClassifier");
     AddDocTag(Tags::Segmentation);
   
-    AddParameter(ParameterType_InputFilename, "inshp", "Name of the input shapefile");
+    AddParameter(ParameterType_InputVectorData, "inshp", "Name of the input shapefile");
     SetParameterDescription("inshp","Name of the input shapefile");
 
     AddParameter(ParameterType_InputFilename, "instats", "XML file containing mean and variance of each feature.");
@@ -122,8 +122,8 @@ private:
 
   void DoExecute()
   {
-	  
-	#ifdef OTB_USE_LIBSVM 
+      
+    #ifdef OTB_USE_LIBSVM 
     clock_t tic = clock();
 
     std::string shapefile = GetParameterString("inshp").c_str();
@@ -221,8 +221,8 @@ private:
     otbAppLogINFO( "Elapsed: "<< ((double)(toc - tic) / CLOCKS_PER_SEC)<<" seconds.");
         
     #else
-	otbAppLogFATAL("Module LIBSVM is not installed. You should consider turning OTB_USE_LIBSVM on during cmake configuration.");
-	#endif
+    otbAppLogFATAL("Module LIBSVM is not installed. You should consider turning OTB_USE_LIBSVM on during cmake configuration.");
+    #endif
     
   }
 
diff --git a/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx
index e0a044ae5e80149d3dc6bbd4aa6027a8aafbb8cd..96dfef756458d2185f5553c2d264a5ccf001b014 100644
--- a/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx
@@ -63,7 +63,7 @@ private:
     SetDocSeeAlso("OGRLayerClassifier,ComputeOGRLayersFeaturesStatistics");
     AddDocTag(Tags::Segmentation);
   
-    AddParameter(ParameterType_InputFilename, "inshp", "Name of the input shapefile");
+    AddParameter(ParameterType_InputVectorData, "inshp", "Name of the input shapefile");
     SetParameterDescription("inshp","Name of the input shapefile");
 
     AddParameter(ParameterType_InputFilename, "instats", "XML file containing mean and variance of each feature.");
@@ -121,7 +121,7 @@ private:
 
   void DoExecute()
   {
-	#ifdef OTB_USE_LIBSVM 
+    #ifdef OTB_USE_LIBSVM 
     clock_t tic = clock();
 
     std::string shapefile = GetParameterString("inshp");
@@ -203,9 +203,9 @@ private:
     otbAppLogINFO( "Elapsed: "<< ((double)(toc - tic) / CLOCKS_PER_SEC)<<" seconds.");
     
     #else
-	otbAppLogFATAL("Module LIBSVM is not installed. You should consider turning OTB_USE_LIBSVM on during cmake configuration.");
-	#endif
-	
+    otbAppLogFATAL("Module LIBSVM is not installed. You should consider turning OTB_USE_LIBSVM on during cmake configuration.");
+    #endif
+    
     }
 
 };
diff --git a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
index 8b66ad3b14afe9389a3bbec14b535a16f63c9426..588940de96af33475c130e6e1ad77882aff2149d 100644
--- a/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
+++ b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
@@ -70,7 +70,7 @@ private:
 
     AddDocTag(Tags::Vector);
 
-    AddParameter(ParameterType_InputFilename,  "in",   "Input vector dataset");
+    AddParameter(ParameterType_InputVectorData,  "in",   "Input vector dataset");
     SetParameterDescription( "in", "The input vector dataset to be rasterized" );
 
     AddParameter(ParameterType_OutputImage,  "out",   "Ouptut image");