diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 8f6fb0b1ed..d17c478ba1 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -92,7 +92,7 @@ jobs:
           git clone --branch master https://github.com/alicevision/SfM_quality_evaluation.git
           cd SfM_quality_evaluation/
           # checkout a specific commit to ensure repeatability
-          git checkout 130d12a0f59ebe1695dafdc42dfe109fe08407ea
+          git checkout 36e3bf2d05c64d1726cb4a0e770923794f203f98
           export LD_LIBRARY_PATH=$PWD/../../../AV_install/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
           echo "ldd aliceVision_cameraInit"
           ldd $PWD/../../../AV_install/bin/aliceVision_cameraInit
diff --git a/src/software/utils/CMakeLists.txt b/src/software/utils/CMakeLists.txt
index bd2e5ac732..12e7ffef1e 100644
--- a/src/software/utils/CMakeLists.txt
+++ b/src/software/utils/CMakeLists.txt
@@ -6,7 +6,7 @@ set(FOLDER_SOFTWARE_UTILS "Software/Utils")
 
 
 if(ALICEVISION_HAVE_CUDA)
-alicevision_add_software(aliceVision_utils_hardwareResources
+alicevision_add_software(aliceVision_hardwareResources
   SOURCE main_hardwareResources.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -18,7 +18,7 @@ endif()
 if(ALICEVISION_BUILD_SFM)
 # Uncertainty
 if(ALICEVISION_HAVE_UNCERTAINTYTE)
-    alicevision_add_software(aliceVision_utils_computeUncertainty
+    alicevision_add_software(aliceVision_computeUncertainty
       SOURCE main_computeUncertainty.cpp
       FOLDER ${FOLDER_SOFTWARE_UTILS}
       LINKS aliceVision_sfm
@@ -36,7 +36,7 @@ if(ALICEVISION_HAVE_UNCERTAINTYTE)
 # message(warning "CUDA_cusparse_LIBRARY: ${CUDA_cusparse_LIBRARY}")
 endif()
 
-alicevision_add_software(aliceVision_utils_imageProcessing 
+alicevision_add_software(aliceVision_imageProcessing 
     SOURCE main_imageProcessing.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
@@ -49,10 +49,10 @@ alicevision_add_software(aliceVision_utils_imageProcessing
 )
 
 if(ALICEVISION_HAVE_OPENCV)
-  target_link_libraries(aliceVision_utils_imageProcessing_exe PRIVATE ${OpenCV_LIBS})
+  target_link_libraries(aliceVision_imageProcessing_exe PRIVATE ${OpenCV_LIBS})
 endif()
 
-alicevision_add_software(aliceVision_utils_importMiddlebury
+alicevision_add_software(aliceVision_importMiddlebury
         SOURCE main_importMiddlebury.cpp
         FOLDER ${FOLDER_SOFTWARE_UTILS}
         LINKS
@@ -65,7 +65,7 @@ alicevision_add_software(aliceVision_utils_importMiddlebury
         )
 
 # Voctree creation
-alicevision_add_software(aliceVision_utils_voctreeCreation
+alicevision_add_software(aliceVision_voctreeCreation
   SOURCE main_voctreeCreation.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_voctree
@@ -77,7 +77,7 @@ alicevision_add_software(aliceVision_utils_voctreeCreation
 )
 
 # Voctree query utility
-alicevision_add_software(aliceVision_utils_voctreeQueryUtility
+alicevision_add_software(aliceVision_voctreeQueryUtility
   SOURCE main_voctreeQueryUtility.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_voctree
@@ -91,7 +91,7 @@ alicevision_add_software(aliceVision_utils_voctreeQueryUtility
 )
 
 # Voctree statistics
-alicevision_add_software(aliceVision_utils_voctreeStatistics
+alicevision_add_software(aliceVision_voctreeStatistics
   SOURCE main_voctreeStatistics.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_voctree
@@ -103,7 +103,7 @@ alicevision_add_software(aliceVision_utils_voctreeStatistics
 )
 
 # Frustrum filtering
-alicevision_add_software(aliceVision_utils_frustumFiltering
+alicevision_add_software(aliceVision_frustumFiltering
   SOURCE main_frustumFiltering.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -118,7 +118,7 @@ alicevision_add_software(aliceVision_utils_frustumFiltering
 
 # Transform rig
 if(ALICEVISION_HAVE_ALEMBIC)
-  alicevision_add_software(aliceVision_utils_rigTransform
+  alicevision_add_software(aliceVision_rigTransform
     SOURCE main_rigTransform.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_sfmData
@@ -134,7 +134,7 @@ endif()
 
 # SfM quality evaluation
 # - quality comparison against a GT camera path (MultiView Evaluation dataset)
-alicevision_add_software(aliceVision_utils_qualityEvaluation
+alicevision_add_software(aliceVision_qualityEvaluation
   SOURCE main_qualityEvaluation.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -146,7 +146,7 @@ alicevision_add_software(aliceVision_utils_qualityEvaluation
 )
 
 # SfM alignment
-alicevision_add_software(aliceVision_utils_sfmAlignment
+alicevision_add_software(aliceVision_sfmAlignment
   SOURCE main_sfmAlignment.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -158,7 +158,7 @@ alicevision_add_software(aliceVision_utils_sfmAlignment
 )
 
 # SfM transfer
-alicevision_add_software(aliceVision_utils_sfmTransfer
+alicevision_add_software(aliceVision_sfmTransfer
   SOURCE main_sfmTransfer.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -170,7 +170,7 @@ alicevision_add_software(aliceVision_utils_sfmTransfer
 )
 
 # SfM transform
-alicevision_add_software(aliceVision_utils_sfmTransform
+alicevision_add_software(aliceVision_sfmTransform
   SOURCE main_sfmTransform.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -182,7 +182,7 @@ alicevision_add_software(aliceVision_utils_sfmTransform
 )
 
 # SfM color harmonize
-alicevision_add_software(aliceVision_utils_sfmColorHarmonize
+alicevision_add_software(aliceVision_sfmColorHarmonize
   SOURCE main_sfmColorHarmonize.cpp
          sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp # TODO
   FOLDER ${FOLDER_SOFTWARE_UTILS}
@@ -204,7 +204,7 @@ alicevision_add_software(aliceVision_utils_sfmColorHarmonize
 )
 
 # SfM localization
-alicevision_add_software(aliceVision_utils_sfmLocalization
+alicevision_add_software(aliceVision_sfmLocalization
   SOURCE main_sfmLocalization.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -218,7 +218,7 @@ alicevision_add_software(aliceVision_utils_sfmLocalization
 
 # Keyframe selection
 # - export keyframes from video files / image sequence directories
-alicevision_add_software(aliceVision_utils_keyframeSelection
+alicevision_add_software(aliceVision_keyframeSelection
   SOURCE main_keyframeSelection.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -230,7 +230,7 @@ alicevision_add_software(aliceVision_utils_keyframeSelection
 
 
 # Print distances between 3D objects
-alicevision_add_software(aliceVision_utils_sfmDistances
+alicevision_add_software(aliceVision_sfmDistances
   SOURCE main_sfmDistances.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_sfm
@@ -241,7 +241,7 @@ alicevision_add_software(aliceVision_utils_sfmDistances
 )
 
 # Split 360 images in input in order to export square images
-alicevision_add_software(aliceVision_utils_split360Images
+alicevision_add_software(aliceVision_split360Images
   SOURCE main_split360Images.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -255,7 +255,7 @@ alicevision_add_software(aliceVision_utils_split360Images
 
 
 # Project 180° fisheye images into equirectangular
-alicevision_add_software(aliceVision_utils_fisheyeProjection
+alicevision_add_software(aliceVision_fisheyeProjection
   SOURCE main_fisheyeProjection.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -266,7 +266,7 @@ alicevision_add_software(aliceVision_utils_fisheyeProjection
 )
 
 # Lighting estimation from picture, albedo and geometry
-alicevision_add_software(aliceVision_utils_lightingEstimation
+alicevision_add_software(aliceVision_lightingEstimation
   SOURCE main_lightingEstimation.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -281,7 +281,7 @@ alicevision_add_software(aliceVision_utils_lightingEstimation
 
 
 # Lighting estimation from picture, albedo and geometry
-alicevision_add_software(aliceVision_utils_generateSampleScene
+alicevision_add_software(aliceVision_generateSampleScene
   SOURCE main_generateSampleScene.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
@@ -295,7 +295,7 @@ alicevision_add_software(aliceVision_utils_generateSampleScene
 
 # Perform color chart detection
 if(ALICEVISION_HAVE_OPENCV_CONTRIB)
-  alicevision_add_software(aliceVision_utils_colorCheckerDetection
+  alicevision_add_software(aliceVision_colorCheckerDetection
     SOURCE main_colorCheckerDetection.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
@@ -311,7 +311,7 @@ endif()
 
 # Perform color correction
 if(ALICEVISION_HAVE_OPENCV_CONTRIB)
-  alicevision_add_software(aliceVision_utils_colorCheckerCorrection
+  alicevision_add_software(aliceVision_colorCheckerCorrection
     SOURCE main_colorCheckerCorrection.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
@@ -329,7 +329,7 @@ endif() # ALICEVISION_BUILD_SFM
 if(ALICEVISION_BUILD_MVS)
 
 # Merge two meshes
-alicevision_add_software(aliceVision_utils_mergeMeshes
+alicevision_add_software(aliceVision_mergeMeshes
   SOURCE main_mergeMeshes.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system