diff --git a/cmake/BioDynaMo.cmake b/cmake/BioDynaMo.cmake
index 24f9080ab..7b8b60125 100644
--- a/cmake/BioDynaMo.cmake
+++ b/cmake/BioDynaMo.cmake
@@ -108,7 +108,7 @@ function(build_shared_library TARGET)
   # We always need dictionaries for the plugins (plugin manager requires class
   # information)
   if(dict OR DEFINED ARG_PLUGIN)
-    # generate dictionary using genreflex
+    # generate dictionary using rootcling reflex
     set(DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_dict")
     set(BDM_DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_bdm_dict.cc")
 
diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
index 50bc06ee8..b3f7c2e87 100644
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
@@ -97,8 +97,6 @@ mark_as_advanced(ROOT_CONFIG_EXECUTABLE)
 include(CMakeParseArguments)
 find_program(ROOTCLING_EXECUTABLE rootcling
   HINTS "$ENV{ROOTSYS}/bin" "$ENV{BDM_ROOT_DIR}/bin" "${CMAKE_THIRD_PARTY_DIR}/root/bin")
-find_program(GENREFLEX_EXECUTABLE genreflex
-  HINTS "$ENV{ROOTSYS}/bin" "$ENV{BDM_ROOT_DIR}/bin" "${CMAKE_THIRD_PARTY_DIR}/root/bin")
 #find_package(GCCXML)
 
 # We use the launcher script to emulate a `source thisbdm.sh` call
@@ -198,7 +196,7 @@ function(REFLEX_GENERATE_DICTIONARY dictionary)
   #set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}Dict)
   #---Actual command----------------------------------------
   add_custom_command(OUTPUT ${gensrcdict} ${rootmapname} ${dictionary}_rdict.pcm
-                     COMMAND ${LAUNCHER} ${GENREFLEX_EXECUTABLE} ${headerfiles} -o ${gensrcdict} ${rootmapopts} --select=${selectionfile} --noIncludePaths
+    COMMAND ${ROOTCLING_EXECUTABLE} --reflex --v2 -f ${gensrcdict} ${rootmapopts} ${headerfiles} ${selectionfile} --noIncludePaths --inlineInputHeader
                             ${ARG_OPTIONS} ${includedirs} ${definitions}
                      DEPENDS ${headerfiles} ${selectionfile})
 endfunction()
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index d7fc23074..f6309066d 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -109,7 +109,6 @@ function(verify_ROOT)
         SET(ROOT_ETC_DIR ${ROOT_ETC_DIR} PARENT_SCOPE)
         SET(ROOT_CONFIG_EXECUTABLE ${ROOT_CONFIG_EXECUTABLE} PARENT_SCOPE)
         SET(ROOTCLING_EXECUTABLE ${ROOTCLING_EXECUTABLE} PARENT_SCOPE)
-        SET(GENREFLEX_EXECUTABLE ${GENREFLEX_EXECUTABLE} PARENT_SCOPE)
     else()
         # When ROOT is found, but it's not C++17 compliant, we exit the installation, because ROOT needs
         # to be properly sourced prior to invoking CMake (CMake cannot do this for us, because it requires
diff --git a/util/makefile-build/bdm-code-generation b/util/makefile-build/bdm-code-generation
index cd7dce8b8..cc78053ae 100755
--- a/util/makefile-build/bdm-code-generation
+++ b/util/makefile-build/bdm-code-generation
@@ -58,7 +58,7 @@ CXX_INCLUDES=$(${BDM_CONFIG} --cxxincludes | sed 's|-isystem |-I|g')
 
 CXX_DEFINES=$(${BDM_CONFIG} --cxxdefines)
 
-genreflex ${HEADERS} -o ${DICT} --noIncludePaths --select=${SELECTIONFILE} ${CXX_DEFINES} ${CXX_INCLUDES} $ADDITIONAL_CXX_FLAGS
+rootcling --reflex --v2 -f ${DICT} ${HEADERS} ${SELECTIONFILE} --noIncludePaths --inlineInputHeader ${CXX_DEFINES} ${CXX_INCLUDES} $ADDITIONAL_CXX_FLAGS
 
 # Generate bdm dictionary and append to DICT
 BDM_DICT=$(mktemp)