diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index dee5cdd59..0c0a613b8 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -420,7 +420,7 @@ meta_wayland_init (void)
 
   if (meta_should_autostart_x11_display ())
     {
-      if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
+      if (!meta_xwayland_init (&compositor->xwayland_manager, compositor->wayland_display))
         g_error ("Failed to start X Wayland");
     }
 
@@ -471,7 +471,7 @@ meta_wayland_finalize (void)
 
   compositor = meta_wayland_compositor_get_default ();
 
-  meta_xwayland_stop (&compositor->xwayland_manager);
+  meta_xwayland_shutdown (&compositor->xwayland_manager);
   g_clear_pointer (&compositor->display_name, g_free);
 }
 
diff --git a/src/wayland/meta-xwayland-private.h b/src/wayland/meta-xwayland-private.h
index 9a109da66..ef5a3db51 100644
--- a/src/wayland/meta-xwayland-private.h
+++ b/src/wayland/meta-xwayland-private.h
@@ -25,14 +25,14 @@
 #include "wayland/meta-wayland-private.h"
 
 gboolean
-meta_xwayland_start (MetaXWaylandManager *manager,
-                     struct wl_display   *display);
+meta_xwayland_init (MetaXWaylandManager *manager,
+		    struct wl_display   *display);
 
 void
 meta_xwayland_complete_init (MetaDisplay *display);
 
 void
-meta_xwayland_stop (MetaXWaylandManager *manager);
+meta_xwayland_shutdown (MetaXWaylandManager *manager);
 
 /* wl_data_device/X11 selection interoperation */
 void     meta_xwayland_init_dnd         (void);
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index aa2844d33..04d2df865 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -547,7 +547,7 @@ on_displayfd_ready (int          fd,
 }
 
 static gboolean
-meta_xwayland_init_xserver (MetaXWaylandManager *manager)
+meta_xwayland_start_xserver (MetaXWaylandManager *manager)
 {
   int xwayland_client_fd[2];
   int displayfd[2];
@@ -621,8 +621,8 @@ meta_xwayland_init_xserver (MetaXWaylandManager *manager)
 }
 
 gboolean
-meta_xwayland_start (MetaXWaylandManager *manager,
-                     struct wl_display   *wl_display)
+meta_xwayland_init (MetaXWaylandManager *manager,
+                    struct wl_display   *wl_display)
 {
   if (!choose_xdisplay (manager))
     return FALSE;
@@ -631,7 +631,7 @@ meta_xwayland_start (MetaXWaylandManager *manager,
     return FALSE;
 
   manager->wayland_display = wl_display;
-  return meta_xwayland_init_xserver (manager);
+  return meta_xwayland_start_xserver (manager);
 }
 
 static void
@@ -657,7 +657,7 @@ meta_xwayland_complete_init (MetaDisplay *display)
 }
 
 void
-meta_xwayland_stop (MetaXWaylandManager *manager)
+meta_xwayland_shutdown (MetaXWaylandManager *manager)
 {
   char path[256];