diff --git a/BUILD.md b/BUILD.md
index 69bc8b4..52faedb 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -172,7 +172,7 @@
 | BUILD_WSI_XLIB_SUPPORT | Linux | `ON` | Build the loader with the Xlib entry points enabled. Without this, the X11 headers should not be needed, but the extension `VK_KHR_xlib_surface` won't be available. |
 | BUILD_WSI_WAYLAND_SUPPORT | Linux | `ON` | Build the loader with the Wayland entry points enabled. Without this, the Wayland headers should not be needed, but the extension `VK_KHR_wayland_surface` won't be available. |
 | BUILD_WSI_DIRECTFB_SUPPORT | Linux | `OFF` | Build the loader with the DirectFB entry points enabled. Without this, the DirectFB headers should not be needed, but the extension `VK_EXT_directfb_surface` won't be available. |
-| BUILD_WSI_SCREEN_SUPPORT | QNX | `OFF` | Build the loader with the QNX Screen entry points enabled. Without this the extension `VK_QNX_screen_surface` won't be available. |
+| BUILD_WSI_SCREEN_QNX_SUPPORT | QNX | `OFF` | Build the loader with the QNX Screen entry points enabled. Without this the extension `VK_QNX_screen_surface` won't be available. |
 | ENABLE_WIN10_ONECORE | Windows | `OFF` | Link the loader to the [OneCore](https://msdn.microsoft.com/en-us/library/windows/desktop/mt654039.aspx) umbrella library, instead of the standard Win32 ones. |
 | USE_CCACHE | Linux | `OFF` | Enable caching with the CCache program. |
 | USE_MASM | Windows | `ON` | Controls whether to build assembly files with MS assembler, else fallback to C code |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dadc63..18d12e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@
     option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
     option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
     option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
-    option(BUILD_WSI_SCREEN_SUPPORT "Build QNX Screen WSI support" OFF)
+    option(BUILD_WSI_SCREEN_QNX_SUPPORT "Build QNX Screen WSI support" OFF)
 
     if(BUILD_WSI_XCB_SUPPORT)
         find_package(XCB REQUIRED)
@@ -142,7 +142,7 @@
         include_directories(SYSTEM ${DIRECTFB_INCLUDE_DIR})
     endif()
 
-    if(BUILD_WSI_SCREEN_SUPPORT)
+    if(BUILD_WSI_SCREEN_QNX_SUPPORT)
         # Part of OS, no additional include directories are required
     endif()
 endif()
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 7c07efc..9aa4b39 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -58,7 +58,7 @@
         set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS VK_USE_PLATFORM_DIRECTFB_EXT)
     endif()
 
-    if(BUILD_WSI_SCREEN_SUPPORT)
+    if(BUILD_WSI_SCREEN_QNX_SUPPORT)
         set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS VK_USE_PLATFORM_SCREEN_QNX)
     endif()
 else()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fe8d965..52aa2f9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -46,7 +46,7 @@
         add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
     endif()
 
-    if(BUILD_WSI_SCREEN_SUPPORT)
+    if(BUILD_WSI_SCREEN_QNX_SUPPORT)
         add_definitions(-DVK_USE_PLATFORM_SCREEN_QNX)
     endif()
 else()