diff --git a/awesomerc b/awesomerc
index d0495426..cf0e4cbf 100644
--- a/awesomerc
+++ b/awesomerc
@@ -218,13 +218,13 @@ keys
     {
         modkey = {"Mod4"}
         key = "j"
-        command = "focusnext"
+        command = "client_focusnext"
     }
     key
     {
         modkey = {"Mod4"}
         key = "k"
-        command = "focusprev"
+        command = "client_focusprev"
     }
     key
     {
@@ -314,7 +314,7 @@ keys
     {
         modkey = {"Mod4"}
         key = "m"
-        command = "togglemax"
+        command = "client_togglemax"
     }
     key
     {
diff --git a/config.c b/config.c
index 859c462b..aaef34e4 100644
--- a/config.c
+++ b/config.c
@@ -81,12 +81,12 @@ const NameFuncLink UicbList[] = {
     {"tag_view_next", uicb_tag_viewnext},
     /* layout.c */
     {"setlayout", uicb_setlayout},
-    {"focusnext", uicb_focusnext},
-    {"focusprev", uicb_focusprev}, 
-    {"togglemax", uicb_togglemax},
-    {"toggleverticalmax", uicb_toggleverticalmax},
-    {"togglehorizontalmax", uicb_togglehorizontalmax},
-    {"zoom", uicb_zoom},
+    {"client_focusnext", uicb_client_focusnext},
+    {"client_focusprev", uicb_client_focusprev}, 
+    {"client_togglemax", uicb_client_togglemax},
+    {"client_toggleverticalmax", uicb_client_toggleverticalmax},
+    {"client_togglehorizontalmax", uicb_client_togglehorizontalmax},
+    {"client_zoom", uicb_client_zoom},
     /* layouts/tile.c */
     {"setmwfact", uicb_setmwfact},
     {"setnmaster", uicb_setnmaster},
diff --git a/layout.c b/layout.c
index 779537c6..f1292d85 100644
--- a/layout.c
+++ b/layout.c
@@ -82,8 +82,8 @@ get_current_layout(Tag *tags, int ntags)
 }
 
 void
-uicb_focusnext(awesome_config * awesomeconf,
-               const char *arg __attribute__ ((unused)))
+uicb_client_focusnext(awesome_config * awesomeconf,
+                      const char *arg __attribute__ ((unused)))
 {
     Client *c, *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
 
@@ -100,8 +100,8 @@ uicb_focusnext(awesome_config * awesomeconf,
 }
 
 void
-uicb_focusprev(awesome_config *awesomeconf,
-               const char *arg __attribute__ ((unused)))
+uicb_client_focusprev(awesome_config *awesomeconf,
+                      const char *arg __attribute__ ((unused)))
 {
     Client *c, *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
 
@@ -251,8 +251,8 @@ maximize(int x, int y, int w, int h, awesome_config *awesomeconf)
 }
 
 void
-uicb_togglemax(awesome_config *awesomeconf,
-               const char *arg __attribute__ ((unused)))
+uicb_client_togglemax(awesome_config *awesomeconf,
+                      const char *arg __attribute__ ((unused)))
 {
     ScreenInfo *si = get_screen_info(awesomeconf->display, awesomeconf->screen, &awesomeconf->statusbar);
 
@@ -264,8 +264,8 @@ uicb_togglemax(awesome_config *awesomeconf,
 }
 
 void
-uicb_toggleverticalmax(awesome_config *awesomeconf,
-                       const char *arg __attribute__ ((unused)))
+uicb_client_toggleverticalmax(awesome_config *awesomeconf,
+                              const char *arg __attribute__ ((unused)))
 {
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
     ScreenInfo *si = get_screen_info(awesomeconf->display, awesomeconf->screen, &awesomeconf->statusbar);
@@ -281,8 +281,8 @@ uicb_toggleverticalmax(awesome_config *awesomeconf,
 
 
 void
-uicb_togglehorizontalmax(awesome_config *awesomeconf,
-                         const char *arg __attribute__ ((unused)))
+uicb_client_togglehorizontalmax(awesome_config *awesomeconf,
+                                const char *arg __attribute__ ((unused)))
 {
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
     ScreenInfo *si = get_screen_info(awesomeconf->display, awesomeconf->screen, &awesomeconf->statusbar);
@@ -297,8 +297,8 @@ uicb_togglehorizontalmax(awesome_config *awesomeconf,
 }
 
 void
-uicb_zoom(awesome_config *awesomeconf,
-          const char *arg __attribute__ ((unused)))
+uicb_client_zoom(awesome_config *awesomeconf,
+                 const char *arg __attribute__ ((unused)))
 {
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
 
diff --git a/layout.h b/layout.h
index b975433c..3c725246 100644
--- a/layout.h
+++ b/layout.h
@@ -33,13 +33,13 @@ void restack(awesome_config *);
 void loadawesomeprops(awesome_config *);
 void saveawesomeprops(awesome_config *);
 
-UICB_PROTO(uicb_focusnext);
-UICB_PROTO(uicb_focusprev);
+UICB_PROTO(uicb_client_focusnext);
+UICB_PROTO(uicb_client_focusprev);
 UICB_PROTO(uicb_setlayout);
-UICB_PROTO(uicb_togglemax);
-UICB_PROTO(uicb_toggleverticalmax);
-UICB_PROTO(uicb_togglehorizontalmax);
-UICB_PROTO(uicb_zoom);
+UICB_PROTO(uicb_client_togglemax);
+UICB_PROTO(uicb_client_toggleverticalmax);
+UICB_PROTO(uicb_client_togglehorizontalmax);
+UICB_PROTO(uicb_client_zoom);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99