diff --git a/MyxCMake/modules/MyxCMakeCodeAnalyzeApplyReplacements.cmake b/MyxCMake/modules/MyxCMakeCodeAnalyzeApplyReplacements.cmake
new file mode 100644
index 0000000..f07fd14
--- /dev/null
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeApplyReplacements.cmake
@@ -0,0 +1,8 @@
+set(CLANG_APPLY_REPLACEMENTS_NAMES clang-apply-replacements)
+foreach(V RANGE 9 15)
+  list(INSERT CLANG_APPLY_REPLACEMENTS_NAMES 0 "clang-apply-replacements-${V}")
+endforeach()
+unset(V)
+
+find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES ${CLANG_APPLY_REPLACEMENTS_NAMES})
+unset(CLANG_APPLY_REPLACEMENTS_NAMES)
diff --git a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake
index 6bb009d..150f0e8 100644
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangCheck.cmake
@@ -2,12 +2,12 @@ set(CLANG_CHECK_NAMES clang-check)
 foreach(V RANGE 9 15)
   list(INSERT CLANG_CHECK_NAMES 0 "clang-check-${V}")
 endforeach()
+unset(V)
 
 find_program(CLANG_CHECK_EXE NAMES ${CLANG_CHECK_NAMES})
 if(CLANG_CHECK_EXE)
   option(MYX_CMAKE_CLANG_CHECK_FIX "MyxCMake: perform fixes for Clang Check" OFF)
 endif()
-unset(V)
 unset(CLANG_CHECK_NAMES)
 
 function(myx_cmake_analyze_clang_check target)
@@ -18,7 +18,7 @@ function(myx_cmake_analyze_clang_check target)
     list(FILTER __sources EXCLUDE REGEX "moc_.*\\.cpp$")
     list(FILTER __sources EXCLUDE REGEX "ui_.*\\.h$")
 
-    if(MYX_CMAKE_CLANG_ANALYZE_FIX)
+    if(MYX_CMAKE_CLANG_CHECK_FIX)
       list(APPEND _args "--fixit")
     endif()
     if(NOT TARGET myx-cmake-analyze-clang-check)
diff --git a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake
index ce3a2f9..32dc395 100644
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClangTidy.cmake
@@ -2,12 +2,12 @@ set(CLANG_TIDY_NAMES clang-tidy)
 foreach(V RANGE 9 15)
   list(INSERT CLANG_TIDY_NAMES 0 "clang-tidy-${V}")
 endforeach()
+unset(V)
 
 find_program(CLANG_TIDY_EXE NAMES ${CLANG_TIDY_NAMES})
 if(CLANG_TIDY_EXE)
   option(MYX_CMAKE_CLANG_TIDY_FIX "MyxCMake: perform fixes for Clang Tidy" OFF)
 endif()
-unset(V)
 unset(CLANG_TIDY_NAMES)
 
 function(myx_cmake_analyze_clang_tidy target)
diff --git a/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake b/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake
index daadfc1..ba5f695 100644
--- a/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake
+++ b/MyxCMake/modules/MyxCMakeCodeAnalyzeClazy.cmake
@@ -1,17 +1,5 @@
 find_program(CLAZY_EXE NAMES clazy-standalone)
 
-set(CLANG_APPLY_REPLACEMENTS_NAMES clang-apply-replacements)
-foreach(V RANGE 9 15)
-  list(INSERT CLANG_APPLY_REPLACEMENTS_NAMES 0 "clang-apply-replacements-${V}")
-endforeach()
-
-find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES ${CLANG_APPLY_REPLACEMENTS_NAMES})
-if(CLANG_TIDY_EXE)
-  option(MYX_CMAKE_CLANG_TIDY_FIX "MyxCMake: perform fixes for Clang Tidy" OFF)
-endif()
-unset(V)
-unset(CLANG_TIDY_NAMES)
-
 if(CLAZY_EXE AND CLANG_APPLY_REPLACEMENTS_EXE)
   option(MYX_CMAKE_CLAZY_FIX "MyxCMake: perform fixes for Clazy" OFF)
 endif()
diff --git a/MyxCMake/modules/MyxCMakeCommon.cmake b/MyxCMake/modules/MyxCMakeCommon.cmake
index 74faaf8..6f7a014 100644
--- a/MyxCMake/modules/MyxCMakeCommon.cmake
+++ b/MyxCMake/modules/MyxCMakeCommon.cmake
@@ -22,6 +22,7 @@ include(MyxCMakePrecompiledHeaders)
 include(MyxCMakeBuildTypes)
 include(MyxCMakeDebugOutputOptions)
 
+include(MyxCMakeCodeAnalyzeApplyReplacements)
 include(MyxCMakeCodeAnalyzeClangCheck)
 include(MyxCMakeCodeAnalyzeClangTidy)
 include(MyxCMakeCodeAnalyzeClazy)