diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index f8650b076..52b43a9b9 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -613,7 +613,7 @@ hb_ot_math_get_glyph_assembly
 <SECTION>
 <FILE>hb-ot-meta</FILE>
 hb_ot_meta_t
-hb_ot_meta_get_entries
+hb_ot_meta_get_entry_tags
 hb_ot_meta_reference_entry
 </SECTION>
 
diff --git a/src/hb-ot-meta.cc b/src/hb-ot-meta.cc
index a5ce14876..158bedf45 100644
--- a/src/hb-ot-meta.cc
+++ b/src/hb-ot-meta.cc
@@ -49,10 +49,10 @@
  * Since: REPLACEME
  **/
 unsigned int
-hb_ot_meta_get_entries (hb_face_t        *face,
-			unsigned int      start_offset,
-			unsigned int     *entries_count, /* IN/OUT.  May be NULL. */
-			hb_ot_meta_tag_t *entries        /* OUT.     May be NULL. */)
+hb_ot_meta_get_entry_tags (hb_face_t        *face,
+			   unsigned int      start_offset,
+			   unsigned int     *entries_count, /* IN/OUT.  May be NULL. */
+			   hb_ot_meta_tag_t *entries        /* OUT.     May be NULL. */)
 {
   return face->table.meta->get_entries (start_offset, entries_count, entries);
 }
diff --git a/src/hb-ot-meta.h b/src/hb-ot-meta.h
index 83fcc04af..e19be1500 100644
--- a/src/hb-ot-meta.h
+++ b/src/hb-ot-meta.h
@@ -58,10 +58,10 @@ typedef enum {
 } hb_ot_meta_tag_t;
 
 HB_EXTERN unsigned int
-hb_ot_meta_get_entries (hb_face_t        *face,
-			unsigned int      start_offset,
-			unsigned int     *entries_count, /* IN/OUT.  May be NULL. */
-			hb_ot_meta_tag_t *entries        /* OUT.     May be NULL. */);
+hb_ot_meta_get_entry_tags (hb_face_t        *face,
+			   unsigned int      start_offset,
+			   unsigned int     *entries_count, /* IN/OUT.  May be NULL. */
+			   hb_ot_meta_tag_t *entries        /* OUT.     May be NULL. */);
 
 HB_EXTERN hb_blob_t *
 hb_ot_meta_reference_entry (hb_face_t *face, hb_ot_meta_tag_t meta_tag);
diff --git a/src/test-ot-meta.cc b/src/test-ot-meta.cc
index 512df5a78..1045007f7 100644
--- a/src/test-ot-meta.cc
+++ b/src/test-ot-meta.cc
@@ -48,11 +48,11 @@ main (int argc, char **argv)
   unsigned int count = 0;
 
 #ifndef HB_NO_META
-  count = hb_ot_meta_get_entries (face, 0, nullptr, nullptr);
+  count = hb_ot_meta_get_entry_tags (face, 0, nullptr, nullptr);
 
   hb_ot_meta_tag_t *tags = (hb_ot_meta_tag_t *)
 			   malloc (sizeof (hb_ot_meta_tag_t) * count);
-  hb_ot_meta_get_entries (face, 0, &count, tags);
+  hb_ot_meta_get_entry_tags (face, 0, &count, tags);
   for (unsigned i = 0; i < count; ++i)
   {
     hb_blob_t *entry = hb_ot_meta_reference_entry (face, tags[i]);
diff --git a/test/api/test-ot-face.c b/test/api/test-ot-face.c
index eff0ff711..44a911682 100644
--- a/test/api/test-ot-face.c
+++ b/test/api/test-ot-face.c
@@ -90,7 +90,7 @@ test_face (hb_face_t *face,
   hb_ot_math_get_min_connector_overlap (font, HB_DIRECTION_RTL);
   hb_ot_math_get_glyph_assembly (font, cp, HB_DIRECTION_BTT, 0, NULL, NULL, NULL);
 
-  hb_ot_meta_get_entries (face, 0, NULL, NULL);
+  hb_ot_meta_get_entry_tags (face, 0, NULL, NULL);
   hb_blob_destroy (hb_ot_meta_reference_entry (face, HB_OT_META_TAG_DESIGN_LANGUAGES));
 
   hb_ot_metrics_get_position (font, HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER, NULL);
diff --git a/test/api/test-ot-meta.c b/test/api/test-ot-meta.c
index c15cc1b75..573c8c6f3 100644
--- a/test/api/test-ot-meta.c
+++ b/test/api/test-ot-meta.c
@@ -35,18 +35,18 @@ test_ot_meta_get_entries (void)
   hb_ot_meta_tag_t entries[2];
 
   unsigned int entries_count = 2;
-  g_assert_cmpint (hb_ot_meta_get_entries (face, 0, &entries_count, entries), ==, 5);
+  g_assert_cmpint (hb_ot_meta_get_entry_tags (face, 0, &entries_count, entries), ==, 5);
   g_assert_cmpint (entries_count, ==, 2);
   g_assert_cmpint (entries[0], ==, HB_TAG ('a','p','p','l'));
   g_assert_cmpint (entries[1], ==, HB_TAG ('b','i','l','d'));
 
   entries_count = 1;
-  g_assert_cmpint (hb_ot_meta_get_entries (face, 2, &entries_count, entries), ==, 5);
+  g_assert_cmpint (hb_ot_meta_get_entry_tags (face, 2, &entries_count, entries), ==, 5);
   g_assert_cmpint (entries_count, ==, 1);
   g_assert_cmpint (entries[0], ==, HB_TAG ('d','l','n','g'));
 
   entries_count = 2;
-  g_assert_cmpint (hb_ot_meta_get_entries (face, 4, &entries_count, entries), ==, 5);
+  g_assert_cmpint (hb_ot_meta_get_entry_tags (face, 4, &entries_count, entries), ==, 5);
   g_assert_cmpint (entries_count, ==, 1);
   g_assert_cmpint (entries[0], ==, HB_TAG ('s','l','n','g'));