diff --git a/src/hb-buffer.c b/src/hb-buffer.c
index a4b92d75d..30ce2e8fd 100644
--- a/src/hb-buffer.c
+++ b/src/hb-buffer.c
@@ -172,7 +172,7 @@ hb_buffer_add_glyph (hb_buffer_t    *buffer,
   glyph->cluster = cluster;
   glyph->component = 0;
   glyph->ligID = 0;
-  glyph->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
+  glyph->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
 
   buffer->in_length++;
 }
@@ -285,7 +285,7 @@ _hb_buffer_add_output_glyphs (hb_buffer_t *buffer,
     info->cluster = cluster;
     info->component = component;
     info->ligID = ligID;
-    info->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
+    info->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
   }
 
   buffer->in_pos  += num_in;
@@ -316,7 +316,7 @@ _hb_buffer_add_output_glyph (hb_buffer_t *buffer,
     info->component = component;
   if (ligID != 0xFFFF)
     info->ligID = ligID;
-  info->gproperty = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
+  info->internal = HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN;
 
   buffer->in_pos++;
   buffer->out_pos++;
diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index 26879bf19..4a37cdb80 100644
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -49,7 +49,7 @@ typedef struct _hb_glyph_info_t {
   unsigned int   cluster;
   unsigned short component;
   unsigned short ligID;
-  unsigned short gproperty;
+  unsigned int   internal;
 } hb_glyph_info_t;
 
 typedef struct _hb_glyph_position_t {
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 3ec654ee0..f17d0286a 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -182,9 +182,9 @@ _hb_ot_layout_check_glyph_property (hb_ot_layout_t  *layout,
 {
   unsigned int property;
 
-  if (ginfo->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
-    ginfo->gproperty = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
-  property = ginfo->gproperty;
+  if (ginfo->internal == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
+    ginfo->internal = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
+  property = ginfo->internal;
   if (property_out)
     *property_out = property;
 
@@ -221,9 +221,9 @@ _hb_ot_layout_skip_mark (hb_ot_layout_t  *layout,
 {
   unsigned int property;
 
-  if (ginfo->gproperty == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
-    ginfo->gproperty = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
-  property = ginfo->gproperty;
+  if (ginfo->internal == HB_BUFFER_GLYPH_PROPERTIES_UNKNOWN)
+    ginfo->internal = _hb_ot_layout_get_glyph_property (layout, ginfo->gindex);
+  property = ginfo->internal;
   if (property_out)
     *property_out = property;