diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 0b5952112..be0199251 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -328,10 +328,10 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 		    crtc->x, crtc->y);
     }
 
-    if (crtc->funcs->pan &&
+    if (crtc->funcs->set_origin &&
 	memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
 	saved_rotation == rotation) {
-	crtc->funcs->pan (crtc, crtc->x, crtc->y);
+	crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
 	ret = TRUE;
 	goto done;
     }
@@ -428,12 +428,12 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
  * Pans the screen, does not change the mode
  */
 _X_EXPORT void
-xf86CrtcPan (xf86CrtcPtr crtc, int x, int y)
+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
 {
     crtc->x = x;
     crtc->y = y;
-    if (crtc->funcs->pan)
-	crtc->funcs->pan (crtc, x, y);
+    if (crtc->funcs->set_origin)
+	crtc->funcs->set_origin (crtc, x, y);
     else
 	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
 }
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 097935f57..295324185 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -218,7 +218,7 @@ typedef struct _xf86CrtcFuncs {
      * Callback for panning. Doesn't change the mode.
      */
     void
-    (*pan)(xf86CrtcPtr crtc, int x, int y);
+    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
 
 } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
 
@@ -695,7 +695,7 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 		 int x, int y);
 
 void
-xf86CrtcPan (xf86CrtcPtr crtc, int x, int y);
+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
 
 /*
  * Assign crtc rotation during mode set
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index fda2d25bf..3745f4fbb 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -164,7 +164,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
     if (newY <  crtc->panningTotalArea.y1)
 	newY =  crtc->panningTotalArea.y1;
     if (newX != crtc->x || newY != crtc->y)
-	xf86CrtcPan (crtc, newX, newY);
+	xf86CrtcSetOrigin (crtc, newX, newY);
 }
 
 static Bool