diff --git a/tools/atspi-id/atspi-id.c b/tools/atspi-id/atspi-id.c
index 565277d..0ef1f30 100644
--- a/tools/atspi-id/atspi-id.c
+++ b/tools/atspi-id/atspi-id.c
@@ -20,7 +20,7 @@
 
 #include "at86rf230.h"
 #include "atusb/ep0.h"
-#include "atspi.h"
+#include "atrf.h"
 
 
 #ifdef HAVE_USB
diff --git a/tools/atspi-reset/atspi-reset.c b/tools/atspi-reset/atspi-reset.c
index d834e23..40032cd 100644
--- a/tools/atspi-reset/atspi-reset.c
+++ b/tools/atspi-reset/atspi-reset.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "atspi.h"
+#include "atrf.h"
 
 
 static void usage(const char *name)
diff --git a/tools/atspi-rssi/atspi-rssi.c b/tools/atspi-rssi/atspi-rssi.c
index cf2203c..034b42e 100644
--- a/tools/atspi-rssi/atspi-rssi.c
+++ b/tools/atspi-rssi/atspi-rssi.c
@@ -18,7 +18,7 @@
 #include <sys/time.h>
 
 #include "at86rf230.h"
-#include "atspi.h"
+#include "atrf.h"
 #include "misctxrx.h"
 
 #ifdef HAVE_GFX
diff --git a/tools/atspi-rssi/gui.c b/tools/atspi-rssi/gui.c
index 1427135..5803503 100644
--- a/tools/atspi-rssi/gui.c
+++ b/tools/atspi-rssi/gui.c
@@ -21,7 +21,7 @@
 #include "SDL_gfxPrimitives.h"
 
 #include "at86rf230.h"
-#include "atspi.h"
+#include "atrf.h"
 #include "misctxrx.h"
 
 #include "zgrid.h"
diff --git a/tools/atspi-rssi/gui.h b/tools/atspi-rssi/gui.h
index cba2119..69ce037 100644
--- a/tools/atspi-rssi/gui.h
+++ b/tools/atspi-rssi/gui.h
@@ -13,7 +13,7 @@
 #ifndef GUI_H
 #define GUI_H
 
-#include "atspi.h"
+#include "atrf.h"
 
 
 void gui(struct atspi_dsc *dsc);
diff --git a/tools/atspi-trim/atspi-trim.c b/tools/atspi-trim/atspi-trim.c
index cfb786e..691ecb0 100644
--- a/tools/atspi-trim/atspi-trim.c
+++ b/tools/atspi-trim/atspi-trim.c
@@ -16,7 +16,7 @@
 #include <sys/time.h>
 
 #include "at86rf230.h"
-#include "atspi.h"
+#include "atrf.h"
 
 
 static void usage(const char *name)
diff --git a/tools/atspi-txrx/atspi-txrx.c b/tools/atspi-txrx/atspi-txrx.c
index ecab185..9233d9b 100644
--- a/tools/atspi-txrx/atspi-txrx.c
+++ b/tools/atspi-txrx/atspi-txrx.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 
 #include "at86rf230.h"
-#include "atspi.h"
+#include "atrf.h"
 #include "misctxrx.h"
 
 
diff --git a/tools/include/atspi.h b/tools/include/atrf.h
similarity index 90%
rename from tools/include/atspi.h
rename to tools/include/atrf.h
index aa188bf..aa436ae 100644
--- a/tools/include/atspi.h
+++ b/tools/include/atrf.h
@@ -1,5 +1,5 @@
 /*
- * include/atspi.h - ATSPI access functions library
+ * include/atrf.h - ATRF access functions library
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef ATSPI_H
-#define	ATSPI_H
+#ifndef ATRF_H
+#define	ATRF_H
 
 #include <stdint.h>
 
@@ -39,4 +39,4 @@ int atspi_buf_read(struct atspi_dsc *dsc, void *buf, int size);
 
 int atspi_interrupt(struct atspi_dsc *dsc);
 
-#endif /* !ATSPI_H */
+#endif /* !ATRF_H */
diff --git a/tools/include/misctxrx.h b/tools/include/misctxrx.h
index 5ae94e2..7961abf 100644
--- a/tools/include/misctxrx.h
+++ b/tools/include/misctxrx.h
@@ -15,7 +15,7 @@
 
 #include <stdint.h>
 
-#include "atspi.h"
+#include "atrf.h"
 
 
 uint8_t wait_for_interrupt(struct atspi_dsc *dsc, uint8_t wait_for,
diff --git a/tools/lib/atrf.c b/tools/lib/atrf.c
index 023d20b..ed8dd67 100644
--- a/tools/lib/atrf.c
+++ b/tools/lib/atrf.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 
 #include "driver.h"
-#include "atspi.h"
+#include "atrf.h"
 
 
 extern struct atspi_driver atusb_driver;
diff --git a/tools/lib/misctxrx.c b/tools/lib/misctxrx.c
index 7ea8492..66a5223 100644
--- a/tools/lib/misctxrx.c
+++ b/tools/lib/misctxrx.c
@@ -18,7 +18,7 @@
 #include <signal.h>
 
 #include "at86rf230.h"
-#include "atspi.h"
+#include "atrf.h"
 #include "misctxrx.h"