diff --git a/awesomerc b/awesomerc
index 434410dbb..ad0ad23c5 100644
--- a/awesomerc
+++ b/awesomerc
@@ -137,7 +137,7 @@ mouse
     {
         button = "3"
         modkey = {"Mod4"}
-        command = "toggletag"
+        command = "client_toggletag"
     }
     tag
     {
@@ -557,69 +557,69 @@ keys
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "0"
-        command = "toggletag"
+        command = "client_toggletag"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "1"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "1"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "2"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "2"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "3"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "3"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "4"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "4"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "5"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "5"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "6"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "6"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "7"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "7"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "8"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "8"
     }
     key
     {
         modkey = {"Mod4", "Shift", "Control"}
         key = "9"
-        command = "toggletag"
+        command = "client_toggletag"
         arg = "9"
     }
 }
diff --git a/config.c b/config.c
index 85f5e4273..bbffa547c 100644
--- a/config.c
+++ b/config.c
@@ -74,7 +74,7 @@ const NameFuncLink UicbList[] = {
     {"client_tag", uicb_client_tag},
     {"client_togglefloating", uicb_client_togglefloating},
     {"tag_toggleview", uicb_tag_toggleview},
-    {"toggletag", uicb_toggletag},
+    {"client_toggletag", uicb_client_toggletag},
     {"view", uicb_view},
     {"view_tag_prev_selected", uicb_tag_prev_selected},
     {"view_tag_previous", uicb_tag_viewprev},
diff --git a/tag.c b/tag.c
index 1b7152178..b13e58633 100644
--- a/tag.c
+++ b/tag.c
@@ -109,13 +109,13 @@ uicb_client_togglefloating(awesome_config * awesomeconf,
     arrange(awesomeconf);
 }
 
-/** Toggle tag view
+/** Toggle a tag on client
  * \param arg Tag name
  * \ingroup ui_callback
  */
 void
-uicb_toggletag(awesome_config *awesomeconf,
-               const char *arg)
+uicb_client_toggletag(awesome_config *awesomeconf,
+                      const char *arg)
 {
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
     unsigned int i;
diff --git a/tag.h b/tag.h
index 50b322df9..8592ca0ce 100644
--- a/tag.h
+++ b/tag.h
@@ -32,7 +32,7 @@ void tag_client_with_current_selected(Client *, awesome_config *);
 
 UICB_PROTO(uicb_client_tag);
 UICB_PROTO(uicb_client_togglefloating);
-UICB_PROTO(uicb_toggletag);
+UICB_PROTO(uicb_client_toggletag);
 UICB_PROTO(uicb_tag_toggleview);
 UICB_PROTO(uicb_view);
 UICB_PROTO(uicb_tag_prev_selected);