diff --git a/src/hb-array.hh b/src/hb-array.hh
index d4df16546..a7783511f 100644
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -36,7 +36,7 @@ struct hb_sorted_array_t;
 template <typename Type>
 struct hb_array_t
 {
-  typedef Type ItemType;
+  typedef Type item_type_t;
   enum { item_size = hb_static_size (Type) };
 
   /*
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index 7f88279a7..8956f4530 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -352,7 +352,7 @@ static inline Type& operator + (Base &base, OffsetTo<Type, OffsetType, has_null>
 template <typename Type>
 struct UnsizedArrayOf
 {
-  typedef Type ItemType;
+  typedef Type item_type_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (UnsizedArrayOf, Type);
@@ -508,7 +508,7 @@ struct SortedUnsizedArrayOf : UnsizedArrayOf<Type>
 template <typename Type, typename LenType=HBUINT16>
 struct ArrayOf
 {
-  typedef Type ItemType;
+  typedef Type item_type_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType);
diff --git a/src/hb-vector.hh b/src/hb-vector.hh
index d8e3f4ef1..0d98bd03e 100644
--- a/src/hb-vector.hh
+++ b/src/hb-vector.hh
@@ -34,7 +34,7 @@
 template <typename Type, unsigned int PreallocedCount=8>
 struct hb_vector_t
 {
-  typedef Type ItemType;
+  typedef Type item_type_t;
   enum { item_size = hb_static_size (Type) };
 
   HB_NO_COPY_ASSIGN_TEMPLATE2 (hb_vector_t, Type, PreallocedCount);