diff --git a/client.c b/client.c
index 65b85b69..3daa4578 100644
--- a/client.c
+++ b/client.c
@@ -137,7 +137,7 @@ get_client_bywin(Client *list, Window w)
 }
 
 void
-updatetitle(Client *c)
+client_updatetitle(Client *c)
 {
     if(!xgettextprop(c->display, c->win, XInternAtom(c->display, "_NET_WM_NAME", False), c->name, sizeof(c->name)))
         xgettextprop(c->display, c->win, XInternAtom(c->display, "WM_NAME", False), c->name, sizeof(c->name));
@@ -266,7 +266,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf, int
     move_client_to_screen(c, awesomeconf, screen, True);
 
     /* update window title */
-    updatetitle(c);
+    client_updatetitle(c);
 
     /* loadprops or apply rules if no props */
     if(!loadprops(c, &awesomeconf->screens[screen]))
@@ -310,7 +310,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf, int
     window_configure(c->display, c->win, c->x, c->y, c->w, c->h, c->border);
 
     /* update sizehint */
-    updatesizehints(c);
+    client_updatesizehints(c);
 
     XSelectInput(c->display, w, StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 
@@ -338,7 +338,7 @@ client_manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf, int
         c->isfloating = (rettrans == Success) || c->isfixed;
 
     /* save new props */
-    saveprops(c, &awesomeconf->screens[c->screen]);
+    client_saveprops(c, &awesomeconf->screens[c->screen]);
 
     /* attach to the stack */
     client_attach(&awesomeconf->clients, c);
@@ -442,7 +442,7 @@ client_resize(Client *c, int x, int y, int w, int h, awesome_config *awesomeconf
 }
 
 void
-saveprops(Client * c, VirtScreen *scr)
+client_saveprops(Client * c, VirtScreen *scr)
 {
     int i;
     char *prop;
@@ -497,7 +497,7 @@ client_unmanage(Client *c, long state, awesome_config *awesomeconf)
 }
 
 void
-updatesizehints(Client *c)
+client_updatesizehints(Client *c)
 {
     long msize;
     XSizeHints size;
diff --git a/client.h b/client.h
index 1ab5247f..476054ca 100644
--- a/client.h
+++ b/client.h
@@ -33,9 +33,9 @@ void client_manage(Window, XWindowAttributes *, awesome_config *, int);
 void client_resize(Client *, int, int, int, int, awesome_config *, Bool, Bool);
 void client_unban(Client *);
 void client_unmanage(Client *, long, awesome_config *);
-void updatesizehints(Client *);
-void updatetitle(Client *);
-void saveprops(Client *, VirtScreen *);
+void client_updatesizehints(Client *);
+void client_updatetitle(Client *);
+void client_saveprops(Client *, VirtScreen *);
 void tag_client_with_rules(Client *, awesome_config *);
 
 UICB_PROTO(uicb_client_kill);
diff --git a/event.c b/event.c
index 68516244..065a35f7 100644
--- a/event.c
+++ b/event.c
@@ -358,12 +358,12 @@ handle_event_propertynotify(XEvent * e, awesome_config *awesomeconf)
                 arrange(awesomeconf, c->screen);
             break;
           case XA_WM_NORMAL_HINTS:
-            updatesizehints(c);
+            client_updatesizehints(c);
             break;
         }
         if(ev->atom == XA_WM_NAME || ev->atom == XInternAtom(c->display, "_NET_WM_NAME", False))
         {
-            updatetitle(c);
+            client_updatetitle(c);
             if(c == get_current_tag(awesomeconf->screens[c->screen])->client_sel)
                 drawstatusbar(awesomeconf, c->screen);
         }
diff --git a/tag.c b/tag.c
index a2259ba3..742cdd31 100644
--- a/tag.c
+++ b/tag.c
@@ -157,7 +157,7 @@ uicb_client_tag(awesome_config *awesomeconf,
         tag_client(&awesomeconf->screens[screen].tclink, sel,
                    &awesomeconf->screens[screen].tags[tag_id]);
 
-    saveprops(sel, &awesomeconf->screens[screen]);
+    client_saveprops(sel, &awesomeconf->screens[screen]);
     arrange(awesomeconf, screen);
 }
 
@@ -182,7 +182,7 @@ uicb_client_togglefloating(awesome_config * awesomeconf,
     else
         client_resize(sel, sel->x, sel->y, sel->w, sel->h, awesomeconf, True, True);
 
-    saveprops(sel, &awesomeconf->screens[screen]);
+    client_saveprops(sel, &awesomeconf->screens[screen]);
     arrange(awesomeconf, screen);
 }
 
@@ -226,7 +226,7 @@ uicb_client_toggletag(awesome_config *awesomeconf,
         for(i = 0; i < awesomeconf->screens[screen].ntags; i++)
             tag_client(&awesomeconf->screens[screen].tclink, sel,&awesomeconf->screens[screen].tags[i]);
 
-    saveprops(sel, &awesomeconf->screens[screen]);
+    client_saveprops(sel, &awesomeconf->screens[screen]);
     arrange(awesomeconf, screen);
 }