diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index a6760c102..ed52b69c9 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -773,7 +773,7 @@ hb_subset_plan_destroy
 hb_subset_plan_set_user_data
 hb_subset_plan_get_user_data
 hb_subset_plan_execute_or_fail
-hb_subset_plan_codepoint_to_old_glyph_mapping
+hb_subset_plan_unicode_to_old_glyph_mapping
 hb_subset_plan_new_to_old_glyph_mapping
 hb_subset_plan_old_to_new_glyph_mapping
 hb_subset_or_fail
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 1c5d45a02..00666b849 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -640,7 +640,7 @@ hb_subset_plan_new_to_old_glyph_mapping (const hb_subset_plan_t *plan)
 }
 
 /**
- * hb_subset_plan_codepoint_to_old_glyph_mapping:
+ * hb_subset_plan_unicode_old_glyph_mapping:
  * @plan: a subsetting plan.
  *
  * Returns the mapping between codepoints in the original font and the
@@ -652,7 +652,7 @@ hb_subset_plan_new_to_old_glyph_mapping (const hb_subset_plan_t *plan)
  * Since: REPLACEME
  **/
 const hb_map_t*
-hb_subset_plan_codepoint_to_old_glyph_mapping (const hb_subset_plan_t *plan)
+hb_subset_plan_unicode_to_old_glyph_mapping (const hb_subset_plan_t *plan)
 {
   return plan->codepoint_to_glyph;
 }
diff --git a/src/hb-subset.h b/src/hb-subset.h
index edc909086..a2799d91e 100644
--- a/src/hb-subset.h
+++ b/src/hb-subset.h
@@ -171,7 +171,7 @@ HB_EXTERN const hb_map_t*
 hb_subset_plan_new_to_old_glyph_mapping (const hb_subset_plan_t *plan);
 
 HB_EXTERN const hb_map_t*
-hb_subset_plan_codepoint_to_old_glyph_mapping (const hb_subset_plan_t *plan);
+hb_subset_plan_unicode_to_old_glyph_mapping (const hb_subset_plan_t *plan);
 
 
 HB_EXTERN hb_subset_plan_t *
diff --git a/test/api/test-subset.c b/test/api/test-subset.c
index ee332777f..d6ee3676c 100644
--- a/test/api/test-subset.c
+++ b/test/api/test-subset.c
@@ -178,7 +178,7 @@ test_subset_plan (void)
   g_assert (hb_map_get (mapping, 1) == 1);
   g_assert (hb_map_get (mapping, 2) == 3);
 
-  mapping = hb_subset_plan_codepoint_to_old_glyph_mapping (plan);
+  mapping = hb_subset_plan_unicode_to_old_glyph_mapping (plan);
   g_assert (hb_map_get (mapping, 0x63) == 3);
 
   hb_face_t* face_abc_subset = hb_subset_plan_execute_or_fail (plan);