diff --git a/Makefile b/Makefile
index bc18811879294948e94a948bcc24ef85d8af83b4..083fd101280d0baf29df0f567ddeec6d302d154f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 #
 
 cube-test: cube-test.c
-	cc -Wall -o cube-test cube-test.c
+	$(CC) -Wall -o $@ $<
 
 
 # vim:ft=make
diff --git a/cube-test.c b/cube-test.c
index 71a6c2e106d77c14755887713fce652643b8a5b5..a7d08dff683f563f08c18238ae39e63a111c8c6d 100644
--- a/cube-test.c
+++ b/cube-test.c
@@ -30,17 +30,17 @@ read_number() {
   return atoi(buf);
 }
 
-typedef struct timer_struct {
+typedef struct interval_timer_struct {
   struct timeval then;
-} timer_t;
+} interval_timer_t;
 
 void
-start_timer(timer_t *timer) {
+start_timer(interval_timer_t *timer) {
   gettimeofday(&timer->then, NULL);
 }
 
 long int
-end_timer(timer_t *timer) {
+end_timer(interval_timer_t *timer) {
   struct timeval now;
   long int delta;
 
@@ -68,7 +68,7 @@ humanize_usec(long int usec) {
 int
 main(int argc, char *argv[]) {
   int guess, number, iterations = 0, correct = 0;
-  timer_t timer;
+  interval_timer_t timer;
   long int delta, delta_total = 0;
 
   srand(time(NULL));