diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
index f7a9dc5a07..9187c6c8fa 100644
--- a/shared/source/built_ins/kernels/CMakeLists.txt
+++ b/shared/source/built_ins/kernels/CMakeLists.txt
@@ -87,13 +87,13 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode
                      DEPENDS ${builtin} ocloc copy_compiler_files
   )
 
-  set(addrmode "default")
-  if(${MODE} STREQUAL "bindless")
-    set(addrmode "bindless")
-  elseif(${MODE} STREQUAL "bindful")
-    set(addrmode "bindful")
-  elseif(${MODE} STREQUAL "stateless")
-    set(addrmode "bindful")
+  set(stateful_address_mode "default")
+  if(${mode} STREQUAL "bindless")
+    set(stateful_address_mode "bindless")
+  elseif(${mode} STREQUAL "bindful")
+    set(stateful_address_mode "bindful")
+  elseif(${mode} STREQUAL "stateless")
+    set(stateful_address_mode "bindful")
   endif()
 
   set(OUTPUT_FILES_BINARIES_PREV)
@@ -113,7 +113,7 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode
       get_filename_component(absolute_filepath_spv ${OUTPUT_FILE_SPV} ABSOLUTE)
       add_custom_command(
                          OUTPUT ${OUTPUT_FILES_BINARIES}
-                         COMMAND ${ocloc_cmd_prefix} -q -file ${absolute_filepath_spv} -spirv_input -device ${RELEASE} ${builtin_options} -${bits} -stateful_address_mode ${addrmode} -output ${mode}_${BASENAME}_${RELEASE_FILENAME} -output_no_suffix -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >"
+                         COMMAND ${ocloc_cmd_prefix} -q -file ${absolute_filepath_spv} -spirv_input -device ${RELEASE} ${builtin_options} -${bits} -stateful_address_mode ${stateful_address_mode} -output ${mode}_${BASENAME}_${RELEASE_FILENAME} -output_no_suffix -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >"
                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                          DEPENDS ${OUTPUT_FILE_SPV} ocloc copy_compiler_files ${OUTPUT_FILES_BINARIES_PREV}
       )