diff --git a/glm/core/_swizzle.hpp b/glm/core/_swizzle.hpp
index f0ba22ad..34dabfab 100644
--- a/glm/core/_swizzle.hpp
+++ b/glm/core/_swizzle.hpp
@@ -29,7 +29,7 @@ namespace glm
 	};
 }//namespace glm
 
-#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
 
 #define xx swizzle(glm::X, glm::X)
 #define yx swizzle(glm::Y, glm::X)
@@ -50,7 +50,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
 
 #define rr swizzle(glm::X, glm::X)
 #define gr swizzle(glm::Y, glm::X)
@@ -71,7 +71,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
 
 #define ss swizzle(glm::X, glm::X)
 #define ts swizzle(glm::Y, glm::X)
@@ -92,7 +92,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
 
 #define xxx swizzle(glm::X, glm::X, glm::X)
 #define yxx swizzle(glm::Y, glm::X, glm::X)
@@ -161,7 +161,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
 
 #define rrr swizzle(glm::X, glm::X, glm::X)
 #define grr swizzle(glm::Y, glm::X, glm::X)
@@ -230,7 +230,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
 
 #define sss swizzle(glm::X, glm::X, glm::X)
 #define tss swizzle(glm::Y, glm::X, glm::X)
@@ -299,7 +299,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_XYZW) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_XYZW) || defined(GLM_SWIZZLE))
 
 #define xxxx swizzle(glm::X, glm::X, glm::X, glm::X)
 #define yxxx swizzle(glm::Y, glm::X, glm::X, glm::X)
@@ -560,7 +560,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_RGBA) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_SWIZZLE_RGBA) || defined(GLM_SWIZZLE))
 
 #define rrrr swizzle(glm::X, glm::X, glm::X, glm::X)
 #define grrr swizzle(glm::Y, glm::X, glm::X, glm::X)
@@ -821,7 +821,7 @@ namespace glm
 
 #endif
 
-#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_FORCE_SWIZZLE))
+#if(defined(GLM_FORCE_SWIZZLE_STPQ) || defined(GLM_SWIZZLE))
 
 #define ssss swizzle(glm::X, glm::X, glm::X, glm::X)
 #define tsss swizzle(glm::Y, glm::X, glm::X, glm::X)
diff --git a/glm/setup.hpp b/glm/setup.hpp
index 6bd2e591..37fc44ec 100644
--- a/glm/setup.hpp
+++ b/glm/setup.hpp
@@ -373,16 +373,16 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Swizzle operators
 
-//#define GLM_FORCE_SWIZZLE_XYZW
-//#define GLM_FORCE_SWIZZLE_RGBA
-//#define GLM_FORCE_SWIZZLE_STQP
-//#define GLM_FORCE_SWIZZLE
+//#define GLM_SWIZZLE_XYZW
+//#define GLM_SWIZZLE_RGBA
+//#define GLM_SWIZZLE_STQP
+//#define GLM_SWIZZLE
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED))
 #	define GLM_MESSAGE_SWIZZLE_DISPLAYED
-#	if(defined(GLM_FORCE_SWIZZLE))
+#	if(defined(GLM_SWIZZLE))
 #		pragma message("GLM: Full swizzling operator enabled")
-#	elif(!defined(GLM_FORCE_SWIZZLE_XYZW) && !defined(GLM_FORCE_SWIZZLE_RGBA) && !defined(GLM_FORCE_SWIZZLE_STQP) && !defined(GLM_FORCE_SWIZZLE))
+#	elif(!defined(GLM_SWIZZLE_XYZW) && !defined(GLM_SWIZZLE_RGBA) && !defined(GLM_SWIZZLE_STQP) && !defined(GLM_SWIZZLE))
 #		pragma message("GLM: No swizzling operator enabled")
 #	else
 #		pragma message("GLM: Partial swizzling operator enabled")