diff --git a/atrf/Makefile b/atusb/Makefile
similarity index 56%
rename from atrf/Makefile
rename to atusb/Makefile
index 6583781..4fed8bd 100644
--- a/atrf/Makefile
+++ b/atusb/Makefile
@@ -5,14 +5,14 @@ all:
 		@exit 1
 
 gen generate:
-		eeschema --plot `pwd`/wpan-atrf.sch
+		eeschema --plot `pwd`/atusb.sch
 		# need scripts
 
 sch:
-		eeschema `pwd`/wpan-atrf.sch
+		eeschema `pwd`/atusb.sch
 
 brd:
-		pcbnew `pwd`/wpan-atrf.brd
+		pcbnew `pwd`/atusb.brd
 
 xpdf:
-		xpdf wpan-atrf.pdf
+		xpdf atusb.pdf
diff --git a/atrf/atrf.sch b/atusb/atrf.sch
similarity index 100%
rename from atrf/atrf.sch
rename to atusb/atrf.sch
diff --git a/atrf/wpan-atrf.brd b/atusb/atusb.brd
similarity index 100%
rename from atrf/wpan-atrf.brd
rename to atusb/atusb.brd
diff --git a/atrf/wpan-atrf.cmp b/atusb/atusb.cmp
similarity index 100%
rename from atrf/wpan-atrf.cmp
rename to atusb/atusb.cmp
diff --git a/atrf/wpan-atrf.pro b/atusb/atusb.pro
similarity index 94%
rename from atrf/wpan-atrf.pro
rename to atusb/atusb.pro
index 5b4100a..45ea8c6 100644
--- a/atrf/wpan-atrf.pro
+++ b/atusb/atusb.pro
@@ -1,4 +1,4 @@
-update=Sun Aug 22 16:03:40 2010
+update=Mon Oct 25 00:07:06 2010
 last_client=pcbnew
 [eeschema]
 version=1
@@ -66,7 +66,7 @@ DrawLar=150
 EdgeLar=150
 TxtLar=120
 MSegLar=150
-LastNetListRead=wpan-atrf.net
+LastNetListRead=atusb.net
 [pcbnew/libraries]
 LibDir=
 LibName1=../modules/meander
diff --git a/atrf/wpan-atrf.sch b/atusb/atusb.sch
similarity index 100%
rename from atrf/wpan-atrf.sch
rename to atusb/atusb.sch
diff --git a/atrf/cam/Makefile b/atusb/cam/Makefile
similarity index 100%
rename from atrf/cam/Makefile
rename to atusb/cam/Makefile
diff --git a/atrf/cam/doit b/atusb/cam/doit
similarity index 100%
rename from atrf/cam/doit
rename to atusb/cam/doit
diff --git a/atrf/cam/pcb.pl b/atusb/cam/pcb.pl
similarity index 100%
rename from atrf/cam/pcb.pl
rename to atusb/cam/pcb.pl
diff --git a/atrf/fw/Makefile b/atusb/fw/Makefile
similarity index 100%
rename from atrf/fw/Makefile
rename to atusb/fw/Makefile
diff --git a/atrf/fw/atspi/Makefile b/atusb/fw/atspi/Makefile
similarity index 100%
rename from atrf/fw/atspi/Makefile
rename to atusb/fw/atspi/Makefile
diff --git a/atrf/fw/atspi/atspi.c b/atusb/fw/atspi/atspi.c
similarity index 100%
rename from atrf/fw/atspi/atspi.c
rename to atusb/fw/atspi/atspi.c
diff --git a/atrf/fw/atspi/descr.c b/atusb/fw/atspi/descr.c
similarity index 100%
rename from atrf/fw/atspi/descr.c
rename to atusb/fw/atspi/descr.c
diff --git a/atrf/fw/atspi/ep0.c b/atusb/fw/atspi/ep0.c
similarity index 100%
rename from atrf/fw/atspi/ep0.c
rename to atusb/fw/atspi/ep0.c
diff --git a/atrf/fw/boot/Makefile b/atusb/fw/boot/Makefile
similarity index 100%
rename from atrf/fw/boot/Makefile
rename to atusb/fw/boot/Makefile
diff --git a/atrf/fw/common/Makefile b/atusb/fw/common/Makefile
similarity index 100%
rename from atrf/fw/common/Makefile
rename to atusb/fw/common/Makefile
diff --git a/atrf/fw/common/config.h b/atusb/fw/common/config.h
similarity index 100%
rename from atrf/fw/common/config.h
rename to atusb/fw/common/config.h
diff --git a/atrf/fw/common/io.h b/atusb/fw/common/io.h
similarity index 100%
rename from atrf/fw/common/io.h
rename to atusb/fw/common/io.h
diff --git a/atrf/fw/common/regs.h b/atusb/fw/common/regs.h
similarity index 100%
rename from atrf/fw/common/regs.h
rename to atusb/fw/common/regs.h
diff --git a/atrf/fw/include/at86rf230.h b/atusb/fw/include/at86rf230.h
similarity index 100%
rename from atrf/fw/include/at86rf230.h
rename to atusb/fw/include/at86rf230.h
diff --git a/atrf/fw/include/atspi/ep0.h b/atusb/fw/include/atspi/ep0.h
similarity index 100%
rename from atrf/fw/include/atspi/ep0.h
rename to atusb/fw/include/atspi/ep0.h
diff --git a/atrf/fw/include/atspi/usb-ids.h b/atusb/fw/include/atspi/usb-ids.h
similarity index 100%
rename from atrf/fw/include/atspi/usb-ids.h
rename to atusb/fw/include/atspi/usb-ids.h
diff --git a/atrf/usb.sch b/atusb/usb.sch
similarity index 100%
rename from atrf/usb.sch
rename to atusb/usb.sch
diff --git a/tools/Makefile.common b/tools/Makefile.common
index dbc0a2c..c25dde6 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
@@ -40,5 +40,5 @@ else
     AR		= $(AR_quiet)
 endif
 
-CFLAGS += -I../../atrf/fw/include -I../include $(MACROS_$(TARGET))
+CFLAGS += -I../../atusb/fw/include -I../include $(MACROS_$(TARGET))
 LDLIBS = $(LDLIBS_$(TARGET)) -L../lib -latspi