diff --git a/tools/lib/atrf.c b/tools/lib/atrf.c
index ed8dd67..c5df4c7 100644
--- a/tools/lib/atrf.c
+++ b/tools/lib/atrf.c
@@ -18,12 +18,12 @@
 #include "atrf.h"
 
 
-extern struct atspi_driver atusb_driver;
-extern struct atspi_driver atusd_driver;
+extern struct atrf_driver atusb_driver;
+extern struct atrf_driver atusd_driver;
 
 
 struct atspi_dsc {
-	struct atspi_driver *driver;
+	struct atrf_driver *driver;
 	void *handle;
 };
 
@@ -54,7 +54,7 @@ int atspi_clear_error(struct atspi_dsc *dsc)
 struct atspi_dsc *atspi_open(void)
 {
 	struct atspi_dsc *dsc;
-	struct atspi_driver *driver;
+	struct atrf_driver *driver;
 	void *handle;
 
 #ifdef HAVE_USB
diff --git a/tools/lib/atusb.c b/tools/lib/atusb.c
index 924c99c..41cfebd 100644
--- a/tools/lib/atusb.c
+++ b/tools/lib/atusb.c
@@ -230,7 +230,7 @@ static int atusd_interrupt(void *dsc)
 /* ----- driver interface -------------------------------------------------- */
 
 
-struct atspi_driver atusb_driver = {
+struct atrf_driver atusb_driver = {
 	.name		= "USB",
 	.open		= atusb_open,
 	.close		= atusb_close,
diff --git a/tools/lib/atusd.c b/tools/lib/atusd.c
index 176d5de..13ba067 100644
--- a/tools/lib/atusd.c
+++ b/tools/lib/atusd.c
@@ -314,7 +314,7 @@ static int atusd_interrupt(void *handle)
 /* ----- Driver interface -------------------------------------------------- */
 
 
-struct atspi_driver atusd_driver = {
+struct atrf_driver atusd_driver = {
 	.name		= "uSD",
 	.open		= atusd_open,
 	.close		= atusd_close,
diff --git a/tools/lib/driver.h b/tools/lib/driver.h
index d5e309b..6b291cd 100644
--- a/tools/lib/driver.h
+++ b/tools/lib/driver.h
@@ -1,5 +1,5 @@
 /*
- * lib/driver.h - ATSPI driver API
+ * lib/driver.h - ATRF driver API
  *
  * Written 2010 by Werner Almesberger
  * Copyright 2010 Werner Almesberger
@@ -17,7 +17,7 @@
 #include <stdint.h>
 
 
-struct atspi_driver {
+struct atrf_driver {
 	const char *name;
 	void *(*open)(void);
 	void (*close)(void *dsc);