diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile
index a657de5..479088b 100644
--- a/benchmarks/coremark/Makefile
+++ b/benchmarks/coremark/Makefile
@@ -1,3 +1,3 @@
-NAME = coremark-bench
+NAME = coremark
 SRCS = $(shell find src/ -name "*.c")
 include $(AM_HOME)/Makefile
diff --git a/benchmarks/dhrystone/Makefile b/benchmarks/dhrystone/Makefile
index 152f3e1..5021855 100644
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@@ -1,3 +1,3 @@
-NAME = dhrystone-bench
+NAME = dhrystone
 SRCS = dry.c
 include $(AM_HOME)/Makefile
diff --git a/benchmarks/micro/Makefile b/benchmarks/microbench/Makefile
similarity index 81%
rename from benchmarks/micro/Makefile
rename to benchmarks/microbench/Makefile
index 79b9fef..fb51024 100644
--- a/benchmarks/micro/Makefile
+++ b/benchmarks/microbench/Makefile
@@ -1,3 +1,3 @@
-NAME = micro-bench
+NAME = microbench
 SRCS = $(shell find src/ -name "*.c" -o -name "*.cc")
 include $(AM_HOME)/Makefile
diff --git a/benchmarks/micro/include/benchmark.h b/benchmarks/microbench/include/benchmark.h
similarity index 100%
rename from benchmarks/micro/include/benchmark.h
rename to benchmarks/microbench/include/benchmark.h
diff --git a/benchmarks/micro/src/15pz/15pz.cc b/benchmarks/microbench/src/15pz/15pz.cc
similarity index 100%
rename from benchmarks/micro/src/15pz/15pz.cc
rename to benchmarks/microbench/src/15pz/15pz.cc
diff --git a/benchmarks/micro/src/15pz/heap.h b/benchmarks/microbench/src/15pz/heap.h
similarity index 100%
rename from benchmarks/micro/src/15pz/heap.h
rename to benchmarks/microbench/src/15pz/heap.h
diff --git a/benchmarks/micro/src/15pz/puzzle.h b/benchmarks/microbench/src/15pz/puzzle.h
similarity index 100%
rename from benchmarks/micro/src/15pz/puzzle.h
rename to benchmarks/microbench/src/15pz/puzzle.h
diff --git a/benchmarks/micro/src/bench.c b/benchmarks/microbench/src/bench.c
similarity index 100%
rename from benchmarks/micro/src/bench.c
rename to benchmarks/microbench/src/bench.c
diff --git a/benchmarks/micro/src/bf/bf.c b/benchmarks/microbench/src/bf/bf.c
similarity index 100%
rename from benchmarks/micro/src/bf/bf.c
rename to benchmarks/microbench/src/bf/bf.c
diff --git a/benchmarks/micro/src/dinic/dinic.cc b/benchmarks/microbench/src/dinic/dinic.cc
similarity index 100%
rename from benchmarks/micro/src/dinic/dinic.cc
rename to benchmarks/microbench/src/dinic/dinic.cc
diff --git a/benchmarks/micro/src/fib/fib.c b/benchmarks/microbench/src/fib/fib.c
similarity index 100%
rename from benchmarks/micro/src/fib/fib.c
rename to benchmarks/microbench/src/fib/fib.c
diff --git a/benchmarks/micro/src/lzip/lzip.c b/benchmarks/microbench/src/lzip/lzip.c
similarity index 100%
rename from benchmarks/micro/src/lzip/lzip.c
rename to benchmarks/microbench/src/lzip/lzip.c
diff --git a/benchmarks/micro/src/lzip/quicklz.c b/benchmarks/microbench/src/lzip/quicklz.c
similarity index 100%
rename from benchmarks/micro/src/lzip/quicklz.c
rename to benchmarks/microbench/src/lzip/quicklz.c
diff --git a/benchmarks/micro/src/lzip/quicklz.h b/benchmarks/microbench/src/lzip/quicklz.h
similarity index 100%
rename from benchmarks/micro/src/lzip/quicklz.h
rename to benchmarks/microbench/src/lzip/quicklz.h
diff --git a/benchmarks/micro/src/md5/md5.c b/benchmarks/microbench/src/md5/md5.c
similarity index 100%
rename from benchmarks/micro/src/md5/md5.c
rename to benchmarks/microbench/src/md5/md5.c
diff --git a/benchmarks/micro/src/qsort/qsort.c b/benchmarks/microbench/src/qsort/qsort.c
similarity index 100%
rename from benchmarks/micro/src/qsort/qsort.c
rename to benchmarks/microbench/src/qsort/qsort.c
diff --git a/benchmarks/micro/src/queen/queen.c b/benchmarks/microbench/src/queen/queen.c
similarity index 100%
rename from benchmarks/micro/src/queen/queen.c
rename to benchmarks/microbench/src/queen/queen.c
diff --git a/benchmarks/micro/src/sieve/sieve.c b/benchmarks/microbench/src/sieve/sieve.c
similarity index 100%
rename from benchmarks/micro/src/sieve/sieve.c
rename to benchmarks/microbench/src/sieve/sieve.c
diff --git a/benchmarks/micro/src/ssort/ssort.cc b/benchmarks/microbench/src/ssort/ssort.cc
similarity index 100%
rename from benchmarks/micro/src/ssort/ssort.cc
rename to benchmarks/microbench/src/ssort/ssort.cc
diff --git a/kernels/hello/Makefile b/kernels/hello/Makefile
index c23e05f..db9464c 100644
--- a/kernels/hello/Makefile
+++ b/kernels/hello/Makefile
@@ -1,3 +1,3 @@
-NAME = hello-am
+NAME = hello
 SRCS = hello.c
 include $(AM_HOME)/Makefile