diff --git a/CMake/Modules/FindTclap.cmake b/CMake/Modules/FindTclap.cmake
index 651150af45cc38cc56ffc51d704106eeec3a6741..5ab96ecab6984c000ed20b9dc85bf546ab4460e1 100644
--- a/CMake/Modules/FindTclap.cmake
+++ b/CMake/Modules/FindTclap.cmake
@@ -1,10 +1,10 @@
-find_path(TCLAP_INCLUDE_DIR NAMES tclap/CmdLine.h)
+find_path(Tclap_INCLUDE_DIR NAMES tclap/CmdLine.h)
 
 # Handle the QUIETLY and REQUIRED arguments and set GRAPHVIZ_FOUND to TRUE if all listed variables are TRUE.
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TCLAP
-	FOUND_VAR TCLAP_FOUND
-	REQUIRED_VARS TCLAP_INCLUDE_DIR
+find_package_handle_standard_args(Tclap
+	FOUND_VAR Tclap_FOUND
+	REQUIRED_VARS Tclap_INCLUDE_DIR
 	)
 
-mark_as_advanced(TCLAP_INCLUDE_DIR)
+mark_as_advanced(Tclap_INCLUDE_DIR)
diff --git a/CMake/Modules/Findjsoncpp.cmake b/CMake/Modules/Findjsoncpp.cmake
index 534003ad95ad5c939413c18dacc08efbf30f54cb..71f47fc97cfdda8d7fb0ce8f062ff2de68d43b3d 100644
--- a/CMake/Modules/Findjsoncpp.cmake
+++ b/CMake/Modules/Findjsoncpp.cmake
@@ -1,26 +1,26 @@
-# - Find JSONCPP
-# 
-# Find JSONCPP includes and library
+# - Find jsoncpp
+#
+# Find jsoncpp includes and library
 #
 # This module defines the following variables:
-#  JSONCPP_FOUND - True if libjsoncpp has been found.
-#  JSONCPP_INCLUDE_DIR - location to look for headers,
-#  JSONCPP_LIBRARIES - the libraries to link against libjsoncpp
+#  jsoncpp_FOUND - True if libjsoncpp has been found.
+#  jsoncpp_INCLUDE_DIR - location to look for headers,
+#  jsoncpp_LIBRARIES - the libraries to link against libjsoncpp
 
-find_path(JSONCPP_INCLUDE_DIR json/features.h json/json_features.h
+find_path(jsoncpp_INCLUDE_DIR json/features.h json/json_features.h
     PATH_SUFFIXES include jsoncpp include/jsoncpp)
-find_library(JSONCPP_LIBRARY jsoncpp)
+find_library(jsoncpp_LIBRARY jsoncpp)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(JSONCPP DEFAULT_MSG
-    JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY)
+find_package_handle_standard_args(jsoncpp DEFAULT_MSG
+    jsoncpp_INCLUDE_DIR jsoncpp_LIBRARY)
 
-if(NOT JSONCPP_FOUND)
+if(NOT jsoncpp_FOUND)
     message(FATAL_ERROR "libjsoncpp missing" )
-endif(NOT JSONCPP_FOUND)
+endif(NOT jsoncpp_FOUND)
 
-set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
+set(jsoncpp_LIBRARIES ${jsoncpp_LIBRARY})
 mark_as_advanced(
-    JSONCPP_INCLUDE_DIR
-    JSONCPP_LIBRARIES
+    jsoncpp_INCLUDE_DIR
+    jsoncpp_LIBRARIES
 )
diff --git a/CMake/generate.conf b/CMake/generate.conf
index 24bb7b72206b47481abac5318d643be8d6f4e8ff..72d680c1d50e51f75b6b4cca60669123f45caaf9 100644
--- a/CMake/generate.conf
+++ b/CMake/generate.conf
@@ -57,8 +57,8 @@ include: ${GRAPHVIZ_INCLUDE_DIRS}
 find: Graphviz REQUIRED
 
 [CMake:Deps:json]
-link: ${JSONCPP_LIBRARIES}
-include: ${JSONCPP_INCLUDE_DIR}
+link: ${jsoncpp_LIBRARIES}
+include: ${jsoncpp_INCLUDE_DIR}
 find: jsoncpp REQUIRED
 
 [CMake:Deps:readline]
@@ -67,7 +67,7 @@ include: ${READLINE_INCLUDE_DIR}
 find: Readline REQUIRED
 
 [CMake:Deps:tclap]
-include: ${TCLAP_INCLUDE_DIR}
+include: ${Tclap_INCLUDE_DIR}
 find: Tclap REQUIRED
 
 [CMake:Deps:stdc++fs]