diff --git a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
index 07dd3eb05..2eeaa581b 100644
--- a/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
+++ b/demos/device/device_cmsis_rtx/device_cmsis_rtx.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -927,7 +927,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -941,15 +941,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1851,7 +1851,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1865,15 +1865,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2775,7 +2775,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board rf1ghznode</name>
+    <name>Board_rf1ghznode</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2789,15 +2789,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board rf1ghznode\Exe</state>
+          <state>Board_rf1ghznode\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board rf1ghznode\Obj</state>
+          <state>Board_rf1ghznode\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board rf1ghznode\List</state>
+          <state>Board_rf1ghznode\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -3699,7 +3699,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1347</name>
+    <name>Board_LPCXpresso1347</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -3713,15 +3713,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1347\Exe</state>
+          <state>Board_LPCXpresso1347\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1347\Obj</state>
+          <state>Board_LPCXpresso1347\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1347\List</state>
+          <state>Board_LPCXpresso1347\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -4623,7 +4623,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso11u14</name>
+    <name>Board_LPCXpresso11u14</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -4637,15 +4637,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso11u14\Exe</state>
+          <state>Board_LPCXpresso11u14\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso11u14\Obj</state>
+          <state>Board_LPCXpresso11u14\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso11u14\List</state>
+          <state>Board_LPCXpresso11u14\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -5611,15 +5611,15 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM3.a</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
       </excluded>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
       </excluded>
     </file>
     <file>
@@ -5631,10 +5631,10 @@
     <group>
       <name>lpc11uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</name>
@@ -5652,11 +5652,11 @@
     <group>
       <name>lpc13uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</name>
@@ -5674,11 +5674,11 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -5702,10 +5702,10 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
diff --git a/demos/device/device_cmsis_rtx/device_cmsis_rtx.eww b/demos/device/device_cmsis_rtx/device_cmsis_rtx.eww
index 11215a7ac..67cf8821e 100644
--- a/demos/device/device_cmsis_rtx/device_cmsis_rtx.eww
+++ b/demos/device/device_cmsis_rtx/device_cmsis_rtx.eww
@@ -4,31 +4,6 @@
   <project>
     <path>$WS_DIR$\device_cmsis_rtx.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>device_cmsis_rtx</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>device_cmsis_rtx</project>
-        <configuration>Board LPCXpresso1347</configuration>
-      </member>
-      <member>
-        <project>device_cmsis_rtx</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>device_cmsis_rtx</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-      <member>
-        <project>device_cmsis_rtx</project>
-        <configuration>Board rf1ghznode</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>
 
 
diff --git a/demos/device/device_freertos/device_freertos.ewp b/demos/device/device_freertos/device_freertos.ewp
index f54c5d7c3..d48db2ddc 100644
--- a/demos/device/device_freertos/device_freertos.ewp
+++ b/demos/device/device_freertos/device_freertos.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -928,7 +928,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -942,15 +942,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1853,7 +1853,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1867,15 +1867,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2778,7 +2778,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board rf1ghznode</name>
+    <name>Board_rf1ghznode</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2792,15 +2792,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board rf1ghznode\Exe</state>
+          <state>Board_rf1ghznode\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board rf1ghznode\Obj</state>
+          <state>Board_rf1ghznode\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board rf1ghznode\List</state>
+          <state>Board_rf1ghznode\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -3703,7 +3703,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1347</name>
+    <name>Board_LPCXpresso1347</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -3717,15 +3717,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1347\Exe</state>
+          <state>Board_LPCXpresso1347\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1347\Obj</state>
+          <state>Board_LPCXpresso1347\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1347\List</state>
+          <state>Board_LPCXpresso1347\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -4628,7 +4628,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso11u14</name>
+    <name>Board_LPCXpresso11u14</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -4642,15 +4642,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso11u14\Exe</state>
+          <state>Board_LPCXpresso11u14\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso11u14\Obj</state>
+          <state>Board_LPCXpresso11u14\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso11u14\List</state>
+          <state>Board_LPCXpresso11u14\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -5617,10 +5617,10 @@
     <group>
       <name>CM0</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM0\port.c</name>
@@ -5632,10 +5632,10 @@
     <group>
       <name>CM3</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM3\port.c</name>
@@ -5647,10 +5647,10 @@
     <group>
       <name>CM4F</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM4F\port.c</name>
@@ -5686,10 +5686,10 @@
     <group>
       <name>lpc11uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</name>
@@ -5707,11 +5707,11 @@
     <group>
       <name>lpc13uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</name>
