diff --git a/ports/stm32f10x/bacnet.ewp b/ports/stm32f10x/bacnet.ewp
index 247f54df..7c8cbfcb 100644
--- a/ports/stm32f10x/bacnet.ewp
+++ b/ports/stm32f10x/bacnet.ewp
@@ -1126,7 +1126,7 @@
         </file>
     </group>
     <group>
-        <name>BACnet-Handlers</name>
+        <name>BACnet-Basic-Services</name>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_apdu.c</name>
         </file>
@@ -1157,12 +1157,6 @@
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_wp.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\mstimer.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\ringbuf.c</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\service\s_iam.c</name>
         </file>
@@ -1173,6 +1167,18 @@
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\tsm\tsm.c</name>
         </file>
     </group>
+    <group>
+        <name>BACnet-Basic-System</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\bigend.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\mstimer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\ringbuf.c</name>
+        </file>
+    </group>
     <group>
         <name>CMSIS</name>
         <file>
diff --git a/ports/stm32f4xx/bacnet.ewp b/ports/stm32f4xx/bacnet.ewp
index 9d334f20..47dfc35d 100644
--- a/ports/stm32f4xx/bacnet.ewp
+++ b/ports/stm32f4xx/bacnet.ewp
@@ -1140,7 +1140,7 @@
         </file>
     </group>
     <group>
-        <name>BACnet Service Handlers</name>
+        <name>BACnet Basic Services</name>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_apdu.c</name>
         </file>
@@ -1176,7 +1176,10 @@
         </file>
     </group>
     <group>
-        <name>BACnet System</name>
+        <name>BACnet Basic System</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\bigend.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\fifo.c</name>
         </file>