mesh: Rename cairo_pattern_mesh_* functions to cairo_mesh_pattern_*

This is consistent with the naming of most cairo types/functions
(example: cairo_foo_surface_*).

The substitution in the code has been performed using:

  sed -i 's/cairo_pattern_mesh_/cairo_mesh_pattern_/' <files>

15 files changed, 268 insertions, 268 deletions

diff --git a/doc/public/cairo-sections.txt b/doc/public/cairo-sections.txt
index ec7c9f1b..11439aea 100644
--- a/doc/public/cairo-sections.txt
+++ b/doc/public/cairo-sections.txt
@@ -279,18 +279,18 @@ cairo_pattern_get_linear_points
 cairo_pattern_create_radial
 cairo_pattern_get_radial_circles
 cairo_pattern_create_mesh
-cairo_pattern_mesh_begin_patch
-cairo_pattern_mesh_end_patch
-cairo_pattern_mesh_move_to
-cairo_pattern_mesh_line_to
-cairo_pattern_mesh_curve_to
-cairo_pattern_mesh_set_control_point
-cairo_pattern_mesh_set_corner_color_rgb
-cairo_pattern_mesh_set_corner_color_rgba
-cairo_pattern_mesh_get_patch_count
-cairo_pattern_mesh_get_path
-cairo_pattern_mesh_get_control_point
-cairo_pattern_mesh_get_corner_color_rgba
+cairo_mesh_pattern_begin_patch
+cairo_mesh_pattern_end_patch
+cairo_mesh_pattern_move_to
+cairo_mesh_pattern_line_to
+cairo_mesh_pattern_curve_to
+cairo_mesh_pattern_set_control_point
+cairo_mesh_pattern_set_corner_color_rgb
+cairo_mesh_pattern_set_corner_color_rgba
+cairo_mesh_pattern_get_patch_count
+cairo_mesh_pattern_get_path
+cairo_mesh_pattern_get_control_point
+cairo_mesh_pattern_get_corner_color_rgba
 cairo_pattern_reference
 cairo_pattern_destroy
 cairo_pattern_status
diff --git a/doc/public/language-bindings.xml b/doc/public/language-bindings.xml
index 3b879adf..ce437ef5 100644
--- a/doc/public/language-bindings.xml
+++ b/doc/public/language-bindings.xml
@@ -530,18 +530,18 @@ cairo_pattern_t
       cairo_linear_gradient_t (<link linkend="cairo-pattern-create-linear"><function>cairo_pattern_create_linear()</function></link>)
       cairo_radial_gradient_t (<link linkend="cairo-pattern-create-radial"><function>cairo_pattern_create_radial()</function></link>)
    cairo_mesh_t (<link linkend="cairo-pattern-create-mesh"><function>cairo_pattern_create_mesh()</function></link>)
-         <link linkend="cairo-pattern-mesh-begin-patch"><function>cairo_pattern_mesh_begin_patch()</function></link>
-         <link linkend="cairo-pattern-mesh-end-patch"><function>cairo_pattern_mesh_end_patch()</function></link>
-         <link linkend="cairo-pattern-mesh-move-to"><function>cairo_pattern_mesh_move_to()</function></link>
-         <link linkend="cairo-pattern-mesh-line-to"><function>cairo_pattern_mesh_line_to()</function></link>
-         <link linkend="cairo-pattern-mesh-curve-to"><function>cairo_pattern_mesh_curve_to()</function></link>
-         <link linkend="cairo-pattern-mesh-set-control-point"><function>cairo_pattern_mesh_set_control_point()</function></link>
-         <link linkend="cairo-pattern-mesh-set-corner-color-rgb"><function>cairo_pattern_mesh_set_corner_color_rgb()</function></link>
-         <link linkend="cairo-pattern-mesh-set-corner-color-rgba"><function>cairo_pattern_mesh_set_corner_color_rgba()</function></link>
-         <link linkend="cairo-pattern-mesh-get-patch-count"><function>cairo_pattern_mesh_get_patch_count()</function></link>
-         <link linkend="cairo-pattern-mesh-get-path"><function>cairo_pattern_mesh_get_path()</function></link>
-         <link linkend="cairo-pattern-mesh-get-control-point"><function>cairo_pattern_mesh_get_control_point()</function></link>
-         <link linkend="cairo-pattern-mesh-get-corner-color-rgba"><function>cairo_pattern_mesh_get_corner_color_rgba()</function></link>
+         <link linkend="cairo-mesh-pattern-begin-patch"><function>cairo_mesh_pattern_begin_patch()</function></link>
+         <link linkend="cairo-mesh-pattern-end-patch"><function>cairo_mesh_pattern_end_patch()</function></link>
+         <link linkend="cairo-mesh-pattern-move-to"><function>cairo_mesh_pattern_move_to()</function></link>
+         <link linkend="cairo-mesh-pattern-line-to"><function>cairo_mesh_pattern_line_to()</function></link>
+         <link linkend="cairo-mesh-pattern-curve-to"><function>cairo_mesh_pattern_curve_to()</function></link>
+         <link linkend="cairo-mesh-pattern-set-control-point"><function>cairo_mesh_pattern_set_control_point()</function></link>
+         <link linkend="cairo-mesh-pattern-set-corner-color-rgb"><function>cairo_mesh_pattern_set_corner_color_rgb()</function></link>
+         <link linkend="cairo-mesh-pattern-set-corner-color-rgba"><function>cairo_mesh_pattern_set_corner_color_rgba()</function></link>
+         <link linkend="cairo-mesh-pattern-get-patch-count"><function>cairo_mesh_pattern_get_patch_count()</function></link>
+         <link linkend="cairo-mesh-pattern-get-path"><function>cairo_mesh_pattern_get_path()</function></link>
+         <link linkend="cairo-mesh-pattern-get-control-point"><function>cairo_mesh_pattern_get_control_point()</function></link>
+         <link linkend="cairo-mesh-pattern-get-corner-color-rgba"><function>cairo_mesh_pattern_get_corner_color_rgba()</function></link>
     </programlisting>
     <para>
     </para>
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 82c2279e..630edc25 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -840,17 +840,17 @@ static const int mesh_control_point_j[4] = { 1, 2, 2, 1 };
  * </programlisting></informalexample>
  *
  * Each patch is constructed by first calling
- * cairo_pattern_mesh_begin_patch(), then cairo_pattern_mesh_move_to()
+ * cairo_mesh_pattern_begin_patch(), then cairo_mesh_pattern_move_to()
  * to specify the first point in the patch (C0). Then the sides are
- * specified with calls to cairo_pattern_mesh_curve_to() and
- * cairo_pattern_mesh_line_to().
+ * specified with calls to cairo_mesh_pattern_curve_to() and
+ * cairo_mesh_pattern_line_to().
  *
  * The four additional control points (P0, P1, P2, P3) in a patch can
- * be specified with cairo_pattern_mesh_set_control_point().
+ * be specified with cairo_mesh_pattern_set_control_point().
  *
  * At each corner of the patch (C0, C1, C2, C3) a color may be
- * specified with cairo_pattern_mesh_set_corner_color_rgb() or
- * cairo_pattern_mesh_set_corner_color_rgba(). Any corner whose color
+ * specified with cairo_mesh_pattern_set_corner_color_rgb() or
+ * cairo_mesh_pattern_set_corner_color_rgba(). Any corner whose color
  * is not explicitly specified defaults to transparent black.
  *
  * A Coons patch is a special case of the tensor-product patch where
@@ -873,7 +873,7 @@ static const int mesh_control_point_j[4] = { 1, 2, 2, 1 };
  * specifying colors, corner 0 will always be the first point, corner
  * 1 the point between side 0 and side 1 etc.
  *
- * Calling cairo_pattern_mesh_end_patch() completes the current
+ * Calling cairo_mesh_pattern_end_patch() completes the current
  * patch. If less than 4 sides have been defined, the first missing
  * side is defined as a line from the current point to the first point
  * of the patch (C0) and the other sides are degenerate lines from C0
@@ -882,33 +882,33 @@ static const int mesh_control_point_j[4] = { 1, 2, 2, 1 };
  * the color of C0.
  *
  * Additional patches may be added with additional calls to
- * cairo_pattern_mesh_begin_patch()/cairo_pattern_mesh_end_patch().
+ * cairo_mesh_pattern_begin_patch()/cairo_mesh_pattern_end_patch().
  *
  * <informalexample><programlisting>
- * cairo_pattern_t *mesh = cairo_pattern_mesh_create_mesh ();
+ * cairo_pattern_t *mesh = cairo_mesh_pattern_create_mesh ();
  *
  * /&ast; Add a Coons patch &ast;/
- * cairo_pattern_mesh_begin_patch (mesh);
- * cairo_pattern_mesh_move_to (pattern, 0, 0);
- * cairo_pattern_mesh_curve_to (pattern, 30, -30,  60,  30, 100, 0);
- * cairo_pattern_mesh_curve_to (pattern, 60,  30, 130,  60, 100, 100);
- * cairo_pattern_mesh_curve_to (pattern, 60,  70,  30, 130,   0, 100);
- * cairo_pattern_mesh_curve_to (pattern, 30,  70, -30,  30,   0, 0);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
- * cairo_pattern_mesh_end_patch (mesh);
+ * cairo_mesh_pattern_begin_patch (mesh);
+ * cairo_mesh_pattern_move_to (pattern, 0, 0);
+ * cairo_mesh_pattern_curve_to (pattern, 30, -30,  60,  30, 100, 0);
+ * cairo_mesh_pattern_curve_to (pattern, 60,  30, 130,  60, 100, 100);
+ * cairo_mesh_pattern_curve_to (pattern, 60,  70,  30, 130,   0, 100);
+ * cairo_mesh_pattern_curve_to (pattern, 30,  70, -30,  30,   0, 0);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+ * cairo_mesh_pattern_end_patch (mesh);
  *
  * /&ast; Add a Gouraud-shaded triangle &ast;/
- * cairo_pattern_mesh_begin_patch (mesh)
- * cairo_pattern_mesh_move_to (pattern, 100, 100);
- * cairo_pattern_mesh_line_to (pattern, 130, 130);
- * cairo_pattern_mesh_line_to (pattern, 130,  70);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
- * cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
- * cairo_pattern_mesh_end_patch (mesh)
+ * cairo_mesh_pattern_begin_patch (mesh)
+ * cairo_mesh_pattern_move_to (pattern, 100, 100);
+ * cairo_mesh_pattern_line_to (pattern, 130, 130);
+ * cairo_mesh_pattern_line_to (pattern, 130,  70);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+ * cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+ * cairo_mesh_pattern_end_patch (mesh)
  * </programlisting></informalexample>
  *
  * When two patches overlap, the last one that has been added is drawn
@@ -1137,16 +1137,16 @@ cairo_pattern_set_user_data (cairo_pattern_t		 *pattern,
 }
 
 /**
- * cairo_pattern_mesh_begin_patch:
+ * cairo_mesh_pattern_begin_patch:
  * @pattern: a #cairo_pattern_t
  *
  * Begin a patch in a mesh pattern.
  *
  * After calling this function, the patch shape should be defined with
- * cairo_pattern_mesh_move_to(), cairo_pattern_mesh_line_to() and
- * cairo_pattern_mesh_curve_to().
+ * cairo_mesh_pattern_move_to(), cairo_mesh_pattern_line_to() and
+ * cairo_mesh_pattern_curve_to().
  *
- * After defining the patch, cairo_pattern_mesh_end_patch() must be
+ * After defining the patch, cairo_mesh_pattern_end_patch() must be
  * called before using @pattern as a source or mask.
  *
  * Note: If @pattern is not a mesh pattern then @pattern will be put
@@ -1158,7 +1158,7 @@ cairo_pattern_set_user_data (cairo_pattern_t		 *pattern,
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_begin_patch (cairo_pattern_t *pattern)
+cairo_mesh_pattern_begin_patch (cairo_pattern_t *pattern)
 {
     cairo_mesh_pattern_t *mesh;
     cairo_status_t status;
@@ -1240,14 +1240,14 @@ _calc_control_point (cairo_mesh_patch_t *patch, int control_point)
 }
 
 /**
- * cairo_pattern_mesh_end_patch:
+ * cairo_mesh_pattern_end_patch:
  * @pattern: a #cairo_pattern_t
  *
  * Indicates the end of the current patch in a mesh pattern.
  *
  * If the current patch has less than 4 sides, it is closed with a
  * straight line from the current point to the first point of the
- * patch as if cairo_pattern_mesh_line_to() was used.
+ * patch as if cairo_mesh_pattern_line_to() was used.
  *
  * Note: If @pattern is not a mesh pattern then @pattern will be put
  * into an error status with a status of
@@ -1259,7 +1259,7 @@ _calc_control_point (cairo_mesh_patch_t *patch, int control_point)
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
+cairo_mesh_pattern_end_patch (cairo_pattern_t *pattern)
 {
     cairo_mesh_pattern_t *mesh;
     cairo_mesh_patch_t *current_patch;
@@ -1288,7 +1288,7 @@ cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
     while (mesh->current_side < 3) {
 	int corner_num;
 
-	cairo_pattern_mesh_line_to (pattern,
+	cairo_mesh_pattern_line_to (pattern,
 				    current_patch->points[0][0].x,
 				    current_patch->points[0][0].y);
 
@@ -1313,7 +1313,7 @@ cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
 }
 
 /**
- * cairo_pattern_mesh_curve_to:
+ * cairo_mesh_pattern_curve_to:
  * @pattern: a #cairo_pattern_t
  * @x1: the X coordinate of the first control point
  * @y1: the Y coordinate of the first control point
@@ -1327,8 +1327,8 @@ cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
  * (@x1, @y1) and (@x2, @y2) as the control points.
  *
  * If the current patch has no current point before the call to
- * cairo_pattern_mesh_curve_to(), this function will behave as if
- * preceded by a call to cairo_pattern_mesh_move_to(@pattern, @x1,
+ * cairo_mesh_pattern_curve_to(), this function will behave as if
+ * preceded by a call to cairo_mesh_pattern_move_to(@pattern, @x1,
  * @y1).
  *
  * After this call the current point will be (@x3, @y3).
@@ -1343,7 +1343,7 @@ cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_curve_to (cairo_pattern_t *pattern,
 			     double x1, double y1,
 			     double x2, double y2,
 			     double x3, double y3)
@@ -1371,7 +1371,7 @@ cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
     }
 
     if (mesh->current_side == -2)
-	cairo_pattern_mesh_move_to (pattern, x1, y1);
+	cairo_mesh_pattern_move_to (pattern, x1, y1);
 
     assert (mesh->current_side >= -1);
     assert (pattern->status == CAIRO_STATUS_SUCCESS);
@@ -1400,10 +1400,10 @@ cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
 	mesh->current_patch->points[i][j].y = y3;
     }
 }
-slim_hidden_def (cairo_pattern_mesh_curve_to);
+slim_hidden_def (cairo_mesh_pattern_curve_to);
 
 /**
- * cairo_pattern_mesh_line_to:
+ * cairo_mesh_pattern_line_to:
  * @pattern: a #cairo_pattern_t
  * @x: the X coordinate of the end of the new line
  * @y: the Y coordinate of the end of the new line
@@ -1412,8 +1412,8 @@ slim_hidden_def (cairo_pattern_mesh_curve_to);
  * (@x, @y) in pattern-space coordinates.
  *
  * If there is no current point before the call to
- * cairo_pattern_mesh_line_to() this function will behave as
- * cairo_pattern_mesh_move_to(@pattern, @x, @y).
+ * cairo_mesh_pattern_line_to() this function will behave as
+ * cairo_mesh_pattern_move_to(@pattern, @x, @y).
  *
  * After this call the current point will be (@x, @y).
  *
@@ -1427,7 +1427,7 @@ slim_hidden_def (cairo_pattern_mesh_curve_to);
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_line_to (cairo_pattern_t *pattern,
 			    double x, double y)
 {
     cairo_mesh_pattern_t *mesh;
@@ -1454,7 +1454,7 @@ cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
     }
 
     if (mesh->current_side == -2) {
-	cairo_pattern_mesh_move_to (pattern, x, y);
+	cairo_mesh_pattern_move_to (pattern, x, y);
 	return;
     }
 
@@ -1464,17 +1464,17 @@ cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
 
     last_point = mesh->current_patch->points[i][j];
 
-    cairo_pattern_mesh_curve_to (pattern,
+    cairo_mesh_pattern_curve_to (pattern,
 				 (2 * last_point.x + x) * (1. / 3),
 				 (2 * last_point.y + y) * (1. / 3),
 				 (last_point.x + 2 * x) * (1. / 3),
 				 (last_point.y + 2 * y) * (1. / 3),
 				 x, y);
 }
-slim_hidden_def (cairo_pattern_mesh_line_to);
+slim_hidden_def (cairo_mesh_pattern_line_to);
 
 /**
- * cairo_pattern_mesh_move_to:
+ * cairo_mesh_pattern_move_to:
  * @pattern: a #cairo_pattern_t
  * @x: the X coordinate of the new position
  * @y: the Y coordinate of the new position
@@ -1493,7 +1493,7 @@ slim_hidden_def (cairo_pattern_mesh_line_to);
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_move_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_move_to (cairo_pattern_t *pattern,
 			    double x, double y)
 {
     cairo_mesh_pattern_t *mesh;
@@ -1521,10 +1521,10 @@ cairo_pattern_mesh_move_to (cairo_pattern_t *pattern,
     mesh->current_patch->points[0][0].x = x;
     mesh->current_patch->points[0][0].y = y;
 }
-slim_hidden_def (cairo_pattern_mesh_move_to);
+slim_hidden_def (cairo_mesh_pattern_move_to);
 
 /**
- * cairo_pattern_mesh_set_control_point:
+ * cairo_mesh_pattern_set_control_point:
  * @pattern: a #cairo_pattern_t
  * @point_num: the control point to set the position for
  * @x: the X coordinate of the control point
@@ -1546,7 +1546,7 @@ slim_hidden_def (cairo_pattern_mesh_move_to);
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_set_control_point (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_control_point (cairo_pattern_t *pattern,
 				      unsigned int     point_num,
 				      double           x,
 				      double           y)
@@ -1623,7 +1623,7 @@ _cairo_pattern_gradient_grow (cairo_gradient_pattern_t *pattern)
 }
 
 static void
-_cairo_pattern_mesh_set_corner_color (cairo_mesh_pattern_t *mesh,
+_cairo_mesh_pattern_set_corner_color (cairo_mesh_pattern_t *mesh,
 				      unsigned int     corner_num,
 				      double red, double green, double blue,
 				      double alpha)
@@ -1648,7 +1648,7 @@ _cairo_pattern_mesh_set_corner_color (cairo_mesh_pattern_t *mesh,
 }
 
 /**
- * cairo_pattern_mesh_set_corner_color_rgb:
+ * cairo_mesh_pattern_set_corner_color_rgb:
  * @pattern: a #cairo_pattern_t
  * @corner_num: the corner to set the color for
  * @red: red component of color
@@ -1673,15 +1673,15 @@ _cairo_pattern_mesh_set_corner_color (cairo_mesh_pattern_t *mesh,
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_set_corner_color_rgb (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_corner_color_rgb (cairo_pattern_t *pattern,
 					 unsigned int     corner_num,
 					 double red, double green, double blue)
 {
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, corner_num, red, green, blue, 1.0);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, corner_num, red, green, blue, 1.0);
 }
 
 /**
- * cairo_pattern_mesh_set_corner_color_rgba:
+ * cairo_mesh_pattern_set_corner_color_rgba:
  * @pattern: a #cairo_pattern_t
  * @corner_num: the corner to set the color for
  * @red: red component of color
@@ -1707,7 +1707,7 @@ cairo_pattern_mesh_set_corner_color_rgb (cairo_pattern_t *pattern,
  * Since: 1.12
  **/
 void
-cairo_pattern_mesh_set_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_corner_color_rgba (cairo_pattern_t *pattern,
 					  unsigned int     corner_num,
 					  double red, double green, double blue,
 					  double alpha)
