diff --git a/demos/device/device_cmsis_rtx/device_cmsis_rtx.uvproj b/demos/device/device_cmsis_rtx/device_cmsis_rtx.uvproj
index 30204f36..f355078c 100644
--- a/demos/device/device_cmsis_rtx/device_cmsis_rtx.uvproj
+++ b/demos/device/device_cmsis_rtx/device_cmsis_rtx.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -952,7 +952,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1347</TargetName>
+      <TargetName>Board_LPCXpresso1347</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -988,14 +988,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1347\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1347\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1897,7 +1897,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1933,14 +1933,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -2842,7 +2842,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board rf1ghznode</TargetName>
+      <TargetName>Board_rf1ghznode</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -2878,14 +2878,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_rf1ghznode\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_rf1ghznode\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -3845,7 +3845,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board NGX4330</TargetName>
+      <TargetName>Board_NGX4330</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -3881,14 +3881,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_NGX4330\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_NGX4330\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -4790,7 +4790,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso11u14</TargetName>
+      <TargetName>Board_LPCXpresso11u14</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -4826,14 +4826,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso11u14\</OutputDirectory>
           <OutputName>device_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso11u14\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
diff --git a/demos/device/device_freertos/device_freertos.uvproj b/demos/device/device_freertos/device_freertos.uvproj
index 2f8cb809..27a0370d 100644
--- a/demos/device/device_freertos/device_freertos.uvproj
+++ b/demos/device/device_freertos/device_freertos.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1049,7 +1049,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1347</TargetName>
+      <TargetName>Board_LPCXpresso1347</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1085,14 +1085,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1347\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1347\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -2091,7 +2091,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -2127,14 +2127,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -3133,7 +3133,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board rf1ghznode</TargetName>
+      <TargetName>Board_rf1ghznode</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -3169,14 +3169,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_rf1ghznode\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_rf1ghznode\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -4215,7 +4215,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board NGX4330</TargetName>
+      <TargetName>Board_NGX4330</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -4251,14 +4251,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_NGX4330\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_NGX4330\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -5257,7 +5257,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso11u14</TargetName>
+      <TargetName>Board_LPCXpresso11u14</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -5293,14 +5293,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso11u14\</OutputDirectory>
           <OutputName>device_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso11u14\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj
index ac100bc3..da5d8592 100644
--- a/demos/device/device_os_none/device_os_none.uvproj
+++ b/demos/device/device_os_none/device_os_none.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -914,7 +914,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1347</TargetName>
+      <TargetName>Board_LPCXpresso1347</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -950,14 +950,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1347\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1347\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1821,7 +1821,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1857,14 +1857,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -2728,7 +2728,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board rf1ghznode</TargetName>
+      <TargetName>Board_rf1ghznode</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -2764,14 +2764,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_rf1ghznode\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_rf1ghznode\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -3675,7 +3675,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board NGX4330</TargetName>
+      <TargetName>Board_NGX4330</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -3711,14 +3711,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_NGX4330\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_NGX4330\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -4582,7 +4582,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso11u14</TargetName>
+      <TargetName>Board_LPCXpresso11u14</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -4618,14 +4618,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso11u14\</OutputDirectory>
           <OutputName>device_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso11u14\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj
index 9a423f5d..789f9817 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>host_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -800,7 +800,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -836,14 +836,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>host_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1593,7 +1593,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board MCB4300</TargetName>
+      <TargetName>Board_MCB4300</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1629,14 +1629,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_MCB4300\</OutputDirectory>
           <OutputName>host_cmsis_rtx</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_MCB4300\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
diff --git a/demos/host/host_freertos/host_freertos.uvproj b/demos/host/host_freertos/host_freertos.uvproj
index 6bb2afb0..24971c84 100644
--- a/demos/host/host_freertos/host_freertos.uvproj
+++ b/demos/host/host_freertos/host_freertos.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>host_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -827,7 +827,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -863,14 +863,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>host_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1647,7 +1647,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board NGX4330</TargetName>
+      <TargetName>Board_NGX4330</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1683,14 +1683,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_NGX4330\</OutputDirectory>
           <OutputName>host_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_NGX4330\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -2467,7 +2467,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board MCB4300</TargetName>
+      <TargetName>Board_MCB4300</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -2503,14 +2503,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_MCB4300\</OutputDirectory>
           <OutputName>host_freertos</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_MCB4300\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj
index 627af3eb..fc775332 100644
--- a/demos/host/host_os_none/host_os_none.uvproj
+++ b/demos/host/host_os_none/host_os_none.uvproj
@@ -7,7 +7,7 @@
 
   <Targets>
     <Target>
-      <TargetName>Board EA4357</TargetName>
+      <TargetName>Board_EA4357</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_EA4357\</OutputDirectory>
           <OutputName>host_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_EA4357\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -762,7 +762,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board LPCXpresso1769</TargetName>
+      <TargetName>Board_LPCXpresso1769</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -798,14 +798,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_LPCXpresso1769\</OutputDirectory>
           <OutputName>host_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_LPCXpresso1769\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -1517,7 +1517,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board NGX4330</TargetName>
+      <TargetName>Board_NGX4330</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -1553,14 +1553,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_NGX4330\</OutputDirectory>
           <OutputName>host_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_NGX4330\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>
@@ -2272,7 +2272,7 @@
       </Groups>
     </Target>
     <Target>
-      <TargetName>Board MCB4300</TargetName>
+      <TargetName>Board_MCB4300</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
@@ -2308,14 +2308,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\UV4Build\</OutputDirectory>
+          <OutputDirectory>.\KeilBuild\Board_MCB4300\</OutputDirectory>
           <OutputName>host_os_none</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\UV4Build\</ListingPath>
+          <ListingPath>.\KeilBuild\Board_MCB4300\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>