diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cec2909..9ff243d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,17 +15,17 @@ jobs:
         build: [ cli, cli-mt, cli-ansi, cli-ansi-mt, gui, gui-mt ]
         include:
           - build: cli
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=OFF
+            cmake-opts: -DCOMPONENT_CLI=ON -DCOMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=OFF
           - build: cli-mt
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=ON
+            cmake-opts: -DCOMPONENT_CLI=ON -DCOMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=ON
           - build: cli-ansi
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=OFF
+            cmake-opts: -DCOMPONENT_CLI=ON -DCOMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=OFF
           - build: cli-ansi-mt
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=ON
+            cmake-opts: -DCOMPONENT_CLI=ON -DCOMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=ON
           - build: gui
-            cmake-opts: -DBUILD_COMPONENT_CLI=OFF -DBUILD_COMPONENT_GUI=ON -DUSE_THREADS=OFF
+            cmake-opts: -DCOMPONENT_CLI=OFF -DCOMPONENT_GUI=ON -DUSE_THREADS=OFF
           - build: gui-mt
-            cmake-opts: -DBUILD_COMPONENT_CLI=OFF -DBUILD_COMPONENT_GUI=ON -DUSE_THREADS=ON
+            cmake-opts: -DCOMPONENT_CLI=OFF -DCOMPONENT_GUI=ON -DUSE_THREADS=ON
 
     name: ${{matrix.os}} (${{matrix.build}})
     runs-on: ${{matrix.os}}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7664ef3..58a5c4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,10 @@ set( PROJECT_LICENSE_FILE ${CMAKE_CURRENT_LIST_DIR}/LICENSE )
 #  Options
 # --------------------------------
 
-option(BUILD_COMPONENT_CLI "Build CLI Component" ON)
-option(BUILD_COMPONENT_GUI "Build GUI Component (Qt5)" OFF)
+option(COMPONENT_CLI "Build CLI Component" ON)
+option(COMPONENT_GUI "Build GUI Component (Qt5)" OFF)
 
-if (NOT BUILD_COMPONENT_CLI AND NOT BUILD_COMPONENT_GUI)
+if (NOT COMPONENT_CLI AND NOT COMPONENT_GUI)
 	message(FATAL_ERROR "Atleast one of BUILD_COMPONENT_GUI,BUILD_COMPONENT_CLI must be set to ON")
 endif()
 
@@ -111,11 +111,11 @@ configure_file(cmake/CPackProperties.cmake.in ${CPACK_PROPERTIES_FILE} @ONLY)
 
 add_subdirectory( common )
 
-if (BUILD_COMPONENT_CLI)
+if (COMPONENT_CLI)
 	add_subdirectory( cli )
 endif()
 
-if (BUILD_COMPONENT_GUI)
+if (COMPONENT_GUI)
 	add_subdirectory( gui )
 endif()
 
diff --git a/README.md b/README.md
index f1ce300..cb68cd3 100644
--- a/README.md
+++ b/README.md
@@ -102,13 +102,13 @@ C:\repo\build> cmake --build . --config Release
 
 These compile options are available:
 
-| Cmake                       | build.sh          | Description                               |
-|---------------------------- | ----------------- | ----------------------------------------- |
-| -DBUILD_COMPONENT_CLI=`OFF` | --no-cli          | Do not build cli program                  |
-| -DBUILD_COMPONENT_GUI=`ON`  | --gui             | Build gui program (Qt5)                   |
-| -DUSE_THREADS=`OFF`         | --disable-threads | Disable thread support                    |
-| -DCMAKE_BUILD_TYPE=`value`  | -t `value`        | Type of build                             |
-| -DFORCE_ANSI=`ON`           | --force-ansi      | Force ANSI console colors even on windows |
+| Cmake                      | build.sh          | Description                               |
+|--------------------------- | ----------------- | ----------------------------------------- |
+| -DCOMPONENT_CLI=`OFF`      | --no-cli          | Do not build cli program                  |
+| -DCOMPONENT_GUI=`ON`       | --gui             | Build gui program (Qt5)                   |
+| -DUSE_THREADS=`OFF`        | --disable-threads | Disable thread support                    |
+| -DCMAKE_BUILD_TYPE=`value` | -t `value`        | Type of build                             |
+| -DFORCE_ANSI=`ON`          | --force-ansi      | Force ANSI console colors even on windows |
 
 For more details about options run `./build.sh -l` or `mkdir build && cmake build -LA`
 
diff --git a/build.sh b/build.sh
index b623cdc..7bab057 100755
--- a/build.sh
+++ b/build.sh
@@ -34,9 +34,9 @@ while true; do
 		ARGS="${ARGS} -DCPACK_GENERATOR=${1^^}"
 		;;
 	--no-cli)
-		ARGS="${ARGS} -DBUILD_COMPONENT_CLI=OFF" ;;
+		ARGS="${ARGS} -DCOMPONENT_CLI=OFF" ;;
 	--gui)
-		ARGS="${ARGS} -DBUILD_COMPONENT_GUI=ON" ;;
+		ARGS="${ARGS} -DCOMPONENT_GUI=ON" ;;
 	--disable-threads)
 		ARGS="${ARGS} -DUSE_THREADS=OFF" ;;
 	--force-ansi)