diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -7,14 +7,14 @@
   STRING "Host clang-tidy-confusable-chars-gen executable. Saves building if cross-compiling.")
 
 if(NOT CLANG_TIDY_CONFUSABLE_CHARS_GEN STREQUAL "clang-tidy-confusable-chars-gen")
-  set(make_confusable_table ${CLANG_TIDY_CONFUSABLE_CHARS_GEN})
-  set(make_confusable_table_target ${CLANG_TIDY_CONFUSABLE_CHARS_GEN})
+  set(clang_tidy_confusable_chars_gen ${CLANG_TIDY_CONFUSABLE_CHARS_GEN})
+  set(clang_tidy_confusable_chars_gen_target ${CLANG_TIDY_CONFUSABLE_CHARS_GEN})
 elseif(LLVM_USE_HOST_TOOLS)
-  build_native_tool(clang-tidy-confusable-chars-gen make_confusable_table)
-  set(make_confusable_table_target "${make_confusable_table}")
+  build_native_tool(clang-tidy-confusable-chars-gen clang_tidy_confusable_chars_gen)
+  set(clang_tidy_confusable_chars_gen_target "${clang_tidy_confusable_chars_gen}")
 else()
-  set(make_confusable_table $<TARGET_FILE:clang-tidy-confusable-chars-gen>)
-  set(make_confusable_table_target clang-tidy-confusable-chars-gen)
+  set(clang_tidy_confusable_chars_gen $<TARGET_FILE:clang-tidy-confusable-chars-gen>)
+  set(clang_tidy_confusable_chars_gen_target clang-tidy-confusable-chars-gen)
 endif()
 
 add_subdirectory(ConfusableTable)
@@ -22,8 +22,8 @@
 
 add_custom_command(
     OUTPUT Confusables.inc
-    COMMAND ${make_confusable_table} ${CMAKE_CURRENT_SOURCE_DIR}/ConfusableTable/confusables.txt ${CMAKE_CURRENT_BINARY_DIR}/Confusables.inc
-    DEPENDS ${make_confusable_table_target} ConfusableTable/confusables.txt)
+    COMMAND ${clang_tidy_confusable_chars_gen} ${CMAKE_CURRENT_SOURCE_DIR}/ConfusableTable/confusables.txt ${CMAKE_CURRENT_BINARY_DIR}/Confusables.inc
+    DEPENDS ${clang_tidy_confusable_chars_gen_target} ConfusableTable/confusables.txt)
 
 add_custom_target(genconfusable DEPENDS Confusables.inc)