diff --git a/awesome.c b/awesome.c
index 107a5b0a5..530d9d299 100644
--- a/awesome.c
+++ b/awesome.c
@@ -63,7 +63,7 @@ cleanup(awesome_config *awesomeconf)
 
     while(*awesomeconf->clients)
     {
-        unban(*awesomeconf->clients);
+        client_unban(*awesomeconf->clients);
         client_unmanage(*awesomeconf->clients, NormalState, awesomeconf);
     }
 
diff --git a/client.c b/client.c
index 3c570dc4b..f7846b3ed 100644
--- a/client.c
+++ b/client.c
@@ -112,7 +112,7 @@ updatetitle(Client *c)
  * \param c the client
  */
 void
-ban(Client * c)
+client_ban(Client * c)
 {
     XUnmapWindow(c->display, c->win);
     window_setstate(c->display, c->win, IconicState);
@@ -477,7 +477,7 @@ saveprops(Client * c, int ntags)
 }
 
 void
-unban(Client *c)
+client_unban(Client *c)
 {
     XMapWindow(c->display, c->win);
     window_setstate(c->display, c->win, NormalState);
diff --git a/client.h b/client.h
index e1e2a9ec8..4032bd1ab 100644
--- a/client.h
+++ b/client.h
@@ -28,11 +28,11 @@ Client * get_client_bywin(Client *, Window);
 inline void client_attach(Client **, Client *);
 inline void client_detach(Client **, Client *);
 void client_reattach_after(Client *, Client *);
-void ban(Client *);
+void client_ban(Client *);
 void focus(Client *, Bool, awesome_config *);
 void client_manage(Window, XWindowAttributes *, awesome_config *);
 void client_resize(Client *, int, int, int, int, awesome_config *, Bool);
-void unban(Client *);
+void client_unban(Client *);
 void client_unmanage(Client *, long, awesome_config *);
 inline void updatesizehints(Client *);
 void updatetitle(Client *);
diff --git a/layout.c b/layout.c
index e96093ed0..6aef7b12e 100644
--- a/layout.c
+++ b/layout.c
@@ -58,10 +58,10 @@ arrange(awesome_config *awesomeconf)
     for(c = *awesomeconf->clients; c; c = c->next)
     {
         if(isvisible(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags))
-            unban(c);
+            client_unban(c);
         /* we don't touch other screens windows */
         else if(c->screen == awesomeconf->screen)
-            ban(c);
+            client_ban(c);
     }
     if ((curtag = get_current_tag_number(awesomeconf->tags, awesomeconf->ntags)) >= 0)
     {