diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35533b326..0ba4ef9b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,12 +95,12 @@ kompute_option(KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK "Whether to check if you
 kompute_option(KOMPUTE_OPT_BUILD_SHADERS "Rebuilds all compute shaders during compilation and does not use the already precompiled versions. Requires glslangValidator to be installed on your system." OFF)
 
 # External components
-kompute_option(KOMPUTE_OPT_USE_BUILD_IN_SPDLOG "Use the built-in version of Spdlog." ON)
-kompute_option(KOMPUTE_OPT_USE_BUILD_IN_FMT "Use the built-in version of fmt." ON)
-kompute_option(KOMPUTE_OPT_USE_BUILD_IN_GOOGLE_TEST "Use the built-in version of GoogleTest." ON)
-kompute_option(KOMPUTE_OPT_USE_BUILD_IN_PYBIND11 "Use the built-in version of pybind11." ON)
-kompute_option(KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER "Use the built-in version of Vulkan Headers. This could be helpful in case your system Vulkan Headers are to new for your driver. If you set this to false, please make sure your system Vulkan Header are supported by your driver." ON)
-kompute_option_string(KOMPUTE_OPT_BUILD_IN_VULKAN_HEADER_TAG "The git tag used for the built-in Vulkan Headers when 'KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER' is enabled. A list of tags can be found here: https://github.com/KhronosGroup/Vulkan-Headers/tags" "v1.2.203")
+kompute_option(KOMPUTE_OPT_USE_BUILT_IN_SPDLOG "Use the built-in version of Spdlog." ON)
+kompute_option(KOMPUTE_OPT_USE_BUILT_IN_FMT "Use the built-in version of fmt." ON)
+kompute_option(KOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST "Use the built-in version of GoogleTest." ON)
+kompute_option(KOMPUTE_OPT_USE_BUILT_IN_PYBIND11 "Use the built-in version of pybind11." ON)
+kompute_option(KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER "Use the built-in version of Vulkan Headers. This could be helpful in case your system Vulkan Headers are to new for your driver. If you set this to false, please make sure your system Vulkan Header are supported by your driver." ON)
+kompute_option_string(KOMPUTE_OPT_BUILT_IN_VULKAN_HEADER_TAG "The git tag used for the built-in Vulkan Headers when 'KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER' is enabled. A list of tags can be found here: https://github.com/KhronosGroup/Vulkan-Headers/tags" "v1.2.203")
 message(STATUS "=======================================================")
 
 # ####################################################
@@ -122,9 +122,9 @@ if(NOT KOMPUTE_OPT_ANDROID_BUILD)
     find_package(Vulkan REQUIRED)
 endif()
 
-if(KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER)
+if(KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER)
     FetchContent_Declare(vulkan_header GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git
-        GIT_TAG ${KOMPUTE_OPT_BUILD_IN_VULKAN_HEADER_TAG}) # Source: https://github.com/KhronosGroup/Vulkan-Headers/tags
+        GIT_TAG ${KOMPUTE_OPT_BUILT_IN_VULKAN_HEADER_TAG}) # Source: https://github.com/KhronosGroup/Vulkan-Headers/tags
     FetchContent_MakeAvailable(vulkan_header)
 
     if(NOT KOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK)
@@ -140,7 +140,7 @@ endif()
 
 # Spdlog
 if(NOT KOMPUTE_OPT_LOG_LEVEL_DISABLED)
-    if(KOMPUTE_OPT_USE_BUILD_IN_SPDLOG)
+    if(KOMPUTE_OPT_USE_BUILT_IN_SPDLOG)
         set(SPDLOG_INSTALL ${KOMPUTE_OPT_INSTALL})
         set(SPDLOG_BUILD_SHARED ${BUILD_SHARED_LIBS})
 
@@ -153,7 +153,7 @@ if(NOT KOMPUTE_OPT_LOG_LEVEL_DISABLED)
 endif()
 
 # fmt
-if(KOMPUTE_OPT_USE_BUILD_IN_FMT)
+if(KOMPUTE_OPT_USE_BUILT_IN_FMT)
     set(FMT_INSTALL ${KOMPUTE_OPT_INSTALL})
     FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git
         GIT_TAG 8.1.1) # Source: https://github.com/fmtlib/fmt/releases
@@ -164,7 +164,7 @@ endif()
 
 # GoogleTest
 if(KOMPUTE_OPT_BUILD_TESTS)
-    if(KOMPUTE_OPT_USE_BUILD_IN_GOOGLE_TEST)
+    if(KOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST)
         FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git
             GIT_TAG release-1.11.0) # Source: https://github.com/google/googletest/releases
         FetchContent_MakeAvailable(googletest)
@@ -185,7 +185,7 @@ endif()
 
 # pybind11
 if(KOMPUTE_OPT_BUILD_PYTHON)
