diff --git a/src/hb-ot-metrics.cc b/src/hb-ot-metrics.cc
index 07eb4667af58e06fb9a18e4e883ad4bced3d6761..d211d7e68338f1f3fd3dbaea2b79ddcb4451bab0 100644
--- a/src/hb-ot-metrics.cc
+++ b/src/hb-ot-metrics.cc
@@ -34,7 +34,7 @@
 
 
 static float
-_fix_ascender_descender (float value, hb_ot_metrics_t metrics_tag)
+_fix_ascender_descender (float value, hb_ot_metrics_tag_t metrics_tag)
 {
   if (metrics_tag == HB_OT_METRICS_HORIZONTAL_ASCENDER ||
       metrics_tag == HB_OT_METRICS_VERTICAL_ASCENDER)
@@ -48,9 +48,9 @@ _fix_ascender_descender (float value, hb_ot_metrics_t metrics_tag)
 /* The common part of _get_position logic needed on hb-ot-font and here
    to be able to have slim builds without the not always needed parts */
 bool
-_hb_ot_metrics_get_position_common (hb_font_t       *font,
-				    hb_ot_metrics_t  metrics_tag,
-				    hb_position_t   *position     /* OUT.  May be NULL. */)
+_hb_ot_metrics_get_position_common (hb_font_t           *font,
+				    hb_ot_metrics_tag_t  metrics_tag,
+				    hb_position_t       *position     /* OUT.  May be NULL. */)
 {
   hb_face_t *face = font->face;
   switch ((unsigned) metrics_tag)
@@ -91,7 +91,7 @@ _hb_ot_metrics_get_position_common (hb_font_t       *font,
 
 #if 0
 static bool
-_get_gasp (hb_face_t *face, float *result, hb_ot_metrics_t metrics_tag)
+_get_gasp (hb_face_t *face, float *result, hb_ot_metrics_tag_t metrics_tag)
 {
   const OT::GaspRange& range = face->table.gasp->get_gasp_range (metrics_tag - HB_TAG ('g','s','p','0'));
   if (&range == &Null (OT::GaspRange)) return false;
@@ -120,9 +120,9 @@ _get_gasp (hb_face_t *face, float *result, hb_ot_metrics_t metrics_tag)
  * Since: REPLACEME
  **/
 hb_bool_t
-hb_ot_metrics_get_position (hb_font_t       *font,
-			    hb_ot_metrics_t  metrics_tag,
-			    hb_position_t   *position     /* OUT.  May be NULL. */)
+hb_ot_metrics_get_position (hb_font_t           *font,
+			    hb_ot_metrics_tag_t  metrics_tag,
+			    hb_position_t       *position     /* OUT.  May be NULL. */)
 {
   hb_face_t *face = font->face;
   switch ((unsigned) metrics_tag)
@@ -192,7 +192,7 @@ hb_ot_metrics_get_position (hb_font_t       *font,
  * Since: REPLACEME
  **/
 float
-hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag)
+hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
 {
   return font->face->table.MVAR->get_var (metrics_tag, font->coords, font->num_coords);
 }
@@ -207,7 +207,7 @@ hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag)
  * Since: REPLACEME
  **/
 hb_position_t
-hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag)
+hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
 {
   return font->em_scalef_x (hb_ot_metrics_get_variation (font, metrics_tag));
 }
@@ -222,7 +222,7 @@ hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag)
  * Since: REPLACEME
  **/
 hb_position_t
-hb_ot_metrics_get_y_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag)
+hb_ot_metrics_get_y_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag)
 {
   return font->em_scalef_y (hb_ot_metrics_get_variation (font, metrics_tag));
 }
diff --git a/src/hb-ot-metrics.h b/src/hb-ot-metrics.h
index c60ee739cacb02ad8eeff69dcaf7047d612754ce..6b2747b96b285c2f9cfbae89dd03251ea8504bd7 100644
--- a/src/hb-ot-metrics.h
+++ b/src/hb-ot-metrics.h
@@ -36,7 +36,7 @@ HB_BEGIN_DECLS
 
 
 /**
- * hb_ot_metrics_t:
+ * hb_ot_metrics_tag_t:
  *
  * From https://docs.microsoft.com/en-us/typography/opentype/spec/mvar#value-tags
  *
@@ -73,21 +73,21 @@ typedef enum {
   HB_OT_METRICS_UNDERLINE_OFFSET		= HB_TAG ('u','n','d','o'),
 
   _HB_OT_METRICS_MAX_VALUE = HB_TAG_MAX_SIGNED /*< skip >*/
-} hb_ot_metrics_t;
+} hb_ot_metrics_tag_t;
 
 HB_EXTERN hb_bool_t
-hb_ot_metrics_get_position (hb_font_t       *font,
-			    hb_ot_metrics_t  metrics_tag,
-			    hb_position_t   *position     /* OUT.  May be NULL. */);
+hb_ot_metrics_get_position (hb_font_t           *font,
+			    hb_ot_metrics_tag_t  metrics_tag,
+			    hb_position_t       *position     /* OUT.  May be NULL. */);
 
 HB_EXTERN float
-hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag);
+hb_ot_metrics_get_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag);
 
 HB_EXTERN hb_position_t
-hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag);
+hb_ot_metrics_get_x_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag);
 
 HB_EXTERN hb_position_t
-hb_ot_metrics_get_y_variation (hb_font_t *font, hb_ot_metrics_t metrics_tag);
+hb_ot_metrics_get_y_variation (hb_font_t *font, hb_ot_metrics_tag_t metrics_tag);
 
 HB_END_DECLS
 
diff --git a/src/hb-ot-metrics.hh b/src/hb-ot-metrics.hh
index f9ae46fc992299f9ae9d863b2be3090ebf3ab24e..19a5e9ed41fcd4fb65341524596bb7cb7359f118 100644
--- a/src/hb-ot-metrics.hh
+++ b/src/hb-ot-metrics.hh
@@ -28,8 +28,8 @@
 #include "hb.hh"
 
 HB_INTERNAL bool
-_hb_ot_metrics_get_position_common (hb_font_t       *font,
-				    hb_ot_metrics_t  metrics_tag,
-				    hb_position_t   *position     /* OUT.  May be NULL. */);
+_hb_ot_metrics_get_position_common (hb_font_t           *font,
+				    hb_ot_metrics_tag_t  metrics_tag,
+				    hb_position_t       *position     /* OUT.  May be NULL. */);
 
 #endif /* HB_OT_METRICS_HH */