diff --git a/Modules/Applications/AppFiltering/app/otbFastNLMeans.cxx b/Modules/Applications/AppFiltering/app/otbFastNLMeans.cxx
index 80fa9c84be64f54b26b879ffe971ab1b23f900a4..2463dee25c365721d462d8a71539361dcfd032fa 100644
--- a/Modules/Applications/AppFiltering/app/otbFastNLMeans.cxx
+++ b/Modules/Applications/AppFiltering/app/otbFastNLMeans.cxx
@@ -68,17 +68,17 @@ namespace Wrapper
       AddParameter(ParameterType_OutputImage, "out", "Output Image");
       SetParameterDescription("out","Output image.");
 
-      AddParameter(ParameterType_Int, "patchsize", "Half patch size (patch is a square)");
-      SetParameterDescription("patchsize", "Full patch will have a size of 2*patchsize +1.");
-      SetDefaultParameterInt("patchsize", 2);
-      SetMinimumParameterIntValue("patchsize", 0);
-      MandatoryOff("patchsize");
-
-      AddParameter(ParameterType_Int, "searchsize", "Half search window size");
-      SetParameterDescription("searchsize", "Search window is used to find similar patches. Its size will be 2*searchsize+1. It is a squared window.");
-      SetDefaultParameterInt("searchsize", 7);
-      SetMinimumParameterIntValue("searchsize", 0);
-      MandatoryOff("searchsize");
+      AddParameter(ParameterType_Int, "patchradius", "Patch radius (patch is a square)");
+      SetParameterDescription("patchradius", "Full patch will have a size of 2*patchradius +1.");
+      SetDefaultParameterInt("patchradius", 2);
+      SetMinimumParameterIntValue("patchradius", 0);
+      MandatoryOff("patchradius");
+
+      AddParameter(ParameterType_Int, "searchradius", "Search window radius (search window is a square)");
+      SetParameterDescription("searchradius", "Search window is used to find similar patches. Its size will be 2*searchradius+1.");
+      SetDefaultParameterInt("searchradius", 7);
+      SetMinimumParameterIntValue("searchradius", 0);
+      MandatoryOff("searchradius");
 
       AddParameter(ParameterType_Float, "sig", "Standard deviation in image");
       SetParameterDescription("sig", "Noise standard deviation estimated in image. This parameter is used to correct for the expected difference between two patches. This filter works fine without using this tuning.");
@@ -109,8 +109,8 @@ namespace Wrapper
       ImageType::Pointer imIn = this->GetParameterFloatImage("in");
       float sigma = this->GetParameterFloat("sig");
       float cutoffDistance = this->GetParameterFloat("thresh");
-      int halfPatchSize = this->GetParameterInt("patchsize");
-      int halfSearchSize = this->GetParameterInt("searchsize");
+      int halfPatchSize = this->GetParameterInt("patchradius");
+      int halfSearchSize = this->GetParameterInt("searchradius");
       NLMeansFilterType::Pointer nlMeansFilter = NLMeansFilterType::New();
       nlMeansFilter->SetInput(imIn);
       nlMeansFilter->SetSigma(sigma);
diff --git a/Modules/Applications/AppFiltering/test/CMakeLists.txt b/Modules/Applications/AppFiltering/test/CMakeLists.txt
index 7ec7dadddd1a97cf3effb41cd1fc4addfd24b6a9..84ce8527671b5e9ecf1540dd0d80216297cfa707 100644
--- a/Modules/Applications/AppFiltering/test/CMakeLists.txt
+++ b/Modules/Applications/AppFiltering/test/CMakeLists.txt
@@ -108,8 +108,8 @@ otb_test_application(NAME  nlMeansTest_base
                      APP  FastNLMeans
                      OPTIONS -in ${INPUTDATA}/GomaAvant.tif
                              -out ${TEMP}/GomaAvant_NLMeans.tif
-                             -patchsize 2
-                             -searchsize 11
+                             -patchradius 2
+                             -searchradius 11
                              -thresh 30
                      VALID   --compare-image ${EPSILON_7}
                              ${BASELINE}/GomaAvant_NLMeans.tif