diff --git a/bar/layoutindicator.c b/bar/layoutindicator.c
index 392f4f7..ecd6faa 100644
--- a/bar/layoutindicator.c
+++ b/bar/layoutindicator.c
@@ -24,6 +24,6 @@ click_ltsymbol(Bar *bar, Arg *arg, BarClickArg *a)
     if (selmon->hidelayout) {
         return 0;
     } else {
-	   return ClkLtSymbol;
+	   return clicklayout;
     }
 }
diff --git a/bar/statusbar-basic.c b/bar/statusbar-basic.c
index c8a5064..71574e1 100644
--- a/bar/statusbar-basic.c
+++ b/bar/statusbar-basic.c
@@ -26,6 +26,6 @@ click_status_basic(Bar *bar, Arg *arg, BarClickArg *a)
     if (selmon->hidestatus) {
         return 0;
     } else {
-	    return ClkStatusText;
+	    return clickstatusbar;
     }
 }
diff --git a/bar/statusbar-powerline.c b/bar/statusbar-powerline.c
index 6ca325c..5103955 100644
--- a/bar/statusbar-powerline.c
+++ b/bar/statusbar-powerline.c
@@ -4,7 +4,7 @@ click_status_pwl(Bar *bar, Arg *arg, BarClickArg *a)
     if (selmon->hidestatus) {
         return 0;
     } else {
-        return ClkStatusText;
+        return clickstatusbar;
     }
 }
 
diff --git a/bar/statusbar.c b/bar/statusbar.c
index f83ff8f..1b57a55 100644
--- a/bar/statusbar.c
+++ b/bar/statusbar.c
@@ -196,7 +196,7 @@ click_status_text(Arg *arg, int rel_x, char *text)
 		}
 	}
     #endif
-	return ClkStatusText;
+	return clickstatusbar;
 }
 
 void
diff --git a/bar/tags-powerline.c b/bar/tags-powerline.c
index 137d971..36da8df 100644
--- a/bar/tags-powerline.c
+++ b/bar/tags-powerline.c
@@ -128,5 +128,5 @@ click_tags_pwl(Bar *bar, Arg *arg, BarClickArg *a)
 	if (i < LENGTH(tags)) {
 		arg->ui = 1 << i;
 	}
-	return ClkTagBar;
+	return clicktags;
 }
diff --git a/bar/tags.c b/bar/tags.c
index 7643b24..c2e1ec7 100644
--- a/bar/tags.c
+++ b/bar/tags.c
@@ -101,5 +101,5 @@ click_tags(Bar *bar, Arg *arg, BarClickArg *a)
 	if (i < LENGTH(tags)) {
 		arg->ui = 1 << i;
 	}
-	return ClkTagBar;
+	return clicktags;
 }
diff --git a/bar/title-basic.c b/bar/title-basic.c
index bbc6d19..0941276 100644
--- a/bar/title-basic.c
+++ b/bar/title-basic.c
@@ -59,5 +59,5 @@ click_title_basic(Bar *bar, Arg *arg, BarClickArg *a)
         return 0;
     }
 
-	return ClkWinTitle;
+	return clicktitle;
 }
diff --git a/bar/title.c b/bar/title.c
index e6f5493..d95be4c 100644
--- a/bar/title.c
+++ b/bar/title.c
@@ -100,7 +100,7 @@ click_title(Bar *bar, Arg *arg, BarClickArg *a)
 
 	if (c) {
 		arg->v = c;
-		return ClkWinTitle;
+		return clicktitle;
 	}
 	return -1;
 }
diff --git a/mouse.h b/mouse.h
index dff37ce..040e8fc 100644
--- a/mouse.h
+++ b/mouse.h
@@ -6,11 +6,12 @@
  *
  * To disable all mouse binds, edit toggle.h.
  *
- * ClkLtSymbol - Layout icon
- * ClkWinTitle - Window title
- * ClkStatusText - Status text
- * ClkRootWin - Root window (background)
- * ClkTagBar - Tags
+ * clicklayout - Layout icon
+ * clicktitle - Window title
+ * clickstatusbar - Status text
+ * clickroot - Root window (background)
+ * clicktags - Tags
+ * clickclient - Window
  *
  * Button1 - Left click
  * Button2 - Middle click
