Index: uspace/app/hbench/benchlist.c
===================================================================
--- uspace/app/hbench/benchlist.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/benchlist.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -39,10 +39,10 @@
 
 benchmark_t *benchmarks[] = {
-	&bench_dir_read,
-	&bench_file_read,
-	&bench_malloc1,
-	&bench_malloc2,
-	&bench_ns_ping,
-	&bench_ping_pong
+	&benchmark_dir_read,
+	&benchmark_file_read,
+	&benchmark_malloc1,
+	&benchmark_malloc2,
+	&benchmark_ns_ping,
+	&benchmark_ping_pong
 };
 
Index: uspace/app/hbench/fs/dirread.c
===================================================================
--- uspace/app/hbench/fs/dirread.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/fs/dirread.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -69,5 +69,5 @@
 }
 
-benchmark_t bench_dir_read = {
+benchmark_t benchmark_dir_read = {
 	.name = "dir_read",
 	.desc = "Read contents of a directory (use 'dirname' param to alter the default).",
Index: uspace/app/hbench/fs/fileread.c
===================================================================
--- uspace/app/hbench/fs/fileread.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/fs/fileread.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -95,5 +95,5 @@
 }
 
-benchmark_t bench_file_read = {
+benchmark_t benchmark_file_read = {
 	.name = "file_read",
 	.desc = "Sequentially read contents of a file (use 'filename' param to alter the default).",
Index: uspace/app/hbench/hbench.h
===================================================================
--- uspace/app/hbench/hbench.h	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/hbench.h	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -66,10 +66,10 @@
 
 /* Put your benchmark descriptors here (and also to benchlist.c). */
-extern benchmark_t bench_dir_read;
-extern benchmark_t bench_file_read;
-extern benchmark_t bench_malloc1;
-extern benchmark_t bench_malloc2;
-extern benchmark_t bench_ns_ping;
-extern benchmark_t bench_ping_pong;
+extern benchmark_t benchmark_dir_read;
+extern benchmark_t benchmark_file_read;
+extern benchmark_t benchmark_malloc1;
+extern benchmark_t benchmark_malloc2;
+extern benchmark_t benchmark_ns_ping;
+extern benchmark_t benchmark_ping_pong;
 
 #endif
Index: uspace/app/hbench/ipc/ns_ping.c
===================================================================
--- uspace/app/hbench/ipc/ns_ping.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/ipc/ns_ping.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -59,5 +59,5 @@
 }
 
-benchmark_t bench_ns_ping = {
+benchmark_t benchmark_ns_ping = {
 	.name = "ns_ping",
 	.desc = "Name service IPC ping-pong benchmark",
Index: uspace/app/hbench/ipc/ping_pong.c
===================================================================
--- uspace/app/hbench/ipc/ping_pong.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/ipc/ping_pong.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -80,5 +80,5 @@
 }
 
-benchmark_t bench_ping_pong = {
+benchmark_t benchmark_ping_pong = {
 	.name = "ping_pong",
 	.desc = "IPC ping-pong benchmark",
Index: uspace/app/hbench/malloc/malloc1.c
===================================================================
--- uspace/app/hbench/malloc/malloc1.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/malloc/malloc1.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -55,5 +55,5 @@
 }
 
-benchmark_t bench_malloc1 = {
+benchmark_t benchmark_malloc1 = {
 	.name = "malloc1",
 	.desc = "User-space memory allocator benchmark, repeatedly allocate one block",
Index: uspace/app/hbench/malloc/malloc2.c
===================================================================
--- uspace/app/hbench/malloc/malloc2.c	(revision 77b01fe4b1170f3bc4616c973b8783a1bed2acdf)
+++ uspace/app/hbench/malloc/malloc2.c	(revision a787081a79dcfffa35f9e024d6587817108cf357)
@@ -72,5 +72,5 @@
 }
 
-benchmark_t bench_malloc2 = {
+benchmark_t benchmark_malloc2 = {
 	.name = "malloc2",
 	.desc = "User-space memory allocator benchmark, allocate many small blocks",