diff --git a/CMakeLists.txt b/CMakeLists.txt
index e07caeeb81..aaa5ba1de3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,8 +192,8 @@ endif()
 ### @brief Enable Backtrace
 ################################################################################
 
-option(USER_MAINTAINER_MODE "whether we want to have Assertions and other development features" OFF)
-if (USER_MAINTAINER_MODE)
+option(USE_MAINTAINER_MODE "whether we want to have assertions and other development features" OFF)
+if (USE_MAINTAINER_MODE)
   add_definitions("-DTRI_ENABLE_MAINTAINER_MODE=1")
 endif()
 
diff --git a/GNUmakefile b/GNUmakefile
index 44ab275754..15790e8e96 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -308,13 +308,13 @@ pack-win64:
 	$(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 12 Win64"
 
 pack-win32-relative:
-	$(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 12" MOREOPTS='-D "USE_RELATIVE=ON" -D "USER_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
+	$(MAKE) pack-winXX BITS=32 TARGET="Visual Studio 12" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
 
 pack-win64-relative:
-	$(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USER_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
+	$(MAKE) pack-winXX BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
 
 win64-relative:
-	$(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USER_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
+	$(MAKE) winXX-cmake BITS=64 TARGET="Visual Studio 12 Win64" MOREOPTS='-D "USE_RELATIVE=ON" -D "USE_MAINTAINER_MODE=ON" -D "USE_BACKTRACE=ON"'
 	$(MAKE) winXX-build BITS=64
 
 pack-winXX: