diff --git a/whirl/cpu/Makefile b/tornado/cpu/Makefile
similarity index 100%
rename from whirl/cpu/Makefile
rename to tornado/cpu/Makefile
diff --git a/whirl/cpu/cpu.brd b/tornado/cpu/cpu.brd
similarity index 100%
rename from whirl/cpu/cpu.brd
rename to tornado/cpu/cpu.brd
diff --git a/whirl/cpu/cpu.cmp b/tornado/cpu/cpu.cmp
similarity index 100%
rename from whirl/cpu/cpu.cmp
rename to tornado/cpu/cpu.cmp
diff --git a/whirl/cpu/cpu.pro b/tornado/cpu/cpu.pro
similarity index 100%
rename from whirl/cpu/cpu.pro
rename to tornado/cpu/cpu.pro
diff --git a/whirl/cpu/cpu.sch b/tornado/cpu/cpu.sch
similarity index 100%
rename from whirl/cpu/cpu.sch
rename to tornado/cpu/cpu.sch
diff --git a/whirl/cpu/pcb/Makefile b/tornado/cpu/pcb/Makefile
similarity index 100%
rename from whirl/cpu/pcb/Makefile
rename to tornado/cpu/pcb/Makefile
diff --git a/whirl/doc/mech.fpd b/tornado/doc/mech.fpd
similarity index 98%
rename from whirl/doc/mech.fpd
rename to tornado/doc/mech.fpd
index f9c939b..e280a75 100644
--- a/whirl/doc/mech.fpd
+++ b/tornado/doc/mech.fpd
@@ -31,7 +31,7 @@ frame cpu {
 	rect __0 . w
 }
 
-package "whirl"
+package "tornado"
 unit mm
 
 table
diff --git a/whirl/fw/Makefile b/tornado/fw/Makefile
similarity index 98%
rename from whirl/fw/Makefile
rename to tornado/fw/Makefile
index b2741f5..24d549e 100644
--- a/whirl/fw/Makefile
+++ b/tornado/fw/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile - Makefile of the Whirl firmware 
+# Makefile - Makefile of the Tornado firmware 
 #
 # Written 2012 by Werner Almesberger
 # Copyright 2012 by Werner Almesberger
@@ -12,7 +12,7 @@
 
 SHELL = /bin/bash
 
-NAME = whirl
+NAME = tornado
 
 CFLAGS = -g -mmcu=$(CHIP) \
 	 -DBOOT_ADDR=$(BOOT_ADDR) \
diff --git a/whirl/fw/boot.c b/tornado/fw/boot.c
similarity index 100%
rename from whirl/fw/boot.c
rename to tornado/fw/boot.c
diff --git a/whirl/fw/io.h b/tornado/fw/io.h
similarity index 100%
rename from whirl/fw/io.h
rename to tornado/fw/io.h
diff --git a/whirl/fw/whirl.c b/tornado/fw/tornado.c
similarity index 100%
rename from whirl/fw/whirl.c
rename to tornado/fw/tornado.c
diff --git a/whirl/fw/version.h b/tornado/fw/version.h
similarity index 100%
rename from whirl/fw/version.h
rename to tornado/fw/version.h
diff --git a/whirl/led/Makefile b/tornado/led/Makefile
similarity index 100%
rename from whirl/led/Makefile
rename to tornado/led/Makefile
diff --git a/whirl/led/led.brd b/tornado/led/led.brd
similarity index 100%
rename from whirl/led/led.brd
rename to tornado/led/led.brd
diff --git a/whirl/led/led.cmp b/tornado/led/led.cmp
similarity index 100%
rename from whirl/led/led.cmp
rename to tornado/led/led.cmp
diff --git a/whirl/led/led.pro b/tornado/led/led.pro
similarity index 100%
rename from whirl/led/led.pro
rename to tornado/led/led.pro
diff --git a/whirl/led/led.sch b/tornado/led/led.sch
similarity index 100%
rename from whirl/led/led.sch
rename to tornado/led/led.sch
diff --git a/whirl/led/pcb/Makefile b/tornado/led/pcb/Makefile
similarity index 100%
rename from whirl/led/pcb/Makefile
rename to tornado/led/pcb/Makefile