diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index 4b66bfc50..9e78b9efe 100644
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -231,7 +231,7 @@ struct name
       const hb_ot_name_entry_t key = {name_id, {0}, language};
       const hb_ot_name_entry_t *entry = (const hb_ot_name_entry_t *)
 					hb_bsearch (&key,
-						    this->names.arrayZ(),
+						    (const hb_ot_name_entry_t *) this->names,
 						    this->names.length,
 						    sizeof (key),
 						    _hb_ot_name_entry_cmp_key);
diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index 5b792aee4..907ae6ab5 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -60,7 +60,7 @@ hb_ot_name_list_names (hb_face_t    *face,
 {
   const OT::name_accelerator_t &name = *face->table.name;
   if (num_entries) *num_entries = name.names.length;
-  return name.names.arrayZ();
+  return (const hb_ot_name_entry_t *) name.names;
 }