diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8e345e2..ed5c5409 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 
 option(EIVE_BUILD_UNITTESTS "Build Catch2 unittests" OFF)
 option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
-option(ADD_JSON_LIB "Add JSON library" ON)
+option(EIVE_ADD_JSON_LIB "Add JSON library" ON)
 option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
 
 if(NOT FSFW_OSAL)
@@ -148,7 +148,7 @@ if(EIVE_ADD_ETL_LIB)
     add_subdirectory(${ETL_LIB_PATH})
 endif()
 
-if(ADD_JSON_LIB)
+if(EIVE_ADD_JSON_LIB)
     add_subdirectory(${LIB_JSON_PATH})
 endif()
 
@@ -210,7 +210,7 @@ if(EIVE_ADD_ETL_LIB)
     )
 endif()
 
-if(ADD_JSON_LIB)
+if(EIVE_ADD_JSON_LIB)
     target_link_libraries(${TARGET_NAME} PRIVATE
         ${LIB_JSON_NAME}
     )