diff --git a/demos/host/host_freertos/host_os_none.ewd b/demos/host/host_freertos/host_freertos.ewd
similarity index 95%
rename from demos/host/host_freertos/host_os_none.ewd
rename to demos/host/host_freertos/host_freertos.ewd
index c2d573653..7dd622af2 100644
--- a/demos/host/host_freertos/host_os_none.ewd
+++ b/demos/host/host_freertos/host_freertos.ewd
@@ -697,7 +697,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -774,7 +774,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -848,7 +848,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -1342,7 +1342,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC1769.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -1382,11 +1382,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -1414,7 +1414,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\NXP\FlashNXPLPC512K_Cortex.board</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -1994,7 +1994,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -2071,7 +2071,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -2080,7 +2080,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -2145,7 +2145,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
@@ -2153,7 +2153,7 @@
         </option>
         <option>
           <name>OCJLinkTraceSource</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkTraceSourceDummy</name>
@@ -2639,7 +2639,7 @@
         </option>
         <option>
           <name>MemFile</name>
-          <state>$TOOLKIT_DIR$\CONFIG\debugger\NXP\LPC4330_M4.ddf</state>
+          <state></state>
         </option>
         <option>
           <name>RunToEnable</name>
@@ -2679,11 +2679,11 @@
         </option>
         <option>
           <name>OCDynDriverList</name>
-          <state>JLINK_ID</state>
+          <state>ARMSIM_ID</state>
         </option>
         <option>
           <name>OCLastSavedByProductVersion</name>
-          <state>6.50.5.4846</state>
+          <state></state>
         </option>
         <option>
           <name>OCDownloadAttachToProgram</name>
@@ -2711,7 +2711,7 @@
         </option>
         <option>
           <name>FlashLoadersV3</name>
-          <state>$TOOLKIT_DIR$\config\flashloader\</state>
+          <state></state>
         </option>
         <option>
           <name>OCImagesSuppressCheck1</name>
@@ -3238,7 +3238,7 @@
         </option>
         <option>
           <name>OCProbeConfig</name>
-          <state>$TOOLKIT_DIR$\config\debugger\NXP\LPC43xx.ProbeConfig</state>
+          <state></state>
         </option>
         <option>
           <name>IjetProbeConfigRadio</name>
@@ -3291,7 +3291,7 @@
         </option>
         <option>
           <name>JLinkInitialSpeed</name>
-          <state>5000</state>
+          <state>32</state>
         </option>
         <option>
           <name>CCDoJlinkMultiTarget</name>
@@ -3368,7 +3368,7 @@
         </option>
         <option>
           <name>CCJLinkInterfaceRadio</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>OCJLinkAttachSlave</name>
@@ -3377,7 +3377,7 @@
         <option>
           <name>CCJLinkResetList</name>
           <version>6</version>
-          <state>7</state>
+          <state>5</state>
         </option>
         <option>
           <name>CCJLinkInterfaceCmdLine</name>
@@ -3442,7 +3442,7 @@
         </option>
         <option>
           <name>CCSwoClockAuto</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>CCSwoClockEdit</name>
diff --git a/demos/host/host_freertos/host_os_none.ewp b/demos/host/host_freertos/host_freertos.ewp
similarity index 96%
rename from demos/host/host_freertos/host_os_none.ewp
rename to demos/host/host_freertos/host_freertos.ewp
index 3fb25d72b..c313e6a28 100644
--- a/demos/host/host_freertos/host_os_none.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -579,7 +579,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>host_os_none.srec</state>
+          <state>host_freertos.srec</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>
@@ -633,7 +633,7 @@
         </option>
         <option>
           <name>IlinkOutputFile</name>
-          <state>host_os_none.out</state>
+          <state>host_freertos.out</state>
         </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
@@ -1502,7 +1502,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>host_os_none.srec</state>
+          <state>host_freertos.srec</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>
@@ -1556,7 +1556,7 @@
         </option>
         <option>
           <name>IlinkOutputFile</name>
-          <state>host_os_none.out</state>
+          <state>host_freertos.out</state>
         </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
@@ -2425,7 +2425,7 @@
         </option>
         <option>
           <name>OOCOutputFile</name>
-          <state>host_os_none.srec</state>
+          <state>host_freertos.srec</state>
         </option>
         <option>
           <name>OOCCommandLineProducer</name>
@@ -2479,7 +2479,7 @@
         </option>
         <option>
           <name>IlinkOutputFile</name>
-          <state>host_os_none.out</state>
+          <state>host_freertos.out</state>
         </option>
         <option>
           <name>IlinkDebugInfoEnable</name>
diff --git a/demos/host/host_freertos/host_os_none.eww b/demos/host/host_freertos/host_freertos.eww
similarity index 71%
rename from demos/host/host_freertos/host_os_none.eww
rename to demos/host/host_freertos/host_freertos.eww
index c9165d7c6..4f89508d1 100644
--- a/demos/host/host_freertos/host_os_none.eww
+++ b/demos/host/host_freertos/host_freertos.eww
@@ -2,7 +2,7 @@
 
 <workspace>
   <project>
-    <path>$WS_DIR$\host_os_none.ewp</path>
+    <path>$WS_DIR$\host_freertos.ewp</path>
   </project>
   <batchBuild/>
 </workspace>