diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake
index daee4af..0042fb3 100644
--- a/CMLibCodeAnalysisClangAnalyze.cmake
+++ b/CMLibCodeAnalysisClangAnalyze.cmake
@@ -3,9 +3,6 @@ find_program(
   NAMES
     clang-check-10
     clang-check-9
-    clang-check-8
-    clang-check-7
-    clang-check-6.0
     clang-check)
 if(CLANG_CHECK_EXE)
   option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF)
@@ -17,7 +14,7 @@ function(add_clang_analyze_check target)
 
   if(CLANG_CHECK_EXE)
     if(CMLIB_CLANG_ANALYZE_FIX)
-      list(APPEND _args "-fix")
+      list(APPEND _args "--fixit")
     endif()
     if(NOT TARGET clang-analyze-check)
       add_custom_target(clang-analyze-check)
diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake
index ce95052..e6c3305 100644
--- a/CMLibCodeAnalysisClangTidy.cmake
+++ b/CMLibCodeAnalysisClangTidy.cmake
@@ -3,9 +3,6 @@ find_program(
   NAMES
     clang-tidy-10
     clang-tidy-9
-    clang-tidy-8
-    clang-tidy-7
-    clang-tidy-6.0
     clang-tidy)
 if(CLANG_TIDY_EXE)
   option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF)
@@ -17,7 +14,7 @@ function(add_clang_tidy_check target)
 
   if(CLANG_TIDY_EXE)
     if(CMLIB_CLANG_TIDY_FIX)
-      list(APPEND _args "-fix")
+      list(APPEND _args "--fix")
     endif()
     if(NOT TARGET clang-tidy-check)
       add_custom_target(clang-tidy-check)