diff --git a/src/Makefile.am b/src/Makefile.am
index fb7f79161..93879c4db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,8 +87,8 @@ HBSOURCES += \
 	hb-ot-shape-complex-private.hh \
 	hb-ot-shape-normalize-private.hh \
 	hb-ot-shape-normalize.cc \
-	hb-ot-shape-position-fallback-private.hh \
-	hb-ot-shape-position-fallback.cc \
+	hb-ot-shape-fallback-private.hh \
+	hb-ot-shape-fallback.cc \
 	hb-ot-shape-private.hh \
 	$(NULL)
 HBHEADERS += \
diff --git a/src/hb-ot-shape-position-fallback-private.hh b/src/hb-ot-shape-fallback-private.hh
similarity index 86%
rename from src/hb-ot-shape-position-fallback-private.hh
rename to src/hb-ot-shape-fallback-private.hh
index f84752eb8..be96c4f19 100644
--- a/src/hb-ot-shape-position-fallback-private.hh
+++ b/src/hb-ot-shape-fallback-private.hh
@@ -24,16 +24,16 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef HB_OT_POSITION_FALLBACK_PRIVATE_HH
-#define HB_OT_POSITION_FALLBACK_PRIVATE_HH
+#ifndef HB_OT_SHAPE_FALLBACK_PRIVATE_HH
+#define HB_OT_SHAPE_FALLBACK_PRIVATE_HH
 
 #include "hb-private.hh"
 
 #include "hb-ot-shape-private.hh"
 
 
-HB_INTERNAL void _hb_ot_shape_position_fallback (const hb_ot_shape_plan_t *plan,
+HB_INTERNAL void _hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan,
 						 hb_font_t *font,
 						 hb_buffer_t  *buffer);
 
-#endif /* HB_OT_POSITION_FALLBACK_PRIVATE_HH */
+#endif /* HB_OT_SHAPE_FALLBACK_PRIVATE_HH */
diff --git a/src/hb-ot-shape-position-fallback.cc b/src/hb-ot-shape-fallback.cc
similarity index 98%
rename from src/hb-ot-shape-position-fallback.cc
rename to src/hb-ot-shape-fallback.cc
index 7966852de..54ffdb008 100644
--- a/src/hb-ot-shape-position-fallback.cc
+++ b/src/hb-ot-shape-fallback.cc
@@ -24,7 +24,7 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#include "hb-ot-shape-position-fallback-private.hh"
+#include "hb-ot-shape-fallback-private.hh"
 
 static void
 zero_mark_advances (hb_buffer_t *buffer,
@@ -259,7 +259,7 @@ position_cluster (const hb_ot_shape_plan_t *plan,
 }
 
 void
-_hb_ot_shape_position_fallback (const hb_ot_shape_plan_t *plan,
+_hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan,
 				hb_font_t *font,
 				hb_buffer_t  *buffer)
 {
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 6ec17c545..41ec329a8 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -33,8 +33,8 @@
 
 #include "hb-ot-shape-private.hh"
 #include "hb-ot-shape-complex-private.hh"
+#include "hb-ot-shape-fallback-private.hh"
 #include "hb-ot-shape-normalize-private.hh"
-#include "hb-ot-shape-position-fallback-private.hh"
 
 #include "hb-ot-layout-private.hh"
 #include "hb-set-private.hh"
@@ -427,7 +427,7 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
 static void
 hb_position_complex_fallback (hb_ot_shape_context_t *c)
 {
-  _hb_ot_shape_position_fallback (c->plan, c->font, c->buffer);
+  _hb_ot_shape_fallback_position (c->plan, c->font, c->buffer);
 }
 
 static void