diff --git a/awesomerc b/awesomerc
index d4cd49e2..55b0997c 100644
--- a/awesomerc
+++ b/awesomerc
@@ -332,7 +332,7 @@ keys
     {
         modkey = {"Mod4", "Shift"}
         key = "c"
-        command = "killclient"
+        command = "client_kill"
     }
     key
     {
diff --git a/client.c b/client.c
index 947a2c04..3579bcdb 100644
--- a/client.c
+++ b/client.c
@@ -762,8 +762,8 @@ uicb_moveresize(awesome_config *awesomeconf,
  * \ingroup ui_callback
  */
 void
-uicb_killclient(awesome_config *awesomeconf,
-                const char *arg __attribute__ ((unused)))
+uicb_client_kill(awesome_config *awesomeconf,
+                 const char *arg __attribute__ ((unused)))
 {
     XEvent ev;
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
diff --git a/client.h b/client.h
index 3ed7ecee..3fae3bd8 100644
--- a/client.h
+++ b/client.h
@@ -39,7 +39,7 @@ inline void updatesizehints(Client *);
 void updatetitle(Client *);
 void saveprops(Client *, int);
 
-UICB_PROTO(uicb_killclient);
+UICB_PROTO(uicb_client_kill);
 UICB_PROTO(uicb_moveresize);
 UICB_PROTO(uicb_settrans);
 UICB_PROTO(uicb_setborder);
diff --git a/config.c b/config.c
index 6571770a..a200749e 100644
--- a/config.c
+++ b/config.c
@@ -64,7 +64,7 @@ const NameFuncLink UicbList[] = {
     {"spawn", uicb_spawn},
     {"exec", uicb_exec},
     /* client.c */
-    {"killclient", uicb_killclient},
+    {"client_kill", uicb_client_kill},
     {"moveresize", uicb_moveresize},
     {"settrans", uicb_settrans},
     {"setborder", uicb_setborder},