--- a/aewl.c	Fri Dec 05 15:44:43 2008 +0100
+++ b/aewl.c	Fri Dec 05 16:03:45 2008 +0100
@@ -86,7 +86,7 @@
 	long flags;
 	unsigned int border;
 	Bool isfixed, isfloat, ismax;
-	Bool tag;
+	Bool group;
 	Client *next;
 	Client *prev;
 	Client *snext;
@@ -95,7 +95,7 @@
 
 typedef struct {
 	const char *clpattern;
-	int tag;
+	int group;
 	Bool isfloat;
 } Rule;
 
@@ -126,7 +126,7 @@
 void (*handler[LASTEvent])(XEvent *);	/* event handler */
 void (*arrange)(void);			/* arrange function, indicates mode  */
 Atom wmatom[WMLast], netatom[NetLast];
-Bool running, selscreen, seltag;
+Bool running, selscreen, selgroup;
 Client *clients, *sel, *stack;		/* global client list and stack */
 Cursor cursor[CurLast];
 DC dc;					/* global draw context */
@@ -177,7 +177,7 @@
 /* tag.c */
 void initrregs(void);			/* initialize regexps of rules defined in config.h */
 Client *getnext(Client *c);		/* returns next visible client */
-void settags(Client *c, Client *trans);	/* sets tags of c */
+void setgroup(Client *c, Client *trans);	/* sets group of c */
 
 /* util.c */
 void *emallocz(unsigned int size);	/* allocates zero-initialized memory, exits on error */
@@ -191,7 +191,7 @@
 void restack(void);			/* restores z layers of all clients */
 
 
-void toggleview(void);			/* toggle the viewed tag */
+void toggleview(void);			/* toggle the viewed group */
 void focusnext(void);		/* focuses next visible client  */
 void zoom(void);			/* zooms the focused client to master area */
 void killclient(void);		/* kill c nicely */
@@ -200,7 +200,7 @@
 void togglefloat(void);		/* toggles focusesd client between floating/non-floating state */
 void incnmaster(void);		/* increments nmaster */
 void decnmaster(void);		/* decrements nmaster */
-void toggletag(void);		/* toggles c tag */
+void togglegroup(void);		/* toggles c group */
 void spawn(const char* cmd);			/* forks a new subprocess with cmd */
 
 
@@ -388,10 +388,7 @@
 
 Bool
 isvisible(Client *c) {
-	if(c->tag == seltag) {
-		return True;
-	}
-	return False;
+	return (c->group == selgroup);
 }
 
 void
@@ -447,7 +444,7 @@
 
 void
 toggleview() {
-	seltag = !seltag;
+	selgroup = !selgroup;
 	arrange();
 }
 
@@ -581,15 +578,15 @@
 }
 
 void
-settags(Client *c, Client *trans) {
+setgroup(Client *c, Client *trans) {
 	char prop[512];
 	unsigned int i;
 	regmatch_t tmp;
-	Bool matched = trans != NULL;
+	Bool matched = (trans != NULL);
 	XClassHint ch = { 0 };
 
 	if(matched) {
-		c->tag = trans->tag;
+		c->group = trans->group;
 	} else {
 		XGetClassHint(dpy, c->win, &ch);
 		snprintf(prop, sizeof prop, "%s:%s:%s",
@@ -598,12 +595,12 @@
 		for(i = 0; i < len; i++)
 			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 1, &tmp, 0)) {
 				c->isfloat = rule[i].isfloat;
-				if (rule[i].tag < 0) {
-					c->tag = seltag;
-				} else if (rule[i].tag == 0) {
-					c->tag = True;
+				if (rule[i].group < 0) {
+					c->group = selgroup;
+				} else if (rule[i].group == 0) {
+					c->group = True;
 				} else {
-					c->tag = False;
+					c->group = False;
 				}
 				matched = True;
         break;  /* perform only the first rule matching */
@@ -614,15 +611,15 @@
 			XFree(ch.res_name);
 	}
 	if(!matched) {
-		c->tag = seltag;
+		c->group = selgroup;
 	}
 }
 
 void
-toggletag() {
+togglegroup() {
 	if(!sel)
 		return;
-	sel->tag = !sel->tag;
+	sel->group = !sel->group;
 	toggleview();
 }
 
@@ -1054,10 +1051,10 @@
 
 	dc.x = dc.y = 0;
 	dc.w = textw(NAMESEL);
-	drawtext(NAMESEL, ( seltag ? dc.sel : dc.norm ));
+	drawtext(NAMESEL, ( selgroup ? dc.sel : dc.norm ));
 	dc.x += dc.w + 1;
 	dc.w = textw(NAMENSEL);
-	drawtext(NAMENSEL, ( seltag ? dc.norm : dc.sel ));
+	drawtext(NAMENSEL, ( selgroup ? dc.norm : dc.sel ));
 	dc.x += dc.w + 1;
 	dc.w = bmw;
 	drawtext("", dc.norm);
@@ -1289,7 +1286,7 @@
 	Window trans;
 
 	c = emallocz(sizeof(Client));
-	c->tag = True;
+	c->group = True;
 	c->win = w;
 	c->x = wa->x;
 	c->y = wa->y;
@@ -1317,7 +1314,7 @@
 	grabbuttons(c, False);
 	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
 	updatetitle(c);
-	settags(c, getclient(trans));
+	setgroup(c, getclient(trans));
 	if(!c->isfloat)
 		c->isfloat = trans || c->isfixed;
 	if(clients)
@@ -1590,7 +1587,7 @@
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 	grabkeys();
 	initrregs();
-	seltag = True;
+	selgroup = True;
 	/* style */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = getcolor(NORMBGCOLOR);