diff --git a/firmware/Makefile b/firmware/Makefile
index 149f0b85..addbaf0d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -88,7 +88,7 @@ NM = $(CROSS_COMPILE)nm
 # Flags
 INCLUDES_USB = -Iatmel_softpack_libraries/usb/include
 
-INCLUDES  = -Iinclude_board -Iinclude_sam3s -Iinclude -Isimtrace_src
+INCLUDES  = -Iinclude_board -Iinclude_sam3s -Iinclude -Isrc_simtrace
 INCLUDES += -Icmsis
 INCLUDES += $(INCLUDES_USB)
 
@@ -129,7 +129,7 @@ LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-secti
 # Directories where source files can be found
 
 USB_PATHS = $(AT91LIB_USB_CORE_PATH) $(AT91LIB_USB_COMMON_CORE_PATH)
-VPATH += src_board src_sam3s cmsis $(USB_PATHS) simtrace_src
+VPATH += src_board src_sam3s cmsis $(USB_PATHS) src_simtrace
 
 # Objects built from C source files
 C_CMSIS    = core_cm3.o
diff --git a/firmware/simtrace_src/ccid.c b/firmware/src_simtrace/ccid.c
similarity index 100%
rename from firmware/simtrace_src/ccid.c
rename to firmware/src_simtrace/ccid.c
diff --git a/firmware/simtrace_src/cciddriver.c b/firmware/src_simtrace/cciddriver.c
similarity index 100%
rename from firmware/simtrace_src/cciddriver.c
rename to firmware/src_simtrace/cciddriver.c
diff --git a/firmware/simtrace_src/cciddriver.h b/firmware/src_simtrace/cciddriver.h
similarity index 100%
rename from firmware/simtrace_src/cciddriver.h
rename to firmware/src_simtrace/cciddriver.h
diff --git a/firmware/simtrace_src/cciddriverdescriptors.h b/firmware/src_simtrace/cciddriverdescriptors.h
similarity index 100%
rename from firmware/simtrace_src/cciddriverdescriptors.h
rename to firmware/src_simtrace/cciddriverdescriptors.h
diff --git a/firmware/simtrace_src/main.c b/firmware/src_simtrace/main.c
similarity index 100%
rename from firmware/simtrace_src/main.c
rename to firmware/src_simtrace/main.c
diff --git a/firmware/simtrace_src/mitm.c b/firmware/src_simtrace/mitm.c
similarity index 100%
rename from firmware/simtrace_src/mitm.c
rename to firmware/src_simtrace/mitm.c
diff --git a/firmware/simtrace_src/phone.c b/firmware/src_simtrace/phone.c
similarity index 100%
rename from firmware/simtrace_src/phone.c
rename to firmware/src_simtrace/phone.c
diff --git a/firmware/simtrace_src/simtrace.h b/firmware/src_simtrace/simtrace.h
similarity index 100%
rename from firmware/simtrace_src/simtrace.h
rename to firmware/src_simtrace/simtrace.h
diff --git a/firmware/simtrace_src/simtrace_iso7816.c b/firmware/src_simtrace/simtrace_iso7816.c
similarity index 100%
rename from firmware/simtrace_src/simtrace_iso7816.c
rename to firmware/src_simtrace/simtrace_iso7816.c
diff --git a/firmware/simtrace_src/sniffer.c b/firmware/src_simtrace/sniffer.c
similarity index 100%
rename from firmware/simtrace_src/sniffer.c
rename to firmware/src_simtrace/sniffer.c
diff --git a/firmware/simtrace_src/tc_etu.c b/firmware/src_simtrace/tc_etu.c
similarity index 100%
rename from firmware/simtrace_src/tc_etu.c
rename to firmware/src_simtrace/tc_etu.c
diff --git a/firmware/simtrace_src/usb.c b/firmware/src_simtrace/usb.c
similarity index 100%
rename from firmware/simtrace_src/usb.c
rename to firmware/src_simtrace/usb.c