diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp
index 24d36970..bd4cfb83 100644
--- a/glm/gtc/swizzle.hpp
+++ b/glm/gtc/swizzle.hpp
@@ -145,113 +145,113 @@ namespace swizzle ///< GLM_GTC_swizzle extension
 		{return detail::tvec4<TYPE>(v[x], v[y], v[z], v[w]);}
 
 
-	static_swizzle2_const(glm::f16vec2, 2)
-	static_swizzle2_const(glm::f16vec3, 3)
-	static_swizzle2_const(glm::f16vec4, 4)
-	static_swizzle2_const(glm::f32vec2, 2)
-	static_swizzle2_const(glm::f32vec3, 3)
-	static_swizzle2_const(glm::f32vec4, 4)
-	static_swizzle2_const(glm::f64vec2, 2)
-	static_swizzle2_const(glm::f64vec3, 3)
-	static_swizzle2_const(glm::f64vec4, 4)
+	static_swizzle2_const(glm::f16, 2)
+	static_swizzle2_const(glm::f16, 3)
+	static_swizzle2_const(glm::f16, 4)
+	static_swizzle2_const(glm::f32, 2)
+	static_swizzle2_const(glm::f32, 3)
+	static_swizzle2_const(glm::f32, 4)
+	static_swizzle2_const(glm::f64, 2)
+	static_swizzle2_const(glm::f64, 3)
+	static_swizzle2_const(glm::f64, 4)
 
-	static_swizzle2_const(glm::i8vec2, 2)
-	static_swizzle2_const(glm::i8vec3, 3)
-	static_swizzle2_const(glm::i8vec4, 4)
-	static_swizzle2_const(glm::i16vec2, 2)
-	static_swizzle2_const(glm::i16vec3, 3)
-	static_swizzle2_const(glm::i16vec4, 4)
-	static_swizzle2_const(glm::i32vec2, 2)
-	static_swizzle2_const(glm::i32vec3, 3)
-	static_swizzle2_const(glm::i32vec4, 4)
-	static_swizzle2_const(glm::i64vec2, 2)
-	static_swizzle2_const(glm::i64vec3, 3)
-	static_swizzle2_const(glm::i64vec4, 4)
+	static_swizzle2_const(glm::i8, 2)
+	static_swizzle2_const(glm::i8, 3)
+	static_swizzle2_const(glm::i8, 4)
+	static_swizzle2_const(glm::i16, 2)
+	static_swizzle2_const(glm::i16, 3)
+	static_swizzle2_const(glm::i16, 4)
+	static_swizzle2_const(glm::i32, 2)
+	static_swizzle2_const(glm::i32, 3)
+	static_swizzle2_const(glm::i32, 4)
+	static_swizzle2_const(glm::i64, 2)
+	static_swizzle2_const(glm::i64, 3)
+	static_swizzle2_const(glm::i64, 4)
 
-	static_swizzle2_const(glm::u8vec2, 2)
-	static_swizzle2_const(glm::u8vec3, 3)
-	static_swizzle2_const(glm::u8vec4, 4)
-	static_swizzle2_const(glm::u16vec2, 2)
-	static_swizzle2_const(glm::u16vec3, 3)
-	static_swizzle2_const(glm::u16vec4, 4)
-	static_swizzle2_const(glm::u32vec2, 2)
-	static_swizzle2_const(glm::u32vec3, 3)
-	static_swizzle2_const(glm::u32vec4, 4)
-	static_swizzle2_const(glm::u64vec2, 2)
-	static_swizzle2_const(glm::u64vec3, 3)
-	static_swizzle2_const(glm::u64vec4, 4)
+	static_swizzle2_const(glm::u8, 2)
+	static_swizzle2_const(glm::u8, 3)
+	static_swizzle2_const(glm::u8, 4)
+	static_swizzle2_const(glm::u16, 2)
+	static_swizzle2_const(glm::u16, 3)
+	static_swizzle2_const(glm::u16, 4)
+	static_swizzle2_const(glm::u32, 2)
+	static_swizzle2_const(glm::u32, 3)
+	static_swizzle2_const(glm::u32, 4)
+	static_swizzle2_const(glm::u64, 2)
+	static_swizzle2_const(glm::u64, 3)
+	static_swizzle2_const(glm::u64, 4)
 
