diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index e6dbe0a4d..3494cb7fc 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -52,7 +52,7 @@ hb_ot_name_get_names (hb_face_t                 *face,
 
 
 template <typename utf_t>
-static inline hb_bool_t
+static inline unsigned int
 hb_ot_name_get_utf (hb_face_t     *face,
 		    hb_name_id_t   name_id,
 		    hb_language_t  language,
@@ -71,10 +71,10 @@ hb_ot_name_get_utf (hb_face_t     *face,
   if (text_size)
     *text_size = bytes.len / 2; //TODO
   /* TODO Fallback? */
-  return true; //XXX
+  return *text_size; //XXX
 }
 
-hb_bool_t
+unsigned int
 hb_ot_name_get_utf16 (hb_face_t     *face,
 		      hb_name_id_t   name_id,
 		      hb_language_t  language,
diff --git a/src/hb-ot-name.h b/src/hb-ot-name.h
index fb4948021..0afcd3fca 100644
--- a/src/hb-ot-name.h
+++ b/src/hb-ot-name.h
@@ -50,7 +50,7 @@ typedef unsigned int hb_name_id_t;
 
 
 #if 0
-HB_EXTERN hb_bool_t
+HB_EXTERN unsigned int
 Xhb_ot_name_get_utf8 (hb_face_t     *face,
 		     hb_name_id_t   name_id,
 		     hb_language_t  language,
@@ -58,7 +58,7 @@ Xhb_ot_name_get_utf8 (hb_face_t     *face,
 		     char          *text      /* OUT */);
 #endif
 
-HB_EXTERN hb_bool_t
+HB_EXTERN unsigned int
 hb_ot_name_get_utf16 (hb_face_t     *face,
 		      hb_name_id_t   name_id,
 		      hb_language_t  language,
@@ -66,7 +66,7 @@ hb_ot_name_get_utf16 (hb_face_t     *face,
 		      uint16_t      *text      /* OUT */);
 
 #if 0
-HB_EXTERN hb_bool_t
+HB_EXTERN unsigned int
 Xhb_ot_name_get_utf32 (hb_face_t     *face,
 		      hb_name_id_t   name_id,
 		      hb_language_t  language,