diff --git a/src/OT/Layout/Common/Coverage.hh b/src/OT/Layout/Common/Coverage.hh
index 5047fe42f..39a88855b 100644
--- a/src/OT/Layout/Common/Coverage.hh
+++ b/src/OT/Layout/Common/Coverage.hh
@@ -242,11 +242,11 @@ struct Coverage
     {
       switch (format)
       {
-      case 1: return u.format1.more ();
-      case 2: return u.format2.more ();
+      case 1: return u.format1.__more__ ();
+      case 2: return u.format2.__more__ ();
 #ifndef HB_NO_BORING_EXPANSION
-      case 3: return u.format3.more ();
-      case 4: return u.format4.more ();
+      case 3: return u.format3.__more__ ();
+      case 4: return u.format4.__more__ ();
 #endif
       default:return false;
       }
@@ -255,11 +255,11 @@ struct Coverage
     {
       switch (format)
       {
-      case 1: u.format1.next (); break;
-      case 2: u.format2.next (); break;
+      case 1: u.format1.__next__ (); break;
+      case 2: u.format2.__next__ (); break;
 #ifndef HB_NO_BORING_EXPANSION
-      case 3: u.format3.next (); break;
-      case 4: u.format4.next (); break;
+      case 3: u.format3.__next__ (); break;
+      case 4: u.format4.__next__ (); break;
 #endif
       default:                   break;
       }
diff --git a/src/OT/Layout/Common/CoverageFormat1.hh b/src/OT/Layout/Common/CoverageFormat1.hh
index 28de94b58..b1314e34c 100644
--- a/src/OT/Layout/Common/CoverageFormat1.hh
+++ b/src/OT/Layout/Common/CoverageFormat1.hh
@@ -105,9 +105,8 @@ struct CoverageFormat1_3
   struct iter_t
   {
     void init (const struct CoverageFormat1_3 &c_) { c = &c_; i = 0; }
-    void fini () {}
-    bool more () const { return i < c->glyphArray.len; }
-    void next () { i++; }
+    bool __more__ () const { return i < c->glyphArray.len; }
+    void __next__ () { i++; }
     hb_codepoint_t get_glyph () const { return c->glyphArray[i]; }
     bool operator != (const iter_t& o) const
     { return i != o.i; }
diff --git a/src/OT/Layout/Common/CoverageFormat2.hh b/src/OT/Layout/Common/CoverageFormat2.hh
index 3669d4fdc..6ea8b2278 100644
--- a/src/OT/Layout/Common/CoverageFormat2.hh
+++ b/src/OT/Layout/Common/CoverageFormat2.hh
@@ -177,14 +177,13 @@ struct CoverageFormat2_4
         j = 0;
       }
     }
-    void fini () {}
-    bool more () const { return i < c->rangeRecord.len; }
-    void next ()
+    bool __more__ () const { return i < c->rangeRecord.len; }
+    void __next__ ()
     {
       if (j >= c->rangeRecord[i].last)
       {
         i++;
-        if (more ())
+        if (__more__ ())
         {
           unsigned int old = coverage;
           j = c->rangeRecord[i].first;