diff --git a/CMake/i18n_qt5.cmake b/CMake/i18n_qt.cmake
similarity index 88%
rename from CMake/i18n_qt5.cmake
rename to CMake/i18n_qt.cmake
index 300f7f409c2034b2ef6361ed3a4201865d479892..6ef1672cf82bc0465e967ce4282a133e5cf0cf4f 100644
--- a/CMake/i18n_qt5.cmake
+++ b/CMake/i18n_qt.cmake
@@ -20,7 +20,7 @@
 
 #
 # Reset Qt I18N source files cache variable.
-macro( reset_qt5_i18n_sources )
+macro( reset_qt_i18n_sources )
   set( OTB_QT_I18N_INCLUDE_PATH "" CACHE INTERNAL "" FORCE )
   set( OTB_QT_I18N_HEADER_FILES "" CACHE INTERNAL "" FORCE )
   set( OTB_QT_I18N_SOURCE_FILES "" CACHE INTERNAL "" FORCE )
@@ -33,7 +33,7 @@ endmacro()
 
 #
 # Func
-function( add_to_qt5_i18n_files RESULT )
+function( add_to_qt_i18n_files RESULT )
   foreach( F ${ARGN} )
     #message( "${F}" )
 
@@ -45,13 +45,13 @@ endfunction()
 
 #
 #
-macro( add_to_qt5_i18n_include_path DIRECTORY )
+macro( add_to_qt_i18n_include_path DIRECTORY )
   set(OTB_I18N_INCLUDE_PATH ${OTB_I18N_INCLUDE_PATH} ${DIRECTORY} CACHE INTERNAL "")
 endmacro()
 
 #
 #
-macro( add_to_qt5_i18n_headers INCLUDE_DIR )
+macro( add_to_qt_i18n_headers INCLUDE_DIR )
 
   get_filename_component( ABS_INCLUDE_DIR ${INCLUDE_DIR} ABSOLUTE )
 
@@ -68,19 +68,19 @@ endmacro()
 
 #
 # Add source files to Qt I18n translation build.
-macro( add_to_qt5_i18n_sources )
-  add_to_qt5_i18n_files( OTB_QT_I18N_SOURCE_FILES ${ARGN} )
+macro( add_to_qt_i18n_sources )
+  add_to_qt_i18n_files( OTB_QT_I18N_SOURCE_FILES ${ARGN} )
 endmacro()
 
 #
 # Add source files to Qt I18n translation build.
-macro( add_to_qt5_i18n_forms )
-  add_to_qt5_i18n_files( OTB_QT_I18N_FORM_FILES ${ARGN} )
+macro( add_to_qt_i18n_forms )
+  add_to_qt_i18n_files( OTB_QT_I18N_FORM_FILES ${ARGN} )
 endmacro()
 
 #
 #
-macro( generate_qt5_project FILENAME )
+macro( generate_qt_project FILENAME )
   message( STATUS "Generating Qt5 '${FILENAME}' project file for I18N." )
 
   unset(_OTB_QT_I18N_INCLUDE_PATH_PRO)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b1f4d3bcca0e984a0196869d8802a026200676c..27c09612a6e2928b5aae6f6f407e0944270b1f87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,9 +100,9 @@ include(PreventInBuildInstalls)
 include(OTBModuleMacros)
 include(OTBModuleRemote)
 include(OTBModuleTest)
-include( i18n_qt4 )
+include( i18n_qt )
 
-reset_qt4_i18n_sources()
+reset_qt_i18n_sources()
 
 repository_status(${PROJECT_SOURCE_DIR} OTB_GIT_STATUS_MESSAGE)
 
diff --git a/Modules/Adapters/QtAdapters/src/CMakeLists.txt b/Modules/Adapters/QtAdapters/src/CMakeLists.txt
index ae4d62b84ba4a4cb45d77fa40f18bc4a812fa207..7b172de93e5bf7db63ff9075273ba5071030f4de 100644
--- a/Modules/Adapters/QtAdapters/src/CMakeLists.txt
+++ b/Modules/Adapters/QtAdapters/src/CMakeLists.txt
@@ -26,8 +26,8 @@ set( OTBQtAdapters_HEADERS_MOC
   # otbQtAdapters.h
   )
 
-add_to_qt4_i18n_sources( ${OTBQtAdapters_SRCS} )
-add_to_qt4_i18n_headers( "../include" ${OTBQtAdapters_SRCS} )
+add_to_qt_i18n_sources( ${OTBQtAdapters_SRCS} )
+add_to_qt_i18n_headers( "../include" ${OTBQtAdapters_SRCS} )
 
 qt5_wrap_cpp( OTBQtAdapters_SRC_MOC ${OTBQtAdapters_HEADERS_MOC} )
 
