diff --git a/include/cglm/struct/box.h b/include/cglm/struct/box.h
index 8356bf2..e7cd5af 100644
--- a/include/cglm/struct/box.h
+++ b/include/cglm/struct/box.h
@@ -31,7 +31,7 @@ glms_aabb_(transform)(vec3s box[2], mat4s m, vec3s dest[2]) {
   vec3 rawBox[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   glm_aabb_transform(rawBox, m.raw, rawDest);
   glms_vec3_pack(dest, rawDest, 2);
 }
@@ -53,10 +53,10 @@ glms_aabb_(merge)(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
   vec3 rawBox2[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox1, box1, 2);
-  glms_vec3_unpack(rawBox2, box2, 2);
+  glms_vec3_(unpack)(rawBox1, box1, 2);
+  glms_vec3_(unpack)(rawBox2, box2, 2);
   glm_aabb_merge(rawBox1, rawBox2, rawDest);
-  glms_vec3_pack(dest, rawDest, 2);
+  glms_vec3_(pack)(dest, rawDest, 2);
 }
 
 /*!
@@ -77,10 +77,10 @@ glms_aabb_(crop)(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
   vec3 rawCropBox[2];
   vec3 rawDest[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
-  glms_vec3_unpack(rawCropBox, cropBox, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
+  glms_vec3_(unpack)(rawCropBox, cropBox, 2);
   glm_aabb_crop(rawBox, rawCropBox, rawDest);
-  glms_vec3_pack(dest, rawDest, 2);
+  glms_vec3_(pack)(dest, rawDest, 2);
 }
 
 /*!
@@ -101,8 +101,8 @@ glms_aabb_(crop_until)(vec3s box[2],
                        vec3s cropBox[2],
                        vec3s clampBox[2],
                        vec3s dest[2]) {
-  glms_aabb_crop(box, cropBox, dest);
-  glms_aabb_merge(clampBox, dest, dest);
+  glms_aabb_(crop)(box, cropBox, dest);
+  glms_aabb_(merge)(clampBox, dest, dest);
 }
 
 /*!
@@ -125,8 +125,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
   vec3 rawBox[2];
   vec4 rawPlanes[6];
 
-  glms_vec3_unpack(rawBox, box, 2);
-  glms_vec4_unpack(rawPlanes, planes, 6);
+  glms_vec3_(unpack)(rawBox, box, 2);
+  glms_vec4_(unpack)(rawPlanes, planes, 6);
   return glm_aabb_frustum(rawBox, rawPlanes);
 }
 
@@ -138,8 +138,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
 CGLM_INLINE
 void
 glms_aabb_(invalidate)(vec3s box[2]) {
-  box[0] = glms_vec3_broadcast(FLT_MAX);
-  box[1] = glms_vec3_broadcast(-FLT_MAX);
+  box[0] = glms_vec3_(broadcast)(FLT_MAX);
+  box[1] = glms_vec3_(broadcast)(-FLT_MAX);
 }
 
 /*!
@@ -151,7 +151,7 @@ CGLM_INLINE
 bool
 glms_aabb_(isvalid)(vec3s box[2]) {
   vec3 rawBox[2];
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_isvalid(rawBox);
 }
 
@@ -174,7 +174,7 @@ glms_aabb_(size)(vec3s box[2]) {
 CGLM_INLINE
 float
 glms_aabb_(radius)(vec3s box[2]) {
-  return glms_aabb_size(box) * 0.5f;
+  return glms_aabb_(size)(box) * 0.5f;
 }
 
 /*!
@@ -186,7 +186,7 @@ glms_aabb_(radius)(vec3s box[2]) {
 CGLM_INLINE
 vec3s
 glms_aabb_(center)(vec3s box[2]) {
-  return glms_vec3_center(box[0], box[1]);
+  return glms_vec3_(center)(box[0], box[1]);
 }
 
 /*!
@@ -201,8 +201,8 @@ glms_aabb_(aabb)(vec3s box[2], vec3s other[2]) {
   vec3 rawBox[2];
   vec3 rawOther[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
-  glms_vec3_unpack(rawOther, other, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
+  glms_vec3_(unpack)(rawOther, other, 2);
   return glm_aabb_aabb(rawBox, rawOther);
 }
 
@@ -220,7 +220,7 @@ bool
 glms_aabb_(sphere)(vec3s box[2], vec4s s) {
   vec3 rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_sphere(rawBox, s.raw);
 }
 
@@ -235,7 +235,7 @@ bool
 glms_aabb_(point)(vec3s box[2], vec3s point) {
   vec3 rawBox[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
   return glm_aabb_point(rawBox, point.raw);
 }
 
@@ -251,8 +251,8 @@ glms_aabb_(contains)(vec3s box[2], vec3s other[2]) {
   vec3 rawBox[2];
   vec3 rawOther[2];
 
-  glms_vec3_unpack(rawBox, box, 2);
-  glms_vec3_unpack(rawOther, other, 2);
+  glms_vec3_(unpack)(rawBox, box, 2);
+  glms_vec3_(unpack)(rawOther, other, 2);
   return glm_aabb_contains(rawBox, rawOther);
 }
 
diff --git a/include/cglm/struct/frustum.h b/include/cglm/struct/frustum.h
index 2c51d6d..81b5b7b 100644
--- a/include/cglm/struct/frustum.h
+++ b/include/cglm/struct/frustum.h
@@ -57,7 +57,7 @@ void
 glms_frustum_planes(mat4s m, vec4s dest[6]) {
   vec4 rawDest[6];
   glm_frustum_planes(m.raw, rawDest);
-  glms_vec4_pack(dest, rawDest, 6);
+  glms_vec4_(pack)(dest, rawDest, 6);
 }
 
 /*!
@@ -88,7 +88,7 @@ void
 glms_frustum_corners(mat4s invMat, vec4s dest[8]) {
   vec4 rawDest[8];
   glm_frustum_corners(invMat.raw, rawDest);
-  glms_vec4_pack(dest, rawDest, 8);
+  glms_vec4_(pack)(dest, rawDest, 8);
 }
 
 /*!
@@ -103,7 +103,7 @@ glms_frustum_center(vec4s corners[8]) {
   vec4 rawCorners[8];
   vec4s r;
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_center(rawCorners, r.raw);
   return r;
 }
@@ -121,9 +121,9 @@ glms_frustum_box(vec4s corners[8], mat4s m, vec3s box[2]) {
   vec4 rawCorners[8];
   vec3 rawBox[2];
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_box(rawCorners, m.raw, rawBox);
-  glms_vec3_pack(box, rawBox, 2);
+  glms_vec3_(pack)(box, rawBox, 2);
 }
 
 /*!
@@ -147,9 +147,9 @@ glms_frustum_corners_at(vec4s corners[8],
   vec4 rawCorners[8];
   vec4 rawPlaneCorners[4];
 
-  glms_vec4_unpack(rawCorners, corners, 8);
+  glms_vec4_(unpack)(rawCorners, corners, 8);
   glm_frustum_corners_at(rawCorners, splitDist, farDist, rawPlaneCorners);
-  glms_vec4_pack(planeCorners, rawPlaneCorners, 8);
+  glms_vec4_(pack)(planeCorners, rawPlaneCorners, 8);
 }
 
 #endif /* cglms_frustums_h */
diff --git a/include/cglm/struct/mat4.h b/include/cglm/struct/mat4.h
index 2a122cb..6517f5c 100644
--- a/include/cglm/struct/mat4.h
+++ b/include/cglm/struct/mat4.h
@@ -240,7 +240,7 @@ glms_mat4_(mulN)(mat4s * __restrict matrices[], uint32_t len) {
   size_t i;
 
   for (i = 0; i < len; i++) {
-    r = glms_mat4_mul(r, *matrices[i]);
+    r = glms_mat4_(mul)(r, *matrices[i]);
   }
   
   return r;