@@ -5729,11 +5729,11 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -5757,10 +5757,10 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
diff --git a/demos/device/device_freertos/device_freertos.eww b/demos/device/device_freertos/device_freertos.eww
index 3256c3aaf..5a0caeaf1 100644
--- a/demos/device/device_freertos/device_freertos.eww
+++ b/demos/device/device_freertos/device_freertos.eww
@@ -4,31 +4,6 @@
   <project>
     <path>$WS_DIR$\device_freertos.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>device_freertos</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>device_freertos</project>
-        <configuration>Board LPCXpresso1347</configuration>
-      </member>
-      <member>
-        <project>device_freertos</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>device_freertos</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-      <member>
-        <project>device_freertos</project>
-        <configuration>Board rf1ghznode</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>
 
 
diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp
index 1055abe0a..0e2368f53 100644
--- a/demos/device/device_os_none/device_os_none.ewp
+++ b/demos/device/device_os_none/device_os_none.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -925,7 +925,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -939,15 +939,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1847,7 +1847,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1861,15 +1861,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2769,7 +2769,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board rf1ghznode</name>
+    <name>Board_rf1ghznode</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2783,15 +2783,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board rf1ghznode\Exe</state>
+          <state>Board_rf1ghznode\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board rf1ghznode\Obj</state>
+          <state>Board_rf1ghznode\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board rf1ghznode\List</state>
+          <state>Board_rf1ghznode\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -3691,7 +3691,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1347</name>
+    <name>Board_LPCXpresso1347</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -3705,15 +3705,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1347\Exe</state>
+          <state>Board_LPCXpresso1347\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1347\Obj</state>
+          <state>Board_LPCXpresso1347\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1347\List</state>
+          <state>Board_LPCXpresso1347\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -4613,7 +4613,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso11u14</name>
+    <name>Board_LPCXpresso11u14</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -4627,15 +4627,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso11u14\Exe</state>
+          <state>Board_LPCXpresso11u14\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso11u14\Obj</state>
+          <state>Board_LPCXpresso11u14\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso11u14\List</state>
+          <state>Board_LPCXpresso11u14\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -5599,10 +5599,10 @@
     <group>
       <name>lpc11uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</name>
@@ -5620,11 +5620,11 @@
     <group>
       <name>lpc13uxx</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</name>
@@ -5642,11 +5642,11 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -5670,10 +5670,10 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
-        <configuration>Board rf1ghznode</configuration>
-        <configuration>Board LPCXpresso1347</configuration>
-        <configuration>Board LPCXpresso11u14</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
+        <configuration>Board_rf1ghznode</configuration>
+        <configuration>Board_LPCXpresso1347</configuration>
+        <configuration>Board_LPCXpresso11u14</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
diff --git a/demos/device/device_os_none/device_os_none.eww b/demos/device/device_os_none/device_os_none.eww
index 5b458323c..56fd33764 100644
--- a/demos/device/device_os_none/device_os_none.eww
+++ b/demos/device/device_os_none/device_os_none.eww
@@ -4,31 +4,6 @@
   <project>
     <path>$WS_DIR$\device_os_none.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>device_os_none</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>device_os_none</project>
-        <configuration>Board LPCXpresso1347</configuration>
-      </member>
-      <member>
-        <project>device_os_none</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>device_os_none</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-      <member>
-        <project>device_os_none</project>
-        <configuration>Board rf1ghznode</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
index 8b45463ca..e2beeab11 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -928,7 +928,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -942,15 +942,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1853,7 +1853,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1867,15 +1867,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2825,14 +2825,14 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM3.a</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
       </excluded>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
       </excluded>
     </file>
     <file>
@@ -2856,8 +2856,8 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -2881,7 +2881,7 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.eww b/demos/host/host_cmsis_rtx/host_cmsis_rtx.eww
index 6901204f3..642ac4dff 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.eww
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.eww
@@ -4,23 +4,6 @@
   <project>
     <path>$WS_DIR$\host_cmsis_rtx.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>host_cmsis_rtx</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>host_cmsis_rtx</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>host_cmsis_rtx</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index 5130465a4..bb850bbf3 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -929,7 +929,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -943,15 +943,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1855,7 +1855,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1869,15 +1869,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2781,7 +2781,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board MCB4300</name>