diff --git a/Modules/Visualization/Mapla/src/CMakeLists.txt b/Modules/Visualization/Mapla/src/CMakeLists.txt
index d7e34cdeaf06b2ecdc23427920b895785dbbc985..f6d02273ee06b69dab8a6909784b96ad29d06b7c 100644
--- a/Modules/Visualization/Mapla/src/CMakeLists.txt
+++ b/Modules/Visualization/Mapla/src/CMakeLists.txt
@@ -66,9 +66,9 @@ qt5_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS}  )
 qt5_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} OPTIONS "-no-compress")
 
 #############################################################################
-add_to_qt4_i18n_sources( ${OTBMapla_SRCS} )
-add_to_qt4_i18n_headers( "../include" ${OTBMapla_SRCS} )
-add_to_qt4_i18n_forms( ${OTBMapla_FORMS} )
+add_to_qt_i18n_sources( ${OTBMapla_SRCS} )
+add_to_qt_i18n_headers( "../include" ${OTBMapla_SRCS} )
+add_to_qt_i18n_forms( ${OTBMapla_FORMS} )
 
 ##########################[Mapla library]####################################
 add_library( OTBMapla
diff --git a/Modules/Visualization/Monteverdi/src/CMakeLists.txt b/Modules/Visualization/Monteverdi/src/CMakeLists.txt
index 8d215eb074c13602cc26808d1ee19402d137d2c8..9952927df4f285bb515e5bafdb56426f55d94a0c 100644
--- a/Modules/Visualization/Monteverdi/src/CMakeLists.txt
+++ b/Modules/Visualization/Monteverdi/src/CMakeLists.txt
@@ -49,9 +49,9 @@ qt5_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS}  )
 qt5_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} OPTIONS "-no-compress")
 
 #############################################################################
-add_to_qt4_i18n_sources( ${OTBMonteverdi_SRCS} )
-add_to_qt4_i18n_headers( "../include" ${OTBMonteverdi_SRCS} )
-add_to_qt4_i18n_forms( ${OTBMonteverdi_FORMS} )
+add_to_qt_i18n_sources( ${OTBMonteverdi_SRCS} )
+add_to_qt_i18n_headers( "../include" ${OTBMonteverdi_SRCS} )
+add_to_qt_i18n_forms( ${OTBMonteverdi_FORMS} )
 
 #############################################################################
 add_library( OTBMonteverdi
diff --git a/Modules/Visualization/MonteverdiCore/src/CMakeLists.txt b/Modules/Visualization/MonteverdiCore/src/CMakeLists.txt
index ae5ee7cb45701998ae7c94e8078489ba00db1e36..0525e9d28204399d7045efda29aa7850a08b7059 100644
--- a/Modules/Visualization/MonteverdiCore/src/CMakeLists.txt
+++ b/Modules/Visualization/MonteverdiCore/src/CMakeLists.txt
@@ -90,8 +90,8 @@ if( OTBApplicationEngine_ENABLED )
 endif()
 
 #############################################################################
-add_to_qt4_i18n_sources( ${OTBMonteverdiCore_SRCS} )
-add_to_qt4_i18n_headers( "../include" ${OTBMonteverdiCore_SRCS} )
+add_to_qt_i18n_sources( ${OTBMonteverdiCore_SRCS} )
+add_to_qt_i18n_headers( "../include" ${OTBMonteverdiCore_SRCS} )
 
 #############################################################################
 qt5_wrap_cpp( OTBMonteverdiCore_SRC_MOC ${OTBMonteverdiCore_HEADERS_MOC} )
diff --git a/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt b/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt
index 506d7153c0831ffb7b85dce9b94391c9b079ab77..e5d9c3016e522d6d24e7b8cead00987f6f959095 100644
--- a/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt
+++ b/Modules/Visualization/MonteverdiGui/src/CMakeLists.txt
@@ -179,9 +179,9 @@ qt5_wrap_ui( OTBMonteverdiGUI_FORMS_HEADERS ${OTBMonteverdiGUI_FORMS} )
 qt5_add_resources( OTBMonteverdiGUI_RESOURCES_RCC ${OTBMonteverdiGUI_RESOURCES} )
 
 #############################################################################
-add_to_qt4_i18n_sources( ${OTBMonteverdiGUI_SRCS} )
-add_to_qt4_i18n_headers( "../include" ${OTBMonteverdiGUI_SRCS} )
-add_to_qt4_i18n_forms( ${OTBMonteverdiGUI_FORMS} )
+add_to_qt_i18n_sources( ${OTBMonteverdiGUI_SRCS} )
+add_to_qt_i18n_headers( "../include" ${OTBMonteverdiGUI_SRCS} )
+add_to_qt_i18n_forms( ${OTBMonteverdiGUI_FORMS} )
 
 #############################################################################
 add_library( OTBMonteverdiGUI