diff --git a/tools/Makefile b/tools/Makefile
index 846e93f..2091692 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,5 @@
 #
-# tools/Makefile - Build the ATSPI-specific tools
+# tools/Makefile - Build the ATRF-specific tools
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-DIRS=atspi-id atspi-reset atspi-rssi atspi-trim atspi-txrx
+DIRS=atrf-id atrf-reset atrf-rssi atrf-trim atrf-txrx
 TARGET_ONLY_DIRS=lib
 
 include ../Makefile.recurse
diff --git a/tools/atspi-id/Makefile b/tools/atrf-id/Makefile
similarity index 100%
rename from tools/atspi-id/Makefile
rename to tools/atrf-id/Makefile
diff --git a/tools/atspi-id/atspi-id.c b/tools/atrf-id/atspi-id.c
similarity index 100%
rename from tools/atspi-id/atspi-id.c
rename to tools/atrf-id/atspi-id.c
diff --git a/tools/atspi-reset/Makefile b/tools/atrf-reset/Makefile
similarity index 100%
rename from tools/atspi-reset/Makefile
rename to tools/atrf-reset/Makefile
diff --git a/tools/atspi-reset/atspi-reset.c b/tools/atrf-reset/atspi-reset.c
similarity index 100%
rename from tools/atspi-reset/atspi-reset.c
rename to tools/atrf-reset/atspi-reset.c
diff --git a/tools/atspi-rssi/Makefile b/tools/atrf-rssi/Makefile
similarity index 100%
rename from tools/atspi-rssi/Makefile
rename to tools/atrf-rssi/Makefile
diff --git a/tools/atspi-rssi/atspi-rssi.c b/tools/atrf-rssi/atspi-rssi.c
similarity index 100%
rename from tools/atspi-rssi/atspi-rssi.c
rename to tools/atrf-rssi/atspi-rssi.c
diff --git a/tools/atspi-rssi/digit.c b/tools/atrf-rssi/digit.c
similarity index 100%
rename from tools/atspi-rssi/digit.c
rename to tools/atrf-rssi/digit.c
diff --git a/tools/atspi-rssi/digit.h b/tools/atrf-rssi/digit.h
similarity index 100%
rename from tools/atspi-rssi/digit.h
rename to tools/atrf-rssi/digit.h
diff --git a/tools/atspi-rssi/gui.c b/tools/atrf-rssi/gui.c
similarity index 100%
rename from tools/atspi-rssi/gui.c
rename to tools/atrf-rssi/gui.c
diff --git a/tools/atspi-rssi/gui.h b/tools/atrf-rssi/gui.h
similarity index 100%
rename from tools/atspi-rssi/gui.h
rename to tools/atrf-rssi/gui.h
diff --git a/tools/atspi-rssi/zgrid.c b/tools/atrf-rssi/zgrid.c
similarity index 100%
rename from tools/atspi-rssi/zgrid.c
rename to tools/atrf-rssi/zgrid.c
diff --git a/tools/atspi-rssi/zgrid.h b/tools/atrf-rssi/zgrid.h
similarity index 100%
rename from tools/atspi-rssi/zgrid.h
rename to tools/atrf-rssi/zgrid.h
diff --git a/tools/atspi-trim/Makefile b/tools/atrf-trim/Makefile
similarity index 100%
rename from tools/atspi-trim/Makefile
rename to tools/atrf-trim/Makefile
diff --git a/tools/atspi-trim/atspi-trim.c b/tools/atrf-trim/atspi-trim.c
similarity index 100%
rename from tools/atspi-trim/atspi-trim.c
rename to tools/atrf-trim/atspi-trim.c
diff --git a/tools/atspi-txrx/Makefile b/tools/atrf-txrx/Makefile
similarity index 100%
rename from tools/atspi-txrx/Makefile
rename to tools/atrf-txrx/Makefile
diff --git a/tools/atspi-txrx/atspi-txrx.c b/tools/atrf-txrx/atspi-txrx.c
similarity index 100%
rename from tools/atspi-txrx/atspi-txrx.c
rename to tools/atrf-txrx/atspi-txrx.c