diff --git a/client.c b/client.c
index d2732d92e..3db6c17b6 100644
--- a/client.c
+++ b/client.c
@@ -216,9 +216,9 @@ client_ban(client_t *c)
         client_unfocus(c);
     xcb_unmap_window(globalconf.connection, c->win);
     if(c->ishidden)
-        window_setstate(c->win, XCB_WM_ICONIC_STATE);
+        window_state_set(c->win, XCB_WM_ICONIC_STATE);
     else
-        window_setstate(c->win, XCB_WM_WITHDRAWN_STATE);
+        window_state_set(c->win, XCB_WM_WITHDRAWN_STATE);
     if(c->titlebar && c->titlebar->position && c->titlebar->sw)
         xcb_unmap_window(globalconf.connection, c->titlebar->sw->window);
 }
@@ -664,7 +664,7 @@ void
 client_unban(client_t *c)
 {
     xcb_map_window(globalconf.connection, c->win);
-    window_setstate(c->win, XCB_WM_NORMAL_STATE);
+    window_state_set(c->win, XCB_WM_NORMAL_STATE);
     if(c->titlebar && c->titlebar->sw && c->titlebar->position)
         xcb_map_window(globalconf.connection, c->titlebar->sw->window);
 }
@@ -693,7 +693,7 @@ client_unmanage(client_t *c)
 
     xcb_ungrab_button(globalconf.connection, XCB_BUTTON_INDEX_ANY, c->win,
                       XUTIL_ANY_MODIFIER);
-    window_setstate(c->win, XCB_WM_WITHDRAWN_STATE);
+    window_state_set(c->win, XCB_WM_WITHDRAWN_STATE);
 
     xcb_aux_sync(globalconf.connection);
     xcb_ungrab_server(globalconf.connection);
@@ -1157,7 +1157,7 @@ luaA_client_newindex(lua_State *L)
       case A_TK_OPACITY:
         d = luaL_checknumber(L, 3);
         if(d == -1 || (d >= 0 && d <= 1))
-            window_settrans((*c)->win, d);
+            window_trans_set((*c)->win, d);
         break;
       case A_TK_FLOATING:
         client_setfloating(*c, luaA_checkboolean(L, 3));
diff --git a/event.c b/event.c
index 0f25199ea..8d79145a8 100644
--- a/event.c
+++ b/event.c
@@ -337,7 +337,7 @@ event_handle_enternotify(void *data __attribute__ ((unused)),
     if((c = client_getbytitlebarwin(ev->event))
        || (c = client_getbywin(ev->event)))
     {
-        window_grabbuttons(c->win, ev->root, c->buttons);
+        window_buttons_grab(c->win, ev->root, c->buttons);
         /* The idea behind saving pointer_x and pointer_y is Bob Marley powered.
          * this will allow us top drop some EnterNotify events and thus not giving
          * focus to windows appering under the cursor without a cursor move */
@@ -352,7 +352,7 @@ event_handle_enternotify(void *data __attribute__ ((unused)),
                           xutil_screen_get(connection, emwin->phys_screen)->root,
                           XUTIL_ANY_MODIFIER);
     else
-        window_root_grabbuttons(ev->root);
+        window_root_buttons_grab(ev->root);
 
     return 0;
 }
diff --git a/layout.c b/layout.c
index ec98051aa..9850cc735 100644
--- a/layout.c
+++ b/layout.c
@@ -58,9 +58,9 @@ arrange(int screen)
     if((qp_r = xcb_query_pointer_reply(globalconf.connection, qp_c, NULL)))
     {
         if(qp_r->child == XCB_NONE || qp_r->root == qp_r->child)
-            window_root_grabbuttons(qp_r->root);
+            window_root_buttons_grab(qp_r->root);
         else if ((c = client_getbywin(qp_r->child)))
-            window_grabbuttons(c->win, qp_r->root, c->buttons);
+            window_buttons_grab(c->win, qp_r->root, c->buttons);
 
         globalconf.pointer_x = qp_r->root_x;
         globalconf.pointer_y = qp_r->root_y;
diff --git a/systray.c b/systray.c
index e10f31f90..0918263f2 100644
--- a/systray.c
+++ b/systray.c
@@ -109,7 +109,7 @@ systray_request_handle(xcb_window_t embed_win, int phys_screen, xembed_info_t *i
 
     xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK,
                                  select_input_val);
-    window_setstate(embed_win, XCB_WM_WITHDRAWN_STATE);
+    window_state_set(embed_win, XCB_WM_WITHDRAWN_STATE);
 
     em = p_new(xembed_window_t, 1);
     em->win = embed_win;
diff --git a/window.c b/window.c
index fa37b17a0..1d54c1af5 100644
--- a/window.c
+++ b/window.c
@@ -35,7 +35,7 @@ extern awesome_t globalconf;
  * \param state The state to set.
  */
 void
-window_setstate(xcb_window_t win, long state)
+window_state_set(xcb_window_t win, long state)
 {
     long data[] = { state, XCB_NONE };
     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, win,
@@ -105,7 +105,7 @@ window_configure(xcb_window_t win, area_t geometry, int border)
  * \param buttons The buttons to grab.
  */
 void
-window_grabbuttons(xcb_window_t win, xcb_window_t root, button_t *buttons)
+window_buttons_grab(xcb_window_t win, xcb_window_t root, button_t *buttons)
 {
     button_t *b;
 
@@ -132,7 +132,7 @@ window_grabbuttons(xcb_window_t win, xcb_window_t root, button_t *buttons)
  * \param root The root window.
  */
 void
-window_root_grabbuttons(xcb_window_t root)
+window_root_buttons_grab(xcb_window_t root)
 {
     button_t *b;
 
@@ -158,7 +158,7 @@ window_root_grabbuttons(xcb_window_t root)
  * \param opacity Opacity of the window, between 0 and 1.
  */
 void
-window_settrans(xcb_window_t win, double opacity)
+window_trans_set(xcb_window_t win, double opacity)
 {
     unsigned int real_opacity = 0xffffffff;
 
diff --git a/window.h b/window.h
index 05e5a82e7..96c28a3e2 100644
--- a/window.h
+++ b/window.h
@@ -24,13 +24,13 @@
 
 #include "structs.h"
 
-void window_setstate(xcb_window_t, long);
+void window_state_set(xcb_window_t, long);
 xcb_get_property_cookie_t window_state_get_unchecked(xcb_window_t);
 long window_state_get_reply(xcb_get_property_cookie_t);
 void window_configure(xcb_window_t, area_t, int);
-void window_grabbuttons(xcb_window_t, xcb_window_t, button_t *);
-void window_root_grabbuttons(xcb_window_t);
-void window_settrans(xcb_window_t, double);
+void window_buttons_grab(xcb_window_t, xcb_window_t, button_t *);
+void window_root_buttons_grab(xcb_window_t);
+void window_trans_set(xcb_window_t, double);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80