diff --git a/.docs/examples/minimal-hpp.cmake b/.docs/examples/minimal-hpp.cmake
index 4552b3c06..a9b01b515 100644
--- a/.docs/examples/minimal-hpp.cmake
+++ b/.docs/examples/minimal-hpp.cmake
@@ -7,7 +7,7 @@ set(PROJECT_DESCRIPTION "A HPP project example")
 # hpp.cmake includes base.cmake.
 include(cmake/hpp.cmake)
 
-compute_project_args(PROJECT_ARGS LANGUAGES CXX)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
 
 # Configure the build of your project here add_subdirectory(src)
diff --git a/.docs/examples/minimal-with-packages.cmake b/.docs/examples/minimal-with-packages.cmake
index cd6953a2e..0d5912efc 100644
--- a/.docs/examples/minimal-with-packages.cmake
+++ b/.docs/examples/minimal-with-packages.cmake
@@ -13,11 +13,17 @@ include(cmake/base.cmake)
 project(${PROJECT_NAME} CXX)
 
 # Add a required dependency
-add_project_dependency(MyDependency REQUIRED)
+ADD_PROJECT_DEPENDENCY(MyDependency REQUIRED)
 
 # Another example to show that arguments can be passed down to the underlying
 # find_package call
-add_project_dependency(Boost 1.50 REQUIRED COMPONENT timer)
+ADD_PROJECT_DEPENDENCY(
+  Boost
+  1.50
+  REQUIRED
+  COMPONENT
+  timer
+)
 
 add_library(myLibrary ${MY_SOURCES})
 target_link_libraries(myLibrary MyDependency::MyAwesomeLib Boost::timer)
diff --git a/.gersemirc b/.gersemirc
index b8bb9d578..e2080e3f1 100644
--- a/.gersemirc
+++ b/.gersemirc
@@ -1,2 +1,3 @@
+definitions: [./]
 indent: 2
 warn_about_unknown_commands: false
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index b4a95db9c..b1f014c65 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -3,3 +3,5 @@ a7abe2312a94b28f01173d6db5f74bb26c934e10
 # switch to gersemi and pre-commit run -a (ManifoldFR, 2024-10-23)
 f743a57ca5b83cc19669cac3d3541c23ea89a74a
 ad86c1842091800eeff5fdcb32e766ac2338e50c
+# add ./ to gersemi defs and pre-commit run -a (ManifoldFR, 2024-12-19)
+c37b94e619480d12a68d1f045df184534025b7ef
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 168d6156e..783389a8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   include(GNUInstallDirs)
   include(package-config.cmake)
   set(PROJECT_JRL_CMAKE_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
-  setup_project_package_finalize()
+  SETUP_PROJECT_PACKAGE_FINALIZE()
 
   # Add a dummy library with a useful INTERFACE_INCLUDE_DIRECTORIES
   add_library(${PROJECT_NAME} INTERFACE)
diff --git a/_unittests/cpp/CMakeLists.txt b/_unittests/cpp/CMakeLists.txt
index c666e12e9..89ccd4605 100644
--- a/_unittests/cpp/CMakeLists.txt
+++ b/_unittests/cpp/CMakeLists.txt
@@ -8,7 +8,7 @@ set(PROJECT_USE_CMAKE_EXPORT TRUE)
 
 include(../../base.cmake)
 
-compute_project_args(PROJECT_ARGS LANGUAGES CXX)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
 
 set(${PROJECT_NAME}_HEADERS include/jrl_cmakemodule/lib.hh)
diff --git a/_unittests/dependency/CMakeLists.txt b/_unittests/dependency/CMakeLists.txt
index 35f7f7949..03d4befe6 100644
--- a/_unittests/dependency/CMakeLists.txt
+++ b/_unittests/dependency/CMakeLists.txt
@@ -10,10 +10,10 @@ include(../macros.cmake)
 
 include(../../base.cmake)
 
-compute_project_args(PROJECT_ARGS LANGUAGES CXX)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
 
-add_project_dependency(jrl-cmakemodules-cpp REQUIRED)
+ADD_PROJECT_DEPENDENCY(jrl-cmakemodules-cpp REQUIRED)
 
 check_exist_target(jrl-cmakemodules-cpp::jrl_cmakemodule_lib "")
 
diff --git a/_unittests/python/CMakeLists.txt b/_unittests/python/CMakeLists.txt
index 97631c3d2..3a24d4d29 100644
--- a/_unittests/python/CMakeLists.txt
+++ b/_unittests/python/CMakeLists.txt
@@ -11,10 +11,10 @@ include(../macros.cmake)
 include(../../base.cmake)
 include(../../python.cmake)
 
-compute_project_args(PROJECT_ARGS)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS)
 project(${PROJECT_NAME} ${PROJECT_ARGS})
-findpython()
+FINDPYTHON()
 
 check_exist_variable(PYTHON_SITELIB "")
 
-python_install_on_site(jrl_cmakemodule python.py)
+PYTHON_INSTALL_ON_SITE(jrl_cmakemodule python.py)
diff --git a/_unittests/test_pkg-config.cmake b/_unittests/test_pkg-config.cmake
index 1b7fe729a..b566420b6 100644
--- a/_unittests/test_pkg-config.cmake
+++ b/_unittests/test_pkg-config.cmake
@@ -13,37 +13,49 @@ macro(UNSET_TEST_VARS)
   unset(PKG_CONFIG_STRING_NOSPACE)
 endmacro()
 
-unset_test_vars()
-_parse_pkg_config_string("my-package > 0.4" PKG_LIB_NAME PKG_PREFIX
-                         PKG_CONFIG_STRING_NOSPACE
+UNSET_TEST_VARS()
+_PARSE_PKG_CONFIG_STRING(
+  "my-package > 0.4"
+  PKG_LIB_NAME
+  PKG_PREFIX
+  PKG_CONFIG_STRING_NOSPACE
 )
-expect_strequal("my-package" "${PKG_LIB_NAME}")
-expect_strequal("MY_PACKAGE" "${PKG_PREFIX}")
-expect_strequal("my-package>0.4" "${PKG_CONFIG_STRING_NOSPACE}")
+EXPECT_STREQUAL("my-package" "${PKG_LIB_NAME}")
+EXPECT_STREQUAL("MY_PACKAGE" "${PKG_PREFIX}")
+EXPECT_STREQUAL("my-package>0.4" "${PKG_CONFIG_STRING_NOSPACE}")
 
-unset_test_vars()
-_parse_pkg_config_string("my-package >= 0.4" PKG_LIB_NAME PKG_PREFIX
-                         PKG_CONFIG_STRING_NOSPACE
+UNSET_TEST_VARS()
+_PARSE_PKG_CONFIG_STRING(
+  "my-package >= 0.4"
+  PKG_LIB_NAME
+  PKG_PREFIX
+  PKG_CONFIG_STRING_NOSPACE
 )
-expect_strequal("my-package" "${PKG_LIB_NAME}")
-expect_strequal("MY_PACKAGE" "${PKG_PREFIX}")
-expect_strequal("my-package>=0.4" "${PKG_CONFIG_STRING_NOSPACE}")
+EXPECT_STREQUAL("my-package" "${PKG_LIB_NAME}")
+EXPECT_STREQUAL("MY_PACKAGE" "${PKG_PREFIX}")
+EXPECT_STREQUAL("my-package>=0.4" "${PKG_CONFIG_STRING_NOSPACE}")
 
-unset_test_vars()
-_parse_pkg_config_string("my-package" PKG_LIB_NAME PKG_PREFIX
-                         PKG_CONFIG_STRING_NOSPACE
+UNSET_TEST_VARS()
+_PARSE_PKG_CONFIG_STRING(
+  "my-package"
+  PKG_LIB_NAME
+  PKG_PREFIX
+  PKG_CONFIG_STRING_NOSPACE
 )
-expect_strequal("my-package" "${PKG_LIB_NAME}")
-expect_strequal("MY_PACKAGE" "${PKG_PREFIX}")
-expect_strequal("my-package" "${PKG_CONFIG_STRING_NOSPACE}")
+EXPECT_STREQUAL("my-package" "${PKG_LIB_NAME}")
+EXPECT_STREQUAL("MY_PACKAGE" "${PKG_PREFIX}")
+EXPECT_STREQUAL("my-package" "${PKG_CONFIG_STRING_NOSPACE}")
 
 # it the input does not have spaces around the operator, the operator is
 # considered as being part of the library name. This is expected and consistent
 # with pkg-config's behavior.
-unset_test_vars()
-_parse_pkg_config_string("my-package>=0.4" PKG_LIB_NAME PKG_PREFIX
-                         PKG_CONFIG_STRING_NOSPACE
+UNSET_TEST_VARS()
+_PARSE_PKG_CONFIG_STRING(
+  "my-package>=0.4"
+  PKG_LIB_NAME
+  PKG_PREFIX
+  PKG_CONFIG_STRING_NOSPACE
 )
-expect_strequal("my-package>=0.4" "${PKG_LIB_NAME}")
-expect_strequal("MY_PACKAGE__0_4" "${PKG_PREFIX}")
-expect_strequal("my-package>=0.4" "${PKG_CONFIG_STRING_NOSPACE}")
+EXPECT_STREQUAL("my-package>=0.4" "${PKG_LIB_NAME}")
+EXPECT_STREQUAL("MY_PACKAGE__0_4" "${PKG_PREFIX}")
+EXPECT_STREQUAL("my-package>=0.4" "${PKG_CONFIG_STRING_NOSPACE}")
diff --git a/base.cmake b/base.cmake
index f55016852..27a6e68d5 100644
--- a/base.cmake
+++ b/base.cmake
@@ -207,15 +207,18 @@ message(STATUS "Configuring \"${PROJECT_NAME}\" (${PROJECT_URL})")
 
 # If the project version number is not set, compute it automatically.
 if(NOT DEFINED PROJECT_VERSION)
-  version_compute()
+  VERSION_COMPUTE()
 else()
   if(
     NOT DEFINED PROJECT_VERSION_MAJOR
     AND NOT DEFINED PROJECT_VERSION_MINOR
     AND NOT DEFINED PROJECT_VERSION_PATCH
   )
-    split_version_number(${PROJECT_VERSION} PROJECT_VERSION_MAJOR
-                         PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH
+    SPLIT_VERSION_NUMBER(
+      ${PROJECT_VERSION}
+      PROJECT_VERSION_MAJOR
+      PROJECT_VERSION_MINOR
+      PROJECT_VERSION_PATCH
     )
   endif()
 endif()
@@ -258,7 +261,7 @@ if(PROJECT_AUTO_RUN_FINALIZE)
         JRL_CMAKEMODULE_LOGGING_FILENAME
         "${PROJECT_JRL_CMAKE_BINARY_DIR}/config.log"
       )
-      setup_project_finalize()
+      SETUP_PROJECT_FINALIZE()
       set(CMAKE_CURRENT_LIST_DIR "") # restore value
       set(JRL_CMAKEMODULE_LOGGING_FILENAME "") # restore value
     endif()
@@ -309,7 +312,7 @@ endmacro(_ADD_TO_LIST_IF_NOT_PRESENT LIST VALUE)
 #
 macro(_CONCATENATE_ARGUMENTS OUTPUT SEPARATOR)
   foreach(I RANGE 2 ${ARGC})
-    _add_to_list("${OUTPUT}" "${ARGV${I}}" "${SEPARATOR}")
+    _ADD_TO_LIST("${OUTPUT}" "${ARGV${I}}" "${SEPARATOR}")
   endforeach(I RANGE 2 ${ARGC})
   message(${${OUTPUT}})
 endmacro(_CONCATENATE_ARGUMENTS OUTPUT)
@@ -348,19 +351,19 @@ endmacro(SETUP_PROJECT)
 #
 macro(SETUP_PROJECT_FINALIZE)
   if(INSTALL_PKG_CONFIG_FILE)
-    _setup_project_pkg_config_finalize()
+    _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
   endif(INSTALL_PKG_CONFIG_FILE)
-  _setup_project_documentation_finalize()
-  _setup_project_header_finalize()
-  _setup_coverage_finalize()
-  _setup_debian()
+  _SETUP_PROJECT_DOCUMENTATION_FINALIZE()
+  _SETUP_PROJECT_HEADER_FINALIZE()
+  _SETUP_COVERAGE_FINALIZE()
+  _SETUP_DEBIAN()
   # Install data if needed
-  _install_project_data()
+  _INSTALL_PROJECT_DATA()
   _install_project_ros2_ament_files()
 
-  logging_finalize()
+  LOGGING_FINALIZE()
   if(PROJECT_USE_CMAKE_EXPORT)
-    setup_project_package_finalize()
+    SETUP_PROJECT_PACKAGE_FINALIZE()
   endif()
 endmacro(SETUP_PROJECT_FINALIZE)
 
diff --git a/boost.cmake b/boost.cmake
index 49335eded..49304e139 100644
--- a/boost.cmake
+++ b/boost.cmake
@@ -99,7 +99,7 @@ macro(SEARCH_FOR_BOOST_PYTHON)
     set(BOOST_PYTHON_REQUIRED REQUIRED)
   endif(SEARCH_FOR_BOOST_PYTHON_ARGS_REQUIRED)
 
-  set_boost_default_options()
+  SET_BOOST_DEFAULT_OPTIONS()
 
   if(NOT PYTHON_EXECUTABLE)
     message(
@@ -120,7 +120,7 @@ macro(SEARCH_FOR_BOOST_PYTHON)
     )
     set(BOOST_PYTHON_FOUND FALSE)
     foreach(BOOST_PYTHON_COMPONENT ${BOOST_PYTHON_COMPONENT_LIST})
-      search_for_boost_component(${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_FOUND)
+      SEARCH_FOR_BOOST_COMPONENT(${BOOST_PYTHON_COMPONENT} BOOST_PYTHON_FOUND)
       if(BOOST_PYTHON_FOUND)
         set(BOOST_PYTHON_NAME ${BOOST_PYTHON_COMPONENT})
         break()
@@ -138,8 +138,8 @@ macro(SEARCH_FOR_BOOST_PYTHON)
   endif()
 
   if(PYTHON_EXPORT_DEPENDENCY)
-    install_jrl_cmakemodules_dir("boost")
-    install_jrl_cmakemodules_file("boost.cmake")
+    INSTALL_JRL_CMAKEMODULES_DIR("boost")
+    INSTALL_JRL_CMAKEMODULES_FILE("boost.cmake")
     set(
       PYTHON_EXPORT_DEPENDENCY_MACROS
       "${PYTHON_EXPORT_DEPENDENCY_MACROS}\nSEARCH_FOR_BOOST_PYTHON(${BOOST_PYTHON_REQUIRED} NAME ${BOOST_PYTHON_NAME})"
@@ -238,7 +238,7 @@ endmacro(TARGET_LINK_BOOST_PYTHON)
 # PKG_CONFIG_APPEND_BOOST_LIBS(system filesystem)
 #
 macro(PKG_CONFIG_APPEND_BOOST_LIBS)
-  pkg_config_append_library_dir("${Boost_LIBRARY_DIRS}")
+  PKG_CONFIG_APPEND_LIBRARY_DIR("${Boost_LIBRARY_DIRS}")
 
   foreach(COMPONENT ${ARGN})
     string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
@@ -259,17 +259,17 @@ macro(PKG_CONFIG_APPEND_BOOST_LIBS)
       get_filename_component(LIB_NAME ${LIB_PATH} NAME_WE)
       string(REGEX REPLACE "^lib" "" LIB_NAME "${LIB_NAME}")
       if("${LOWERCOMPONENT}" MATCHES "python")
-        pkg_config_append_libs_raw(-Wl,-undefined,dynamic_lookup,-l${LIB_NAME})
+        PKG_CONFIG_APPEND_LIBS_RAW(-Wl,-undefined,dynamic_lookup,-l${LIB_NAME})
       else("${LOWERCOMPONENT}" MATCHES "python")
-        pkg_config_append_libs_raw(-l${LIB_NAME})
+        PKG_CONFIG_APPEND_LIBS_RAW(-l${LIB_NAME})
       endif("${LOWERCOMPONENT}" MATCHES "python")
     elseif(WIN32)
       get_filename_component(LIB_NAME ${LIB_PATH} NAME)
-      pkg_config_append_libs_raw("-l${LIB_NAME}")
+      PKG_CONFIG_APPEND_LIBS_RAW("-l${LIB_NAME}")
     else()
       get_filename_component(LIB_NAME ${LIB_PATH} NAME_WE)
       string(REGEX REPLACE "^lib" "" LIB_NAME "${LIB_NAME}")
-      pkg_config_append_libs_raw("-l${LIB_NAME}")
+      PKG_CONFIG_APPEND_LIBS_RAW("-l${LIB_NAME}")
     endif(APPLE)
   endforeach()
 endmacro(PKG_CONFIG_APPEND_BOOST_LIBS)
diff --git a/compiler.cmake b/compiler.cmake
index afe75cf5c..1a46647d5 100644
--- a/compiler.cmake
+++ b/compiler.cmake
@@ -59,13 +59,10 @@ macro(_SETUP_PROJECT_WARNINGS)
     /wd4355
   )
 
-  cxx_flags_by_compiler_frontend(
-    GNU
-    ${GNU_FLAGS}
-    MSVC
-    ${MSVC_FLAGS}
-    OUTPUT
-    WARNING_CXX_FLAGS_LIST
+  CXX_FLAGS_BY_COMPILER_FRONTEND(
+    GNU ${GNU_FLAGS}
+    MSVC ${MSVC_FLAGS}
+    OUTPUT WARNING_CXX_FLAGS_LIST
     FILTER
   )
   string(REPLACE ";" " " WARNING_CXX_FLAGS "${WARNING_CXX_FLAGS_LIST}")
diff --git a/cpack.cmake b/cpack.cmake
index 3dd68a9a0..872c001e1 100644
--- a/cpack.cmake
+++ b/cpack.cmake
@@ -35,8 +35,10 @@ macro(ADD_CMAKE_DEPENDENCY PKG_CONFIG_STRING)
     VERSION
     "${PKG_CONFIG_STRING}"
   )
-  _add_to_list(CPACK_INTERNAL_CONFIG_REQUIRES "${LIBRARY_NAME}(>=${VERSION})"
-               ","
+  _ADD_TO_LIST(
+    CPACK_INTERNAL_CONFIG_REQUIRES
+    "${LIBRARY_NAME}(>=${VERSION})"
+    ","
   )
 endmacro(ADD_CMAKE_DEPENDENCY)
 
diff --git a/cxx11.cmake b/cxx11.cmake
index c83d3feaa..911235136 100644
--- a/cxx11.cmake
+++ b/cxx11.cmake
@@ -25,5 +25,5 @@ macro(PROJECT_USE_CXX11)
     DEPRECATION
     "This macro is deprecated. Use CHECK_MINIMAL_CXX_STANDARD instead."
   )
-  check_minimal_cxx_standard(11 REQUIRED)
+  CHECK_MINIMAL_CXX_STANDARD(11 REQUIRED)
 endmacro(PROJECT_USE_CXX11)
diff --git a/cython/cython.cmake b/cython/cython.cmake
index 59df137bd..ef30f474f 100644
--- a/cython/cython.cmake
+++ b/cython/cython.cmake
@@ -421,7 +421,7 @@ macro(ADD_CYTHON_BINDINGS PACKAGE)
   foreach(TGT ${CYTHON_BINDINGS_TARGETS})
     _is_interface_library(${TGT} IS_INTERFACE)
     if(${IS_INTERFACE})
-      _cython_dummy_target(${TGT})
+      _CYTHON_DUMMY_TARGET(${TGT})
       list(
         APPEND
         CYTHON_BINDINGS_COMPILE_DEFINITIONS
@@ -506,32 +506,47 @@ macro(ADD_CYTHON_BINDINGS PACKAGE)
     )
   endforeach()
   if(${PYTHON_BINDING_BUILD_PYTHON2_AND_PYTHON3})
-    _add_cython_bindings_targets(
-      "python2" ${PACKAGE} "${CYTHON_BINDINGS_SOURCES}"
-      "${CYTHON_BINDINGS_GENERATE_SOURCES}" "${CYTHON_BINDINGS_TARGETS}"
+    _ADD_CYTHON_BINDINGS_TARGETS(
+      "python2"
+      ${PACKAGE}
+      "${CYTHON_BINDINGS_SOURCES}"
+      "${CYTHON_BINDINGS_GENERATE_SOURCES}"
+      "${CYTHON_BINDINGS_TARGETS}"
       ${WITH_TESTS}
     )
-    _add_cython_bindings_targets(
-      "python3" ${PACKAGE} "${CYTHON_BINDINGS_SOURCES}"
-      "${CYTHON_BINDINGS_GENERATE_SOURCES}" "${CYTHON_BINDINGS_TARGETS}"
+    _ADD_CYTHON_BINDINGS_TARGETS(
+      "python3"
+      ${PACKAGE}
+      "${CYTHON_BINDINGS_SOURCES}"
+      "${CYTHON_BINDINGS_GENERATE_SOURCES}"
+      "${CYTHON_BINDINGS_TARGETS}"
       ${WITH_TESTS}
     )
   elseif(${PYTHON_BINDING_FORCE_PYTHON3})
-    _add_cython_bindings_targets(
-      "python3" ${PACKAGE} "${CYTHON_BINDINGS_SOURCES}"
-      "${CYTHON_BINDINGS_GENERATE_SOURCES}" "${CYTHON_BINDINGS_TARGETS}"
+    _ADD_CYTHON_BINDINGS_TARGETS(
+      "python3"
+      ${PACKAGE}
+      "${CYTHON_BINDINGS_SOURCES}"
+      "${CYTHON_BINDINGS_GENERATE_SOURCES}"
+      "${CYTHON_BINDINGS_TARGETS}"
       ${WITH_TESTS}
     )
   elseif(${PYTHON_BINDING_FORCE_PYTHON2})
-    _add_cython_bindings_targets(
-      "python2" ${PACKAGE} "${CYTHON_BINDINGS_SOURCES}"
-      "${CYTHON_BINDINGS_GENERATE_SOURCES}" "${CYTHON_BINDINGS_TARGETS}"
+    _ADD_CYTHON_BINDINGS_TARGETS(
+      "python2"
+      ${PACKAGE}
+      "${CYTHON_BINDINGS_SOURCES}"
+      "${CYTHON_BINDINGS_GENERATE_SOURCES}"
+      "${CYTHON_BINDINGS_TARGETS}"
       ${WITH_TESTS}
     )
   else()
-    _add_cython_bindings_targets(
-      "python" ${PACKAGE} "${CYTHON_BINDINGS_SOURCES}"
-      "${CYTHON_BINDINGS_GENERATE_SOURCES}" "${CYTHON_BINDINGS_TARGETS}"
+    _ADD_CYTHON_BINDINGS_TARGETS(
+      "python"
+      ${PACKAGE}
+      "${CYTHON_BINDINGS_SOURCES}"
+      "${CYTHON_BINDINGS_GENERATE_SOURCES}"
+      "${CYTHON_BINDINGS_TARGETS}"
       ${WITH_TESTS}
     )
   endif()
@@ -572,7 +587,7 @@ macro(_MAKE_CYTHON_LIBRARY PACKAGE PYTHON PYTHON_B OUT)
 endmacro()
 
 macro(_APPEND_CYTHON_LIBRARY PACKAGE PYTHON PYTHON_B OUT)
-  _make_cython_library(${PACKAGE} ${PYTHON} ${PYTHON_B} LIB)
+  _MAKE_CYTHON_LIBRARY(${PACKAGE} ${PYTHON} ${PYTHON_B} LIB)
   list(APPEND ${OUT} ${LIB})
 endmacro()
 
@@ -591,12 +606,12 @@ macro(GET_CYTHON_LIBRARIES PACKAGE VAR)
   endif()
   set(${VAR})
   if(${PYTHON_BINDING_BUILD_PYTHON2_AND_PYTHON3})
-    _append_cython_library(${PACKAGE} Python2 python2 ${VAR})
-    _append_cython_library(${PACKAGE} Python3 python3 ${VAR})
+    _APPEND_CYTHON_LIBRARY(${PACKAGE} Python2 python2 ${VAR})
+    _APPEND_CYTHON_LIBRARY(${PACKAGE} Python3 python3 ${VAR})
   elseif(${PYTHON_BINDING_FORCE_PYTHON2})
-    _append_cython_library(${PACKAGE} Python2 python2 ${VAR})
+    _APPEND_CYTHON_LIBRARY(${PACKAGE} Python2 python2 ${VAR})
   elseif(${PYTHON_BINDING_FORCE_PYTHON3})
-    _append_cython_library(${PACKAGE} Python3 python3 ${VAR})
+    _APPEND_CYTHON_LIBRARY(${PACKAGE} Python3 python3 ${VAR})
   else()
     execute_process(
       COMMAND python -c "import sys; print(sys.version_info.major);"
@@ -604,7 +619,7 @@ macro(GET_CYTHON_LIBRARIES PACKAGE VAR)
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     if("${PYTHON_MAJOR}" STREQUAL "2" OR "${PYTHON_MAJOR}" STREQUAL "3")
-      _append_cython_library(${PACKAGE} Python${PYTHON_MAJOR} python ${VAR})
+      _APPEND_CYTHON_LIBRARY(${PACKAGE} Python${PYTHON_MAJOR} python ${VAR})
     else()
       message(
         FATAL_ERROR
diff --git a/doxygen.cmake b/doxygen.cmake
index a55122bec..405187531 100644
--- a/doxygen.cmake
+++ b/doxygen.cmake
@@ -410,8 +410,9 @@ macro(_SETUP_DOXYGEN_DEFAULT_OPTIONS)
   _set_if_undefined(DOXYGEN_PROJECT_NUMBER "${PROJECT_VERSION}")
   _set_if_undefined(DOXYGEN_PROJECT_BRIEF "\"${PROJECT_DESCRIPTION}\"")
   _set_if_undefined(DOXYGEN_STRIP_FROM_PATH "${PROJECT_SOURCE_DIR}")
-  _set_if_undefined(DOXYGEN_STRIP_FROM_INC_PATH
-                    "${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/include"
+  _set_if_undefined(
+    DOXYGEN_STRIP_FROM_INC_PATH
+    "${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/include"
   )
   _set_if_undefined(DOXYGEN_EXTRACT_ALL "YES")
   # ---------------------------------------------------------------------------
@@ -423,8 +424,9 @@ macro(_SETUP_DOXYGEN_DEFAULT_OPTIONS)
   # Configuration options related to the input files
   # ---------------------------------------------------------------------------
   _set_if_undefined(DOXYGEN_IMAGE_PATH "${PROJECT_SOURCE_DIR}/doc")
-  _set_if_undefined(DOXYGEN_FILE_PATTERNS
-                    "*.cc *.cpp *.h *.hh *.hpp *.hxx *.idl"
+  _set_if_undefined(
+    DOXYGEN_FILE_PATTERNS
+    "*.cc *.cpp *.h *.hh *.hpp *.hxx *.idl"
   )
   _set_if_undefined(DOXYGEN_RECURSIVE YES)
   # ---------------------------------------------------------------------------
@@ -514,7 +516,7 @@ macro(_SETUP_PROJECT_DOCUMENTATION)
     endif(has_parent_scope)
     unset(has_parent_scope)
 
-    _setup_doxygen_default_options()
+    _SETUP_DOXYGEN_DEFAULT_OPTIONS()
     # Generate variable to be substitued in Doxyfile.in for dot use.
     if(DOXYGEN_DOT_FOUND)
       set(DOXYGEN_HAVE_DOT YES)
@@ -577,21 +579,26 @@ macro(_SETUP_PROJECT_DOCUMENTATION)
         ${PROJECT_NAME}-doc
         ${PROJECT_NAME}-generate-template-css
       )
-      _set_if_undefined(DOXYGEN_HTML_HEADER
-                        "${PROJECT_BINARY_DIR}/doc/header.html"
+      _set_if_undefined(
+        DOXYGEN_HTML_HEADER
+        "${PROJECT_BINARY_DIR}/doc/header.html"
       )
-      _set_if_undefined(DOXYGEN_HTML_FOOTER
-                        "${PROJECT_BINARY_DIR}/doc/footer.html"
+      _set_if_undefined(
+        DOXYGEN_HTML_FOOTER
+        "${PROJECT_BINARY_DIR}/doc/footer.html"
       )
-      _set_if_undefined(DOXYGEN_HTML_STYLESHEET
-                        "${PROJECT_BINARY_DIR}/doc/doxygen.css"
+      _set_if_undefined(
+        DOXYGEN_HTML_STYLESHEET
+        "${PROJECT_BINARY_DIR}/doc/doxygen.css"
       )
     else(DOXYGEN_USE_TEMPLATE_CSS)
-      _set_if_undefined(DOXYGEN_HTML_FOOTER
-                        "${PROJECT_JRL_CMAKE_MODULE_DIR}/doxygen/footer.html"
+      _set_if_undefined(
+        DOXYGEN_HTML_FOOTER
+        "${PROJECT_JRL_CMAKE_MODULE_DIR}/doxygen/footer.html"
       )
-      _set_if_undefined(DOXYGEN_HTML_STYLESHEET
-                        "${PROJECT_JRL_CMAKE_MODULE_DIR}/doxygen/doxygen.css"
+      _set_if_undefined(
+        DOXYGEN_HTML_STYLESHEET
+        "${PROJECT_JRL_CMAKE_MODULE_DIR}/doxygen/doxygen.css"
       )
     endif(DOXYGEN_USE_TEMPLATE_CSS)
 
@@ -691,8 +698,9 @@ macro(_DOXYTAG_ENTRIES_FROM_CMAKE_DEPENDENCIES DEPENDENCIES VAR_OUT)
       )
     endif()
     if(DEFINED ${PREFIX}_DEPENDENCIES)
-      _doxytag_entries_from_cmake_dependencies("${${PREFIX}_DEPENDENCIES}"
-                                               ${VAR_OUT}
+      _DOXYTAG_ENTRIES_FROM_CMAKE_DEPENDENCIES(
+        "${${PREFIX}_DEPENDENCIES}"
+        ${VAR_OUT}
       )
     endif()
   endforeach()
@@ -745,8 +753,11 @@ macro(_SETUP_PROJECT_DOCUMENTATION_FINALIZE)
       set(PKG_REQUIRES ${_PKG_CONFIG_REQUIRES})
       list(APPEND PKG_REQUIRES ${_PKG_CONFIG_COMPILE_TIME_REQUIRES})
       foreach(PKG_CONFIG_STRING ${PKG_REQUIRES})
-        _parse_pkg_config_string(${PKG_CONFIG_STRING} LIBRARY_NAME PREFIX
-                                 PKG_CONFIG_STRING_NOSPACE
+        _PARSE_PKG_CONFIG_STRING(
+          ${PKG_CONFIG_STRING}
+          LIBRARY_NAME
+          PREFIX
+          PKG_CONFIG_STRING_NOSPACE
         )
         # If DOXYGENDOCDIR is specified, add a doc path.
         if(
@@ -766,12 +777,14 @@ macro(_SETUP_PROJECT_DOCUMENTATION_FINALIZE)
           )
         endif()
       endforeach()
-      _doxytag_entries_from_cmake_dependencies(
-        "${_PACKAGE_CONFIG_DEPENDENCIES_PROJECTS}" _TAGFILES_FROM_DEPENDENCIES
+      _DOXYTAG_ENTRIES_FROM_CMAKE_DEPENDENCIES(
+        "${_PACKAGE_CONFIG_DEPENDENCIES_PROJECTS}"
+        _TAGFILES_FROM_DEPENDENCIES
       )
       if(_TAGFILES_FROM_DEPENDENCIES)
-        remove_duplicates(${_TAGFILES_FROM_DEPENDENCIES}
-                          DOXYGEN_TAGFILES_FROM_DEPENDENCIES
+        REMOVE_DUPLICATES(
+          ${_TAGFILES_FROM_DEPENDENCIES}
+          DOXYGEN_TAGFILES_FROM_DEPENDENCIES
         )
       endif()
     endif()
@@ -806,7 +819,7 @@ macro(_SETUP_PROJECT_DOCUMENTATION_FINALIZE)
         @ONLY
       )
       # Generate Doxyfile.
-      _setup_doxygen_config_file(${JRL_CMAKEMODULE_DOXYFILE_PATH})
+      _SETUP_DOXYGEN_CONFIG_FILE(${JRL_CMAKEMODULE_DOXYFILE_PATH})
       file(STRINGS ${PROJECT_BINARY_DIR}/doc/Doxyfile.extra doxyfile_extra)
       foreach(x ${doxyfile_extra})
         file(APPEND ${JRL_CMAKEMODULE_DOXYFILE_PATH} ${x} "\n")
@@ -816,7 +829,7 @@ macro(_SETUP_PROJECT_DOCUMENTATION_FINALIZE)
       # doxygen/Doxyfile.extra.in
       set(DOXYGEN_IMAGE_PATH "${PROJECT_SOURCE_DIR}/doc/pictures")
       # Generate Doxyfile.
-      _setup_doxygen_config_file(${JRL_CMAKEMODULE_DOXYFILE_PATH})
+      _SETUP_DOXYGEN_CONFIG_FILE(${JRL_CMAKEMODULE_DOXYFILE_PATH})
     endif()
   endif(DOXYGEN_FOUND)
 endmacro(_SETUP_PROJECT_DOCUMENTATION_FINALIZE)
diff --git a/eigen.cmake b/eigen.cmake
index 93609e99b..03667af17 100644
--- a/eigen.cmake
+++ b/eigen.cmake
@@ -49,7 +49,7 @@ macro(SEARCH_FOR_EIGEN)
     )
 
     include_directories(SYSTEM ${_Eigen_INCLUDE_DIRS})
-    _add_to_list(_PKG_CONFIG_REQUIRES "${Eigen_REQUIRED}" ",")
+    _ADD_TO_LIST(_PKG_CONFIG_REQUIRES "${Eigen_REQUIRED}" ",")
   else()
     # fallback: search for the signature_of_eigen3_matrix_library file
     find_path(
@@ -59,6 +59,6 @@ macro(SEARCH_FOR_EIGEN)
       PATH_SUFFIXES eigen3 eigen
     )
     include_directories(SYSTEM ${Eigen_INCLUDE_DIR})
-    pkg_config_append_cflags(-I"${Eigen_INCLUDE_DIR}")
+    PKG_CONFIG_APPEND_CFLAGS(-I"${Eigen_INCLUDE_DIR}")
   endif()
 endmacro(SEARCH_FOR_EIGEN)
diff --git a/find-external/OpenMP/FindOpenMP.cmake b/find-external/OpenMP/FindOpenMP.cmake
index d1996d18e..501b5aaa2 100644
--- a/find-external/OpenMP/FindOpenMP.cmake
+++ b/find-external/OpenMP/FindOpenMP.cmake
@@ -209,9 +209,13 @@ endmacro()
 include(CMakeParseImplicitLinkInfo)
 
 function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
-  _openmp_flag_candidates("${LANG}")
-  _openmp_prepare_source("${LANG}" TEST_SOURCE OpenMPTryFlag
-                         _OPENMP_TEST_SRC_NAME _OPENMP_TEST_SRC_CONTENT
+  _OPENMP_FLAG_CANDIDATES("${LANG}")
+  _OPENMP_PREPARE_SOURCE(
+    "${LANG}"
+    TEST_SOURCE
+    OpenMPTryFlag
+    _OPENMP_TEST_SRC_NAME
+    _OPENMP_TEST_SRC_CONTENT
   )
 
   unset(OpenMP_VERBOSE_COMPILE_OPTIONS)
@@ -509,8 +513,12 @@ set(
 )
 
 function(_OPENMP_GET_SPEC_DATE LANG SPEC_DATE)
-  _openmp_prepare_source("${LANG}" CHECK_VERSION_SOURCE OpenMPCheckVersion
-                         _OPENMP_TEST_SRC_NAME _OPENMP_TEST_SRC_CONTENT
+  _OPENMP_PREPARE_SOURCE(
+    "${LANG}"
+    CHECK_VERSION_SOURCE
+    OpenMPCheckVersion
+    _OPENMP_TEST_SRC_NAME
+    _OPENMP_TEST_SRC_CONTENT
   )
 
   unset(_includeDirFlags)
@@ -606,8 +614,11 @@ foreach(LANG IN ITEMS C CXX)
       OR NOT DEFINED OpenMP_${LANG}_LIB_NAMES
       OR "${OpenMP_${LANG}_LIB_NAMES}" STREQUAL "NOTFOUND"
     )
-      _openmp_get_flags("${LANG}" "${LANG}" OpenMP_${LANG}_FLAGS_WORK
-                        OpenMP_${LANG}_LIB_NAMES_WORK
+      _OPENMP_GET_FLAGS(
+        "${LANG}"
+        "${LANG}"
+        OpenMP_${LANG}_FLAGS_WORK
+        OpenMP_${LANG}_LIB_NAMES_WORK
       )
       if(
         NOT DEFINED OpenMP_${LANG}_FLAGS
@@ -647,8 +658,11 @@ if(CMAKE_Fortran_COMPILER_LOADED)
     OR NOT DEFINED OpenMP_Fortran_HAVE_OMPLIB_MODULE
   )
     set(OpenMP_Fortran_INCLUDE_LINE "use omp_lib\n      implicit none")
-    _openmp_get_flags("Fortran" "FortranHeader" OpenMP_Fortran_FLAGS_WORK
-                      OpenMP_Fortran_LIB_NAMES_WORK
+    _OPENMP_GET_FLAGS(
+      "Fortran"
+      "FortranHeader"
+      OpenMP_Fortran_FLAGS_WORK
+      OpenMP_Fortran_LIB_NAMES_WORK
     )
     if(OpenMP_Fortran_FLAGS_WORK)
       set(OpenMP_Fortran_HAVE_OMPLIB_MODULE TRUE CACHE BOOL INTERNAL "")
@@ -689,8 +703,11 @@ if(CMAKE_Fortran_COMPILER_LOADED)
     OR NOT DEFINED OpenMP_Fortran_HAVE_OMPLIB_HEADER
   )
     set(OpenMP_Fortran_INCLUDE_LINE "implicit none\n      include 'omp_lib.h'")
-    _openmp_get_flags("Fortran" "FortranModule" OpenMP_Fortran_FLAGS_WORK
-                      OpenMP_Fortran_LIB_NAMES_WORK
+    _OPENMP_GET_FLAGS(
+      "Fortran"
+      "FortranModule"
+      OpenMP_Fortran_FLAGS_WORK
+      OpenMP_Fortran_LIB_NAMES_WORK
     )
     if(OpenMP_Fortran_FLAGS_WORK)
       set(OpenMP_Fortran_HAVE_OMPLIB_HEADER TRUE CACHE BOOL INTERNAL "")
@@ -742,7 +759,7 @@ include(FindPackageHandleStandardArgs)
 foreach(LANG IN LISTS OpenMP_FINDLIST)
   if(CMAKE_${LANG}_COMPILER_LOADED)
     if(NOT OpenMP_${LANG}_SPEC_DATE AND OpenMP_${LANG}_FLAGS)
-      _openmp_get_spec_date("${LANG}" OpenMP_${LANG}_SPEC_DATE_INTERNAL)
+      _OPENMP_GET_SPEC_DATE("${LANG}" OpenMP_${LANG}_SPEC_DATE_INTERNAL)
       set(
         OpenMP_${LANG}_SPEC_DATE
         "${OpenMP_${LANG}_SPEC_DATE_INTERNAL}"
@@ -750,7 +767,7 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
         "${LANG} compiler's OpenMP specification date"
       )
     endif()
-    _openmp_set_version_by_spec_date("${LANG}")
+    _OPENMP_SET_VERSION_BY_SPEC_DATE("${LANG}")
 
     set(OpenMP_${LANG}_FIND_QUIETLY ${OpenMP_FIND_QUIETLY})
     set(OpenMP_${LANG}_FIND_REQUIRED ${OpenMP_FIND_REQUIRED})
diff --git a/geometric-tools.cmake b/geometric-tools.cmake
index 5357fabac..f5170f9fc 100644
--- a/geometric-tools.cmake
+++ b/geometric-tools.cmake
@@ -81,8 +81,8 @@ macro(SEARCH_FOR_GEOMETRIC_TOOLS)
   include_directories(SYSTEM ${GEOMETRIC_TOOLS_INCLUDEDIR})
   link_directories(${GEOMETRIC_TOOLS_LIBRARYDIR})
 
-  pkg_config_append_cflags("-isystem ${GEOMETRIC_TOOLS_INCLUDEDIR}")
-  pkg_config_append_library_dir("${GEOMETRIC_TOOLS_LIBRARYDIR}")
+  PKG_CONFIG_APPEND_CFLAGS("-isystem ${GEOMETRIC_TOOLS_INCLUDEDIR}")
+  PKG_CONFIG_APPEND_LIBRARY_DIR("${GEOMETRIC_TOOLS_LIBRARYDIR}")
 
   message(STATUS "Module geometric-tools has been detected with success.")
 endmacro(SEARCH_FOR_GEOMETRIC_TOOLS)
diff --git a/header.cmake b/header.cmake
index 813bd41aa..8b40292ae 100644
--- a/header.cmake
+++ b/header.cmake
@@ -91,9 +91,11 @@ macro(_SETUP_PROJECT_HEADER)
 
   if(NOT PROJECT_GENERATED_HEADERS_SKIP_CONFIG)
     # Generate config.hh header.
-    generate_configuration_header(
-      ${HEADER_DIR} config.${PROJECT_CUSTOM_HEADER_EXTENSION}
-      ${PACKAGE_CPPNAME} ${PACKAGE_CPPNAME_LOWER}_EXPORTS
+    GENERATE_CONFIGURATION_HEADER(
+      ${HEADER_DIR}
+      config.${PROJECT_CUSTOM_HEADER_EXTENSION}
+      ${PACKAGE_CPPNAME}
+      ${PACKAGE_CPPNAME_LOWER}_EXPORTS
     )
   endif()
 
@@ -169,17 +171,12 @@ function(
   LIBRARY_NAME
   EXPORT_SYMBOL
 )
-  generate_configuration_header_v2(
-    INCLUDE_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/include
-    HEADER_DIR
-    ${HEADER_DIR}
-    FILENAME
-    ${FILENAME}
-    LIBRARY_NAME
-    ${LIBRARY_NAME}
-    EXPORT_SYMBOL
-    ${EXPORT_SYMBOL}
+  GENERATE_CONFIGURATION_HEADER_V2(
+    INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include
+    HEADER_DIR ${HEADER_DIR}
+    FILENAME ${FILENAME}
+    LIBRARY_NAME ${LIBRARY_NAME}
+    EXPORT_SYMBOL ${EXPORT_SYMBOL}
   )
 endfunction(GENERATE_CONFIGURATION_HEADER)
 
@@ -276,7 +273,7 @@ endfunction(GENERATE_CONFIGURATION_HEADER_V2)
 macro(_SETUP_PROJECT_HEADER_FINALIZE)
   # If the header list is set, install it.
   if(DEFINED ${PROJECT_NAME}_HEADERS)
-    header_install(${${PROJECT_NAME}_HEADERS})
+    HEADER_INSTALL(${${PROJECT_NAME}_HEADERS})
   endif(DEFINED ${PROJECT_NAME}_HEADERS)
 endmacro(_SETUP_PROJECT_HEADER_FINALIZE)
 
diff --git a/ide.cmake b/ide.cmake
index a29a159ee..f42303de3 100644
--- a/ide.cmake
+++ b/ide.cmake
@@ -66,7 +66,7 @@ function(ADD_GROUP GROUP_NAME FILENAMES)
     list(GET REDUCED_FILENAMES 0 str_a)
     foreach(id RANGE 1 ${max_id})
       list(GET REDUCED_FILENAMES ${id} str_b)
-      largest_common_prefix(${str_a} ${str_b} prefix)
+      LARGEST_COMMON_PREFIX(${str_a} ${str_b} prefix)
       set(str_a ${prefix})
       if("${str_a}" STREQUAL "")
         break()
@@ -97,7 +97,7 @@ endfunction(ADD_GROUP)
 # Add FILENAMES to "Header Files" group when using IDE Cmake Generator
 #
 macro(ADD_HEADER_GROUP FILENAMES)
-  add_group("Header Files" ${FILENAMES})
+  ADD_GROUP("Header Files" ${FILENAMES})
 endmacro(ADD_HEADER_GROUP FILENAMES)
 
 # ADD_SOURCE_GROUP
@@ -106,5 +106,5 @@ endmacro(ADD_HEADER_GROUP FILENAMES)
 # Add FILENAMES to "Source Files" group when using IDE Cmake Generator
 #
 macro(ADD_SOURCE_GROUP FILENAMES)
-  add_group("Source Files" ${FILENAMES})
+  ADD_GROUP("Source Files" ${FILENAMES})
 endmacro(ADD_SOURCE_GROUP FILENAMES)
diff --git a/kineo.cmake b/kineo.cmake
index 25ed2a2cf..b32e9cc36 100644
--- a/kineo.cmake
+++ b/kineo.cmake
@@ -38,8 +38,8 @@ macro(KINEO_ADDON MODULE_NAME)
   string(REPLACE "\n" "" UNAME_N "${UNAME_N}")
 
   set(ADDON_INSTALLDIR lib/modules/${UNAME_N})
-  pkg_config_append_library_dir(${CMAKE_INSTALL_PREFIX}/${ADDON_INSTALLDIR})
-  pkg_config_append_libs(${PROJECT_NAME})
+  PKG_CONFIG_APPEND_LIBRARY_DIR(${CMAKE_INSTALL_PREFIX}/${ADDON_INSTALLDIR})
+  PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
   add_library(${MODULE_NAME} SHARED ${KINEO_ADDON_SOURCES})
   set_target_properties(
     ${MODULE_NAME}
diff --git a/lapack.cmake b/lapack.cmake
index d7f6da10f..e07944d2a 100644
--- a/lapack.cmake
+++ b/lapack.cmake
@@ -42,7 +42,7 @@ macro(SEARCH_FOR_LAPACK)
     set(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
   endif(WIN32)
 
-  pkg_config_append_libs_raw("${LAPACK_LINKER_FLAGS};${LAPACK_LIBRARIES}")
+  PKG_CONFIG_APPEND_LIBS_RAW("${LAPACK_LINKER_FLAGS};${LAPACK_LIBRARIES}")
 
   # Watch variables.
   list(
diff --git a/msvc-specific.cmake b/msvc-specific.cmake
index 973a1453b..a39860cea 100644
--- a/msvc-specific.cmake
+++ b/msvc-specific.cmake
@@ -136,7 +136,7 @@ endmacro()
 # update the macro and its documentation.
 #
 macro(REQUIRE_MINIMUM_MSVC_VERSION VERSION)
-  get_msvc_tools_version()
+  GET_MSVC_TOOLS_VERSION()
   if(${MSVC_TOOLS_VERSION})
     if(NOT ${MSVC_TOOLS_VERSION} VERSION_GREATER ${VERSION})
       message(
@@ -174,7 +174,7 @@ endmacro(REQUIRE_MINIMUM_MSVC_VERSION)
 #
 macro(GENERATE_MSVC_DOT_USER_FILE)
   if(MSVC)
-    require_minimum_msvc_version("10.0")
+    REQUIRE_MINIMUM_MSVC_VERSION("10.0")
 
     set(
       oneValueArgs
@@ -217,7 +217,7 @@ macro(GENERATE_MSVC_DOT_USER_FILE)
       set(MSVC_DOT_USER_ADDITIONAL_PATH_DOT_USER ";${GMDUT_ADDITIONAL_PATH}")
     endif()
 
-    get_msvc_tools_version()
+    GET_MSVC_TOOLS_VERSION()
     set(
       DOT_USER_TEMPLATE_PATH
       ${PROJECT_JRL_CMAKE_MODULE_DIR}/msvc.vcxproj.user.in
diff --git a/package-config.cmake b/package-config.cmake
index a905c0126..2945b8f7c 100644
--- a/package-config.cmake
+++ b/package-config.cmake
@@ -82,11 +82,13 @@ macro(ADD_PROJECT_DEPENDENCY)
     ${ARGN}
   )
   if(PARSED_ARGN_PKG_CONFIG_REQUIRES)
-    _add_to_list_if_not_present(_PKG_CONFIG_REQUIRES
-                                "${PARSED_ARGN_PKG_CONFIG_REQUIRES}"
+    _ADD_TO_LIST_IF_NOT_PRESENT(
+      _PKG_CONFIG_REQUIRES
+      "${PARSED_ARGN_PKG_CONFIG_REQUIRES}"
     )
-    _add_to_list_if_not_present(_PKG_CONFIG_DEP_NOT_FOR_CONFIG_CMAKE
-                                "${PARSED_ARGN_PKG_CONFIG_REQUIRES}"
+    _ADD_TO_LIST_IF_NOT_PRESENT(
+      _PKG_CONFIG_DEP_NOT_FOR_CONFIG_CMAKE
+      "${PARSED_ARGN_PKG_CONFIG_REQUIRES}"
     )
   endif()
   if(PARSED_ARGN_FOR_COMPONENT)
@@ -112,16 +114,17 @@ macro(ADD_PROJECT_DEPENDENCY)
       DESTINATION "${CONFIG_INSTALL_DIR}/find-external"
     )
   endif()
-  _add_to_list_if_not_present(_PACKAGE_CONFIG${component}_DEPENDENCIES_PROJECTS
-                              "${ARGV0}"
+  _ADD_TO_LIST_IF_NOT_PRESENT(
+    _PACKAGE_CONFIG${component}_DEPENDENCIES_PROJECTS
+    "${ARGV0}"
   )
 
   string(REPLACE ";" " " PACKAGE_ARGS "${PARSED_ARGN_UNPARSED_ARGUMENTS}")
-  _add_to_list_if_not_present(
+  _ADD_TO_LIST_IF_NOT_PRESENT(
     _PACKAGE_CONFIG${component}_DEPENDENCIES_FIND_PACKAGE
     "find_package(${PACKAGE_ARGS})"
   )
-  _add_to_list_if_not_present(
+  _ADD_TO_LIST_IF_NOT_PRESENT(
     _PACKAGE_CONFIG${component}_DEPENDENCIES_FIND_DEPENDENCY
     "find_dependency(${PACKAGE_ARGS})"
   )
@@ -229,7 +232,7 @@ macro(SETUP_PROJECT_PACKAGE_FINALIZE)
   )
 
   if(DEFINED _MINIMAL_CXX_STANDARD)
-    install_jrl_cmakemodules_file("cxx-standard.cmake")
+    INSTALL_JRL_CMAKEMODULES_FILE("cxx-standard.cmake")
 
     # Add check for standard - enforce if required
     if(${MINIMAL_CXX_STANDARD_ENFORCE})
diff --git a/pkg-config.cmake b/pkg-config.cmake
index b7d211254..144a47786 100644
--- a/pkg-config.cmake
+++ b/pkg-config.cmake
@@ -58,7 +58,7 @@ set(
 #
 macro(_SETUP_PROJECT_PKG_CONFIG)
   # Pkg-config related commands.
-  rel_install_path("${CMAKE_INSTALL_LIBDIR}/pkgconfig" _PC_REL_INSTALL_PATH)
+  REL_INSTALL_PATH("${CMAKE_INSTALL_LIBDIR}/pkgconfig" _PC_REL_INSTALL_PATH)
   set(
     _PKG_CONFIG_PREFIX
     "\${pcfiledir}/${_PC_REL_INSTALL_PATH}"
@@ -308,17 +308,17 @@ macro(_SETUP_PROJECT_PKG_CONFIG_FINALIZE)
   if(DEFINED CMAKE_BUILD_TYPE)
     string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
     if(${cmake_build_type} MATCHES debug)
-      _setup_project_pkg_config_finalize_debug()
+      _SETUP_PROJECT_PKG_CONFIG_FINALIZE_DEBUG()
     else()
-      _setup_project_pkg_config_finalize_optimized()
+      _SETUP_PROJECT_PKG_CONFIG_FINALIZE_OPTIMIZED()
     endif()
     # Multiple build types generator
   else()
     if(DEFINED PROJECT_DEBUG_POSTFIX)
-      _setup_project_pkg_config_finalize_debug()
-      _setup_project_pkg_config_finalize_optimized()
+      _SETUP_PROJECT_PKG_CONFIG_FINALIZE_DEBUG()
+      _SETUP_PROJECT_PKG_CONFIG_FINALIZE_OPTIMIZED()
     else()
-      _setup_project_pkg_config_finalize_optimized()
+      _SETUP_PROJECT_PKG_CONFIG_FINALIZE_OPTIMIZED()
     endif()
   endif()
 endmacro(_SETUP_PROJECT_PKG_CONFIG_FINALIZE)
@@ -391,12 +391,18 @@ macro(
   PKG_CONFIG_STRING
   PKG_CONFIG_DEBUG_STRING
 )
-  _parse_pkg_config_string("${PKG_CONFIG_STRING}" LIBRARY_NAME PREFIX
-                           PKG_CONFIG_STRING_NOSPACE
+  _PARSE_PKG_CONFIG_STRING(
+    "${PKG_CONFIG_STRING}"
+    LIBRARY_NAME
+    PREFIX
+    PKG_CONFIG_STRING_NOSPACE
   )
   if(NOT ${PKG_CONFIG_DEBUG_STRING} STREQUAL "")
-    _parse_pkg_config_string("${PKG_CONFIG_DEBUG_STRING}" LIBRARY_DEBUG_NAME
-                             ${PREFIX}_DEBUG PKG_CONFIG_DEBUG_STRING_NOSPACE
+    _PARSE_PKG_CONFIG_STRING(
+      "${PKG_CONFIG_DEBUG_STRING}"
+      LIBRARY_DEBUG_NAME
+      ${PREFIX}_DEBUG
+      PKG_CONFIG_DEBUG_STRING_NOSPACE
     )
   endif()
 
@@ -593,11 +599,13 @@ macro(
   if(${PACKAGE_FOUND})
     if(NOT ${COMPILE_TIME_ONLY})
       if(DEFINED PROJECT_DEBUG_POSTFIX AND DEFINED ${PREFIX}_DEBUG)
-        _add_to_list_if_not_present(_PKG_CONFIG_REQUIRES_DEBUG
-                                    "${PKG_CONFIG_DEBUG_STRING}"
+        _ADD_TO_LIST_IF_NOT_PRESENT(
+          _PKG_CONFIG_REQUIRES_DEBUG
+          "${PKG_CONFIG_DEBUG_STRING}"
         )
-        _add_to_list_if_not_present(_PKG_CONFIG_REQUIRES_OPTIMIZED
-                                    "${PKG_CONFIG_STRING}"
+        _ADD_TO_LIST_IF_NOT_PRESENT(
+          _PKG_CONFIG_REQUIRES_OPTIMIZED
+          "${PKG_CONFIG_STRING}"
         )
       else()
         # Warn the user in case he/she is using alternative libraries for debug
@@ -611,11 +619,12 @@ macro(
              debug mode."
           )
         endif()
-        _add_to_list_if_not_present(_PKG_CONFIG_REQUIRES "${PKG_CONFIG_STRING}")
+        _ADD_TO_LIST_IF_NOT_PRESENT(_PKG_CONFIG_REQUIRES "${PKG_CONFIG_STRING}")
       endif()
     else()
-      _add_to_list_if_not_present(_PKG_CONFIG_COMPILE_TIME_REQUIRES
-                                  "${PKG_CONFIG_STRING}"
+      _ADD_TO_LIST_IF_NOT_PRESENT(
+        _PKG_CONFIG_COMPILE_TIME_REQUIRES
+        "${PKG_CONFIG_STRING}"
       )
     endif()
   endif()
@@ -623,7 +632,7 @@ macro(
   # Add the package to the cmake dependency list if cpack has been included.
   # This is likely to disappear when Ubuntu 8.04 will disappear.
   if(COMMAND ADD_CMAKE_DEPENDENCY)
-    add_cmake_dependency(${PKG_CONFIG_STRING})
+    ADD_CMAKE_DEPENDENCY(${PKG_CONFIG_STRING})
   endif(COMMAND ADD_CMAKE_DEPENDENCY)
 
   if(${${PREFIX}_FOUND})
@@ -660,7 +669,7 @@ macro(_GET_PKG_CONFIG_DEBUG_STRING PKG_CONFIG_STRING)
     AND DEFINED PROJECT_DEBUG_POSTFIX
     AND "${PKG_CONFIG_DEBUG_STRING}" STREQUAL ""
   )
-    _parse_pkg_config_string("${PKG_CONFIG_STRING}" LIBRARY_NAME PREFIX)
+    _PARSE_PKG_CONFIG_STRING("${PKG_CONFIG_STRING}" LIBRARY_NAME PREFIX)
     string(
       REGEX REPLACE
       "${LIBRARY_NAME}"
@@ -696,8 +705,8 @@ endmacro(_GET_PKG_CONFIG_DEBUG_STRING)
 macro(ADD_REQUIRED_DEPENDENCY PKG_CONFIG_STRING)
   list(FIND _PKG_CONFIG_REQUIRES "${PKG_CONFIG_STRING}" _index)
   if(${_index} EQUAL -1)
-    _get_pkg_config_debug_string("${PKG_CONFIG_STRING}" ${ARGN})
-    add_dependency(1 0 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
+    _GET_PKG_CONFIG_DEBUG_STRING("${PKG_CONFIG_STRING}" ${ARGN})
+    ADD_DEPENDENCY(1 0 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
   else()
     # Already found
     message(STATUS "Package ${PKG_CONFIG_STRING} already found.")
@@ -723,8 +732,8 @@ endmacro(ADD_REQUIRED_DEPENDENCY)
 # for debug builds. It should follow the same rule as PKG_CONFIG_STRING.
 #
 macro(ADD_OPTIONAL_DEPENDENCY PKG_CONFIG_STRING)
-  _get_pkg_config_debug_string("${PKG_CONFIG_STRING}" ${ARGN})
-  add_dependency(0 0 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
+  _GET_PKG_CONFIG_DEBUG_STRING("${PKG_CONFIG_STRING}" ${ARGN})
+  ADD_DEPENDENCY(0 0 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
 endmacro(ADD_OPTIONAL_DEPENDENCY)
 
 # .rst: .. ifmode:: import-advanced
@@ -743,8 +752,8 @@ endmacro(ADD_OPTIONAL_DEPENDENCY)
 # like: ``my-package_d >= 0.5``
 #
 macro(ADD_COMPILE_DEPENDENCY PKG_CONFIG_STRING)
-  _get_pkg_config_debug_string("${PKG_CONFIG_STRING}" ${ARGN})
-  add_dependency(1 1 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
+  _GET_PKG_CONFIG_DEBUG_STRING("${PKG_CONFIG_STRING}" ${ARGN})
+  ADD_DEPENDENCY(1 1 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}")
 endmacro(ADD_COMPILE_DEPENDENCY)
 
 # .rst: .. ifmode:: import-advanced
@@ -754,7 +763,7 @@ endmacro(ADD_COMPILE_DEPENDENCY)
 # Alias for :command:`ADD_COMPILE_DEPENDENCY`
 #
 macro(ADD_DOC_DEPENDENCY PKG_CONFIG_STRING)
-  add_compile_dependency(${PKG_CONFIG_STRING})
+  ADD_COMPILE_DEPENDENCY(${PKG_CONFIG_STRING})
 endmacro(ADD_DOC_DEPENDENCY)
 
 # .rst: .. ifmode:: export
@@ -1103,9 +1112,12 @@ macro(
 
   # Update the flags.
   set_target_properties(${TARGET} PROPERTIES LINK_FLAGS${CONFIG} "${LDFLAGS}")
-  _filter_link_flags(${TARGET} ${IS_GENERAL} ${IS_DEBUG} "${${PREFIX}_LDFLAGS}")
-  _filter_link_flags(${TARGET} ${IS_GENERAL} ${IS_DEBUG}
-                     "${${PREFIX}_LDFLAGS_OTHER}"
+  _FILTER_LINK_FLAGS(${TARGET} ${IS_GENERAL} ${IS_DEBUG} "${${PREFIX}_LDFLAGS}")
+  _FILTER_LINK_FLAGS(
+    ${TARGET}
+    ${IS_GENERAL}
+    ${IS_DEBUG}
+    "${${PREFIX}_LDFLAGS_OTHER}"
   )
 endmacro(
   _PKG_CONFIG_MANIPULATE_LDFLAGS
@@ -1128,27 +1140,35 @@ endmacro(
 #
 macro(PKG_CONFIG_USE_LLINK_DEPENDENCY TARGET PREFIX)
   if(NOT DEFINED ${PREFIX}_DEBUG_FOUND)
-    _pkg_config_manipulate_ldflags(${TARGET} ${PREFIX} "" 1 0)
+    _PKG_CONFIG_MANIPULATE_LDFLAGS(${TARGET} ${PREFIX} "" 1 0)
   else()
     # Single build type generators
     if(DEFINED CMAKE_BUILD_TYPE)
       string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
       if("${cmake_build_type}" MATCHES "debug")
-        _pkg_config_manipulate_ldflags(${TARGET} "${PREFIX}_DEBUG" "" 1 0)
+        _PKG_CONFIG_MANIPULATE_LDFLAGS(${TARGET} "${PREFIX}_DEBUG" "" 1 0)
       else()
-        _pkg_config_manipulate_ldflags(${TARGET} ${PREFIX} "" 1 0)
+        _PKG_CONFIG_MANIPULATE_LDFLAGS(${TARGET} ${PREFIX} "" 1 0)
       endif()
       # Multiple build types generators
     else()
       foreach(config ${CMAKE_CONFIGURATION_TYPES})
         string(TOUPPER "_${config}" config_in)
         if(${config_in} MATCHES "_DEBUG")
-          _pkg_config_manipulate_ldflags(${TARGET} "${PREFIX}_DEBUG"
-                                         "${config_in}" 0 1
+          _PKG_CONFIG_MANIPULATE_LDFLAGS(
+            ${TARGET}
+            "${PREFIX}_DEBUG"
+            "${config_in}"
+            0
+            1
           )
         else()
-          _pkg_config_manipulate_ldflags(${TARGET} "${PREFIX}" "${config_in}" 0
-                                         0
+          _PKG_CONFIG_MANIPULATE_LDFLAGS(
+            ${TARGET}
+            "${PREFIX}"
+            "${config_in}"
+            0
+            0
           )
         endif()
       endforeach()
@@ -1213,11 +1233,13 @@ macro(PKG_CONFIG_USE_DEPENDENCY TARGET DEPENDENCY)
     "${multiValueArgs}"
     ${ARGN}
   )
-  build_prefix_for_pkg(${DEPENDENCY} PREFIX)
-  pkg_config_use_lcompile_dependency(
-    ${TARGET} ${PREFIX} ${PKG_CONFIG_USE_DEPENDENCY_NO_INCLUDE_SYSTEM}
+  BUILD_PREFIX_FOR_PKG(${DEPENDENCY} PREFIX)
+  PKG_CONFIG_USE_LCOMPILE_DEPENDENCY(
+    ${TARGET}
+    ${PREFIX}
+    ${PKG_CONFIG_USE_DEPENDENCY_NO_INCLUDE_SYSTEM}
   )
-  pkg_config_use_llink_dependency(${TARGET} ${PREFIX})
+  PKG_CONFIG_USE_LLINK_DEPENDENCY(${TARGET} ${PREFIX})
 endmacro(PKG_CONFIG_USE_DEPENDENCY TARGET DEPENDENCY)
 
 # .rst: .. ifmode:: import-advanced
@@ -1247,9 +1269,11 @@ macro(PKG_CONFIG_USE_COMPILE_DEPENDENCY TARGET DEPENDENCY)
     "${multiValueArgs}"
     ${ARGN}
   )
-  build_prefix_for_pkg(${DEPENDENCY} PREFIX)
-  pkg_config_use_lcompile_dependency(
-    ${TARGET} ${PREFIX} ${PKG_CONFIG_USE_COMPILE_DEPENDENCY_NO_INCLUDE_SYSTEM}
+  BUILD_PREFIX_FOR_PKG(${DEPENDENCY} PREFIX)
+  PKG_CONFIG_USE_LCOMPILE_DEPENDENCY(
+    ${TARGET}
+    ${PREFIX}
+    ${PKG_CONFIG_USE_COMPILE_DEPENDENCY_NO_INCLUDE_SYSTEM}
   )
 endmacro(PKG_CONFIG_USE_COMPILE_DEPENDENCY TARGET DEPENDENCY)
 
@@ -1261,8 +1285,8 @@ endmacro(PKG_CONFIG_USE_COMPILE_DEPENDENCY TARGET DEPENDENCY)
 # shared libraries when using a dependency detected through pkg-config.
 #
 macro(PKG_CONFIG_USE_LINK_DEPENDENCY TARGET DEPENDENCY)
-  build_prefix_for_pkg(${DEPENDENCY} PREFIX)
-  pkg_config_use_llink_dependency(${TARGET} ${PREFIX})
+  BUILD_PREFIX_FOR_PKG(${DEPENDENCY} PREFIX)
+  PKG_CONFIG_USE_LLINK_DEPENDENCY(${TARGET} ${PREFIX})
 endmacro(PKG_CONFIG_USE_LINK_DEPENDENCY TARGET DEPENDENCY)
 
 # .rst: .. ifmode:: import-advanced
@@ -1275,7 +1299,7 @@ endmacro(PKG_CONFIG_USE_LINK_DEPENDENCY TARGET DEPENDENCY)
 # SET_TARGET_PROPERTIES...
 #
 macro(PKG_CONFIG_ADD_COMPILE_OPTIONS COMPILE_OPTIONS DEPENDENCY)
-  build_prefix_for_pkg(${DEPENDENCY} PREFIX)
+  BUILD_PREFIX_FOR_PKG(${DEPENDENCY} PREFIX)
 
   # If there were no previous options
   if(NOT ${COMPILE_OPTIONS})
diff --git a/post-project.cmake b/post-project.cmake
index 7fb1ed6ed..ca19212a1 100644
--- a/post-project.cmake
+++ b/post-project.cmake
@@ -53,21 +53,21 @@ option(INSTALL_PKG_CONFIG_FILE "Generate and install standard .pc file" ON)
 include(CTest)
 enable_testing()
 
-logging_initialize()
+LOGGING_INITIALIZE()
 
 # FIXME: normalize naming to <MODULE>_SETUP()
 if(COMMAND _setup_python_for_cython)
   _setup_python_for_cython()
 endif()
-_setup_project_warnings()
-_setup_project_header()
-_setup_project_dist()
-distcheck_setup()
-release_setup()
-_setup_project_deb()
-_setup_project_uninstall()
-_setup_project_pkg_config()
+_SETUP_PROJECT_WARNINGS()
+_SETUP_PROJECT_HEADER()
+_SETUP_PROJECT_DIST()
+DISTCHECK_SETUP()
+RELEASE_SETUP()
+_SETUP_PROJECT_DEB()
+_SETUP_PROJECT_UNINSTALL()
+_SETUP_PROJECT_PKG_CONFIG()
 if(BUILD_DOCUMENTATION)
-  _setup_project_documentation()
+  _SETUP_PROJECT_DOCUMENTATION()
 endif(BUILD_DOCUMENTATION)
-_setup_project_package_init()
+_SETUP_PROJECT_PACKAGE_INIT()
diff --git a/python-helpers.cmake b/python-helpers.cmake
index 13b5a6a9f..fc79cf137 100644
--- a/python-helpers.cmake
+++ b/python-helpers.cmake
@@ -46,7 +46,7 @@ macro(PYTHON_INSTALL MODULE FILE DEST)
     set(_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
   endif()
 
-  python_build("${MODULE}" "${FILE}")
+  PYTHON_BUILD("${MODULE}" "${FILE}")
 
   install(
     FILES "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}/${FILE}"
@@ -86,8 +86,11 @@ macro(PYTHON_INSTALL_ON_SITE MODULE FILE)
     set(_COMPONENT_NAME ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
   endif()
 
-  python_install("${MODULE}" "${FILE}" ${PYTHON_SITELIB} COMPONENT
-                 ${_COMPONENT_NAME}
+  PYTHON_INSTALL(
+    "${MODULE}"
+    "${FILE}"
+    ${PYTHON_SITELIB}
+    COMPONENT ${_COMPONENT_NAME}
   )
 endmacro()
 
@@ -120,7 +123,7 @@ endfunction(PYTHON_BUILD_GET_TARGET NAME)
 #
 macro(PYTHON_BUILD MODULE FILE)
   set(python_build_target "")
-  python_build_get_target(python_build_target)
+  PYTHON_BUILD_GET_TARGET(python_build_target)
 
   set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}/${FILE}")
 
@@ -140,7 +143,7 @@ macro(PYTHON_BUILD MODULE FILE)
     COMMAND ${CMAKE_COMMAND} -E make_directory "${OUTPUT_FILE_DIR}"
   )
 
-  python_build_file(${INPUT_FILE} ${OUTPUT_FILE})
+  PYTHON_BUILD_FILE(${INPUT_FILE} ${OUTPUT_FILE})
 endmacro()
 
 # PYTHON_BUILD_FILE(FILE [OUTPUT_FILE])
@@ -150,7 +153,7 @@ endmacro()
 #
 macro(PYTHON_BUILD_FILE FILE)
   set(python_build_target "")
-  python_build_get_target(python_build_target)
+  PYTHON_BUILD_GET_TARGET(python_build_target)
 
   set(extra_var "${ARGV1}")
   if(NOT extra_var STREQUAL "")
diff --git a/python.cmake b/python.cmake
index 12de4e9c6..422f53f28 100644
--- a/python.cmake
+++ b/python.cmake
@@ -178,7 +178,7 @@ macro(FINDPYTHON)
       set(Python${_PYTHON_VERSION_MAJOR}_INCLUDE_DIR ${PYTHON_INCLUDE_DIR})
 
       if(SEARCH_FOR_NUMPY)
-        find_numpy()
+        FIND_NUMPY()
         set(Python_NumPy_INCLUDE_DIR ${NUMPY_INCLUDE_DIRS})
       endif()
 
@@ -390,8 +390,8 @@ macro(FINDPYTHON)
   endif()
 
   if(PYTHON_EXPORT_DEPENDENCY)
-    install_jrl_cmakemodules_file("python.cmake")
-    install_jrl_cmakemodules_file("python-helpers.cmake")
+    INSTALL_JRL_CMAKEMODULES_FILE("python.cmake")
+    INSTALL_JRL_CMAKEMODULES_FILE("python-helpers.cmake")
     string(
       CONCAT
       PYTHON_EXPORT_DEPENDENCY_MACROS
@@ -404,7 +404,7 @@ macro(FINDPYTHON)
   endif()
 
   if(SEARCH_FOR_NUMPY)
-    find_numpy()
+    FIND_NUMPY()
     if(PYTHON_EXPORT_DEPENDENCY)
       set(
         PYTHON_EXPORT_DEPENDENCY_MACROS
@@ -515,7 +515,7 @@ macro(DYNAMIC_GRAPH_PYTHON_MODULE SUBMODULENAME LIBRARYNAME TARGETNAME)
     ${PYTHON_MODULE}
     PUBLIC ${LIBRARYNAME} dynamic-graph::dynamic-graph
   )
-  target_link_boost_python(${PYTHON_MODULE} PUBLIC)
+  TARGET_LINK_BOOST_PYTHON(${PYTHON_MODULE} PUBLIC)
   if(PROJECT_NAME STREQUAL "dynamic-graph-python")
     target_link_libraries(${PYTHON_MODULE} PUBLIC dynamic-graph-python)
   else()
diff --git a/qhull.cmake b/qhull.cmake
index d92fcafa6..64707a2f4 100644
--- a/qhull.cmake
+++ b/qhull.cmake
@@ -139,20 +139,20 @@ macro(SEARCH_FOR_QHULL)
   if(QHULL_FOUND)
     set(HAVE_QHULL ON)
     add_definitions("-DHAVE_QHULL")
-    pkg_config_append_cflags(-DHAVE_QHULL)
+    PKG_CONFIG_APPEND_CFLAGS(-DHAVE_QHULL)
     message(STATUS "Qhull found")
     get_filename_component(QHULL_LIBRARY_DIR ${QHULL_LIBRARY} PATH)
   endif(QHULL_FOUND)
 
   if(HAVE_QHULL_2011)
     add_definitions("-DHAVE_QHULL_2011")
-    pkg_config_append_cflags(-DHAVE_QHULL_2011)
+    PKG_CONFIG_APPEND_CFLAGS(-DHAVE_QHULL_2011)
   endif(HAVE_QHULL_2011)
 
   if(QHULL_FOUND)
     include_directories(${QHULL_INCLUDE_DIRS})
     link_directories(${QHULL_LIBRARY_DIR})
-    pkg_config_append_cflags("-I ${QHULL_INCLUDE_DIRS}")
-    pkg_config_append_library_dir("${QHULL_LIBRARY_DIR}")
+    PKG_CONFIG_APPEND_CFLAGS("-I ${QHULL_INCLUDE_DIRS}")
+    PKG_CONFIG_APPEND_LIBRARY_DIR("${QHULL_LIBRARY_DIR}")
   endif(QHULL_FOUND)
 endmacro(SEARCH_FOR_QHULL)
diff --git a/relpath.cmake b/relpath.cmake
index 2146dc535..79bd1fa25 100644
--- a/relpath.cmake
+++ b/relpath.cmake
@@ -37,7 +37,7 @@ macro(GET_RELATIVE_RPATH TARGET_INSTALL_DIR VARIABLE)
     else()
       set(ORIGIN "\$ORIGIN")
     endif()
-    rel_install_path("${TARGET_INSTALL_DIR}" _TGT_INV_REL)
+    REL_INSTALL_PATH("${TARGET_INSTALL_DIR}" _TGT_INV_REL)
     if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
       file(
         RELATIVE_PATH
diff --git a/ros.cmake b/ros.cmake
index 437c436e0..f12519ce3 100644
--- a/ros.cmake
+++ b/ros.cmake
@@ -130,8 +130,8 @@ macro(ADD_ROSPACK_DEPENDENCY PKG_ROS)
   string(REPLACE "\n" "" ${PKG}_ROS_PREFIX "${${PKG}_ROS_PREFIX}")
 
   # Add flags to package pkg-config file.
-  pkg_config_append_cflags("${${PREFIX}_CFLAGS}")
-  pkg_config_append_libs_raw("${${PREFIX}_LIBS}")
+  PKG_CONFIG_APPEND_CFLAGS("${${PREFIX}_CFLAGS}")
+  PKG_CONFIG_APPEND_LIBS_RAW("${${PREFIX}_LIBS}")
 endmacro()
 
 macro(ROSPACK_USE_DEPENDENCY TARGET PKG)
diff --git a/sdformat.cmake b/sdformat.cmake
index 3e8c4a702..a68e8d6dc 100644
--- a/sdformat.cmake
+++ b/sdformat.cmake
@@ -39,7 +39,7 @@ macro(SEARCH_FOR_SDFORMAT)
     find_package(SDFormat${version} QUIET)
     if(SDFormat${version}_FOUND)
       set(SDFormat_FOUND True)
-      add_project_dependency(SDFormat${version})
+      ADD_PROJECT_DEPENDENCY(SDFormat${version})
       message(STATUS "SDFormat${version} Found")
       break()
     endif()
diff --git a/swig.cmake b/swig.cmake
index 5f92944b7..57b04fbf5 100644
--- a/swig.cmake
+++ b/swig.cmake
@@ -15,7 +15,7 @@ macro(ADD_SWIG_PYTHON_BINDING FILENAME DIRECTORY)
   if(${SWIG} STREQUAL SWIG-NOTFOUND)
     message(FATAL_ERROR "Cannot find swig")
   endif()
-  generate_include_flags()
+  GENERATE_INCLUDE_FLAGS()
   set(outname ${CMAKE_BINARY_DIR}/${DIRECTORY}/${FILENAME}_wrap.cxx)
   add_custom_command(
     OUTPUT ${outname}
diff --git a/test.cmake b/test.cmake
index 535147700..487c9b20e 100644
--- a/test.cmake
+++ b/test.cmake
@@ -95,7 +95,7 @@ endmacro(CREATE_CTEST_BUILD_TESTS_TARGET)
 # The behaviour of this function depends on :variable:`BUILD_TESTING` option.
 #
 macro(ADD_UNIT_TEST NAME)
-  create_ctest_build_tests_target()
+  CREATE_CTEST_BUILD_TESTS_TARGET()
 
   if(NOT BUILD_TESTING)
     add_executable(${NAME} EXCLUDE_FROM_ALL ${ARGN})
@@ -212,7 +212,7 @@ macro(ADD_PYTHON_UNIT_TEST NAME SOURCE)
 
   set(MODULES "${ARGN}") # ARGN is not a variable
   set(PYTHONPATH)
-  compute_pythonpath(ENV_VARIABLES ${MODULES})
+  COMPUTE_PYTHONPATH(ENV_VARIABLES ${MODULES})
   set_tests_properties(${NAME} PROPERTIES ENVIRONMENT "${ENV_VARIABLES}")
   if(ENABLE_COVERAGE)
     set_tests_properties(
@@ -233,8 +233,13 @@ endmacro(ADD_PYTHON_UNIT_TEST NAME SOURCE)
 # work if valgrind is installed
 #
 macro(ADD_PYTHON_MEMORYCHECK_UNIT_TEST NAME SOURCE)
-  add_python_memorycheck_unit_test_v2(NAME ${NAME} SOURCE ${SOURCE} MODULES
-                                      ${ARGN}
+  ADD_PYTHON_MEMORYCHECK_UNIT_TEST_V2(
+    NAME
+    ${NAME}
+    SOURCE
+    ${SOURCE}
+    MODULES
+    ${ARGN}
   )
 endmacro()
 
@@ -288,7 +293,7 @@ macro(ADD_PYTHON_MEMORYCHECK_UNIT_TEST_V2)
 
     add_test(NAME ${ARGS_NAME} COMMAND ${CMAKE_COMMAND} -P ${TEST_FILE_NAME})
 
-    compute_pythonpath(ENV_VARIABLES ${ARGS_MODULES})
+    COMPUTE_PYTHONPATH(ENV_VARIABLES ${ARGS_MODULES})
     set_tests_properties(${ARGS_NAME} PROPERTIES ENVIRONMENT "${ENV_VARIABLES}")
   endif()
 endmacro()
@@ -310,6 +315,6 @@ endmacro(ADD_JULIA_UNIT_TEST NAME SOURCE)
 # Compile a program and add it as a test
 #
 macro(DEFINE_UNIT_TEST NAME LIB)
-  add_unit_test(${NAME} ${NAME}.cc)
+  ADD_UNIT_TEST(${NAME} ${NAME}.cc)
   target_link_libraries(${NAME} ${PUBLIC_KEYWORD} ${LIB})
 endmacro(DEFINE_UNIT_TEST)
diff --git a/tracy.cmake b/tracy.cmake
index ee6813a11..0da3e1488 100644
--- a/tracy.cmake
+++ b/tracy.cmake
@@ -106,19 +106,14 @@ function(_SETUP_TRACY_HEADER)
   string(REGEX REPLACE "[^a-zA-Z0-9]" "_" PACKAGE_CPPNAME "${PROJECT_NAME}")
   string(TOUPPER "${PACKAGE_CPPNAME}" PACKAGE_CPPNAME)
 
-  _generate_tracy_header(
-    INCLUDE_DIR
-    ${PROJECT_BINARY_DIR}/include
-    HEADER_DIR
-    ${HEADER_DIR}
-    FILENAME
-    tracy.${HEADER_EXTENSION}
-    LIBRARY_NAME
-    ${PACKAGE_CPPNAME}
-    TRACY_ENABLE
-    ${${PACKAGE_CPPNAME}_TRACY_ENABLE}
+  _GENERATE_TRACY_HEADER(
+    INCLUDE_DIR ${PROJECT_BINARY_DIR}/include
+    HEADER_DIR ${HEADER_DIR}
+    FILENAME tracy.${HEADER_EXTENSION}
+    LIBRARY_NAME ${PACKAGE_CPPNAME}
+    TRACY_ENABLE ${${PACKAGE_CPPNAME}_TRACY_ENABLE}
   )
 endfunction()
 
 option(${PACKAGE_CPPNAME}_TRACY_ENABLE "Enable Tracy." OFF)
-_setup_tracy_header()
+_SETUP_TRACY_HEADER()
diff --git a/version-script.cmake b/version-script.cmake
index 611e07d0d..125b87557 100644
--- a/version-script.cmake
+++ b/version-script.cmake
@@ -64,7 +64,7 @@ endmacro(_CHECK_VERSION_SCRIPT_SUPPORT)
 #
 macro(ADD_VERSION_SCRIPT TARGET VERSION_SCRIPT)
   if(NOT DEFINED _HAS_VERSION_SCRIPT_SUPPORT)
-    _check_version_script_support()
+    _CHECK_VERSION_SCRIPT_SUPPORT()
   endif()
   if(_HAS_VERSION_SCRIPT_SUPPORT)
     if(TARGET ${TARGET})
diff --git a/version.cmake b/version.cmake
index ffc79730c..de226a29b 100644
--- a/version.cmake
+++ b/version.cmake
@@ -212,11 +212,11 @@ macro(VERSION_COMPUTE)
   foreach(_computation_method ${PROJECT_VERSION_COMPUTATION_METHODS})
     if(NOT PROJECT_VERSION)
       if(${_computation_method} STREQUAL "DOT_VERSION_FILE")
-        _compute_version_from_dot_version_file()
+        _COMPUTE_VERSION_FROM_DOT_VERSION_FILE()
       elseif(${_computation_method} STREQUAL "GIT_DESCRIBE")
-        _compute_version_from_git_describe()
+        _COMPUTE_VERSION_FROM_GIT_DESCRIBE()
       elseif(${_computation_method} STREQUAL "ROS_PACKAGE_XML_FILE")
-        _compute_version_from_ros_package_xml_file()
+        _COMPUTE_VERSION_FROM_ROS_PACKAGE_XML_FILE()
       else()
         message(
           AUTHOR_WARNING
@@ -239,8 +239,11 @@ macro(VERSION_COMPUTE)
       AND NOT DEFINED PROJECT_VERSION_MINOR
       AND NOT DEFINED PROJECT_VERSION_PATCH
     )
-      split_version_number(${PROJECT_VERSION} PROJECT_VERSION_MAJOR
-                           PROJECT_VERSION_MINOR PROJECT_VERSION_PATCH
+      SPLIT_VERSION_NUMBER(
+        ${PROJECT_VERSION}
+        PROJECT_VERSION_MAJOR
+        PROJECT_VERSION_MINOR
+        PROJECT_VERSION_PATCH
       )
     endif()
   endif()
diff --git a/xacro.cmake b/xacro.cmake
index 7641f6ccd..d4c887682 100644
--- a/xacro.cmake
+++ b/xacro.cmake
@@ -93,5 +93,5 @@ macro(GENERATE_URDF_FILE FILENAME EXTENSION)
     set(_XACRO_FILE_ ${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}.xacro)
   endif(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}.xacro)
 
-  run_xacro(${_XACRO_FILE_} ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE})
+  RUN_XACRO(${_XACRO_FILE_} ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE})
 endmacro(GENERATE_URDF_FILE FILENAME CONFIGURE)