diff --git a/firmware/SOURCES b/firmware/SOURCES
index b8ef111e09..3b0aca79fc 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -399,18 +399,18 @@ target/sh/archos/ondio/usb-ondio.c
 
 #ifdef SANSA_E200
 #ifndef SIMULATOR
-target/arm/sandisk/sansa-e200/ata-e200.c
+target/arm/sandisk/ata-c200_e200.c
 target/arm/sandisk/sansa-e200/lcd-e200.c
 target/arm/sandisk/sansa-e200/lcd-as-e200.S
-target/arm/sandisk/sansa-e200/adc-e200.c
-target/arm/sandisk/sansa-e200/backlight-e200.c
+target/arm/sandisk/adc-c200_e200.c
+target/arm/sandisk/backlight-c200_e200.c
 target/arm/usb-fw-pp502x.c
 target/arm/sandisk/sansa-e200/button-e200.c
-target/arm/sandisk/sansa-e200/power-e200.c
+target/arm/sandisk/power-c200_e200.c
 target/arm/sandisk/sansa-e200/powermgmt-e200.c
 target/arm/i2s-pp.c
 #ifndef BOOTLOADER
-target/arm/sandisk/sansa-e200/audio-e200.c
+target/arm/sandisk/audio-c200_e200.c
 #endif /* BOOTLOADER */
 #endif /* SIMULATOR */
 #endif /* SANSA_E200 */
diff --git a/firmware/target/arm/sandisk/sansa-e200/adc-e200.c b/firmware/target/arm/sandisk/adc-c200_e200.c
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/adc-e200.c
rename to firmware/target/arm/sandisk/adc-c200_e200.c
diff --git a/firmware/target/arm/sandisk/sansa-e200/adc-target.h b/firmware/target/arm/sandisk/adc-target.h
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/adc-target.h
rename to firmware/target/arm/sandisk/adc-target.h
diff --git a/firmware/target/arm/sandisk/sansa-e200/ata-e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/ata-e200.c
rename to firmware/target/arm/sandisk/ata-c200_e200.c
diff --git a/firmware/target/arm/sandisk/sansa-e200/ata-target.h b/firmware/target/arm/sandisk/ata-target.h
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/ata-target.h
rename to firmware/target/arm/sandisk/ata-target.h
diff --git a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c b/firmware/target/arm/sandisk/audio-c200_e200.c
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/audio-e200.c
rename to firmware/target/arm/sandisk/audio-c200_e200.c
diff --git a/firmware/target/arm/sandisk/sansa-e200/backlight-e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/backlight-e200.c
rename to firmware/target/arm/sandisk/backlight-c200_e200.c
diff --git a/firmware/target/arm/sandisk/sansa-e200/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/backlight-target.h
rename to firmware/target/arm/sandisk/backlight-target.h
diff --git a/firmware/target/arm/sandisk/sansa-e200/hotswap-target.h b/firmware/target/arm/sandisk/hotswap-target.h
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/hotswap-target.h
rename to firmware/target/arm/sandisk/hotswap-target.h
diff --git a/firmware/target/arm/sandisk/sansa-e200/power-e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
similarity index 100%
rename from firmware/target/arm/sandisk/sansa-e200/power-e200.c
rename to firmware/target/arm/sandisk/power-c200_e200.c