@@ -21,25 +22,25 @@
 
 /* Actions when the mouse clicks a part of the screen */
 static const Button buttons[] = {
-	/* click         event mask                button      function                 argument */
-	{ ClkLtSymbol,   0,                        Button2,    spawn,                   cmd( "speedwm-utils layout" ) },
-	{ ClkLtSymbol,   0,                        Button1,    cyclelayout,             {.i = +1 } },
-	{ ClkLtSymbol,   0,                        Button3,    cyclelayout,             {.i = -1 } },
-	{ ClkLtSymbol,   0,                        Button4,    cyclelayout,             {.i = +1 } },
-	{ ClkLtSymbol,   0,                        Button5,    cyclelayout,             {.i = -1 } },
-	{ ClkWinTitle,   0,                        Button2,    zoom,                    {0} },
-	{ ClkClientWin,  MODIFIER1,                Button1,    moveorplace,             {.i = 1} },
-	{ ClkClientWin,  MODIFIER1,                Button2,    togglefloating,          {0} },
-	{ ClkClientWin,  MODIFIER1|ControlMask,    Button3,    dragcfact,               {0} },
-	{ ClkClientWin,  MODIFIER1,                Button3,    dragmfact,               {0} },
-	{ ClkStatusText, 0,                        Button1,    spawn,                   {.v = clickstatus } },
-	{ ClkStatusText, 0,                        Button2,    spawn,                   {.v = clickstatus } },
-	{ ClkStatusText, 0,                        Button3,    spawn,                   {.v = clickstatus } },
-	{ ClkWinTitle,   0,                        Button3,    spawn,                   cmd( "speedwm-utils" ) },
-	{ ClkRootWin,    0,                        Button3,    spawn,                   cmd( "j4-dmenu-desktop --term=st --dmenu='dmenu -l 20 -p Open:'" ) },
-	{ ClkTagBar,     0,                        Button1,    view,                    {0} },
-	{ ClkTagBar,     0,                        Button4,    viewtoleft,              {0} },
-	{ ClkTagBar,     0,                        Button5,    viewtoright,             {0} },
-	{ ClkTagBar,     MODIFIER1,                Button4,    viewtoleft_vacant,       {0} },
-	{ ClkTagBar,     MODIFIER1,                Button5,    viewtoright_vacant,      {0} },
+	/* click          event mask                button      function                 argument */
+	{ clicklayout,    0,                        Button2,    spawn,                   cmd( "speedwm-utils layout" ) },
+	{ clicklayout,    0,                        Button1,    cyclelayout,             {.i = +1 } },
+	{ clicklayout,    0,                        Button3,    cyclelayout,             {.i = -1 } },
+	{ clicklayout,    0,                        Button4,    cyclelayout,             {.i = +1 } },
+	{ clicklayout,    0,                        Button5,    cyclelayout,             {.i = -1 } },
+	{ clicktitle,     0,                        Button2,    zoom,                    {0} },
+	{ clickclient,    MODIFIER1,                Button1,    moveorplace,             {.i = 1} },
+	{ clickclient,    MODIFIER1,                Button2,    togglefloating,          {0} },
+	{ clickclient,    MODIFIER1|ControlMask,    Button3,    dragcfact,               {0} },
+	{ clickclient,    MODIFIER1,                Button3,    dragmfact,               {0} },
+	{ clickstatusbar, 0,                        Button1,    spawn,                   {.v = clickstatus } },
+	{ clickstatusbar, 0,                        Button2,    spawn,                   {.v = clickstatus } },
+	{ clickstatusbar, 0,                        Button3,    spawn,                   {.v = clickstatus } },
+	{ clicktitle,     0,                        Button3,    spawn,                   cmd( "speedwm-utils" ) },
+	{ clickroot,      0,                        Button3,    spawn,                   cmd( "j4-dmenu-desktop --term=st --dmenu='dmenu -l 20 -p Open:'" ) },
+	{ clicktags,      0,                        Button1,    view,                    {0} },
+	{ clicktags,      0,                        Button4,    viewtoleft,              {0} },
+	{ clicktags,      0,                        Button5,    viewtoright,             {0} },
+	{ clicktags,      MODIFIER1,                Button4,    viewtoleft_vacant,       {0} },
+	{ clicktags,      MODIFIER1,                Button5,    viewtoright_vacant,      {0} },
 };
diff --git a/speedwm.c b/speedwm.c
index 25df2c4..a4ab871 100644
--- a/speedwm.c
+++ b/speedwm.c
@@ -140,13 +140,13 @@ enum { WMClass,
 };
 
 /* clicks */
-enum { ClkTagBar,
-       ClkLtSymbol,
-       ClkStatusText,
-       ClkWinTitle,
-       ClkClientWin,
-       ClkRootWin,
-       ClkLast,
+enum { clicktags,
+       clicklayout,
+       clickstatusbar,
+       clicktitle,
+       clickclient,
+       clickroot,
+       clicklast,
 };
 
 #if USEIPC
@@ -1370,7 +1370,7 @@ buttonpress(XEvent *e)
 	const BarRule *br;
 	BarClickArg carg = { 0, 0, 0, 0 };
 
-	click = ClkRootWin;
+	click = clickroot;
 	/* focus monitor if necessary */
 	if ((m = wintomon(ev->window)) && m != selmon
 	) {
@@ -1403,17 +1403,17 @@ buttonpress(XEvent *e)
 		}
 	}
 
-	if (click == ClkRootWin && (c = wintoclient(ev->window))) {
+	if (click == clickroot && (c = wintoclient(ev->window))) {
 		focus(c);
 		restack(selmon);
 		XAllowEvents(dpy, ReplayPointer, CurrentTime);
-		click = ClkClientWin;
+		click = clickclient;
 	}
 
 	for (i = 0; i < LENGTH(buttons); i++) {
 		if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
 				&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
-			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+			buttons[i].func(click == clicktags && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 		}
 	}
 }
@@ -2613,7 +2613,7 @@ grabbuttons(Client *c, int focused)
 				BUTTONMASK, GrabModeSync, GrabModeSync, None, None);
 		#if USEMOUSE
 		for (i = 0; i < LENGTH(buttons); i++)
-			if (buttons[i].click == ClkClientWin)
+			if (buttons[i].click == clickclient)
 				for (j = 0; j < LENGTH(modifiers); j++)
 					XGrabButton(dpy, buttons[i].button,
 						buttons[i].mask | modifiers[j],