--- a/main.c	Mon Aug 21 07:31:15 2006 +0200
+++ b/main.c	Mon Aug 21 07:33:18 2006 +0200
@@ -63,7 +63,7 @@
 }
 
 static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 	int status, format;
 	unsigned long res, extra;
@@ -116,7 +116,7 @@
 	long res;
 	Atom *protocols;
 
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+	res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
 			((unsigned char **)&protocols));
 	if(res <= 0) {
 		return protos;

--- a/util.c	Mon Aug 21 07:31:15 2006 +0200
+++ b/util.c	Mon Aug 21 07:33:18 2006 +0200
@@ -12,7 +12,7 @@
 /* static */
 
 static void
-bad_malloc(unsigned int size)
+badmalloc(unsigned int size)
 {
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
@@ -25,7 +25,7 @@
 	void *res = calloc(1, size);
 
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
@@ -45,7 +45,7 @@
 {
 	void *res = realloc(ptr, size);
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }