diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32390f3be2..8ea6a5662a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,15 +157,15 @@ add_custom_target(
   ALL DEPENDS
     "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
 )
-add_dependencies(run_codegen codegen)
+add_dependencies(run_codegen codegen-tool)
 add_custom_command(
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
-  COMMAND codegen ARGS "modules" "src"
+  COMMAND codegen-tool ARGS "modules" "src"
   WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
   VERBATIM
 )
 set_target_properties(codegen-lib PROPERTIES FOLDER "support")
-set_target_properties(codegen PROPERTIES FOLDER "support")
+set_target_properties(codegen-tool PROPERTIES FOLDER "support")
 set_target_properties(run_codegen PROPERTIES FOLDER "support")
 
 
diff --git a/support/coding/codegen b/support/coding/codegen
index 664bb14e12..3b2c085fcd 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 664bb14e12335b0d5ea166f633fd571859fdd5c2
+Subproject commit 3b2c085fcd1be8edc3719aea40d7c4387044322c