diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake
index 82b2fc544e..c26a5234e0 100644
--- a/cmake/flatzinc.cmake
+++ b/cmake/flatzinc.cmake
@@ -72,6 +72,7 @@ set_target_properties(flatzinc PROPERTIES
   CXX_STANDARD 17
   CXX_STANDARD_REQUIRED ON
   CXX_EXTENSIONS OFF
+  OUTPUT_NAME ${PROJECT_NAME}_flatzinc
   )
 target_compile_features(flatzinc PUBLIC cxx_std_17)
 target_compile_definitions(flatzinc PUBLIC ${FLATZINC_COMPILE_DEFINITIONS})
@@ -93,12 +94,12 @@ set_target_properties(flatzinc PROPERTIES
 set_target_properties(flatzinc PROPERTIES INTERFACE_flatzinc_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
 set_target_properties(flatzinc PROPERTIES COMPATIBLE_INTERFACE_STRING flatzinc_MAJOR_VERSION)
 ## Dependencies
-target_link_libraries(flatzinc PUBLIC ortools::ortools)
+target_link_libraries(flatzinc PUBLIC ${PROJECT_NAMESPACE}::ortools)
 if(WIN32)
   #target_link_libraries(flatzinc PUBLIC psapi.lib ws2_32.lib)
 endif()
 ## Alias
-add_library(${PROJECT_NAME}::flatzinc ALIAS flatzinc)
+add_library(${PROJECT_NAMESPACE}::flatzinc ALIAS flatzinc)
 
 
 if(APPLE)
@@ -109,58 +110,60 @@ elseif(UNIX)
 endif()
 
 
-# Fz Binary
-add_executable(fz
+# fzn-ortools Binary
+add_executable(fzn
   ortools/flatzinc/fz.cc
   )
 ## Includes
-target_include_directories(fz PRIVATE
+target_include_directories(fzn PRIVATE
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
   )
 ## Compile options
-set_target_properties(fz PROPERTIES
+set_target_properties(fzn PROPERTIES
   CXX_STANDARD 17
   CXX_STANDARD_REQUIRED ON
   CXX_EXTENSIONS OFF
+  OUTPUT_NAME fzn-${PROJECT_NAME}
   )
-target_compile_features(fz PUBLIC cxx_std_17)
-target_compile_definitions(fz PUBLIC ${FLATZINC_COMPILE_DEFINITIONS})
-target_compile_options(fz PUBLIC ${FLATZINC_COMPILE_OPTIONS})
+target_compile_features(fzn PUBLIC cxx_std_17)
+target_compile_definitions(fzn PUBLIC ${FLATZINC_COMPILE_DEFINITIONS})
+target_compile_options(fzn PUBLIC ${FLATZINC_COMPILE_OPTIONS})
 ## Dependencies
-target_link_libraries(fz PRIVATE ortools::flatzinc)
+target_link_libraries(fzn PRIVATE ${PROJECT_NAMESPACE}::flatzinc)
 ## Alias
-add_executable(${PROJECT_NAME}::fz ALIAS fz)
+add_executable(${PROJECT_NAME}::fzn ALIAS fzn)
 
 
-# Parser Binary
-add_executable(parser_main
+# Parser-main Binary
+add_executable(fzn-parser_test
   ortools/flatzinc/parser_main.cc
   )
 ## Includes
-target_include_directories(parser_main PRIVATE
+target_include_directories(fzn-parser_test PRIVATE
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
   )
 ## Compile options
-set_target_properties(parser_main PROPERTIES
+set_target_properties(fzn-parser_test PROPERTIES
   CXX_STANDARD 17
   CXX_STANDARD_REQUIRED ON
   CXX_EXTENSIONS OFF
+  OUTPUT_NAME fzn-parser-${PROJECT_NAME}
   )
-target_compile_features(parser_main PUBLIC cxx_std_17)
-target_compile_definitions(parser_main PUBLIC ${FLATZINC_COMPILE_DEFINITIONS})
-target_compile_options(parser_main PUBLIC ${FLATZINC_COMPILE_OPTIONS})
+target_compile_features(fzn-parser_test PUBLIC cxx_std_17)
+target_compile_definitions(fzn-parser_test PUBLIC ${FLATZINC_COMPILE_DEFINITIONS})
+target_compile_options(fzn-parser_test PUBLIC ${FLATZINC_COMPILE_OPTIONS})
 ## Dependencies
-target_link_libraries(parser_main PRIVATE ortools::flatzinc)
+target_link_libraries(fzn-parser_test PRIVATE ${PROJECT_NAMESPACE}::flatzinc)
 ## Alias
-add_executable(${PROJECT_NAME}::parser_main ALIAS parser_main)
+add_executable(${PROJECT_NAME}::fzn-parser_test ALIAS fzn-parser_test)
 
 
 # MiniZinc solver configuration
 file(RELATIVE_PATH FZ_REL_INSTALL_BINARY
   ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/minizinc/solvers
-  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fz)
+  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/fzn)
 configure_file(
   ortools/flatzinc/ortools.msc.in
   ${PROJECT_BINARY_DIR}/ortools.msc
@@ -168,7 +171,7 @@ configure_file(
 
 # Install rules
 include(GNUInstallDirs)
-install(TARGETS flatzinc fz parser_main
+install(TARGETS flatzinc fzn #fzn-parser_test
   EXPORT ${PROJECT_NAME}Targets
   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index bd9ae55470..f2c8853222 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -510,8 +510,8 @@ test_cc_cpp: \
  SOURCE=examples/cpp/solve.cc \
  ARGS="--input $(OR_ROOT_FULL)/examples/data/tests/test2.mps"
 
-rfz_%: fz
-	$(INSTALL_DIR)$Sbin$Sfz$E $(FZ_EX_PATH)$S$*.fzn
+rfz_%: cpp
+	$(INSTALL_DIR)$Sbin$Sfzn-ortools$E $(OR_ROOT_FULL)/examples/flatzinc/$*.fzn
 
 ###############
 ##  Archive  ##
diff --git a/makefiles/Makefile.port.mk b/makefiles/Makefile.port.mk
index 20857cd1f9..2c8bbd2791 100644
--- a/makefiles/Makefile.port.mk
+++ b/makefiles/Makefile.port.mk
@@ -28,7 +28,7 @@ ifneq ($(PLATFORM),WIN64)
   PDB = .pdb
   EXP = .exp
   ARCHIVE_EXT = .tar.gz
-  FZ_EXE = fzn-or-tools$E
+  FZ_EXE = fzn-ortools$E
   OBJ_OUT = -o # need the space
   EXE_OUT = -o # need the space
   S = /
@@ -194,7 +194,7 @@ else # Windows specific part.
   PDB = .pdb
   EXP = .exp
   ARCHIVE_EXT = .zip
-  FZ_EXE = fzn-or-tools$E
+  FZ_EXE = fzn-ortools$E
   OBJ_OUT = /Fo
   EXE_OUT = /Fe
   S = \\
diff --git a/tools/docker/minizinc-challenge.Dockerfile b/tools/docker/minizinc-challenge.Dockerfile
index 65dae735af..423a2e0699 100644
--- a/tools/docker/minizinc-challenge.Dockerfile
+++ b/tools/docker/minizinc-challenge.Dockerfile
@@ -40,6 +40,6 @@ RUN make detect \
 FROM third_party AS build
 RUN make compile JOBS=8
 
-RUN ln -s /root/or-tools/bin/fz /entry_data/fzn-exec
+RUN ln -s /root/or-tools/bin/fzn-ortools /entry_data/fzn-exec
 
 RUN cp /root/or-tools/ortools/flatzinc/mznlib/*mzn /entry_data/mzn-lib