diff --git a/src/core/display.c b/src/core/display.c
index 62c63e9d8..4da248c88 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1302,7 +1302,7 @@ meta_grab_op_should_block_wayland (MetaGrabOp op)
   if (op == META_GRAB_OP_NONE)
     return FALSE;
 
-  if (op == META_GRAB_OP_WAYLAND_CLIENT)
+  if (op == META_GRAB_OP_WAYLAND_POPUP)
     return FALSE;
 
   /* Clicking on a frame button needs us to deliver events to the
diff --git a/src/core/events.c b/src/core/events.c
index 7741d8ef9..62335437e 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -1703,7 +1703,7 @@ grab_op_should_block_mouse_events (MetaGrabOp op)
 {
   switch (op)
     {
-    case META_GRAB_OP_WAYLAND_CLIENT:
+    case META_GRAB_OP_WAYLAND_POPUP:
     case META_GRAB_OP_COMPOSITOR:
       return TRUE;
 
@@ -2165,7 +2165,7 @@ meta_display_handle_event (MetaDisplay        *display,
     bypass_wayland = TRUE;
 
   /* If a Wayland client has a grab, don't pass that through to Clutter */
-  if (display->grab_op == META_GRAB_OP_WAYLAND_CLIENT)
+  if (display->grab_op == META_GRAB_OP_WAYLAND_POPUP)
     bypass_clutter = TRUE;
 
   if (compositor && !bypass_wayland)
diff --git a/src/meta/common.h b/src/meta/common.h
index 6ae1d8918..457576b23 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -223,8 +223,8 @@ typedef enum
   /* Special grab op when the compositor asked for a grab */
   META_GRAB_OP_COMPOSITOR,
 
-  /* For when a client takes a popup grab */
-  META_GRAB_OP_WAYLAND_CLIENT,
+  /* For when a Wayland client takes a popup grab */
+  META_GRAB_OP_WAYLAND_POPUP,
 } MetaGrabOp;
 
 /**
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index ca7786587..19f03ea33 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -793,7 +793,7 @@ meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
       meta_display_begin_grab_op (window->display,
                                   window->screen,
                                   window,
-                                  META_GRAB_OP_WAYLAND_CLIENT,
+                                  META_GRAB_OP_WAYLAND_POPUP,
                                   FALSE, /* pointer_already_grabbed */
                                   FALSE, /* frame_action */
                                   1, /* button. XXX? */