-    if(KOMPUTE_OPT_USE_BUILD_IN_PYBIND11)
+    if(KOMPUTE_OPT_USE_BUILT_IN_PYBIND11)
         FetchContent_Declare(pybind GIT_REPOSITORY https://github.com/pybind/pybind11.git
             GIT_TAG v2.9.2) # Source: https://github.com/pybind/pybind11/releases
         FetchContent_MakeAvailable(pybind)
diff --git a/cmake/deprecation_warnings.cmake b/cmake/deprecation_warnings.cmake
index 9d6337376..1ed1f4555 100644
--- a/cmake/deprecation_warnings.cmake
+++ b/cmake/deprecation_warnings.cmake
@@ -1,5 +1,5 @@
 if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
-    message(FATAL_ERROR "'KOMPUTE_OPT_REPO_SUBMODULE_BUILD' got replaced by 'KOMPUTE_OPT_USE_BUILD_IN_SPDLOG', 'KOMPUTE_OPT_USE_BUILD_IN_FMT', 'KOMPUTE_OPT_USE_BUILD_IN_GOOGLE_TEST', 'KOMPUTE_OPT_USE_BUILD_IN_PYBIND11' and 'KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER'. Please use them instead.")
+    message(FATAL_ERROR "'KOMPUTE_OPT_REPO_SUBMODULE_BUILD' got replaced by 'KOMPUTE_OPT_USE_BUILT_IN_SPDLOG', 'KOMPUTE_OPT_USE_BUILT_IN_FMT', 'KOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST', 'KOMPUTE_OPT_USE_BUILT_IN_PYBIND11' and 'KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER'. Please use them instead.")
 endif()
 
 if(KOMPUTE_OPT_BUILD_AS_SHARED_LIB)
diff --git a/docs/overview/build-system.rst b/docs/overview/build-system.rst
index f5310bf58..e5c454932 100644
--- a/docs/overview/build-system.rst
+++ b/docs/overview/build-system.rst
@@ -46,18 +46,18 @@ This by default configures without any of the extra build tasks (such as buildin
      - Whether to check if your driver supports the Vulkan Header version you are linking against. This might be useful in case you build shared on a different system than you run later.
    * - -DKOMPUTE_OPT_BUILD_SHADERS=OFF
      - Rebuilds all compute shaders during compilation and does not use the already precompiled versions. Requires glslangValidator to be installed on your system.
-   * - -DKOMPUTE_OPT_USE_BUILD_IN_SPDLOG=ON
+   * - -DKOMPUTE_OPT_USE_BUILT_IN_SPDLOG=ON
      - Use the built-in version of Spdlog.
-   * - -DKOMPUTE_OPT_USE_BUILD_IN_FMT=ON
+   * - -DKOMPUTE_OPT_USE_BUILT_IN_FMT=ON
      - Use the built-in version of fmt.
-   * - -DKOMPUTE_OPT_USE_BUILD_IN_GOOGLE_TEST=ON
+   * - -DKOMPUTE_OPT_USE_BUILT_IN_GOOGLE_TEST=ON
      - Use the built-in version of GoogleTest.
-   * - -DKOMPUTE_OPT_USE_BUILD_IN_PYBIND11=ON
+   * - -DKOMPUTE_OPT_USE_BUILT_IN_PYBIND11=ON
      - Use the built-in version of pybind11.
-   * - -DKOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER=ON
+   * - -DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=ON
      - Use the built-in version of Vulkan Headers. This could be helpful in case your system Vulkan Headers are to new for your driver. If you set this to false, please make sure your system Vulkan Header are supported by your driver.
-   * - -DKOMPUTE_OPT_BUILD_IN_VULKAN_HEADER_TAG="v1.2.203"
-     - The git tag used for the built-in Vulkan Headers when 'KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER' is enabled. A list of tags can be found here: https://github.com/KhronosGroup/Vulkan-Headers/tags
+   * - -DKOMPUTE_OPT_BUILT_IN_VULKAN_HEADER_TAG="v1.2.203"
+     - The git tag used for the built-in Vulkan Headers when 'KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER' is enabled. A list of tags can be found here: https://github.com/KhronosGroup/Vulkan-Headers/tags
 
 Compile Flags
 ~~~~~~~~~~~~~
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eebe6104c..f080af940 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,7 +82,7 @@ if(KOMPUTE_OPT_BUILD_PYTHON)
     target_link_libraries(kompute PRIVATE pybind11::headers ${PYTHON_LIBRARIES})
 endif()
 
-if(KOMPUTE_OPT_USE_BUILD_IN_VULKAN_HEADER)
+if(KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER)
     target_link_libraries(kompute PUBLIC Vulkan-Headers)
 endif()