diff --git a/CMakeLists.txt b/CMakeLists.txt
index c71989ee..818af5b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,23 +72,23 @@ if(GLM_TEST_FORCE_PURE)
 	elseif(MSVC)
 		add_definitions(/arch:IA32)
 	endif()
-elseif(GLM_TEST_ENABLE_AVX2)
+elseif(GLM_TEST_ENABLE_SIMD_AVX2)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-mavx2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX2)
 	elseif(MSVC)
-		add_definitions(/arch:AVX2)	
+		add_definitions(/arch:AVX2)
 	endif()
-elseif(GLM_TEST_ENABLE_AVX)
+elseif(GLM_TEST_ENABLE_SIMD_AVX)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-mavx)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxAVX)
 	elseif(MSVC)
-		add_definitions(/arch:AVX)	
+		add_definitions(/arch:AVX)
 	endif()
-elseif(GLM_TEST_ENABLE_SSE3)
+elseif(GLM_TEST_ENABLE_SIMD_SSE3)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-msse3)
 	elseif(GLM_USE_INTEL)
@@ -96,14 +96,14 @@ elseif(GLM_TEST_ENABLE_SSE3)
 	elseif(MSVC)
 		add_definitions(/arch:SSE2) # VC doesn't support /arch:SSE3	
 	endif()
-elseif(GLM_TEST_ENABLE_SSE2)
+elseif(GLM_TEST_ENABLE_SIMD_SSE2)
 	if(CMAKE_COMPILER_IS_GNUCXX)
 		add_definitions(-msse2)
 	elseif(GLM_USE_INTEL)
 		add_definitions(/QxSSE2)
 	elseif(MSVC)
 		if(NOT CMAKE_CL_64)
-			add_definitions(/arch:SSE2)	
+			add_definitions(/arch:SSE2)
 		endif()
 	endif()
 endif()