diff --git a/client.c b/client.c
index c4b5b822..4d95cceb 100644
--- a/client.c
+++ b/client.c
@@ -360,7 +360,7 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, int screen)
 
     /* Try to load props if any */
     if(!(retloadprops = client_loadprops(c, screen)))
-        move_client_to_screen(c, screen, true);
+        screen_client_moveto(c, screen, true);
 
     /* Then check clients hints */
     ewmh_check_client_hints(c);
@@ -538,7 +538,7 @@ client_resize(client_t *c, area_t geometry, bool hints)
         window_configure(c->win, geometry, c->border);
 
         if(c->screen != new_screen)
-            move_client_to_screen(c, new_screen, false);
+            screen_client_moveto(c, new_screen, false);
 
         resized = true;
     }
@@ -951,7 +951,7 @@ luaA_client_screen_set(lua_State *L)
     client_t **c = luaA_checkudata(L, 1, "client");
     int screen = luaL_checknumber(L, 2) - 1;
     luaA_checkscreen(screen);
-    move_client_to_screen(*c, screen, true);
+    screen_client_moveto(*c, screen, true);
     return 0;
 }
 
diff --git a/mouse.c b/mouse.c
index f5155ff8..d0c6edba 100644
--- a/mouse.c
+++ b/mouse.c
@@ -357,7 +357,7 @@ mouse_client_move(client_t *c, int snap)
                                                        mquery_pointer_r->root_x,
                                                        mquery_pointer_r->root_y)) != c->screen)
                     {
-                        move_client_to_screen(c, newscreen, true);
+                        screen_client_moveto(c, newscreen, true);
                         globalconf.screens[c->screen].need_arrange = true;
                         globalconf.screens[newscreen].need_arrange = true;
                         layout_refresh();
diff --git a/screen.c b/screen.c
index a0bc64d1..afe74d26 100644
--- a/screen.c
+++ b/screen.c
@@ -108,8 +108,8 @@ display_area_get(int phys_screen, statusbar_t *statusbar, padding_t *padding)
 
 /** This returns the real X screen number for a logical
  * screen if Xinerama is active.
- * \param screen the logical screen
- * \return the X screen
+ * \param screen The logical screen.
+ * \return The X screen.
  */
 int
 screen_virttophys(int screen)
@@ -119,14 +119,14 @@ screen_virttophys(int screen)
     return screen;
 }
 
-/** Move a client to a virtual screen
- * \param c the client
- * \param new_screen The destinatiuon screen
- * \param doresize set to true if we also move the client to the new x and
- *        y of the new screen
+/** Move a client to a virtual screen.
+ * \param c The client to move.
+ * \param new_screen The destinatiuon screen number.
+ * \param doresize Set to true if we also move the client to the new x and
+ *        y of the new screen.
  */
 void
-move_client_to_screen(client_t *c, int new_screen, bool doresize)
+screen_client_moveto(client_t *c, int new_screen, bool doresize)
 {
     tag_t *tag;
     int old_screen = c->screen;
diff --git a/screen.h b/screen.h
index 8d8cf3b9..ff132db9 100644
--- a/screen.h
+++ b/screen.h
@@ -27,7 +27,7 @@
 area_t screen_area_get(int, statusbar_t *, padding_t *);
 area_t display_area_get(int, statusbar_t *, padding_t *);
 int screen_virttophys(int);
-void move_client_to_screen(client_t *, int, bool);
+void screen_client_moveto(client_t *, int, bool);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80