diff --git a/hardware/arduino/boards.txt b/hardware/arduino/boards.txt
index 9c155c10e..834db541b 100644
--- a/hardware/arduino/boards.txt
+++ b/hardware/arduino/boards.txt
@@ -153,8 +153,8 @@ leonardo.upload.speed=1200
 leonardo.bootloader.low_fuses=0xde
 leonardo.bootloader.high_fuses=0xda
 leonardo.bootloader.extended_fuses=0xcb
-leonardo.bootloader.path=diskloader
-leonardo.bootloader.file=DiskLoader-Leonardo.hex
+leonardo.bootloader.path=caterina
+leonardo.bootloader.file=Caterina-Leonardo.hex
 leonardo.bootloader.unlock_bits=0x3F
 leonardo.bootloader.lock_bits=0x2F
 leonardo.build.mcu=atmega32u4
@@ -171,8 +171,8 @@ leonardo.build.variant=leonardo
 #micro.bootloader.low_fuses=0xde
 #micro.bootloader.high_fuses=0xda
 #micro.bootloader.extended_fuses=0xcb
-#micro.bootloader.path=diskloader
-#micro.bootloader.file=DiskLoader-Micro.hex
+#micro.bootloader.path=caterina
+#micro.bootloader.file=Caterina-Micro.hex
 #micro.bootloader.unlock_bits=0x3F
 #micro.bootloader.lock_bits=0x2F
 #micro.build.mcu=atmega32u4
diff --git a/hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex b/hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/DiskLoader-Leonardo.hex
rename to hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
diff --git a/hardware/arduino/bootloaders/diskloader/Makefile b/hardware/arduino/bootloaders/caterina/Makefile
similarity index 88%
rename from hardware/arduino/bootloaders/diskloader/Makefile
rename to hardware/arduino/bootloaders/caterina/Makefile
index ed4ba7811..4bb41c879 100644
--- a/hardware/arduino/bootloaders/diskloader/Makefile
+++ b/hardware/arduino/bootloaders/caterina/Makefile
@@ -1,10 +1,10 @@
 ###############################################################################
-# Makefile for DiskLoader
+# Makefile for Caterina (formerly DiskLoader)
 ###############################################################################
 
 ## General Flags
-PROJECT = DiskLoader
-TARGET = DiskLoader.elf
+PROJECT = Caterina
+TARGET = Caterina.elf
 CC = avr-gcc
 
 # BOARD2
@@ -24,7 +24,7 @@ AVRDUDE_PROGRAMMER = avrispmkII
 AVRDUDE_PORT = usb	   
 
 # program name should not be changed...
-PROGRAM = DiskLoader
+PROGRAM = Caterina
 
 AVRDUDE = avrdude
 AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) -p $(MCU)
@@ -41,7 +41,7 @@ ASMFLAGS += -x assembler-with-cpp -Wa,-gdwarf2
 
 ## Linker flags
 LDFLAGS = $(COMMON)
-LDFLAGS += -Wl,-gc-sections,-Map=DiskLoader.map,--section-start=.text=0x7800,--relax
+LDFLAGS += -Wl,-gc-sections,-Map=Caterina.map,--section-start=.text=0x7800,--relax
 LDFLAGS += -nodefaultlibs -nostartfiles
 
 ## Intel Hex file production flags
@@ -65,7 +65,7 @@ vpath %.cpp $(SRC_DIR)
 
 .PHONY: all checkdirs clean
 
-all: checkdirs $(TARGET) DiskLoader.hex DiskLoader.lss size
+all: checkdirs $(TARGET) Caterina.hex Caterina.lss size
 
 -include $(DEP)
 
diff --git a/hardware/arduino/bootloaders/diskloader/src/DiskLoader.cpp b/hardware/arduino/bootloaders/caterina/src/Caterina.cpp
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/DiskLoader.cpp
rename to hardware/arduino/bootloaders/caterina/src/Caterina.cpp
diff --git a/hardware/arduino/bootloaders/diskloader/src/Platform.h b/hardware/arduino/bootloaders/caterina/src/Platform.h
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/Platform.h
rename to hardware/arduino/bootloaders/caterina/src/Platform.h
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBCore.cpp b/hardware/arduino/bootloaders/caterina/src/USBCore.cpp
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/USBCore.cpp
rename to hardware/arduino/bootloaders/caterina/src/USBCore.cpp
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBCore.h b/hardware/arduino/bootloaders/caterina/src/USBCore.h
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/USBCore.h
rename to hardware/arduino/bootloaders/caterina/src/USBCore.h
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBDesc.cpp b/hardware/arduino/bootloaders/caterina/src/USBDesc.cpp
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/USBDesc.cpp
rename to hardware/arduino/bootloaders/caterina/src/USBDesc.cpp
diff --git a/hardware/arduino/bootloaders/diskloader/src/USBDesc.h b/hardware/arduino/bootloaders/caterina/src/USBDesc.h
similarity index 100%
rename from hardware/arduino/bootloaders/diskloader/src/USBDesc.h
rename to hardware/arduino/bootloaders/caterina/src/USBDesc.h