diff --git a/demos/device/src/cdcd_app.c b/demos/device/src/cdc_device_app.c
similarity index 100%
rename from demos/device/src/cdcd_app.c
rename to demos/device/src/cdc_device_app.c
diff --git a/demos/device/src/cdcd_app.h b/demos/device/src/cdc_device_app.h
similarity index 100%
rename from demos/device/src/cdcd_app.h
rename to demos/device/src/cdc_device_app.h
diff --git a/demos/device/src/keyboardd_app.c b/demos/device/src/keyboard_device_app.c
similarity index 100%
rename from demos/device/src/keyboardd_app.c
rename to demos/device/src/keyboard_device_app.c
diff --git a/demos/device/src/keyboardd_app.h b/demos/device/src/keyboard_device_app.h
similarity index 100%
rename from demos/device/src/keyboardd_app.h
rename to demos/device/src/keyboard_device_app.h
diff --git a/demos/device/src/moused_app.c b/demos/device/src/mouse_device_app.c
similarity index 100%
rename from demos/device/src/moused_app.c
rename to demos/device/src/mouse_device_app.c
diff --git a/demos/device/src/moused_app.h b/demos/device/src/mouse_device_app.h
similarity index 100%
rename from demos/device/src/moused_app.h
rename to demos/device/src/mouse_device_app.h
diff --git a/demos/device/src/mscd_app.c b/demos/device/src/msc_device_app.c
similarity index 100%
rename from demos/device/src/mscd_app.c
rename to demos/device/src/msc_device_app.c
diff --git a/demos/device/src/mscd_app.h b/demos/device/src/msc_device_app.h
similarity index 100%
rename from demos/device/src/mscd_app.h
rename to demos/device/src/msc_device_app.h
diff --git a/demos/device/src/mscd_app_ramdisk.c b/demos/device/src/msc_device_ramdisk.c
similarity index 100%
rename from demos/device/src/mscd_app_ramdisk.c
rename to demos/device/src/msc_device_ramdisk.c
diff --git a/demos/device/src/mscd_app_romdisk.c b/demos/device/src/msc_device_romdisk.c
similarity index 100%
rename from demos/device/src/mscd_app_romdisk.c
rename to demos/device/src/msc_device_romdisk.c