diff --git a/tools/Makefile.common b/tools/Makefile.common
index 00b71e0..0bbc7bd 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
@@ -1,5 +1,5 @@
 #
-# tools/Makefile.common - Common items in ATSPI tool makefiles
+# tools/Makefile.common - Common items in ATRF tool makefiles
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
diff --git a/tools/include/atrf.h b/tools/include/atrf.h
index 430e7a1..f5e015f 100644
--- a/tools/include/atrf.h
+++ b/tools/include/atrf.h
@@ -19,7 +19,7 @@
 struct atrf_dsc;
 
 
-void *atrf_usb_handle(struct atrf_dsc *dsc); /* hack for atspi-id */
+void *atrf_usb_handle(struct atrf_dsc *dsc); /* hack for atrf-id */
 
 struct atrf_dsc *atrf_open(void);
 void atrf_close(struct atrf_dsc *dsc);
diff --git a/tools/lib/atrf.c b/tools/lib/atrf.c
index 42d84ac..9edad56 100644
--- a/tools/lib/atrf.c
+++ b/tools/lib/atrf.c
@@ -1,5 +1,5 @@
 /*
- * lib/atrf.c - ATSPI access functions library
+ * lib/atrf.c - ATRF access functions library
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
diff --git a/tools/lib/atusd.c b/tools/lib/atusd.c
index 13ba067..831989f 100644
--- a/tools/lib/atusd.c
+++ b/tools/lib/atusd.c
@@ -1,5 +1,5 @@
 /*
- * lib/atusd.c - ATSPI access functions library (uSD version)
+ * lib/atusd.c - ATRF access functions library (uSD version)
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger