diff --git a/tools/atrf-id/Makefile b/tools/atrf-id/Makefile
index f35d10b..a3bfc40 100644
--- a/tools/atrf-id/Makefile
+++ b/tools/atrf-id/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi-id/Makefile - Build the ATSPI identification utility
+# atrf-id/Makefile - Build the ATRF identification utility
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,6 +11,6 @@
 #
 
 
-MAIN = atspi-id
+MAIN = atrf-id
 
 include ../Makefile.common
diff --git a/tools/atrf-id/atspi-id.c b/tools/atrf-id/atrf-id.c
similarity index 97%
rename from tools/atrf-id/atspi-id.c
rename to tools/atrf-id/atrf-id.c
index f283454..e0c9920 100644
--- a/tools/atrf-id/atspi-id.c
+++ b/tools/atrf-id/atrf-id.c
@@ -1,5 +1,5 @@
 /*
- * atspi-id/atspi-id.c - Identify a ben-wpan AT86RF230 board
+ * atrf-id/atrf-id.c - Identify a ben-wpan AT86RF230 board
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-reset/Makefile b/tools/atrf-reset/Makefile
index 7cafc86..15fdc83 100644
--- a/tools/atrf-reset/Makefile
+++ b/tools/atrf-reset/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi-reset/Makefile - Reset the transceiver or the whole board
+# atrf-reset/Makefile - Reset the transceiver or the whole board
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,6 +11,6 @@
 #
 
 
-MAIN = atspi-reset
+MAIN = atrf-reset
 
 include ../Makefile.common
diff --git a/tools/atrf-reset/atspi-reset.c b/tools/atrf-reset/atrf-reset.c
similarity index 94%
rename from tools/atrf-reset/atspi-reset.c
rename to tools/atrf-reset/atrf-reset.c
index 84873c1..bbfa384 100644
--- a/tools/atrf-reset/atspi-reset.c
+++ b/tools/atrf-reset/atrf-reset.c
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/atspi-rssi.c - ben-wpan AT86RF230 spectrum scan
+ * atrf-rssi/atrf-rssi.c - ben-wpan AT86RF230 spectrum scan
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/Makefile b/tools/atrf-rssi/Makefile
index 268e837..a1ef26d 100644
--- a/tools/atrf-rssi/Makefile
+++ b/tools/atrf-rssi/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi-rssi/Makefile - Build the spectrum scan utility
+# atrf-rssi/Makefile - Build the spectrum scan utility
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-MAIN = atspi-rssi
+MAIN = atrf-rssi
 
 include ../Makefile.common
 
diff --git a/tools/atrf-rssi/atspi-rssi.c b/tools/atrf-rssi/atrf-rssi.c
similarity index 97%
rename from tools/atrf-rssi/atspi-rssi.c
rename to tools/atrf-rssi/atrf-rssi.c
index 79eb282..07daf70 100644
--- a/tools/atrf-rssi/atspi-rssi.c
+++ b/tools/atrf-rssi/atrf-rssi.c
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/atspi-rssi.c - ben-wpan AT86RF230 spectrum scan
+ * atrf-rssi/atrf-rssi.c - ben-wpan AT86RF230 spectrum scan
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/digit.c b/tools/atrf-rssi/digit.c
index 101e355..7db5fe7 100644
--- a/tools/atrf-rssi/digit.c
+++ b/tools/atrf-rssi/digit.c
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/digit.c - Draw 7 segment style digits
+ * atrf-rssi/digit.c - Draw 7 segment style digits
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/digit.h b/tools/atrf-rssi/digit.h
index a727547..bbc98de 100644
--- a/tools/atrf-rssi/digit.h
+++ b/tools/atrf-rssi/digit.h
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/digit.h - Draw 7 segment style digits
+ * atrf-rssi/digit.h - Draw 7 segment style digits
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/gui.c b/tools/atrf-rssi/gui.c
index 7039c14..4f9a9f5 100644
--- a/tools/atrf-rssi/gui.c
+++ b/tools/atrf-rssi/gui.c
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/gui.c - Graphical output for atspi-rssi
+ * atrf-rssi/gui.c - Graphical output for atrf-rssi
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/gui.h b/tools/atrf-rssi/gui.h
index b089c4d..fe72dfd 100644
--- a/tools/atrf-rssi/gui.h
+++ b/tools/atrf-rssi/gui.h
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/gui.h - Graphical output for atspi-rssi
+ * atrf-rssi/gui.h - Graphical output for atrf-rssi
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/zgrid.c b/tools/atrf-rssi/zgrid.c
index c9422f1..724f506 100644
--- a/tools/atrf-rssi/zgrid.c
+++ b/tools/atrf-rssi/zgrid.c
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/zgrid.c - Display a surface in faux 3D with SDL/SDL_gfx
+ * atrf-rssi/zgrid.c - Display a surface in faux 3D with SDL/SDL_gfx
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-rssi/zgrid.h b/tools/atrf-rssi/zgrid.h
index a5db289..912e1f8 100644
--- a/tools/atrf-rssi/zgrid.h
+++ b/tools/atrf-rssi/zgrid.h
@@ -1,5 +1,5 @@
 /*
- * atspi-rssi/zgrid.h - Display a surface in faux 3D with SDL/SDL_gfx
+ * atrf-rssi/zgrid.h - Display a surface in faux 3D with SDL/SDL_gfx
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-trim/Makefile b/tools/atrf-trim/Makefile
index a434315..2e3b7fa 100644
--- a/tools/atrf-trim/Makefile
+++ b/tools/atrf-trim/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi-trim/Makefile - Build the oscillator trim utility
+# atrf-trim/Makefile - Build the oscillator trim utility
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,6 +11,6 @@
 #
 
 
-MAIN = atspi-trim
+MAIN = atrf-trim
 
 include ../Makefile.common
diff --git a/tools/atrf-trim/atspi-trim.c b/tools/atrf-trim/atrf-trim.c
similarity index 94%
rename from tools/atrf-trim/atspi-trim.c
rename to tools/atrf-trim/atrf-trim.c
index a5ab2c7..5e8f465 100644
--- a/tools/atrf-trim/atspi-trim.c
+++ b/tools/atrf-trim/atrf-trim.c
@@ -1,5 +1,5 @@
 /*
- * atspi-trim/atspi-trim.c - AT86RF230 oscillator trim utility
+ * atrf-trim/atrf-trim.c - AT86RF230 oscillator trim utility
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/atrf-txrx/Makefile b/tools/atrf-txrx/Makefile
index 43b8cc1..56bd71e 100644
--- a/tools/atrf-txrx/Makefile
+++ b/tools/atrf-txrx/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi-txrx/Makefile - Build the TX/RX test utility
+# atrf-txrx/Makefile - Build the TX/RX test utility
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-MAIN = atspi-txrx
+MAIN = atrf-txrx
 
 include ../Makefile.common
 
diff --git a/tools/atrf-txrx/atspi-txrx.c b/tools/atrf-txrx/atrf-txrx.c
similarity index 99%
rename from tools/atrf-txrx/atspi-txrx.c
rename to tools/atrf-txrx/atrf-txrx.c
index 7be6f08..8478115 100644
--- a/tools/atrf-txrx/atspi-txrx.c
+++ b/tools/atrf-txrx/atrf-txrx.c
@@ -1,5 +1,5 @@
 /*
- * atspi-txrx/atspi-txrx.c - ben-wpan AT86RF230 TX/RX
+ * atrf-txrx/atrf-txrx.c - ben-wpan AT86RF230 TX/RX
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger