diff --git a/pixman/update.pl b/pixman/update.pl
index 24bde5392..f59bdaf5d 100644
--- a/pixman/update.pl
+++ b/pixman/update.pl
@@ -109,3 +109,40 @@ s/IcImageSetTransform/pixman_image_set_transform/g;
 s/IcPixelToColor/pixman_pixel_to_color/g;
 # finally the type that is the most generic
 s/PixRegion/pixman_region16_t/g;
+
+# correct over-eager renames made above
+s/pixman_bits_tPerPixel/pixman_bits_per_pixel/g;
+s/pixman_color_tToPixel/pixman_color_to_pixel/g;
+s/pixman_format_tCreate/pixman_format_create/g;
+s/pixman_format_tCreateMasks/pixman_format_create_masks/g;
+s/pixman_format_tDestroy/pixman_format_destroy/g;
+s/pixman_format_tInit/pixman_format_init/g;
+s/pixman_image_tCreate/pixman_image_create/g;
+s/pixman_image_tCreateForData/pixman_image_create_for_data/g;
+s/pixman_image_tCreateForPixels/pixman_image_create_for_pixels/g;
+s/pixman_image_tDestroy/pixman_image_destroy/g;
+s/pixman_image_tDestroyClip/pixman_image_destroy_clip/g;
+s/pixman_image_tGetData/pixman_image_get_data/g;
+s/pixman_image_tGetDepth/pixman_image_get_depth/g;
+s/pixman_image_tGetHeight/pixman_image_get_height/g;
+s/pixman_image_tGetStride/pixman_image_get_stride/g;
+s/pixman_image_tGetWidth/pixman_image_get_width/g;
+s/pixman_image_tInit/pixman_image_init/g;
+s/pixman_image_tSetClipRegion/pixman_image_set_clip_region/g;
+s/pixman_image_tSetFilter/pixman_image_set_filter/g;
+s/pixman_image_tSetRepeat/pixman_image_set_repeat/g;
+s/pixman_image_tSetTransform/pixman_image_set_transform/g;
+s/pixman_line_fixed_tX/pixman_line_fixed_x/g;
+s/pixman_point_fixed_tBounds/pixman_point_fixed_bounds/g;
+s/pixman_region16_tBreak/pixman_break/g;
+s/pixman_region16_tBrokenData/pixman_brokendata/g;
+s/pixman_region16_tBrokenRegion/pixman_brokenregion/g;
+s/pixman_region16_tCoalesce/pixman_coalesce/g;
+s/pixman_region16_tInit/pixman_init/g;
+s/pixman_region16_tOp/pixman_op/g;
+s/pixman_region16_tRectAlloc/pixman_rect_alloc/g;
+s/pixman_region16_tSetExtents/pixman_set_extents/g;
+s/pixman_region16_tUninit/pixman_uninit/g;
+s/pixman_transform_tPoint/pixman_transform_point/g;
+s/pixman_trapezoid_tBounds/pixman_trapezoid_bounds/g;
+s/pixman_triangle_tBounds/pixman_triangle_bounds/g;