@@ -1738,9 +1738,9 @@ cairo_pattern_mesh_set_corner_color_rgba (cairo_pattern_t *pattern,
     blue   = _cairo_restrict_value (blue,   0.0, 1.0);
     alpha  = _cairo_restrict_value (alpha,  0.0, 1.0);
 
-    _cairo_pattern_mesh_set_corner_color (mesh, corner_num, red, green, blue, alpha);
+    _cairo_mesh_pattern_set_corner_color (mesh, corner_num, red, green, blue, alpha);
 }
-slim_hidden_def (cairo_pattern_mesh_set_corner_color_rgba);
+slim_hidden_def (cairo_mesh_pattern_set_corner_color_rgba);
 
 static void
 _cairo_pattern_add_color_stop (cairo_gradient_pattern_t	*pattern,
@@ -4874,14 +4874,14 @@ cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
 }
 
 /**
- * cairo_pattern_mesh_get_patch_count
+ * cairo_mesh_pattern_get_patch_count
  * @pattern: a #cairo_pattern_t
  * @count: return value for the number patches, or %NULL
  *
  * Gets the number of patches specified in the given mesh pattern.
  *
  * The number only includes patches which have been finished by
- * calling cairo_pattern_mesh_end_patch(). For example it will be 0
+ * calling cairo_mesh_pattern_end_patch(). For example it will be 0
  * during the definition of the first patch.
  *
  * Return value: %CAIRO_STATUS_SUCCESS, or
@@ -4891,7 +4891,7 @@ cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
  * Since: 1.12
  */
 cairo_status_t
