diff --git a/ChangeLog b/ChangeLog
index ce89e7c7a..2df06c9c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-05-07  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-xcb-surface.c (_render_operator): 
+	* src/cairo-win32-surface.c (_cairo_win32_surface_composite)
+	(_cairo_win32_surface_fill_rectangles): Update to track new
+	CAIRO_OPERATOR names.
+
+	* test/select-font-no-show-text.c: 
+	* src/cairo-surface.c (cairo_surface_set_user_data): Fix
+	documentation to refer to functions by their current names.
+
+	* src/cairo-gstate.c (_cairo_gstate_begin_group): Update to track
+	latest API (in currently unused function).
+
 2005-05-06  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-glitz-surface.c (_cairo_glitz_surface_show_glyphs):
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 48a1324f6..e05cdcd8d 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -278,7 +278,7 @@ _cairo_gstate_begin_group (cairo_gstate_t *gstate)
     _cairo_surface_set_drawableWH (gstate->surface, pix, width, height);
 
     status = _cairo_surface_fill_rectangle (gstate->surface,
-                                   CAIRO_OPERATOR_SRC,
+                                   CAIRO_OPERATOR_SOURCE,
 				   &CAIRO_COLOR_TRANSPARENT,
 				   0, 0,
 			           _cairo_surface_get_width (gstate->surface),
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index b2ed96499..30162c962 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -364,7 +364,7 @@ cairo_surface_set_user_data (cairo_surface_t		 *surface,
  * way that is completely invisible to the user of the cairo
  * API. Setting a transformation via cairo_translate() isn't
  * sufficient to do this, since functions like
- * cairo_inverse_transform_point() will expose the hidden offset.
+ * cairo_device_to_user() will expose the hidden offset.
  *
  * Note that the offset only affects drawing to the surface, not using
  * the surface in a surface pattern.
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index e3e2e3a50..add86f09f 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -565,7 +565,7 @@ _cairo_win32_surface_composite (cairo_operator_t	operator,
 
     if (alpha == 255 &&
 	src->format == dst->format &&
-	(operator == CAIRO_OPERATOR_SRC ||
+	(operator == CAIRO_OPERATOR_SOURCE ||
 	 (src->format == CAIRO_FORMAT_RGB24 && operator == CAIRO_OPERATOR_OVER))) {
 	
 	if (!BitBlt (dst->dc,
@@ -626,11 +626,11 @@ _cairo_win32_surface_fill_rectangles (void			*abstract_surface,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     
     /* We could support possibly support more operators for color->alpha = 0xffff.
-     * for CAIRO_OPERATOR_SRC, alpha doesn't matter since we know the destination
+     * for CAIRO_OPERATOR_SOURCE, alpha doesn't matter since we know the destination
      * image doesn't have alpha. (surface->pixman_image is non-NULL for all
      * surfaces with alpha.)
      */
-    if (operator != CAIRO_OPERATOR_SRC)
+    if (operator != CAIRO_OPERATOR_SOURCE)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     new_color = RGB (color->red_short >> 8, color->green_short >> 8, color->blue_short >> 8);
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 240faef15..bf9082c6e 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -646,25 +646,25 @@ _render_operator (cairo_operator_t operator)
     switch (operator) {
     case CAIRO_OPERATOR_CLEAR:
 	return XCBRenderPictOpClear;
-    case CAIRO_OPERATOR_SRC:
+    case CAIRO_OPERATOR_SOURCE:
 	return XCBRenderPictOpSrc;
-    case CAIRO_OPERATOR_DST:
+    case CAIRO_OPERATOR_DEST:
 	return XCBRenderPictOpDst;
     case CAIRO_OPERATOR_OVER:
 	return XCBRenderPictOpOver;
-    case CAIRO_OPERATOR_OVER_REVERSE:
+    case CAIRO_OPERATOR_DEST_OVER:
 	return XCBRenderPictOpOverReverse;
     case CAIRO_OPERATOR_IN:
 	return XCBRenderPictOpIn;
-    case CAIRO_OPERATOR_IN_REVERSE:
+    case CAIRO_OPERATOR_DEST_IN:
 	return XCBRenderPictOpInReverse;
     case CAIRO_OPERATOR_OUT:
 	return XCBRenderPictOpOut;
-    case CAIRO_OPERATOR_OUT_REVERSE:
+    case CAIRO_OPERATOR_DEST_OUT:
 	return XCBRenderPictOpOutReverse;
     case CAIRO_OPERATOR_ATOP:
 	return XCBRenderPictOpAtop;
-    case CAIRO_OPERATOR_ATOP_REVERSE:
+    case CAIRO_OPERATOR_DEST_ATOP:
 	return XCBRenderPictOpAtopReverse;
     case CAIRO_OPERATOR_XOR:
 	return XCBRenderPictOpXor;
diff --git a/test/select-font-no-show-text.c b/test/select-font-no-show-text.c
index 8f7708fff..b99dfeaef 100644
--- a/test/select-font-no-show-text.c
+++ b/test/select-font-no-show-text.c
@@ -27,7 +27,7 @@
  *
  * 2005-04-12 Carl Worth <cworth@cworth.org>
  *
- *   I noticed that if we call cairo_select_font, but then do a
+ *   I noticed that if we call cairo_select_font_face, but then do a
  *   cairo_destroy before ever drawing any text, then we get:
  *
  *   *** glibc detected *** double free or corruption (fasttop): 0x083274d0 ***
@@ -43,7 +43,7 @@
 
 static cairo_test_t test = {
     "select-font-no-show-text",
-    "Test calling cairo_select_font but never drawing text.",
+    "Test calling cairo_select_font_face but never drawing text.",
     0, 0
 };