diff --git a/client.c b/client.c
index 4e93b848..4c129638 100644
--- a/client.c
+++ b/client.c
@@ -513,7 +513,7 @@ uicb_moveresize(Display *disp __attribute__ ((unused)),
     unsigned int dui;
     Window dummy;
 
-    if(!IS_ARRANGE(floating))
+    if(!IS_ARRANGE(layout_floating))
         if(!sel || !sel->isfloating || sel->isfixed || !arg)
             return;
     if(sscanf(arg, "%d%c %d%c %d%c %d%c", &x, &xabs, &y, &yabs, &w, &wabs, &h, &habs) != 8)
diff --git a/config.c b/config.c
index 3c2a3181..1bcaa8b1 100644
--- a/config.c
+++ b/config.c
@@ -71,9 +71,9 @@ static const KeyMod KeyModList[] =
 /** List of available layouts and link between name and functions */
 static const NameFuncLink LayoutsList[] =
 {
-    {"tile", tile},
-    {"tileleft", tileleft},
-    {"floating", floating},
+    {"tile", layout_tile},
+    {"tileleft", layout_tileleft},
+    {"floating", layout_floating},
     {NULL, NULL}
 };
 
@@ -166,9 +166,9 @@ set_default_config(awesome_config *awesomeconf)
     awesomeconf->nlayouts = 2;
     awesomeconf->layouts = p_new(Layout, awesomeconf->nlayouts + 1);
     awesomeconf->layouts[0].symbol = a_strdup("[]=");
-    awesomeconf->layouts[0].arrange = tile;
+    awesomeconf->layouts[0].arrange = layout_tile;
     awesomeconf->layouts[1].symbol = a_strdup("<><");
-    awesomeconf->layouts[1].arrange = floating;
+    awesomeconf->layouts[1].arrange = layout_floating;
     awesomeconf->layouts[2].symbol = NULL;
     awesomeconf->layouts[2].arrange = NULL;
 
diff --git a/event.c b/event.c
index 246b4fd8..4d986363 100644
--- a/event.c
+++ b/event.c
@@ -186,7 +186,7 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
             return;
         if(ev->button == Button1)
         {
-            if(!IS_ARRANGE(floating) && !c->isfloating)
+            if(!IS_ARRANGE(layout_floating) && !c->isfloating)
                 uicb_togglefloating(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL);
             else
                 restack(e->xany.display, &dc[c->screen], &awesomeconf[c->screen]);
@@ -194,14 +194,14 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
         }
         else if(ev->button == Button2)
         {
-            if(IS_ARRANGE(tile) && !c->isfixed && c->isfloating)
+            if(!IS_ARRANGE(layout_floating) && !c->isfixed && c->isfloating)
                 uicb_togglefloating(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL);
             else
                 uicb_zoom(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL);
         }
         else if(ev->button == Button3)
         {
-            if(!IS_ARRANGE(floating) && !c->isfloating)
+            if(!IS_ARRANGE(layout_floating) && !c->isfloating)
                 uicb_togglefloating(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL);
             else
                 restack(e->xany.display, &dc[c->screen], &awesomeconf[c->screen]);
@@ -231,7 +231,7 @@ handle_event_configurerequest(XEvent * e, awesome_config *awesomeconf)
         c->ismax = False;
         if(ev->value_mask & CWBorderWidth)
             c->border = ev->border_width;
-        if(c->isfixed || c->isfloating || IS_ARRANGE(floating))
+        if(c->isfixed || c->isfloating || IS_ARRANGE(layout_floating))
         {
             if(ev->value_mask & CWX)
                 c->x = ev->x;
diff --git a/layout.c b/layout.c
index f01446db..53b30255 100644
--- a/layout.c
+++ b/layout.c
@@ -118,9 +118,9 @@ restack(Display * disp, DC * drawcontext, awesome_config *awesomeconf)
     drawstatusbar(disp, awesomeconf->screen, drawcontext, awesomeconf);
     if(!sel)
         return;
-    if(sel->isfloating || IS_ARRANGE(floating))
+    if(sel->isfloating || IS_ARRANGE(layout_floating))
         XRaiseWindow(disp, sel->win);
-    if(!IS_ARRANGE(floating))
+    if(!IS_ARRANGE(layout_floating))
     {
         wc.stack_mode = Below;
         wc.sibling = awesomeconf->statusbar.window;
diff --git a/layouts/floating.c b/layouts/floating.c
index 8705a1b9..1652c1a8 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -27,7 +27,7 @@
 extern Client *clients;         /* global client */
 
 void
-floating(Display *disp __attribute__ ((unused)), awesome_config *awesomeconf)
+layout_floating(Display *disp __attribute__ ((unused)), awesome_config *awesomeconf)
 {                               /* default floating layout */
     Client *c;
 
diff --git a/layouts/floating.h b/layouts/floating.h
index e413991c..25214b17 100644
--- a/layouts/floating.h
+++ b/layouts/floating.h
@@ -23,6 +23,6 @@
 #ifndef AWESOME_FLOATING_H
 #define AWESOME_FLOATING_H
 
-void floating(Display *, awesome_config *);            /* floating layout */
+void layout_floating(Display *, awesome_config *);            /* floating layout */
 
 #endif
diff --git a/layouts/tile.c b/layouts/tile.c
index 81248c8e..59995ff2 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -37,7 +37,7 @@ uicb_setnmaster(Display *disp,
                 awesome_config *awesomeconf,
                 const char * arg)
 {
-    if(!arg || (!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)))
+    if(!arg || (IS_ARRANGE(layout_tile) && !IS_ARRANGE(layout_tileleft)))
         return;
 
     if((awesomeconf->nmaster = (int) compute_new_value_from_arg(arg, (double) awesomeconf->nmaster)) < 0)
@@ -52,7 +52,7 @@ uicb_setncols(Display *disp,
               awesome_config *awesomeconf,
               const char * arg)
 {
-    if(!arg || (!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft)))
+    if(!arg || (!IS_ARRANGE(layout_tile) && !IS_ARRANGE(layout_tileleft)))
         return;
 
     if((awesomeconf->ncols = (int) compute_new_value_from_arg(arg, (double) awesomeconf->ncols)) < 1)
@@ -67,7 +67,7 @@ uicb_setmwfact(Display *disp,
                awesome_config * awesomeconf,
                const char *arg)
 {
-    if(!IS_ARRANGE(tile) && !IS_ARRANGE(tileleft))
+    if(!IS_ARRANGE(layout_tile) && !IS_ARRANGE(layout_tileleft))
         return;
 
     if((awesomeconf->mwfact = compute_new_value_from_arg(arg, awesomeconf->mwfact)) < 0.1)
@@ -192,13 +192,13 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
 }
 
 void
-tile(Display *disp, awesome_config *awesomeconf)
+layout_tile(Display *disp, awesome_config *awesomeconf)
 {
     _tile(disp, awesomeconf, True);
 }
 
 void
-tileleft(Display *disp, awesome_config *awesomeconf)
+layout_tileleft(Display *disp, awesome_config *awesomeconf)
 {
     _tile(disp, awesomeconf, False);
 }
diff --git a/layouts/tile.h b/layouts/tile.h
index 138544bf..449106ea 100644
--- a/layouts/tile.h
+++ b/layouts/tile.h
@@ -28,7 +28,7 @@
 void uicb_setnmaster(Display *, DC *, awesome_config *, const char *);        /* change number of master windows */
 void uicb_setncols(Display *, DC *, awesome_config *, const char *);
 void uicb_setmwfact(Display *, DC *, awesome_config *, const char *);        /* sets master width factor */
-void tile(Display *, awesome_config *);
-void tileleft(Display *, awesome_config *);
+void layout_tile(Display *, awesome_config *);
+void layout_tileleft(Display *, awesome_config *);
 
 #endif