diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 4950e0021478359b7d7ee3dbcfd79497c87d144e..76d4a56e2f9bf3f28d1ee9e5dd39c3f21b12341b 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -366,16 +366,16 @@ hb_ot_shape_execute (hb_ot_shape_plan_t *plan,
 }
 
 void
-hb_ot_shape (hb_font_t    *font,
-	     hb_face_t    *face,
-	     hb_buffer_t  *buffer,
-	     const hb_feature_t *user_features,
-	     unsigned int        num_user_features)
+hb_ot_shape (hb_font_t          *font,
+	     hb_face_t          *face,
+	     hb_buffer_t        *buffer,
+	     const hb_feature_t *features,
+	     unsigned int        num_features)
 {
   hb_ot_shape_plan_t plan;
 
-  hb_ot_shape_plan_internal (&plan, face, &buffer->props, user_features, num_user_features);
-  hb_ot_shape_execute (&plan, font, face, buffer, user_features, num_user_features);
+  hb_ot_shape_plan_internal (&plan, face, &buffer->props, features, num_features);
+  hb_ot_shape_execute (&plan, font, face, buffer, features, num_features);
 }
 
 
diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index c90e0fea5196ee43aa6a90dbb9c0a64916e07c14..45d8104c7a90a27bbcaf3d5207133d2afa480bf5 100644
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -37,8 +37,8 @@ void
 hb_ot_shape (hb_font_t          *font,
 	     hb_face_t          *face,
 	     hb_buffer_t        *buffer,
-	     const hb_feature_t *user_features,
-	     unsigned int        num_user_features);
+	     const hb_feature_t *features,
+	     unsigned int        num_features);
 
 
 HB_END_DECLS
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 0a6f1dc56418009e74bfb1479d603838f38c245e..9e2ea4ecdb75d1a764b23298d9eb4a9bda4991e1 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -40,11 +40,11 @@ HB_BEGIN_DECLS
 
 
 static void
-hb_shape_internal (hb_font_t    *font,
-		   hb_face_t    *face,
-		   hb_buffer_t  *buffer,
-		   hb_feature_t *features,
-		   unsigned int  num_features)
+hb_shape_internal (hb_font_t          *font,
+		   hb_face_t          *face,
+		   hb_buffer_t        *buffer,
+		   const hb_feature_t *features,
+		   unsigned int        num_features)
 {
 #if 0 && defined(HAVE_GRAPHITE)
   hb_blob_t *silf_blob;
@@ -62,11 +62,11 @@ hb_shape_internal (hb_font_t    *font,
 }
 
 void
-hb_shape (hb_font_t    *font,
-	  hb_face_t    *face,
-	  hb_buffer_t  *buffer,
-	  hb_feature_t *features,
-	  unsigned int  num_features)
+hb_shape (hb_font_t          *font,
+	  hb_face_t          *face,
+	  hb_buffer_t        *buffer,
+	  const hb_feature_t *features,
+	  unsigned int        num_features)
 {
   hb_segment_properties_t orig_props;
 
diff --git a/src/hb-shape.h b/src/hb-shape.h
index 48f1a557c7d88177481c8b434545faa9bd88daff..6bc325763314dc915447a0c49aecaf4fe719f79a 100644
--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@@ -42,11 +42,11 @@ typedef struct _hb_feature_t {
 } hb_feature_t;
 
 void
-hb_shape (hb_font_t    *font,
-	  hb_face_t    *face,
-	  hb_buffer_t  *buffer,
-	  hb_feature_t *features,
-	  unsigned int  num_features);
+hb_shape (hb_font_t          *font,
+	  hb_face_t          *face,
+	  hb_buffer_t        *buffer,
+	  const hb_feature_t *features,
+	  unsigned int        num_features);
 
 
 HB_END_DECLS