-cairo_pattern_mesh_get_patch_count (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_patch_count (cairo_pattern_t *pattern,
 				    unsigned int *count)
 {
     cairo_mesh_pattern_t *mesh = (cairo_mesh_pattern_t *) pattern;
@@ -4912,7 +4912,7 @@ cairo_pattern_mesh_get_patch_count (cairo_pattern_t *pattern,
 }
 
 /**
- * cairo_pattern_mesh_get_path
+ * cairo_mesh_pattern_get_path
  * @pattern: a #cairo_pattern_t
  * @patch_num: the patch number to return data for
  *
@@ -4920,7 +4920,7 @@ cairo_pattern_mesh_get_patch_count (cairo_pattern_t *pattern,
  * pattern.
  *
  * @patch_num can range 0 to 1 less than the number returned by
- * cairo_pattern_mesh_get_patch_count().
+ * cairo_mesh_pattern_get_patch_count().
  *
  * Return value: the path defining the patch, or a path with status
  * %CAIRO_STATUS_INVALID_INDEX if @patch_num or @point_num is not
@@ -4930,7 +4930,7 @@ cairo_pattern_mesh_get_patch_count (cairo_pattern_t *pattern,
  * Since: 1.12
  */
 cairo_path_t *
-cairo_pattern_mesh_get_path (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_path (cairo_pattern_t *pattern,
 			     unsigned int patch_num)
 {
     cairo_mesh_pattern_t *mesh = (cairo_mesh_pattern_t *) pattern;
@@ -4999,7 +4999,7 @@ cairo_pattern_mesh_get_path (cairo_pattern_t *pattern,
 }
 
 /**
- * cairo_pattern_mesh_get_corner_color_rgba
+ * cairo_mesh_pattern_get_corner_color_rgba
  * @pattern: a #cairo_pattern_t
  * @patch_num: the patch number to return data for
  * @corner_num: the corner number to return data for
@@ -5012,7 +5012,7 @@ cairo_pattern_mesh_get_path (cairo_pattern_t *pattern,
  * @patch_num for a mesh pattern.
  *
  * @patch_num can range 0 to 1 less than the number returned by
- * cairo_pattern_mesh_get_patch_count().
+ * cairo_mesh_pattern_get_patch_count().
  *
  * Valid values for @corner_num are from 0 to 3 and identify the
  * corners as explained in cairo_pattern_create_mesh().
@@ -5025,7 +5025,7 @@ cairo_pattern_mesh_get_path (cairo_pattern_t *pattern,
  * Since: 1.12
  **/
 cairo_status_t
-cairo_pattern_mesh_get_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_corner_color_rgba (cairo_pattern_t *pattern,
 					  unsigned int patch_num,
 					  unsigned int corner_num,
 					  double *red, double *green,
@@ -5066,7 +5066,7 @@ cairo_pattern_mesh_get_corner_color_rgba (cairo_pattern_t *pattern,
 }
 
 /**
- * cairo_pattern_mesh_get_control_point
+ * cairo_mesh_pattern_get_control_point
  * @pattern: a #cairo_pattern_t
  * @patch_num: the patch number to return data for
  * @point_num: the control point number to return data for
@@ -5077,7 +5077,7 @@ cairo_pattern_mesh_get_corner_color_rgba (cairo_pattern_t *pattern,
  * pattern.
  *
  * @patch_num can range 0 to 1 less than the number returned by
- * cairo_pattern_mesh_get_patch_count().
+ * cairo_mesh_pattern_get_patch_count().
  *
  * Valid values for @point_num are from 0 to 3 and identify the
  * control points as explained in cairo_pattern_create_mesh().
@@ -5090,7 +5090,7 @@ cairo_pattern_mesh_get_corner_color_rgba (cairo_pattern_t *pattern,
  * Since: 1.12
  **/
 cairo_status_t
-cairo_pattern_mesh_get_control_point (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_control_point (cairo_pattern_t *pattern,
 				      unsigned int patch_num,
 				      unsigned int point_num,
 				      double *x, double *y)
diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index 5200b3ab..b975afaf 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -964,7 +964,7 @@ _emit_mesh_pattern (cairo_script_surface_t *surface,
     unsigned int i, n;
 
     mesh = (cairo_pattern_t *) pattern;
-    status = cairo_pattern_mesh_get_patch_count (mesh, &n);
+    status = cairo_mesh_pattern_get_patch_count (mesh, &n);
     if (unlikely (status))
 	return status;
 
@@ -976,7 +976,7 @@ _emit_mesh_pattern (cairo_script_surface_t *surface,
 
 	_cairo_output_stream_printf (ctx->stream, "\n  mesh-begin-patch");
 
-	path = cairo_pattern_mesh_get_path (mesh, i);
+	path = cairo_mesh_pattern_get_path (mesh, i);
 	if (unlikely (path->status))
 	    return path->status;
 
@@ -1009,7 +1009,7 @@ _emit_mesh_pattern (cairo_script_surface_t *surface,
 	for (j = 0; j < 4; j++) {
 	    double x, y;
 
-	    status = cairo_pattern_mesh_get_control_point (mesh, i, j, &x, &y);
+	    status = cairo_mesh_pattern_get_control_point (mesh, i, j, &x, &y);
 	    if (unlikely (status))
 		return status;
 	    _cairo_output_stream_printf (ctx->stream,
@@ -1020,7 +1020,7 @@ _emit_mesh_pattern (cairo_script_surface_t *surface,
 	for (j = 0; j < 4; j++) {
 	    double r, g, b, a;
 
-	    status = cairo_pattern_mesh_get_corner_color_rgba (mesh, i, j, &r, &g, &b, &a);
+	    status = cairo_mesh_pattern_get_corner_color_rgba (mesh, i, j, &r, &g, &b, &a);
 	    if (unlikely (status))
 		return status;
 
diff --git a/src/cairo.h b/src/cairo.h
index a966c833..3495146f 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -273,7 +273,7 @@ typedef struct _cairo_user_data_key {
  * @CAIRO_STATUS_DEVICE_ERROR: an operation to the device caused an unspecified error (Since 1.10)
  * @CAIRO_STATUS_INVALID_MESH_CONSTRUCTION: a mesh pattern
  *   construction operation was used outside of a
- *   cairo_pattern_mesh_begin_patch()/cairo_pattern_mesh_end_patch()
+ *   cairo_mesh_pattern_begin_patch()/cairo_mesh_pattern_end_patch()
  *   pair (Since 1.12)
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
  *   status values defined in this enumeration.  When using this value, note
@@ -2420,37 +2420,37 @@ cairo_pattern_add_color_stop_rgba (cairo_pattern_t *pattern,
 				   double alpha);
 
 cairo_public void
-cairo_pattern_mesh_begin_patch (cairo_pattern_t *pattern);
+cairo_mesh_pattern_begin_patch (cairo_pattern_t *pattern);
 
 cairo_public void
-cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern);
+cairo_mesh_pattern_end_patch (cairo_pattern_t *pattern);
 
 cairo_public void
-cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_curve_to (cairo_pattern_t *pattern,
 			     double x1, double y1,
 			     double x2, double y2,
 			     double x3, double y3);
 
 cairo_public void
-cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_line_to (cairo_pattern_t *pattern,
 			    double x, double y);
 
 cairo_public void
-cairo_pattern_mesh_move_to (cairo_pattern_t *pattern,
+cairo_mesh_pattern_move_to (cairo_pattern_t *pattern,
 			    double x, double y);
 
 cairo_public void
-cairo_pattern_mesh_set_control_point (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_control_point (cairo_pattern_t *pattern,
 				      unsigned int point_num,
 				      double x, double y);
 
 cairo_public void
-cairo_pattern_mesh_set_corner_color_rgb (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_corner_color_rgb (cairo_pattern_t *pattern,
 					 unsigned int corner_num,
 					 double red, double green, double blue);
 
 cairo_public void
-cairo_pattern_mesh_set_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_mesh_pattern_set_corner_color_rgba (cairo_pattern_t *pattern,
 					  unsigned int corner_num,
 					  double red, double green, double blue,
 					  double alpha);
@@ -2563,22 +2563,22 @@ cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
 				  double *x1, double *y1, double *r1);
 
 cairo_public cairo_status_t
-cairo_pattern_mesh_get_patch_count (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_patch_count (cairo_pattern_t *pattern,
 				    unsigned int *count);
 
 cairo_public cairo_path_t *
-cairo_pattern_mesh_get_path (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_path (cairo_pattern_t *pattern,
 			     unsigned int patch_num);
 
 cairo_public cairo_status_t
-cairo_pattern_mesh_get_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_corner_color_rgba (cairo_pattern_t *pattern,
 					  unsigned int patch_num,
 					  unsigned int corner_num,
 					  double *red, double *green,
 					  double *blue, double *alpha);
 
 cairo_public cairo_status_t
-cairo_pattern_mesh_get_control_point (cairo_pattern_t *pattern,
+cairo_mesh_pattern_get_control_point (cairo_pattern_t *pattern,
 				      unsigned int patch_num,
 				      unsigned int point_num,
 				      double *x, double *y);
diff --git a/src/cairoint.h b/src/cairoint.h
index f203ec53..74f80d32 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -2436,10 +2436,10 @@ slim_hidden_proto (cairo_pattern_create_rgb);
 slim_hidden_proto (cairo_pattern_create_rgba);
 slim_hidden_proto (cairo_pattern_destroy);
 slim_hidden_proto (cairo_pattern_get_extend);
-slim_hidden_proto (cairo_pattern_mesh_curve_to);
-slim_hidden_proto (cairo_pattern_mesh_line_to);
-slim_hidden_proto (cairo_pattern_mesh_move_to);
-slim_hidden_proto (cairo_pattern_mesh_set_corner_color_rgba);
+slim_hidden_proto (cairo_mesh_pattern_curve_to);
+slim_hidden_proto (cairo_mesh_pattern_line_to);
+slim_hidden_proto (cairo_mesh_pattern_move_to);
+slim_hidden_proto (cairo_mesh_pattern_set_corner_color_rgba);
 slim_hidden_proto_no_warn (cairo_pattern_reference);
 slim_hidden_proto (cairo_pattern_set_matrix);
 slim_hidden_proto (cairo_pop_group);
diff --git a/test/mesh-pattern-accuracy.c b/test/mesh-pattern-accuracy.c
index 0f756c57..92e15233 100644
--- a/test/mesh-pattern-accuracy.c
+++ b/test/mesh-pattern-accuracy.c
@@ -49,38 +49,38 @@ draw (cairo_t *cr, int width, int height)
 
     pattern = cairo_pattern_create_mesh ();
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 0, 0);
-    cairo_pattern_mesh_line_to (pattern, 1, 0);
-    cairo_pattern_mesh_line_to (pattern, 1, 1);
-    cairo_pattern_mesh_line_to (pattern, 0, 1);
+    cairo_mesh_pattern_move_to (pattern, 0, 0);
+    cairo_mesh_pattern_line_to (pattern, 1, 0);
+    cairo_mesh_pattern_line_to (pattern, 1, 1);
+    cairo_mesh_pattern_line_to (pattern, 0, 1);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 0, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 1, 1, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 0, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 1, 1, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 1);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
     /* A small 1x1 red patch, that should be rendered as a 2x2 red
      * square in the center of the image */
 
     offset = 0.5 / SIZE;
 
-    cairo_pattern_mesh_move_to (pattern, 0.5 + offset, 0.5 + offset);
-    cairo_pattern_mesh_line_to (pattern, 0.5 + offset, 0.5 - offset);
-    cairo_pattern_mesh_line_to (pattern, 0.5 - offset, 0.5 - offset);
-    cairo_pattern_mesh_line_to (pattern, 0.5 - offset, 0.5 + offset);
+    cairo_mesh_pattern_move_to (pattern, 0.5 + offset, 0.5 + offset);
+    cairo_mesh_pattern_line_to (pattern, 0.5 + offset, 0.5 - offset);
+    cairo_mesh_pattern_line_to (pattern, 0.5 - offset, 0.5 - offset);
+    cairo_mesh_pattern_line_to (pattern, 0.5 - offset, 0.5 + offset);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 0, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_scale (cr, SIZE, SIZE);
 
diff --git a/test/mesh-pattern-conical.c b/test/mesh-pattern-conical.c
index aa3e182c..8138884e 100644
--- a/test/mesh-pattern-conical.c
+++ b/test/mesh-pattern-conical.c
@@ -62,14 +62,14 @@ sector_patch (cairo_pattern_t *pattern,
 
     h = 4.0/3.0 * tan ((angle_B - angle_A) / 4.0);
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, CENTER_X, CENTER_Y);
-    cairo_pattern_mesh_line_to (pattern,
+    cairo_mesh_pattern_move_to (pattern, CENTER_X, CENTER_Y);
+    cairo_mesh_pattern_line_to (pattern,
 				CENTER_X + r_cos_A,
 				CENTER_Y + r_sin_A);
 
-    cairo_pattern_mesh_curve_to (pattern,
+    cairo_mesh_pattern_curve_to (pattern,
 				 CENTER_X + r_cos_A - h * r_sin_A,
 				 CENTER_Y + r_sin_A + h * r_cos_A,
 				 CENTER_X + r_cos_B + h * r_sin_B,
@@ -77,11 +77,11 @@ sector_patch (cairo_pattern_t *pattern,
 				 CENTER_X + r_cos_B,
 				 CENTER_Y + r_sin_B);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 1, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, A_r, A_g, A_b);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, B_r, B_g, B_b);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 1, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, A_r, A_g, A_b);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, B_r, B_g, B_b);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 }
 
 static cairo_test_status_t
diff --git a/test/mesh-pattern-control-points.c b/test/mesh-pattern-control-points.c
index 54ff850e..4d594952 100644
--- a/test/mesh-pattern-control-points.c
+++ b/test/mesh-pattern-control-points.c
@@ -53,48 +53,48 @@ draw (cairo_t *cr, int width, int height)
     cairo_translate (cr, PAD, PAD);
 
     pattern = cairo_pattern_create_mesh ();
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern,    0,    0);
-    cairo_pattern_mesh_line_to (pattern, SIZE,    0);
-    cairo_pattern_mesh_line_to (pattern, SIZE, SIZE);
-    cairo_pattern_mesh_line_to (pattern,    0, SIZE);
+    cairo_mesh_pattern_move_to (pattern,    0,    0);
+    cairo_mesh_pattern_line_to (pattern, SIZE,    0);
+    cairo_mesh_pattern_line_to (pattern, SIZE, SIZE);
+    cairo_mesh_pattern_line_to (pattern,    0, SIZE);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_set_control_point (pattern, 0, SIZE * .7, SIZE * .7);
-    cairo_pattern_mesh_set_control_point (pattern, 1, SIZE * .9, SIZE * .7);
-    cairo_pattern_mesh_set_control_point (pattern, 2, SIZE * .9, SIZE * .9);
-    cairo_pattern_mesh_set_control_point (pattern, 3, SIZE * .7, SIZE * .9);
+    cairo_mesh_pattern_set_control_point (pattern, 0, SIZE * .7, SIZE * .7);
+    cairo_mesh_pattern_set_control_point (pattern, 1, SIZE * .9, SIZE * .7);
+    cairo_mesh_pattern_set_control_point (pattern, 2, SIZE * .9, SIZE * .9);
+    cairo_mesh_pattern_set_control_point (pattern, 3, SIZE * .7, SIZE * .9);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern,   SIZE + PAD,    0);
-    cairo_pattern_mesh_line_to (pattern, 2*SIZE + PAD,    0);
-    cairo_pattern_mesh_line_to (pattern, 2*SIZE + PAD, SIZE);
-    cairo_pattern_mesh_line_to (pattern,   SIZE + PAD, SIZE);
+    cairo_mesh_pattern_move_to (pattern,   SIZE + PAD,    0);
+    cairo_mesh_pattern_line_to (pattern, 2*SIZE + PAD,    0);
+    cairo_mesh_pattern_line_to (pattern, 2*SIZE + PAD, SIZE);
+    cairo_mesh_pattern_line_to (pattern,   SIZE + PAD, SIZE);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_set_source (cr, pattern);
     cairo_paint (cr);
 
     /* mark the location of the control points */
     cairo_set_source_rgb (cr, 0, 0, 0);
-    cairo_pattern_mesh_get_patch_count (pattern, &num_patches);
+    cairo_mesh_pattern_get_patch_count (pattern, &num_patches);
     for (i = 0; i < num_patches; i++) {
 	for (j = 0; j < 4; j++) {
-	    cairo_pattern_mesh_get_control_point (pattern, i, j, &x, &y);
+	    cairo_mesh_pattern_get_control_point (pattern, i, j, &x, &y);
 	    cairo_rectangle (cr, x - 5, y - 5, 10, 10);
 	    cairo_fill (cr);
 	}
diff --git a/test/mesh-pattern-fold.c b/test/mesh-pattern-fold.c
index 586b0cd9..4872bc01 100644
--- a/test/mesh-pattern-fold.c
+++ b/test/mesh-pattern-fold.c
@@ -44,26 +44,26 @@ draw (cairo_t *cr, int width, int height)
 
     pattern = cairo_pattern_create_mesh ();
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 1, 1);
+    cairo_mesh_pattern_move_to (pattern, 1, 1);
 
-    cairo_pattern_mesh_curve_to (pattern, 6, 0, -1, 0, 4, 1);
-    cairo_pattern_mesh_curve_to (pattern, 5, 6, 5, -1, 4, 4);
-    cairo_pattern_mesh_curve_to (pattern, -1, 3, 6, 3, 1, 4);
-    cairo_pattern_mesh_curve_to (pattern, 2, -1, 2, 6, 1, 1);
+    cairo_mesh_pattern_curve_to (pattern, 6, 0, -1, 0, 4, 1);
+    cairo_mesh_pattern_curve_to (pattern, 5, 6, 5, -1, 4, 4);
+    cairo_mesh_pattern_curve_to (pattern, -1, 3, 6, 3, 1, 4);
+    cairo_mesh_pattern_curve_to (pattern, 2, -1, 2, 6, 1, 1);
 
-    cairo_pattern_mesh_set_control_point (pattern, 0, 2, 3);
-    cairo_pattern_mesh_set_control_point (pattern, 1, 3, 3);
-    cairo_pattern_mesh_set_control_point (pattern, 2, 3, 2);
-    cairo_pattern_mesh_set_control_point (pattern, 3, 2, 2);
+    cairo_mesh_pattern_set_control_point (pattern, 0, 2, 3);
+    cairo_mesh_pattern_set_control_point (pattern, 1, 3, 3);
+    cairo_mesh_pattern_set_control_point (pattern, 2, 3, 2);
+    cairo_mesh_pattern_set_control_point (pattern, 3, 2, 2);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 0, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_scale (cr, SIZE, SIZE);
 
diff --git a/test/mesh-pattern-overlap.c b/test/mesh-pattern-overlap.c
index 63cf0243..5ecbf9f6 100644
--- a/test/mesh-pattern-overlap.c
+++ b/test/mesh-pattern-overlap.c
@@ -46,20 +46,20 @@ draw (cairo_t *cr, int width, int height)
 
     pattern = cairo_pattern_create_mesh ();
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 0, 0);
-    cairo_pattern_mesh_curve_to (pattern,  30, -30, 60,  30, 100, 0);
-    cairo_pattern_mesh_curve_to (pattern, 130, 140, 60, -40, 100, 100);
-    cairo_pattern_mesh_curve_to (pattern,  60,  70, 30, 130,   0, 100);
-    cairo_pattern_mesh_curve_to (pattern, -30, -40, 30, 140,   0, 0);
+    cairo_mesh_pattern_move_to (pattern, 0, 0);
+    cairo_mesh_pattern_curve_to (pattern,  30, -30, 60,  30, 100, 0);
+    cairo_mesh_pattern_curve_to (pattern, 130, 140, 60, -40, 100, 100);
+    cairo_mesh_pattern_curve_to (pattern,  60,  70, 30, 130,   0, 100);
+    cairo_mesh_pattern_curve_to (pattern, -30, -40, 30, 140,   0, 0);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_set_source (cr, pattern);
     cairo_paint (cr);
diff --git a/test/mesh-pattern-transformed.c b/test/mesh-pattern-transformed.c
index 278e4a8c..a5c20e75 100644
--- a/test/mesh-pattern-transformed.c
+++ b/test/mesh-pattern-transformed.c
@@ -48,38 +48,38 @@ draw (cairo_t *cr, int width, int height)
 
     pattern = cairo_pattern_create_mesh ();
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 0, 0);
-    cairo_pattern_mesh_curve_to (pattern, 30, -30,  60,  30, 100, 0);
-    cairo_pattern_mesh_curve_to (pattern, 60,  30, 130,  60, 100, 100);
-    cairo_pattern_mesh_curve_to (pattern, 60,  70,  30, 130,   0, 100);
-    cairo_pattern_mesh_curve_to (pattern, 30,  70, -30,  30,   0, 0);
+    cairo_mesh_pattern_move_to (pattern, 0, 0);
+    cairo_mesh_pattern_curve_to (pattern, 30, -30,  60,  30, 100, 0);
+    cairo_mesh_pattern_curve_to (pattern, 60,  30, 130,  60, 100, 100);
+    cairo_mesh_pattern_curve_to (pattern, 60,  70,  30, 130,   0, 100);
+    cairo_mesh_pattern_curve_to (pattern, 30,  70, -30,  30,   0, 0);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 50, 50);
-    cairo_pattern_mesh_curve_to (pattern, 80, 20, 110, 80, 150, 50);
+    cairo_mesh_pattern_move_to (pattern, 50, 50);
+    cairo_mesh_pattern_curve_to (pattern, 80, 20, 110, 80, 150, 50);
 
-    cairo_pattern_mesh_curve_to (pattern, 110, 80, 180, 110, 150, 150);
+    cairo_mesh_pattern_curve_to (pattern, 110, 80, 180, 110, 150, 150);
 
-    cairo_pattern_mesh_curve_to (pattern, 110, 120, 80, 180, 50, 150);
+    cairo_mesh_pattern_curve_to (pattern, 110, 120, 80, 180, 50, 150);
 
-    cairo_pattern_mesh_curve_to (pattern, 80, 120, 20, 80, 50, 50);
+    cairo_mesh_pattern_curve_to (pattern, 80, 120, 20, 80, 50, 50);
 
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, 0, 1, 0, 0, 0.3);
-    cairo_pattern_mesh_set_corner_color_rgb  (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, 2, 0, 0, 1, 0.3);
-    cairo_pattern_mesh_set_corner_color_rgb  (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, 0, 1, 0, 0, 0.3);
+    cairo_mesh_pattern_set_corner_color_rgb  (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, 2, 0, 0, 1, 0.3);
+    cairo_mesh_pattern_set_corner_color_rgb  (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_scale (cr, .5, .5);
 
diff --git a/test/mesh-pattern.c b/test/mesh-pattern.c
index bcd49be2..68f18304 100644
--- a/test/mesh-pattern.c
+++ b/test/mesh-pattern.c
@@ -49,35 +49,35 @@ draw (cairo_t *cr, int width, int height)
 
     pattern = cairo_pattern_create_mesh ();
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 0, 0);
-    cairo_pattern_mesh_curve_to (pattern, 30, -30,  60,  30, 100, 0);
-    cairo_pattern_mesh_curve_to (pattern, 60,  30, 130,  60, 100, 100);
-    cairo_pattern_mesh_curve_to (pattern, 60,  70,  30, 130,   0, 100);
-    cairo_pattern_mesh_curve_to (pattern, 30,  70, -30,  30,   0, 0);
+    cairo_mesh_pattern_move_to (pattern, 0, 0);
+    cairo_mesh_pattern_curve_to (pattern, 30, -30,  60,  30, 100, 0);
+    cairo_mesh_pattern_curve_to (pattern, 60,  30, 130,  60, 100, 100);
+    cairo_mesh_pattern_curve_to (pattern, 60,  70,  30, 130,   0, 100);
+    cairo_mesh_pattern_curve_to (pattern, 30,  70, -30,  30,   0, 0);
 
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 0, 1, 0, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 2, 0, 0, 1);
-    cairo_pattern_mesh_set_corner_color_rgb (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 0, 1, 0, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 2, 0, 0, 1);
+    cairo_mesh_pattern_set_corner_color_rgb (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
 
-    cairo_pattern_mesh_move_to (pattern, 50, 50);
-    cairo_pattern_mesh_curve_to (pattern,  80,  20, 110,  80, 150, 50);
-    cairo_pattern_mesh_curve_to (pattern, 110,  80, 180, 110, 150, 150);
-    cairo_pattern_mesh_curve_to (pattern, 110, 120,  80, 180,  50, 150);
-    cairo_pattern_mesh_curve_to (pattern,  80, 120,  20,  80,  50, 50);
+    cairo_mesh_pattern_move_to (pattern, 50, 50);
+    cairo_mesh_pattern_curve_to (pattern,  80,  20, 110,  80, 150, 50);
+    cairo_mesh_pattern_curve_to (pattern, 110,  80, 180, 110, 150, 150);
+    cairo_mesh_pattern_curve_to (pattern, 110, 120,  80, 180,  50, 150);
+    cairo_mesh_pattern_curve_to (pattern,  80, 120,  20,  80,  50, 50);
 
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, 0, 1, 0, 0, 0.3);
-    cairo_pattern_mesh_set_corner_color_rgb  (pattern, 1, 0, 1, 0);
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, 2, 0, 0, 1, 0.3);
-    cairo_pattern_mesh_set_corner_color_rgb  (pattern, 3, 1, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, 0, 1, 0, 0, 0.3);
+    cairo_mesh_pattern_set_corner_color_rgb  (pattern, 1, 0, 1, 0);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, 2, 0, 0, 1, 0.3);
+    cairo_mesh_pattern_set_corner_color_rgb  (pattern, 3, 1, 1, 0);
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
 
     cairo_set_source (cr, pattern);
     cairo_paint (cr);
diff --git a/test/pattern-getters.c b/test/pattern-getters.c
index 2d7d9048..da56db4b 100644
--- a/test/pattern-getters.c
+++ b/test/pattern-getters.c
@@ -189,7 +189,7 @@ draw (cairo_t *cr, int width, int height)
 	int i;
 	pat = cairo_pattern_create_mesh ();
 
-	status = cairo_pattern_mesh_get_patch_count (pat, &count);
+	status = cairo_mesh_pattern_get_patch_count (pat, &count);
 	CHECK_SUCCESS;
 
 	if (count != 0) {
@@ -197,13 +197,13 @@ draw (cairo_t *cr, int width, int height)
 	    return CAIRO_TEST_FAILURE;
 	}
 
-	cairo_pattern_mesh_begin_patch (pat);
-	cairo_pattern_mesh_move_to (pat, 0, 0);
-	cairo_pattern_mesh_line_to (pat, 0, 3);
-	cairo_pattern_mesh_line_to (pat, 3, 3);
-	cairo_pattern_mesh_line_to (pat, 3, 0);
+	cairo_mesh_pattern_begin_patch (pat);
+	cairo_mesh_pattern_move_to (pat, 0, 0);
+	cairo_mesh_pattern_line_to (pat, 0, 3);
+	cairo_mesh_pattern_line_to (pat, 3, 3);
+	cairo_mesh_pattern_line_to (pat, 3, 0);
 
-	status = cairo_pattern_mesh_get_patch_count (pat, &count);
+	status = cairo_mesh_pattern_get_patch_count (pat, &count);
 	CHECK_SUCCESS;
 
 	if (count != 0) {
@@ -211,9 +211,9 @@ draw (cairo_t *cr, int width, int height)
 	    return CAIRO_TEST_FAILURE;
 	}
 
-	cairo_pattern_mesh_end_patch (pat);
+	cairo_mesh_pattern_end_patch (pat);
 
-	status = cairo_pattern_mesh_get_patch_count (pat, &count);
+	status = cairo_mesh_pattern_get_patch_count (pat, &count);
 	CHECK_SUCCESS;
 
 	if (count != 1) {
@@ -226,7 +226,7 @@ draw (cairo_t *cr, int width, int height)
 	    double cp_y[4] = { 1, 2, 2, 1 };
 	    double x, y;
 
-	    status = cairo_pattern_mesh_get_control_point (pat, 0, i, &x, &y);
+	    status = cairo_mesh_pattern_get_control_point (pat, 0, i, &x, &y);
 	    CHECK_SUCCESS;
 
 	    if (!CAIRO_TEST_DOUBLE_EQUALS(x,cp_x[i]) ||
@@ -237,18 +237,18 @@ draw (cairo_t *cr, int width, int height)
 	    }
 	}
 
-	cairo_pattern_mesh_begin_patch (pat);
-	cairo_pattern_mesh_move_to (pat, 0, 0);
-	cairo_pattern_mesh_line_to (pat, 1, 0);
-	cairo_pattern_mesh_line_to (pat, 1, 1);
-	cairo_pattern_mesh_set_corner_color_rgb (pat, 0, 1, 1, 1);
-	cairo_pattern_mesh_end_patch (pat);
+	cairo_mesh_pattern_begin_patch (pat);
+	cairo_mesh_pattern_move_to (pat, 0, 0);
+	cairo_mesh_pattern_line_to (pat, 1, 0);
+	cairo_mesh_pattern_line_to (pat, 1, 1);
+	cairo_mesh_pattern_set_corner_color_rgb (pat, 0, 1, 1, 1);
+	cairo_mesh_pattern_end_patch (pat);
 
 	for (i = 0; i < 4; i++) {
 	    double corner_color[4] = { 1, 0, 0, 1 };
 	    double a, r, g, b;
 
-	    status = cairo_pattern_mesh_get_corner_color_rgba (pat, 1, i,
+	    status = cairo_mesh_pattern_get_corner_color_rgba (pat, 1, i,
 							       &r, &g, &b, &a);
 	    CHECK_SUCCESS;
 
diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index e447b2e1..647975f7 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -3613,7 +3613,7 @@ _mesh_begin_patch (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_begin_patch (pattern);
+    cairo_mesh_pattern_begin_patch (pattern);
     return CSI_STATUS_SUCCESS;
 }
 
@@ -3648,7 +3648,7 @@ _mesh_curve_to (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_curve_to (pattern, x1, y1, x2, y2, x3, y3);
+    cairo_mesh_pattern_curve_to (pattern, x1, y1, x2, y2, x3, y3);
 
     pop (6);
     return CSI_STATUS_SUCCESS;
@@ -3666,7 +3666,7 @@ _mesh_end_patch (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_end_patch (pattern);
+    cairo_mesh_pattern_end_patch (pattern);
     return CSI_STATUS_SUCCESS;
 }
 
@@ -3689,7 +3689,7 @@ _mesh_line_to (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_line_to (pattern, x, y);
+    cairo_mesh_pattern_line_to (pattern, x, y);
 
     pop (2);
     return CSI_STATUS_SUCCESS;
@@ -3714,7 +3714,7 @@ _mesh_move_to (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_move_to (pattern, x, y);
+    cairo_mesh_pattern_move_to (pattern, x, y);
 
     pop (2);
     return CSI_STATUS_SUCCESS;
@@ -3743,7 +3743,7 @@ _mesh_set_control_point (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_set_control_point (pattern, point, x, y);
+    cairo_mesh_pattern_set_control_point (pattern, point, x, y);
 
     pop (3);
     return CSI_STATUS_SUCCESS;
@@ -3778,7 +3778,7 @@ _mesh_set_corner_color (csi_t *ctx)
     if (_csi_unlikely (status))
 	return status;
 
-    cairo_pattern_mesh_set_corner_color_rgba (pattern, corner, r, g, b, a);
+    cairo_mesh_pattern_set_corner_color_rgba (pattern, corner, r, g, b, a);
 
     pop (5);
     return CSI_STATUS_SUCCESS;