diff --git a/awesomerc b/awesomerc
index 1a0132892..999397b7f 100644
--- a/awesomerc
+++ b/awesomerc
@@ -169,7 +169,7 @@ mouse
     {
         modkey = {"Mod4"}
         button = "1"
-        command = "movemouse"
+        command = "client_movemouse"
     }
     client
     {
@@ -181,7 +181,7 @@ mouse
     {
         modkey = {"Mod4"}
         button = "3"
-        command = "resizemouse"
+        command = "client_resizemouse"
     }
 }
 
diff --git a/config.c b/config.c
index 6917ad217..09a4d52b8 100644
--- a/config.c
+++ b/config.c
@@ -103,8 +103,8 @@ const NameFuncLink UicbList[] = {
     {"reloadconfig", uicb_reloadconfig},
     {"setstatustext", uicb_setstatustext},
     /* mouse.c */
-    {"movemouse", uicb_movemouse},
-    {"resizemouse", uicb_resizemouse},
+    {"client_movemouse", uicb_client_movemouse},
+    {"client_resizemouse", uicb_client_resizemouse},
     {NULL, NULL}
 };
 
diff --git a/mouse.c b/mouse.c
index 5f3d7c943..20c948ab1 100644
--- a/mouse.c
+++ b/mouse.c
@@ -29,7 +29,7 @@
 #include "layouts/floating.h"
 
 void
-uicb_movemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unused)))
+uicb_client_movemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unused)))
 {
     int x1, y1, ocx, ocy, di, nx, ny;
     unsigned int dui;
@@ -92,7 +92,7 @@ uicb_movemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unus
 }
 
 void
-uicb_resizemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unused)))
+uicb_client_resizemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unused)))
 {
     int ocx, ocy, nw, nh;
     XEvent ev;
diff --git a/mouse.h b/mouse.h
index 2a80a493e..4da95de1e 100644
--- a/mouse.h
+++ b/mouse.h
@@ -26,8 +26,8 @@
 
 #define MOUSEMASK                       (BUTTONMASK | PointerMotionMask)
 
-UICB_PROTO(uicb_movemouse);
-UICB_PROTO(uicb_resizemouse);
+UICB_PROTO(uicb_client_movemouse);
+UICB_PROTO(uicb_client_resizemouse);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99