diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh
index 539941d85f707271bb420f03fc350fb302c8abd9..cede80c87f8f6e5af3cf78407ac31a6265ae67b9 100644
--- a/src/hb-aat-layout-common.hh
+++ b/src/hb-aat-layout-common.hh
@@ -546,7 +546,7 @@ struct ClassTable
   DEFINE_SIZE_ARRAY (4, classArray);
 };
 
-struct MortTypes
+struct ObsoleteTypes
 {
   static const bool extended = false;
   typedef HBUINT16 HBUINT;
@@ -573,7 +573,7 @@ struct MortTypes
     return offsetToIndex (2 * offset, base, array);
   }
 };
-struct MorxTypes
+struct ExtendedTypes
 {
   static const bool extended = true;
   typedef HBUINT32 HBUINT;
diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh
index 2b26d496a16e1502879f42a59a121419dc9036bd..6469e5cf1f4ba976986715100bd095017ed75795 100644
--- a/src/hb-aat-layout-kerx-table.hh
+++ b/src/hb-aat-layout-kerx-table.hh
@@ -476,6 +476,8 @@ struct KerxSubTableFormat2
 template <typename KernSubTableHeader>
 struct KerxSubTableFormat4
 {
+  typedef ExtendedTypes Types;
+
   struct EntryData
   {
     HBUINT16	ankrActionIndex;/* Either 0xFFFF (for no action) or the index of
@@ -512,12 +514,12 @@ struct KerxSubTableFormat4
 	mark_set (false),
 	mark (0) {}
 
-    inline bool is_actionable (StateTableDriver<MorxTypes, EntryData> *driver HB_UNUSED,
+    inline bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
 			       const Entry<EntryData> *entry)
     {
       return entry->data.ankrActionIndex != 0xFFFF;
     }
-    inline bool transition (StateTableDriver<MorxTypes, EntryData> *driver,
+    inline bool transition (StateTableDriver<Types, EntryData> *driver,
 			    const Entry<EntryData> *entry)
     {
       hb_buffer_t *buffer = driver->buffer;
@@ -619,7 +621,7 @@ struct KerxSubTableFormat4
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<MorxTypes, EntryData> driver (machine, c->buffer, c->font->face);
+    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->font->face);
     driver.drive (&dc);
 
     return_trace (true);
@@ -634,10 +636,9 @@ struct KerxSubTableFormat4
   }
 
   protected:
-  KernSubTableHeader	header;
-  StateTable<MorxTypes, EntryData>
-			machine;
-  HBUINT32		flags;
+  KernSubTableHeader		header;
+  StateTable<Types, EntryData>	machine;
+  HBUINT32			flags;
   public:
   DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 20);
 };
@@ -756,7 +757,7 @@ struct KerxSubTableFormat6
 
 struct KerxSubTableHeader
 {
-  typedef MorxTypes Types;
+  typedef ExtendedTypes Types;
 
   unsigned int tuple_count (void) const { return tupleCount; }
 
diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh
index 51f14682c78515be55ac152d375edb8363c4a55e..a364f7ac76b04ea64593086a04e332ef570e243f 100644
--- a/src/hb-aat-layout-morx-table.hh
+++ b/src/hb-aat-layout-morx-table.hh
@@ -1166,11 +1166,11 @@ struct mortmorx
   DEFINE_SIZE_MIN (8);
 };
 
-struct morx : mortmorx<MorxTypes>
+struct morx : mortmorx<ExtendedTypes>
 {
   static const hb_tag_t tableTag	= HB_AAT_TAG_morx;
 };
-struct mort : mortmorx<MortTypes>
+struct mort : mortmorx<ObsoleteTypes>
 {
   static const hb_tag_t tableTag	= HB_AAT_TAG_mort;
 };
diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh
index 6f1b46a93fd40dad73720e2b84fb5b69f23334b6..3f771d2d57ef3248597f402f7eb84f0643708786 100644
--- a/src/hb-ot-kern-table.hh
+++ b/src/hb-ot-kern-table.hh
@@ -316,7 +316,7 @@ struct KernOT : KernTable<KernOT>
 
   struct SubTableHeader
   {
-    typedef AAT::MortTypes Types;
+    typedef AAT::ObsoleteTypes Types;
 
     unsigned int tuple_count (void) const { return 0; }
 
@@ -363,7 +363,7 @@ struct KernAAT : KernTable<KernAAT>
 
   struct SubTableHeader
   {
-    typedef AAT::MortTypes Types;
+    typedef AAT::ObsoleteTypes Types;
 
     unsigned int tuple_count (void) const { return 0; }