diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl
index 3b6d0418..d7aa7a43 100644
--- a/glm/core/func_matrix.inl
+++ b/glm/core/func_matrix.inl
@@ -135,8 +135,8 @@ namespace glm
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tmat2x4<T> outerProduct
 	(
-		detail::tvec2<T> const & c, 
-		detail::tvec4<T> const & r
+		detail::tvec4<T> const & c, 
+		detail::tvec2<T> const & r
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");
@@ -156,8 +156,8 @@ namespace glm
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tmat4x2<T> outerProduct
 	(
-		detail::tvec4<T> const & c, 
-		detail::tvec2<T> const & r
+		detail::tvec2<T> const & c, 
+		detail::tvec4<T> const & r
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");
diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl
index 656f6ced..079411b3 100644
--- a/glm/core/type_mat2x2.inl
+++ b/glm/core/type_mat2x2.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl
index 11b899fe..9bb4a449 100644
--- a/glm/core/type_mat2x3.inl
+++ b/glm/core/type_mat2x3.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl
index 9ac9ca94..6ec1cd48 100644
--- a/glm/core/type_mat2x4.inl
+++ b/glm/core/type_mat2x4.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl
index ada56a89..011ee330 100644
--- a/glm/core/type_mat3x2.inl
+++ b/glm/core/type_mat3x2.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl
index faf90540..72098aaf 100644
--- a/glm/core/type_mat3x3.inl
+++ b/glm/core/type_mat3x3.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl
index 8e5d92c4..d4f5e2a3 100644
--- a/glm/core/type_mat3x4.inl
+++ b/glm/core/type_mat3x4.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl
index 87741e17..73c780cb 100644
--- a/glm/core/type_mat4x2.inl
+++ b/glm/core/type_mat4x2.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl
index 6d639a21..db823e0e 100644
--- a/glm/core/type_mat4x3.inl
+++ b/glm/core/type_mat4x3.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl
index 2c34f07f..daa3c8c7 100644
--- a/glm/core/type_mat4x4.inl
+++ b/glm/core/type_mat4x4.inl
@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
diff --git a/glm/core/type_vec1.inl b/glm/core/type_vec1.inl
index e3fed5c7..5528cd38 100644
--- a/glm/core/type_vec1.inl
+++ b/glm/core/type_vec1.inl
@@ -50,7 +50,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -60,7 +60,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
diff --git a/glm/core/type_vec2.inl b/glm/core/type_vec2.inl
index 6345adab..8c00216e 100644
--- a/glm/core/type_vec2.inl
+++ b/glm/core/type_vec2.inl
@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
diff --git a/glm/core/type_vec3.inl b/glm/core/type_vec3.inl
index 918fadb4..75d72e5e 100644
--- a/glm/core/type_vec3.inl
+++ b/glm/core/type_vec3.inl
@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
diff --git a/glm/core/type_vec4.inl b/glm/core/type_vec4.inl
index af4c1b2d..8bbaac29 100644
--- a/glm/core/type_vec4.inl
+++ b/glm/core/type_vec4.inl
@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}