diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index 087cbe696..4baadac86 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -51,28 +51,29 @@ static void
 set_cursor_surface (MetaWaylandSeat    *seat,
                     MetaWaylandSurface *surface)
 {
-  if (seat->sprite == surface)
+  if (seat->cursor_surface == surface)
     return;
 
-  if (seat->sprite)
-    wl_list_remove (&seat->sprite_destroy_listener.link);
+  if (seat->cursor_surface)
+    wl_list_remove (&seat->cursor_surface_destroy_listener.link);
 
-  seat->sprite = surface;
+  seat->cursor_surface = surface;
 
-  if (seat->sprite)
-    wl_resource_add_destroy_listener (seat->sprite->resource, &seat->sprite_destroy_listener);
+  if (seat->cursor_surface)
+    wl_resource_add_destroy_listener (seat->cursor_surface->resource,
+                                      &seat->cursor_surface_destroy_listener);
 }
 
 void
-meta_wayland_seat_update_sprite (MetaWaylandSeat *seat)
+meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat)
 {
   struct wl_resource *buffer;
 
   if (seat->cursor_tracker == NULL)
     return;
 
-  if (seat->sprite && seat->sprite->buffer_ref.buffer)
-    buffer = seat->sprite->buffer_ref.buffer->resource;
+  if (seat->cursor_surface && seat->cursor_surface->buffer_ref.buffer)
+    buffer = seat->cursor_surface->buffer_ref.buffer->resource;
   else
     buffer = NULL;
 
@@ -104,7 +105,7 @@ pointer_set_cursor (struct wl_client *client,
   seat->hotspot_x = x;
   seat->hotspot_y = y;
   set_cursor_surface (seat, surface);
-  meta_wayland_seat_update_sprite (seat);
+  meta_wayland_seat_update_cursor_surface (seat);
 }
 
 static const struct wl_pointer_interface pointer_interface = {
@@ -194,12 +195,12 @@ bind_seat (struct wl_client *client,
 }
 
 static void
-pointer_handle_sprite_destroy (struct wl_listener *listener, void *data)
+pointer_handle_cursor_surface_destroy (struct wl_listener *listener, void *data)
 {
-  MetaWaylandSeat *seat = wl_container_of (listener, seat, sprite_destroy_listener);
+  MetaWaylandSeat *seat = wl_container_of (listener, seat, cursor_surface_destroy_listener);
 
   set_cursor_surface (seat, NULL);
-  meta_wayland_seat_update_sprite (seat);
+  meta_wayland_seat_update_cursor_surface (seat);
 }
 
 MetaWaylandSeat *
@@ -220,8 +221,8 @@ meta_wayland_seat_new (struct wl_display *display,
 
   seat->current_stage = 0;
 
-  seat->sprite = NULL;
-  seat->sprite_destroy_listener.notify = pointer_handle_sprite_destroy;
+  seat->cursor_surface = NULL;
+  seat->cursor_surface_destroy_listener.notify = pointer_handle_cursor_surface_destroy;
   seat->hotspot_x = 16;
   seat->hotspot_y = 16;
 
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index dd2b85e72..f2c7fc249 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -66,9 +66,9 @@ struct _MetaWaylandSeat
   struct wl_display *display;
 
   MetaCursorTracker *cursor_tracker;
-  MetaWaylandSurface *sprite;
+  MetaWaylandSurface *cursor_surface;
   int hotspot_x, hotspot_y;
-  struct wl_listener sprite_destroy_listener;
+  struct wl_listener cursor_surface_destroy_listener;
 
   ClutterActor *current_stage;
 };
@@ -90,7 +90,7 @@ meta_wayland_seat_repick (MetaWaylandSeat    *seat,
 			  const ClutterEvent *for_event);
 
 void
-meta_wayland_seat_update_sprite (MetaWaylandSeat *seat);
+meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
 
 void
 meta_wayland_seat_free (MetaWaylandSeat *seat);
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 7a9001734..0e8ffae35 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -254,7 +254,7 @@ cursor_surface_commit (MetaWaylandSurface             *surface,
                        gboolean                        buffer_changed)
 {
   if (buffer_changed)
-    meta_wayland_seat_update_sprite (surface->compositor->seat);
+    meta_wayland_seat_update_cursor_surface (surface->compositor->seat);
 }
 
 static void
@@ -455,7 +455,7 @@ commit_double_buffered_state (MetaWaylandSurface             *surface,
       buffer_changed = TRUE;
     }
 
-  if (surface == compositor->seat->sprite)
+  if (surface == compositor->seat->cursor_surface)
     cursor_surface_commit (surface, pending, buffer_changed);
   else if (surface->window)
     toplevel_surface_commit (surface, pending, buffer_changed);