diff --git a/include/cglm-affine-mat-avx.h b/include/cglm-affine-mat-avx.h
index 096fd15..fc5f07c 100644
--- a/include/cglm-affine-mat-avx.h
+++ b/include/cglm-affine-mat-avx.h
@@ -14,7 +14,7 @@
 
 CGLM_INLINE
 void
-glm_affine_mul_avx(mat4 m1, mat4 m2, mat4 dest) {
+glm_mul_avx(mat4 m1, mat4 m2, mat4 dest) {
   /* D = R * L (Column-Major) */
 
   __m256 y0, y1, y2, y3, y4, y5, y6, y7, y8, y9;
diff --git a/include/cglm-affine-mat-sse2.h b/include/cglm-affine-mat-sse2.h
index d384824..4d3efc0 100644
--- a/include/cglm-affine-mat-sse2.h
+++ b/include/cglm-affine-mat-sse2.h
@@ -14,7 +14,7 @@
 
 CGLM_INLINE
 void
-glm_affine_mul_sse2(mat4 m1, mat4 m2, mat4 dest) {
+glm_mul_sse2(mat4 m1, mat4 m2, mat4 dest) {
   /* D = R * L (Column-Major) */
   __m128 l0, l1, l2, l3, r;
 
@@ -51,7 +51,7 @@ glm_affine_mul_sse2(mat4 m1, mat4 m2, mat4 dest) {
 
 CGLM_INLINE
 void
-glm_affine_inv_tr_sse2(mat4 mat) {
+glm_inv_tr_sse2(mat4 mat) {
   __m128 r0, r1, r2, r3, x0;
 
   r0 = _mm_load_ps(mat[0]);
diff --git a/include/cglm-affine-mat.h b/include/cglm-affine-mat.h
index 00fcbcd..1ec77de 100644
--- a/include/cglm-affine-mat.h
+++ b/include/cglm-affine-mat.h
@@ -17,11 +17,11 @@
 
 CGLM_INLINE
 void
-glm_affine_mul(mat4 m1, mat4 m2, mat4 dest) {
+glm_mul(mat4 m1, mat4 m2, mat4 dest) {
 #ifdef __AVX__
-    glm_affine_mul_avx(m1, m2, dest);
+  glm_mul_avx(m1, m2, dest);
 #elif defined( __SSE__ ) || defined( __SSE2__ )
-  glm_affine_mul_sse2(m1, m2, dest);
+  glm_mul_sse2(m1, m2, dest);
 #else
   float a00, a01, a02, a03,    b00, b01, b02,
         a10, a11, a12, a13,    b10, b11, b12,
@@ -72,9 +72,9 @@ glm_affine_mul(mat4 m1, mat4 m2, mat4 dest) {
  */
 CGLM_INLINE
 void
-glm_affine_inv_tr(mat4 mat) {
+glm_inv_tr(mat4 mat) {
 #if defined( __SSE__ ) || defined( __SSE2__ )
-  glm_affine_inv_tr_sse2(mat);
+  glm_inv_tr_sse2(mat);
 #else
   CGLM_ALIGN(16) mat3 r;
   CGLM_ALIGN(16) vec3 t;