-	static_swizzle3_const(glm::f16vec2, 2)
-	static_swizzle3_const(glm::f16vec3, 3)
-	static_swizzle3_const(glm::f16vec4, 4)
-	static_swizzle3_const(glm::f32vec2, 2)
-	static_swizzle3_const(glm::f32vec3, 3)
-	static_swizzle3_const(glm::f32vec4, 4)
-	static_swizzle3_const(glm::f64vec2, 2)
-	static_swizzle3_const(glm::f64vec3, 3)
-	static_swizzle3_const(glm::f64vec4, 4)
+	static_swizzle3_const(glm::f16, 2)
+	static_swizzle3_const(glm::f16, 3)
+	static_swizzle3_const(glm::f16, 4)
+	static_swizzle3_const(glm::f32, 2)
+	static_swizzle3_const(glm::f32, 3)
+	static_swizzle3_const(glm::f32, 4)
+	static_swizzle3_const(glm::f64, 2)
+	static_swizzle3_const(glm::f64, 3)
+	static_swizzle3_const(glm::f64, 4)
 
-	static_swizzle3_const(glm::i8vec2, 2)
-	static_swizzle3_const(glm::i8vec3, 3)
-	static_swizzle3_const(glm::i8vec4, 4)
-	static_swizzle3_const(glm::i16vec2, 2)
-	static_swizzle3_const(glm::i16vec3, 3)
-	static_swizzle3_const(glm::i16vec4, 4)
-	static_swizzle3_const(glm::i32vec2, 2)
-	static_swizzle3_const(glm::i32vec3, 3)
-	static_swizzle3_const(glm::i32vec4, 4)
-	static_swizzle3_const(glm::i64vec2, 2)
-	static_swizzle3_const(glm::i64vec3, 3)
-	static_swizzle3_const(glm::i64vec4, 4)
+	static_swizzle3_const(glm::i8, 2)
+	static_swizzle3_const(glm::i8, 3)
+	static_swizzle3_const(glm::i8, 4)
+	static_swizzle3_const(glm::i16, 2)
+	static_swizzle3_const(glm::i16, 3)
+	static_swizzle3_const(glm::i16, 4)
+	static_swizzle3_const(glm::i32, 2)
+	static_swizzle3_const(glm::i32, 3)
+	static_swizzle3_const(glm::i32, 4)
+	static_swizzle3_const(glm::i64, 2)
+	static_swizzle3_const(glm::i64, 3)
+	static_swizzle3_const(glm::i64, 4)
 
-	static_swizzle3_const(glm::u8vec2, 2)
-	static_swizzle3_const(glm::u8vec3, 3)
-	static_swizzle3_const(glm::u8vec4, 4)
-	static_swizzle3_const(glm::u16vec2, 2)
-	static_swizzle3_const(glm::u16vec3, 3)
-	static_swizzle3_const(glm::u16vec4, 4)
-	static_swizzle3_const(glm::u32vec2, 2)
-	static_swizzle3_const(glm::u32vec3, 3)
-	static_swizzle3_const(glm::u32vec4, 4)
-	static_swizzle3_const(glm::u64vec2, 2)
-	static_swizzle3_const(glm::u64vec3, 3)
-	static_swizzle3_const(glm::u64vec4, 4)
+	static_swizzle3_const(glm::u8, 2)
+	static_swizzle3_const(glm::u8, 3)
+	static_swizzle3_const(glm::u8, 4)
+	static_swizzle3_const(glm::u16, 2)
+	static_swizzle3_const(glm::u16, 3)
+	static_swizzle3_const(glm::u16, 4)
+	static_swizzle3_const(glm::u32, 2)
+	static_swizzle3_const(glm::u32, 3)
+	static_swizzle3_const(glm::u32, 4)
+	static_swizzle3_const(glm::u64, 2)
+	static_swizzle3_const(glm::u64, 3)
+	static_swizzle3_const(glm::u64, 4)
 
-	static_swizzle4_const(glm::f16vec2, 2)
-	static_swizzle4_const(glm::f16vec3, 3)
-	static_swizzle4_const(glm::f16vec4, 4)
-	static_swizzle4_const(glm::f32vec2, 2)
-	static_swizzle4_const(glm::f32vec3, 3)
-	static_swizzle4_const(glm::f32vec4, 4)
-	static_swizzle4_const(glm::f64vec2, 2)
-	static_swizzle4_const(glm::f64vec3, 3)
-	static_swizzle4_const(glm::f64vec4, 4)
+	static_swizzle4_const(glm::f16, 2)
+	static_swizzle4_const(glm::f16, 3)
+	static_swizzle4_const(glm::f16, 4)
+	static_swizzle4_const(glm::f32, 2)
+	static_swizzle4_const(glm::f32, 3)
+	static_swizzle4_const(glm::f32, 4)
+	static_swizzle4_const(glm::f64, 2)
+	static_swizzle4_const(glm::f64, 3)
+	static_swizzle4_const(glm::f64, 4)
 
-	static_swizzle4_const(glm::i8vec2, 2)
-	static_swizzle4_const(glm::i8vec3, 3)
-	static_swizzle4_const(glm::i8vec4, 4)
-	static_swizzle4_const(glm::i16vec2, 2)
-	static_swizzle4_const(glm::i16vec3, 3)
-	static_swizzle4_const(glm::i16vec4, 4)
-	static_swizzle4_const(glm::i32vec2, 2)
-	static_swizzle4_const(glm::i32vec3, 3)
-	static_swizzle4_const(glm::i32vec4, 4)
-	static_swizzle4_const(glm::i64vec2, 2)
-	static_swizzle4_const(glm::i64vec3, 3)
-	static_swizzle4_const(glm::i64vec4, 4)
+	static_swizzle4_const(glm::i8, 2)
+	static_swizzle4_const(glm::i8, 3)
+	static_swizzle4_const(glm::i8, 4)
+	static_swizzle4_const(glm::i16, 2)
+	static_swizzle4_const(glm::i16, 3)
+	static_swizzle4_const(glm::i16, 4)
+	static_swizzle4_const(glm::i32, 2)
+	static_swizzle4_const(glm::i32, 3)
+	static_swizzle4_const(glm::i32, 4)
+	static_swizzle4_const(glm::i64, 2)
+	static_swizzle4_const(glm::i64, 3)
+	static_swizzle4_const(glm::i64, 4)
 
-	static_swizzle4_const(glm::u8vec2, 2)
-	static_swizzle4_const(glm::u8vec3, 3)
-	static_swizzle4_const(glm::u8vec4, 4)
-	static_swizzle4_const(glm::u16vec2, 2)
-	static_swizzle4_const(glm::u16vec3, 3)
-	static_swizzle4_const(glm::u16vec4, 4)
-	static_swizzle4_const(glm::u32vec2, 2)
-	static_swizzle4_const(glm::u32vec3, 3)
-	static_swizzle4_const(glm::u32vec4, 4)
-	static_swizzle4_const(glm::u64vec2, 2)
-	static_swizzle4_const(glm::u64vec3, 3)
-	static_swizzle4_const(glm::u64vec4, 4)
+	static_swizzle4_const(glm::u8, 2)
+	static_swizzle4_const(glm::u8, 3)
+	static_swizzle4_const(glm::u8, 4)
+	static_swizzle4_const(glm::u16, 2)
+	static_swizzle4_const(glm::u16, 3)
+	static_swizzle4_const(glm::u16, 4)
+	static_swizzle4_const(glm::u32, 2)
+	static_swizzle4_const(glm::u32, 3)
+	static_swizzle4_const(glm::u32, 4)
+	static_swizzle4_const(glm::u64, 2)
+	static_swizzle4_const(glm::u64, 3)
+	static_swizzle4_const(glm::u64, 4)
 
 #	define static_swizzle2_ref(TYPE, SIZE) \
 		template <glm::comp x, glm::comp y> \