+    <name>Board_MCB4300</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2795,15 +2795,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board MCB4300\Exe</state>
+          <state>Board_MCB4300\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board MCB4300\Obj</state>
+          <state>Board_MCB4300\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board MCB4300\List</state>
+          <state>Board_MCB4300\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -3759,9 +3759,9 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board MCB4300</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_MCB4300</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -3785,7 +3785,7 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
@@ -3827,9 +3827,9 @@
     <group>
       <name>CM3</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board MCB4300</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_MCB4300</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM3\port.c</name>
@@ -3841,7 +3841,7 @@
     <group>
       <name>CM4F</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM4F\port.c</name>
diff --git a/demos/host/host_freertos/host_freertos.eww b/demos/host/host_freertos/host_freertos.eww
index 88977519d..400e6fb33 100644
--- a/demos/host/host_freertos/host_freertos.eww
+++ b/demos/host/host_freertos/host_freertos.eww
@@ -4,23 +4,6 @@
   <project>
     <path>$WS_DIR$\host_freertos.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>host_freertos</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>host_freertos</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>host_freertos</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index 70584d7e2..48a0cc8f9 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -3,7 +3,7 @@
 <project>
   <fileVersion>2</fileVersion>
   <configuration>
-    <name>Board EA4357</name>
+    <name>Board_EA4357</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -17,15 +17,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board EA4357\Exe</state>
+          <state>Board_EA4357\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board EA4357\Obj</state>
+          <state>Board_EA4357\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board EA4357\List</state>
+          <state>Board_EA4357\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -926,7 +926,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board LPCXpresso1769</name>
+    <name>Board_LPCXpresso1769</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -940,15 +940,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board LPCXpresso1769\Exe</state>
+          <state>Board_LPCXpresso1769\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board LPCXpresso1769\Obj</state>
+          <state>Board_LPCXpresso1769\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board LPCXpresso1769\List</state>
+          <state>Board_LPCXpresso1769\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -1849,7 +1849,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board NGX4330</name>
+    <name>Board_NGX4330</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -1863,15 +1863,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board NGX4330\Exe</state>
+          <state>Board_NGX4330\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board NGX4330\Obj</state>
+          <state>Board_NGX4330\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board NGX4330\List</state>
+          <state>Board_NGX4330\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -2772,7 +2772,7 @@
     </settings>
   </configuration>
   <configuration>
-    <name>Board MCB4300</name>
+    <name>Board_MCB4300</name>
     <toolchain>
       <name>ARM</name>
     </toolchain>
@@ -2786,15 +2786,15 @@
         <debug>1</debug>
         <option>
           <name>ExePath</name>
-          <state>Board MCB4300\Exe</state>
+          <state>Board_MCB4300\Exe</state>
         </option>
         <option>
           <name>ObjPath</name>
-          <state>Board MCB4300\Obj</state>
+          <state>Board_MCB4300\Obj</state>
         </option>
         <option>
           <name>ListPath</name>
-          <state>Board MCB4300\List</state>
+          <state>Board_MCB4300\List</state>
         </option>
         <option>
           <name>Variant</name>
@@ -3747,9 +3747,9 @@
     <group>
       <name>lpc175x_6x</name>
       <excluded>
-        <configuration>Board EA4357</configuration>
-        <configuration>Board NGX4330</configuration>
-        <configuration>Board MCB4300</configuration>
+        <configuration>Board_EA4357</configuration>
+        <configuration>Board_NGX4330</configuration>
+        <configuration>Board_MCB4300</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
@@ -3773,7 +3773,7 @@
     <group>
       <name>lpc43xx</name>
       <excluded>
-        <configuration>Board LPCXpresso1769</configuration>
+        <configuration>Board_LPCXpresso1769</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
diff --git a/demos/host/host_os_none/host_os_none.eww b/demos/host/host_os_none/host_os_none.eww
index 198332c98..4f65db380 100644
--- a/demos/host/host_os_none/host_os_none.eww
+++ b/demos/host/host_os_none/host_os_none.eww
@@ -4,23 +4,6 @@
   <project>
     <path>$WS_DIR$\host_os_none.ewp</path>
   </project>
-  <batchBuild>
-    <batchDefinition>
-      <name>all</name>
-      <member>
-        <project>host_os_none</project>
-        <configuration>Board EA4357</configuration>
-      </member>
-      <member>
-        <project>host_os_none</project>
-        <configuration>Board LPCXpresso1769</configuration>
-      </member>
-      <member>
-        <project>host_os_none</project>
-        <configuration>Board NGX4330</configuration>
-      </member>
-    </batchDefinition>
-  </batchBuild>
 </workspace>