diff --git a/src/hb-array.hh b/src/hb-array.hh
index 03b52ec56..fc1bdc854 100644
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -39,7 +39,7 @@ struct hb_sorted_array_t;
 template <typename Type>
 struct hb_array_t :
 	hb_iter_t<hb_array_t<Type>, Type&>,
-	hb_iter_mixin_t<hb_array_t<Type>, Type&>
+	hb_iter_fallback_mixin_t<hb_array_t<Type>, Type&>
 {
   /*
    * Constructors.
diff --git a/src/hb-iter.hh b/src/hb-iter.hh
index 93db59a9e..d5201cc99 100644
--- a/src/hb-iter.hh
+++ b/src/hb-iter.hh
@@ -64,7 +64,7 @@ struct hb_iter_t
 
   /* TODO:
    * Port operators below to use hb_enable_if to sniff which method implements
-   * an operator and use it, and remove hb_iter_mixin_t completely. */
+   * an operator and use it, and remove hb_iter_fallback_mixin_t completely. */
 
   /* Operators. */
   iter_t iter () const { return *thiz(); }
@@ -132,7 +132,7 @@ hb_iter (Type (&array)[length]) { return hb_iter (array, length); }
 
 /* Mixin to fill in what the subclass doesn't provide. */
 template <typename iter_t, typename item_t = typename iter_t::__item_t__>
-struct hb_iter_mixin_t
+struct hb_iter_fallback_mixin_t
 {
   private:
   /* https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern */
@@ -158,9 +158,9 @@ struct hb_iter_mixin_t
   void __rewind__ (unsigned n) { while (n--) --*thiz(); }
 
   protected:
-  hb_iter_mixin_t () {}
-  hb_iter_mixin_t (const hb_iter_mixin_t &o HB_UNUSED) {}
-  void operator = (const hb_iter_mixin_t &o HB_UNUSED) {}
+  hb_iter_fallback_mixin_t () {}
+  hb_iter_fallback_mixin_t (const hb_iter_fallback_mixin_t &o HB_UNUSED) {}
+  void operator = (const hb_iter_fallback_mixin_t &o HB_UNUSED) {}
 };
 
 /*
@@ -269,7 +269,7 @@ template <typename Iter, typename Pred, typename Proj,
 	 hb_enable_if (hb_is_iterator (Iter))>
 struct hb_filter_iter_t :
   hb_iter_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>,
-  hb_iter_mixin_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>
+  hb_iter_fallback_mixin_t<hb_filter_iter_t<Iter, Pred, Proj>, typename Iter::item_t>
 {
   hb_filter_iter_t (const Iter& it_, Pred&& p, Proj&& f) : it (it_), p (p), f (f)
   { while (it && !p (f (*it))) ++it; }
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 97a855be2..21eb5e8d6 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -1122,7 +1122,7 @@ struct Coverage
 
   struct iter_t :
     hb_iter_t<iter_t, hb_codepoint_t>,
-    hb_iter_mixin_t<iter_t, hb_codepoint_t>
+    hb_iter_fallback_mixin_t<iter_t, hb_codepoint_t>
   {
     static constexpr bool is_sorted_iterator = true;
     iter_t (const Coverage &c_ = Null(Coverage))
diff --git a/src/hb-set.hh b/src/hb-set.hh
index cd643e98d..b3e4907d6 100644
--- a/src/hb-set.hh
+++ b/src/hb-set.hh
@@ -684,7 +684,7 @@ struct hb_set_t
    */
   struct iter_t :
     hb_iter_t<iter_t, hb_codepoint_t>,
-    hb_iter_mixin_t<iter_t, hb_codepoint_t>
+    hb_iter_fallback_mixin_t<iter_t, hb_codepoint_t>
   {
     static constexpr bool is_sorted_iterator = true;
     iter_t (const hb_set_t &s_ = Null(hb_set_t)) :
diff --git a/src/test-iter.cc b/src/test-iter.cc
index 2dbacae5b..4da8c9d13 100644
--- a/src/test-iter.cc
+++ b/src/test-iter.cc
@@ -35,7 +35,7 @@
 template <typename T>
 struct array_iter_t :
   hb_iter_t<array_iter_t<T>, T&>,
-  hb_iter_mixin_t<array_iter_t<T>, T&>
+  hb_iter_fallback_mixin_t<array_iter_t<T>, T&>
 {
   array_iter_t (hb_array_t<T> arr_) : arr (arr_) {}