diff --git a/atusb/fw/Makefile b/atusb/fw/Makefile
index b5f42a2..7bd445a 100644
--- a/atusb/fw/Makefile
+++ b/atusb/fw/Makefile
@@ -1,5 +1,5 @@
 #
-# fw/Makefile - ATSPI firmware build
+# fw/Makefile - ATUSB firmware build
 #
 # Written 2008-2010 by Werner Almesberger
 # Copyright 2008-2010 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-DIRS=common boot atspi
+DIRS=common boot atusb
 
 
 .PHONY:		all depend install uninstall clean spotless
diff --git a/atusb/fw/atspi/Makefile b/atusb/fw/atusb/Makefile
similarity index 91%
rename from atusb/fw/atspi/Makefile
rename to atusb/fw/atusb/Makefile
index fb01b58..975051b 100644
--- a/atusb/fw/atspi/Makefile
+++ b/atusb/fw/atusb/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi/Makefile - Makefile for USB to SPI translator (for AT86RF230)
+# atusb/Makefile - Makefile for USB to SPI translator (for AT86RF230)
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-MAIN = atspi
+MAIN = atusb
 OBJS = $(MAIN) usb descr version ep0
 
 F32XBASE = ../../../../f32xbase
diff --git a/atusb/fw/atspi/atspi.c b/atusb/fw/atusb/atusb.c
similarity index 96%
rename from atusb/fw/atspi/atspi.c
rename to atusb/fw/atusb/atusb.c
index 7ca229b..c9d05a8 100644
--- a/atusb/fw/atspi/atspi.c
+++ b/atusb/fw/atusb/atusb.c
@@ -1,5 +1,5 @@
 /*
- * atspi/atspi.c - ATSPI initialization and main loop
+ * atusb/atusb.c - ATUSB initialization and main loop
  *
  * Written 2008-2010 by Werner Almesberger
  * Copyright 2008-2010 Werner Almesberger
@@ -14,7 +14,7 @@
 #include "regs.h"
 #include "io.h"
 #include "usb.h"
-#include "atspi/ep0.h"
+#include "atusb/ep0.h"
 #include "version.h"
 
 
diff --git a/atusb/fw/atspi/descr.c b/atusb/fw/atusb/descr.c
similarity index 100%
rename from atusb/fw/atspi/descr.c
rename to atusb/fw/atusb/descr.c
diff --git a/atusb/fw/atspi/ep0.c b/atusb/fw/atusb/ep0.c
similarity index 99%
rename from atusb/fw/atspi/ep0.c
rename to atusb/fw/atusb/ep0.c
index 643dead..559c29c 100644
--- a/atusb/fw/atspi/ep0.c
+++ b/atusb/fw/atusb/ep0.c
@@ -20,7 +20,7 @@
 #include "regs.h"
 //#include "uart.h"
 #include "usb.h"
-#include "atspi/ep0.h"
+#include "atusb/ep0.h"
 #include "at86rf230.h"
 #include "version.h"
 
diff --git a/atusb/fw/common/config.h b/atusb/fw/common/config.h
index 2162be3..19ed150 100644
--- a/atusb/fw/common/config.h
+++ b/atusb/fw/common/config.h
@@ -15,7 +15,7 @@
 
 #include "io.h"
 #include "io-parts.h"
-#include "atspi/usb-ids.h"
+#include "atusb/usb-ids.h"
 
 
 /* ----- Boot loader configuration ----------------------------------------- */
diff --git a/atusb/fw/include/atspi/ep0.h b/atusb/fw/include/atusb/ep0.h
similarity index 97%
rename from atusb/fw/include/atspi/ep0.h
rename to atusb/fw/include/atusb/ep0.h
index bc128ba..00a30e9 100644
--- a/atusb/fw/include/atspi/ep0.h
+++ b/atusb/fw/include/atusb/ep0.h
@@ -1,5 +1,5 @@
 /*
- * include/atspi/ep0.h - EP0 extension protocol
+ * include/atusb/ep0.h - EP0 extension protocol
  *
  * Written 2008-2010 by Werner Almesberger
  * Copyright 2008-2010 Werner Almesberger
diff --git a/atusb/fw/include/atspi/usb-ids.h b/atusb/fw/include/atusb/usb-ids.h
similarity index 100%
rename from atusb/fw/include/atspi/usb-ids.h
rename to atusb/fw/include/atusb/usb-ids.h
diff --git a/tools/atspi-id/atspi-id.c b/tools/atspi-id/atspi-id.c
index f036054..dc0e458 100644
--- a/tools/atspi-id/atspi-id.c
+++ b/tools/atspi-id/atspi-id.c
@@ -19,7 +19,7 @@
 #endif
 
 #include "at86rf230.h"
-#include "atspi/ep0.h"
+#include "atusb/ep0.h"
 #include "atspi.h"
 
 
diff --git a/tools/atspi-trim/atspi-trim.c b/tools/atspi-trim/atspi-trim.c
index 3836d12..cfb786e 100644
--- a/tools/atspi-trim/atspi-trim.c
+++ b/tools/atspi-trim/atspi-trim.c
@@ -16,7 +16,6 @@
 #include <sys/time.h>
 
 #include "at86rf230.h"
-#include "atspi/ep0.h"
 #include "atspi.h"
 
 
diff --git a/tools/lib/atusb.c b/tools/lib/atusb.c
index 3aecb46..d68fc15 100644
--- a/tools/lib/atusb.c
+++ b/tools/lib/atusb.c
@@ -15,8 +15,8 @@
 #include <usb.h>
 
 #include "f32xbase/usb.h"
-#include "atspi/ep0.h"
-#include "atspi/usb-ids.h"
+#include "atusb/ep0.h"
+#include "atusb/usb-ids.h"
 
 #include "driver.h"