diff --git a/modules/git_info/git_info.cmake b/modules/git_info/git_info.cmake
index 1b609c2..c5185d3 100644
--- a/modules/git_info/git_info.cmake
+++ b/modules/git_info/git_info.cmake
@@ -5,10 +5,11 @@
 # Git repository version and status information
 # to the program output.
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   fetch: https://github.com/coderefinery/autocmake/raw/master/modules/git_info/git_info_sub.cmake
-#          https://github.com/coderefinery/autocmake/raw/master/modules/git_info/git_info.h.in
+#   fetch:
+#     - "https://github.com/coderefinery/autocmake/raw/master/modules/git_info/git_info_sub.cmake"
+#     - "https://github.com/coderefinery/autocmake/raw/master/modules/git_info/git_info.h.in"
 
 # CMAKE_CURRENT_LIST_DIR is undefined in CMake 2.8.2
 # see https://public.kitware.com/Bug/print_bug_page.php?bug_id=11675
diff --git a/modules/int64.cmake b/modules/int64.cmake
index 45f4b23..b8847fa 100644
--- a/modules/int64.cmake
+++ b/modules/int64.cmake
@@ -6,10 +6,10 @@
 #
 #   CMAKE_Fortran_FLAGS
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   docopt: --int64 Enable 64bit integers [default: False].
-#   define: '-DENABLE_64BIT_INTEGERS={0}'.format(arguments['--int64'])
+#   docopt: "--int64 Enable 64bit integers [default: False]."
+#   define: "'-DENABLE_64BIT_INTEGERS={0}'.format(arguments['--int64'])"
 
 option(ENABLE_64BIT_INTEGERS "Enable 64-bit integers" OFF)
 
diff --git a/modules/math_libs.cmake b/modules/math_libs.cmake
index 23c64c9..9b85a2d 100644
--- a/modules/math_libs.cmake
+++ b/modules/math_libs.cmake
@@ -37,18 +37,20 @@
 #   MKL_ROOT
 #   MKLROOT
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   docopt: --blas=<BLAS> Detect and link BLAS library (auto or off) [default: auto].
-#           --lapack=<LAPACK> Detect and link LAPACK library (auto or off) [default: auto].
-#           --mkl=<MKL> Pass MKL flag to the Intel compiler and linker and skip BLAS/LAPACK detection (sequential, parallel, cluster, or off) [default: off].
-#   define: '-DENABLE_BLAS={0}'.format(arguments['--blas'])
-#           '-DENABLE_LAPACK={0}'.format(arguments['--lapack'])
-#           '-DMKL_FLAG={0}'.format(arguments['--mkl'])
-#           '-DMATH_LIB_SEARCH_ORDER="MKL;ESSL;OPENBLAS;ATLAS;ACML;SYSTEM_NATIVE"'
-#           '-DBLAS_LANG=Fortran'
-#           '-DLAPACK_LANG=Fortran'
-#   warning: 'This module is deprecated and will be removed in future versions'
+#   docopt:
+#     - "--blas=<BLAS> Detect and link BLAS library (auto or off) [default: auto]."
+#     - "--lapack=<LAPACK> Detect and link LAPACK library (auto or off) [default: auto]."
+#     - "--mkl=<MKL> Pass MKL flag to the Intel compiler and linker and skip BLAS/LAPACK detection (sequential, parallel, cluster, or off) [default: off]."
+#   define:
+#     - "'-DENABLE_BLAS={0}'.format(arguments['--blas'])"
+#     - "'-DENABLE_LAPACK={0}'.format(arguments['--lapack'])"
+#     - "'-DMKL_FLAG={0}'.format(arguments['--mkl'])"
+#     - "'-DMATH_LIB_SEARCH_ORDER=\"MKL;ESSL;OPENBLAS;ATLAS;ACML;SYSTEM_NATIVE\"'"
+#     - "'-DBLAS_LANG=Fortran'"
+#     - "'-DLAPACK_LANG=Fortran'"
+#   warning: "This module is deprecated and will be removed in future versions"
 
 #-------------------------------------------------------------------------------
 # ENABLE_STATIC_LINKING
diff --git a/modules/mpi.cmake b/modules/mpi.cmake
index cb64a41..418975e 100644
--- a/modules/mpi.cmake
+++ b/modules/mpi.cmake
@@ -13,10 +13,10 @@
 #   CMAKE_C_FLAGS
 #   CMAKE_CXX_FLAGS
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   docopt: --mpi Enable MPI parallelization [default: False].
-#   define: '-DENABLE_MPI={0}'.format(arguments['--mpi'])
+#   docopt: "--mpi Enable MPI parallelization [default: False]."
+#   define: "'-DENABLE_MPI={0}'.format(arguments['--mpi'])"
 
 option(ENABLE_MPI "Enable MPI parallelization" OFF)
 
diff --git a/modules/omp.cmake b/modules/omp.cmake
index 1a6e9b4..1719afe 100644
--- a/modules/omp.cmake
+++ b/modules/omp.cmake
@@ -13,10 +13,10 @@
 #   CMAKE_C_FLAGS
 #   CMAKE_CXX_FLAGS
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   docopt: --omp Enable OpenMP parallelization [default: False].
-#   define: '-DENABLE_OPENMP={0}'.format(arguments['--omp'])
+#   docopt: "--omp Enable OpenMP parallelization [default: False]."
+#   define: "'-DENABLE_OPENMP={0}'.format(arguments['--omp'])"
 
 option(ENABLE_OPENMP "Enable OpenMP parallelization" OFF)
 
diff --git a/modules/python_interpreter.cmake b/modules/python_interpreter.cmake
index 54509a0..6d200ef 100644
--- a/modules/python_interpreter.cmake
+++ b/modules/python_interpreter.cmake
@@ -15,10 +15,10 @@
 #   PYTHON_VERSION_MINOR       - Python minor version found e.g. 5
 #   PYTHON_VERSION_PATCH       - Python patch version found e.g. 2
 #
-# autocmake.cfg configuration::
+# autocmake.yml configuration::
 #
-#   docopt: --python=<PYTHON_INTERPRETER> The Python interpreter (development version) to use. [default: ''].
-#   define: '-DPYTHON_INTERPRETER="{0}"'.format(arguments['--python'])
+#   docopt: "--python=<PYTHON_INTERPRETER> The Python interpreter (development version) to use. [default: '']."
+#   define: "'-DPYTHON_INTERPRETER=\"{0}\"'.format(arguments['--python'])"
 
 if("${PYTHON_INTERPRETER}" STREQUAL "")
     find_package(PythonInterp REQUIRED)