diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
index c2aa460bf..0b5d6269c 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
@@ -2778,22 +2778,22 @@
   <group>
     <name>app</name>
     <file>
-      <name>$PROJ_DIR$\..\src\cdc_serial_app.c</name>
+      <name>$PROJ_DIR$\..\src\cdc_serial_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\cli.c</name>
+      <name>$PROJ_DIR$\..\src\msc_cli.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\keyboard_app.c</name>
+      <name>$PROJ_DIR$\..\src\keyboard_host_app.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\src\main.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\mouse_app.c</name>
+      <name>$PROJ_DIR$\..\src\mouse_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\msc_app.c</name>
+      <name>$PROJ_DIR$\..\src\msc_host_app.c</name>
     </file>
   </group>
   <group>
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index efcdffe22..c5f606181 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -2783,22 +2783,22 @@
   <group>
     <name>app</name>
     <file>
-      <name>$PROJ_DIR$\..\src\cdc_serial_app.c</name>
+      <name>$PROJ_DIR$\..\src\cdc_serial_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\cli.c</name>
+      <name>$PROJ_DIR$\..\src\msc_cli.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\keyboard_app.c</name>
+      <name>$PROJ_DIR$\..\src\keyboard_host_app.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\src\main.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\mouse_app.c</name>
+      <name>$PROJ_DIR$\..\src\mouse_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\msc_app.c</name>
+      <name>$PROJ_DIR$\..\src\msc_host_app.c</name>
     </file>
   </group>
   <group>
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index 281b906c3..9019e6ab9 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -2774,22 +2774,22 @@
   <group>
     <name>app</name>
     <file>
-      <name>$PROJ_DIR$\..\src\cdc_serial_app.c</name>
+      <name>$PROJ_DIR$\..\src\cdc_serial_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\cli.c</name>
+      <name>$PROJ_DIR$\..\src\msc_cli.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\keyboard_app.c</name>
+      <name>$PROJ_DIR$\..\src\keyboard_host_app.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\src\main.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\mouse_app.c</name>
+      <name>$PROJ_DIR$\..\src\mouse_host_app.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\src\msc_app.c</name>
+      <name>$PROJ_DIR$\..\src\msc_host_app.c</name>
     </file>
   </group>
   <group>