diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 7426a43a3..455e4f50a 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -67,8 +67,8 @@ hb_buffer_set_user_data
 hb_buffer_get_user_data
 hb_buffer_get_glyph_infos
 hb_buffer_get_glyph_positions
-hb_buffer_get_invisible_codepoint
-hb_buffer_set_invisible_codepoint
+hb_buffer_get_invisible_glyph
+hb_buffer_set_invisible_glyph
 hb_buffer_set_replacement_codepoint
 hb_buffer_get_replacement_codepoint
 hb_buffer_normalize_glyphs
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 2b7b88646..2d75d7264 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -1179,7 +1179,7 @@ hb_buffer_get_replacement_codepoint (hb_buffer_t    *buffer)
 
 
 /**
- * hb_buffer_set_invisible_codepoint:
+ * hb_buffer_set_invisible_glyph:
  * @buffer: an #hb_buffer_t.
  * @invisible: the invisible #hb_codepoint_t
  *
@@ -1191,8 +1191,8 @@ hb_buffer_get_replacement_codepoint (hb_buffer_t    *buffer)
  * Since: REPLACEME
  **/
 void
-hb_buffer_set_invisible_codepoint (hb_buffer_t    *buffer,
-				   hb_codepoint_t  invisible)
+hb_buffer_set_invisible_glyph (hb_buffer_t    *buffer,
+			       hb_codepoint_t  invisible)
 {
   if (unlikely (hb_object_is_inert (buffer)))
     return;
@@ -1201,10 +1201,10 @@ hb_buffer_set_invisible_codepoint (hb_buffer_t    *buffer,
 }
 
 /**
- * hb_buffer_get_invisible_codepoint:
+ * hb_buffer_get_invisible_glyph:
  * @buffer: an #hb_buffer_t.
  *
- * See hb_buffer_set_invisible_codepoint().
+ * See hb_buffer_set_invisible_glyph().
  *
  * Return value: 
  * The @buffer invisible #hb_codepoint_t.
@@ -1212,7 +1212,7 @@ hb_buffer_set_invisible_codepoint (hb_buffer_t    *buffer,
  * Since: REPLACEME
  **/
 hb_codepoint_t
-hb_buffer_get_invisible_codepoint (hb_buffer_t    *buffer)
+hb_buffer_get_invisible_glyph (hb_buffer_t    *buffer)
 {
   return buffer->invisible;
 }
diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index d99ae7d64..d0aed02d5 100644
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -342,11 +342,11 @@ HB_EXTERN hb_codepoint_t
 hb_buffer_get_replacement_codepoint (hb_buffer_t    *buffer);
 
 HB_EXTERN void
-hb_buffer_set_invisible_codepoint (hb_buffer_t    *buffer,
-				   hb_codepoint_t  invisible);
+hb_buffer_set_invisible_glyph (hb_buffer_t    *buffer,
+			       hb_codepoint_t  invisible);
 
 HB_EXTERN hb_codepoint_t
-hb_buffer_get_invisible_codepoint (hb_buffer_t    *buffer);
+hb_buffer_get_invisible_glyph (hb_buffer_t    *buffer);
 
 
 HB_EXTERN void
diff --git a/util/options.cc b/util/options.cc
index 8e17df2a6..090a9c254 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -415,7 +415,7 @@ shape_options_t::add_options (option_parser_t *parser)
     {"eot",		0, 0, G_OPTION_ARG_NONE,	&this->eot,			"Treat text as end-of-paragraph",	nullptr},
     {"preserve-default-ignorables",0, 0, G_OPTION_ARG_NONE,	&this->preserve_default_ignorables,	"Preserve Default-Ignorable characters",	nullptr},
     {"remove-default-ignorables",0, 0, G_OPTION_ARG_NONE,	&this->remove_default_ignorables,	"Remove Default-Ignorable characters",	nullptr},
-    {"invisible-codepoint",0, 0, G_OPTION_ARG_INT,	&this->invisible_codepoint,	"Value to replace Default-Ignorables with",	nullptr},
+    {"invisible-glyph",	0, 0, G_OPTION_ARG_INT,		&this->invisible_glyph,		"Glyph value to replace Default-Ignorables with",	nullptr},
     {"utf8-clusters",	0, 0, G_OPTION_ARG_NONE,	&this->utf8_clusters,		"Use UTF8 byte indices, not char indices",	nullptr},
     {"cluster-level",	0, 0, G_OPTION_ARG_INT,		&this->cluster_level,		"Cluster merging level (default: 0)",	"0/1/2"},
     {"normalize-glyphs",0, 0, G_OPTION_ARG_NONE,	&this->normalize_glyphs,	"Rearrange glyph clusters in nominal order",	nullptr},
diff --git a/util/options.hh b/util/options.hh
index 3d7b96dd9..5088adaba 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -155,7 +155,7 @@ struct shape_options_t : option_group_t
     num_features = 0;
     shapers = nullptr;
     utf8_clusters = false;
-    invisible_codepoint = 0;
+    invisible_glyph = 0;
     cluster_level = HB_BUFFER_CLUSTER_LEVEL_DEFAULT;
     normalize_glyphs = false;
     verify = false;
@@ -186,7 +186,7 @@ struct shape_options_t : option_group_t
 				  (preserve_default_ignorables ? HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES : 0) |
 				  (remove_default_ignorables ? HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES : 0) |
 				  0));
-    hb_buffer_set_invisible_codepoint (buffer, invisible_codepoint);
+    hb_buffer_set_invisible_glyph (buffer, invisible_glyph);
     hb_buffer_set_cluster_level (buffer, cluster_level);
     hb_buffer_guess_segment_properties (buffer);
   }
@@ -437,7 +437,7 @@ struct shape_options_t : option_group_t
   unsigned int num_features;
   char **shapers;
   hb_bool_t utf8_clusters;
-  hb_codepoint_t invisible_codepoint;
+  hb_codepoint_t invisible_glyph;
   hb_buffer_cluster_level_t cluster_level;
   hb_bool_t normalize_glyphs;
   hb_bool_t verify;