diff --git a/firmware/SOURCES b/firmware/SOURCES
index 8d5d28eb5a..9f7007245d 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -332,8 +332,8 @@ target/arm/pnx0101/system-pnx0101.c
 #if CONFIG_CPU == AS3525
 target/arm/as3525/system-as3525.c
 #ifdef SANSA_CLIP
-target/arm/as3525/clip/lcd-ssd1303.c
-target/arm/as3525/clip/button-clip.c
+target/arm/as3525/sansa-clip/lcd-ssd1303.c
+target/arm/as3525/sansa-clip/button-clip.c
 #endif
 #endif
 
diff --git a/firmware/target/arm/as3525/clip/adc-target.h b/firmware/target/arm/as3525/sansa-clip/adc-target.h
similarity index 100%
rename from firmware/target/arm/as3525/clip/adc-target.h
rename to firmware/target/arm/as3525/sansa-clip/adc-target.h
diff --git a/firmware/target/arm/as3525/clip/backlight-target.h b/firmware/target/arm/as3525/sansa-clip/backlight-target.h
similarity index 100%
rename from firmware/target/arm/as3525/clip/backlight-target.h
rename to firmware/target/arm/as3525/sansa-clip/backlight-target.h
diff --git a/firmware/target/arm/as3525/clip/button-clip.c b/firmware/target/arm/as3525/sansa-clip/button-clip.c
similarity index 100%
rename from firmware/target/arm/as3525/clip/button-clip.c
rename to firmware/target/arm/as3525/sansa-clip/button-clip.c
diff --git a/firmware/target/arm/as3525/clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h
similarity index 100%
rename from firmware/target/arm/as3525/clip/button-target.h
rename to firmware/target/arm/as3525/sansa-clip/button-target.h
diff --git a/firmware/target/arm/as3525/clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
similarity index 100%
rename from firmware/target/arm/as3525/clip/lcd-ssd1303.c
rename to firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c
diff --git a/firmware/target/arm/as3525/clip/system-target.h b/firmware/target/arm/as3525/sansa-clip/system-target.h
similarity index 100%
rename from firmware/target/arm/as3525/clip/system-target.h
rename to firmware/target/arm/as3525/sansa-clip/system-target.h
diff --git a/firmware/target/arm/as3525/clip/timer-target.h b/firmware/target/arm/as3525/sansa-clip/timer-target.h
similarity index 100%
rename from firmware/target/arm/as3525/clip/timer-target.h
rename to firmware/target/arm/as3525/sansa-clip/timer-target.h
diff --git a/tools/configure b/tools/configure
index 1b31615d9d..9213aa2576 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1692,7 +1692,7 @@ fi
     toolset="$ams3525bitmaptools"
     t_cpu="arm"
     t_manufacturer="as3525"
-    t_model="clip"
+    t_model="sansa-clip"
     ;;