@@ -268,80 +268,80 @@ namespace swizzle ///< GLM_GTC_swizzle extension
 		GLM_FUNC_QUALIFIER glm::detail::tref4<TYPE> swizzle(detail::tvec##SIZE<TYPE> & v) \
 		{return glm::detail::tref4<TYPE>(v[x], v[y], v[z], v[w]);}	
 
-	static_swizzle2_ref(glm::f16vec2, 2)
-	static_swizzle2_ref(glm::f16vec3, 3)
-	static_swizzle2_ref(glm::f16vec4, 4)
-	static_swizzle2_ref(glm::f32vec2, 2)
-	static_swizzle2_ref(glm::f32vec3, 3)
-	static_swizzle2_ref(glm::f32vec4, 4)
-	static_swizzle2_ref(glm::f64vec2, 2)
-	static_swizzle2_ref(glm::f64vec3, 3)
-	static_swizzle2_ref(glm::f64vec4, 4)
+	static_swizzle2_ref(glm::f16, 2)
+	static_swizzle2_ref(glm::f16, 3)
+	static_swizzle2_ref(glm::f16, 4)
+	static_swizzle2_ref(glm::f32, 2)
+	static_swizzle2_ref(glm::f32, 3)
+	static_swizzle2_ref(glm::f32, 4)
+	static_swizzle2_ref(glm::f64, 2)
+	static_swizzle2_ref(glm::f64, 3)
+	static_swizzle2_ref(glm::f64, 4)
 
-	static_swizzle2_ref(glm::i8vec2, 2)
-	static_swizzle2_ref(glm::i8vec3, 3)
-	static_swizzle2_ref(glm::i8vec4, 4)
-	static_swizzle2_ref(glm::i16vec2, 2)
-	static_swizzle2_ref(glm::i16vec3, 3)
-	static_swizzle2_ref(glm::i16vec4, 4)
-	static_swizzle2_ref(glm::i32vec2, 2)
-	static_swizzle2_ref(glm::i32vec3, 3)
-	static_swizzle2_ref(glm::i32vec4, 4)
-	static_swizzle2_ref(glm::i64vec2, 2)
-	static_swizzle2_ref(glm::i64vec3, 3)
-	static_swizzle2_ref(glm::i64vec4, 4)
+	static_swizzle2_ref(glm::i8, 2)
+	static_swizzle2_ref(glm::i8, 3)
+	static_swizzle2_ref(glm::i8, 4)
+	static_swizzle2_ref(glm::i16, 2)
+	static_swizzle2_ref(glm::i16, 3)
+	static_swizzle2_ref(glm::i16, 4)
+	static_swizzle2_ref(glm::i32, 2)
+	static_swizzle2_ref(glm::i32, 3)
+	static_swizzle2_ref(glm::i32, 4)
+	static_swizzle2_ref(glm::i64, 2)
+	static_swizzle2_ref(glm::i64, 3)
+	static_swizzle2_ref(glm::i64, 4)
 
-	static_swizzle2_ref(glm::u8vec2, 2)
-	static_swizzle2_ref(glm::u8vec3, 3)
-	static_swizzle2_ref(glm::u8vec4, 4)
-	static_swizzle2_ref(glm::u16vec2, 2)
-	static_swizzle2_ref(glm::u16vec3, 3)
-	static_swizzle2_ref(glm::u16vec4, 4)
-	static_swizzle2_ref(glm::u32vec2, 2)
-	static_swizzle2_ref(glm::u32vec3, 3)
-	static_swizzle2_ref(glm::u32vec4, 4)
-	static_swizzle2_ref(glm::u64vec2, 2)
-	static_swizzle2_ref(glm::u64vec3, 3)
-	static_swizzle2_ref(glm::u64vec4, 4)
+	static_swizzle2_ref(glm::u8, 2)
+	static_swizzle2_ref(glm::u8, 3)
+	static_swizzle2_ref(glm::u8, 4)
+	static_swizzle2_ref(glm::u16, 2)
+	static_swizzle2_ref(glm::u16, 3)
+	static_swizzle2_ref(glm::u16, 4)
+	static_swizzle2_ref(glm::u32, 2)
+	static_swizzle2_ref(glm::u32, 3)
+	static_swizzle2_ref(glm::u32, 4)
+	static_swizzle2_ref(glm::u64, 2)
+	static_swizzle2_ref(glm::u64, 3)
+	static_swizzle2_ref(glm::u64, 4)
 
-	static_swizzle3_ref(glm::f16vec3, 3)
-	static_swizzle3_ref(glm::f16vec4, 4)
-	static_swizzle3_ref(glm::f32vec3, 3)
-	static_swizzle3_ref(glm::f32vec4, 4)
-	static_swizzle3_ref(glm::f64vec3, 3)
-	static_swizzle3_ref(glm::f64vec4, 4)
+	static_swizzle3_ref(glm::f16, 3)
+	static_swizzle3_ref(glm::f16, 4)
+	static_swizzle3_ref(glm::f32, 3)
+	static_swizzle3_ref(glm::f32, 4)
+	static_swizzle3_ref(glm::f64, 3)
+	static_swizzle3_ref(glm::f64, 4)
 
-	static_swizzle3_ref(glm::i8vec3, 3)
-	static_swizzle3_ref(glm::i8vec4, 4)
-	static_swizzle3_ref(glm::i16vec3, 3)
-	static_swizzle3_ref(glm::i16vec4, 4)
-	static_swizzle3_ref(glm::i32vec3, 3)
-	static_swizzle3_ref(glm::i32vec4, 4)
-	static_swizzle3_ref(glm::i64vec3, 3)
-	static_swizzle3_ref(glm::i64vec4, 4)
+	static_swizzle3_ref(glm::i8, 3)
+	static_swizzle3_ref(glm::i8, 4)
+	static_swizzle3_ref(glm::i16, 3)
+	static_swizzle3_ref(glm::i16, 4)
+	static_swizzle3_ref(glm::i32, 3)
+	static_swizzle3_ref(glm::i32, 4)
+	static_swizzle3_ref(glm::i64, 3)
+	static_swizzle3_ref(glm::i64, 4)
 
-	static_swizzle3_ref(glm::u8vec3, 3)
-	static_swizzle3_ref(glm::u8vec4, 4)
-	static_swizzle3_ref(glm::u16vec3, 3)
-	static_swizzle3_ref(glm::u16vec4, 4)
-	static_swizzle3_ref(glm::u32vec3, 3)
-	static_swizzle3_ref(glm::u32vec4, 4)
-	static_swizzle3_ref(glm::u64vec3, 3)
-	static_swizzle3_ref(glm::u64vec4, 4)
+	static_swizzle3_ref(glm::u8, 3)
+	static_swizzle3_ref(glm::u8, 4)
+	static_swizzle3_ref(glm::u16, 3)
+	static_swizzle3_ref(glm::u16, 4)
+	static_swizzle3_ref(glm::u32, 3)
+	static_swizzle3_ref(glm::u32, 4)
+	static_swizzle3_ref(glm::u64, 3)
+	static_swizzle3_ref(glm::u64, 4)
 
-	static_swizzle4_ref(glm::f16vec4, 4)
-	static_swizzle4_ref(glm::f32vec4, 4)
-	static_swizzle4_ref(glm::f64vec4, 4)
+	static_swizzle4_ref(glm::f16, 4)
+	static_swizzle4_ref(glm::f32, 4)
+	static_swizzle4_ref(glm::f64, 4)
 
-	static_swizzle4_ref(glm::i8vec4, 4)
-	static_swizzle4_ref(glm::i16vec4, 4)
-	static_swizzle4_ref(glm::i32vec4, 4)
-	static_swizzle4_ref(glm::i64vec4, 4)
+	static_swizzle4_ref(glm::i8, 4)
+	static_swizzle4_ref(glm::i16, 4)
+	static_swizzle4_ref(glm::i32, 4)
+	static_swizzle4_ref(glm::i64, 4)
 
-	static_swizzle4_ref(glm::u8vec4, 4)
-	static_swizzle4_ref(glm::u16vec4, 4)
-	static_swizzle4_ref(glm::u32vec4, 4)
-	static_swizzle4_ref(glm::u64vec4, 4)
+	static_swizzle4_ref(glm::u8, 4)
+	static_swizzle4_ref(glm::u16, 4)
+	static_swizzle4_ref(glm::u32, 4)
+	static_swizzle4_ref(glm::u64, 4)
 
 }//namespace swizzle
 }//namespace gtc