diff --git a/Modules/Applications/AppImageUtils/app/CMakeLists.txt b/Modules/Applications/AppImageUtils/app/CMakeLists.txt
index 82ef77a5887523595bdf30570c5bdebe3b3c5cdc..637eb926408db14daecc6cfd79401ada43a884a3 100644
--- a/Modules/Applications/AppImageUtils/app/CMakeLists.txt
+++ b/Modules/Applications/AppImageUtils/app/CMakeLists.txt
@@ -89,6 +89,6 @@ otb_create_application(
   LINK_LIBRARIES ${${otb-module}_LIBRARIES})
 
 otb_create_application(
-  NAME           NoDataMask
-  SOURCES        otbNoDataMask.cxx
+  NAME           ManageNoData
+  SOURCES        otbManageNoData.cxx
   LINK_LIBRARIES ${${otb-module}_LIBRARIES})
diff --git a/Modules/Applications/AppImageUtils/app/otbNoDataMask.cxx b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
similarity index 94%
rename from Modules/Applications/AppImageUtils/app/otbNoDataMask.cxx
rename to Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
index 5f88cbbc5731ac03004e7c60360e8a0f51eece75..e3ebf70fc18c867d5ca6ccb8ca14cdc67055fbfb 100644
--- a/Modules/Applications/AppImageUtils/app/otbNoDataMask.cxx
+++ b/Modules/Applications/AppImageUtils/app/otbManageNoData.cxx
@@ -26,11 +26,11 @@ namespace otb
 namespace Wrapper
 {
 
-class NoDataMask : public Application
+class ManageNoData : public Application
 {
 public:
   /** Standard class typedefs. */
-  typedef NoDataMask                       Self;
+  typedef ManageNoData                       Self;
   typedef Application                   Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
@@ -38,7 +38,7 @@ public:
   /** Standard macro */
   itkNewMacro(Self);
 
-  itkTypeMacro(NoDataMask, otb::Application);
+  itkTypeMacro(ManageNoData, otb::Application);
 
   /** Filters typedef */
   typedef otb::ImageToNoDataMaskFilter<FloatVectorImageType,UInt8ImageType> FilterType;
@@ -47,8 +47,8 @@ public:
 private:
   void DoInit()
   {
-    SetName("NoDataMask");
-    SetDescription("NoDataMask");
+    SetName("ManageNoData");
+    SetDescription("ManageNoData");
     // Documentation
     SetDocName("No Data Mask management");
     SetDocLongDescription("This application builds a nodata mask from the no data flags found in metadata or from NaN pixels.");
@@ -136,5 +136,5 @@ private:
 }
 }
 
-OTB_APPLICATION_EXPORT(otb::Wrapper::NoDataMask)
+OTB_APPLICATION_EXPORT(otb::Wrapper::ManageNoData)