diff --git a/awesomerc b/awesomerc
index ca0894a7..f2c1ba27 100644
--- a/awesomerc
+++ b/awesomerc
@@ -326,7 +326,7 @@ keys
     {
         modkey = {"Mod4", "Control"}
         key = "space"
-        command = "togglefloating"
+        command = "client_togglefloating"
     }
     key
     {
diff --git a/config.c b/config.c
index 5ed29ebb..6da365f2 100644
--- a/config.c
+++ b/config.c
@@ -72,7 +72,7 @@ const NameFuncLink UicbList[] = {
     {"client_swapprev", uicb_client_swapprev},
     /* tag.c */
     {"client_tag", uicb_client_tag},
-    {"togglefloating", uicb_togglefloating},
+    {"client_togglefloating", uicb_client_togglefloating},
     {"toggleview", uicb_toggleview},
     {"toggletag", uicb_toggletag},
     {"view", uicb_view},
diff --git a/mouse.c b/mouse.c
index e987e504..5f3d7c94 100644
--- a/mouse.c
+++ b/mouse.c
@@ -43,7 +43,7 @@ uicb_movemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((unus
 
     if((get_current_layout(awesomeconf->tags, awesomeconf->ntags)->arrange != layout_floating)
         && !c->isfloating)
-         uicb_togglefloating(awesomeconf, "DUMMY");
+         uicb_client_togglefloating(awesomeconf, "DUMMY");
      else
          restack(awesomeconf);
 
@@ -103,7 +103,7 @@ uicb_resizemouse(awesome_config *awesomeconf, const char *arg __attribute__ ((un
 
     if((get_current_layout(awesomeconf->tags, awesomeconf->ntags)->arrange != layout_floating)
        && !c->isfloating)
-        uicb_togglefloating(awesomeconf, "DUMMY");
+        uicb_client_togglefloating(awesomeconf, "DUMMY");
     else
         restack(awesomeconf);
 
diff --git a/tag.c b/tag.c
index 49fcab21..d1c3de9a 100644
--- a/tag.c
+++ b/tag.c
@@ -90,7 +90,7 @@ uicb_client_tag(awesome_config *awesomeconf,
  * \ingroup ui_callback
  */
 void
-uicb_togglefloating(awesome_config * awesomeconf,
+uicb_client_togglefloating(awesome_config * awesomeconf,
                     const char *arg __attribute__ ((unused)))
 {
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
diff --git a/tag.h b/tag.h
index 9ec33cd1..d279313c 100644
--- a/tag.h
+++ b/tag.h
@@ -31,7 +31,7 @@ Bool isvisible(Client *, int, Tag *, int);
 void tag_client_with_current_selected(Client *, awesome_config *);
 
 UICB_PROTO(uicb_client_tag);
-UICB_PROTO(uicb_togglefloating);
+UICB_PROTO(uicb_client_togglefloating);
 UICB_PROTO(uicb_toggletag);
 UICB_PROTO(uicb_toggleview);
 UICB_PROTO(uicb_view);