Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r292265111b911fa79c52bb4589911dfb60c921bf -rfc9a9244cf4288ff0623c3e02455ac565bf60cdd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 292265111b911fa79c52bb4589911dfb60c921bf)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fc9a9244cf4288ff0623c3e02455ac565bf60cdd)
@@ -40,7 +40,7 @@
     // TODO do we need check the range of the messages?
     // TODO retry?
 
-    U08 data[ CAN_MESSAGE_PAYLOAD_SIZE ];
+    U08 data[ CAN_MESSAGE_FRAME_SIZE ];
 
     if ( SW_UPDATE_COMMAD == mailBox )
     {
@@ -50,7 +50,7 @@
 
             if ( result != 0 )
             {
-                addToCommBuffer( mailBox, data, CAN_MESSAGE_PAYLOAD_SIZE );
+                addToCommBuffer( mailBox, data, CAN_MESSAGE_FRAME_SIZE );
             }
         }
     }
@@ -64,7 +64,7 @@
 
                 if ( result != 0 )
                 {
-                    addToCommBuffer( mailBox, data, CAN_MESSAGE_PAYLOAD_SIZE );
+                    addToCommBuffer( mailBox, data, CAN_MESSAGE_FRAME_SIZE );
                 }
             }
         }
@@ -84,7 +84,7 @@
 {
     BOOL status = FALSE;
 
-    if ( 0 != canTransmit( canREG1, (U32)SW_UPDATE_FW_RESP, data ) )
+    if ( 0 != canTransmit( canREG1, (U32)SW_UPDATE_TD_RESP, data ) )
     {
         status = TRUE;
     }
@@ -94,7 +94,7 @@
 
 BOOL broadcastDataTestRemove( U08* data ) // TODO remove
 {
-    canTransmit( canREG1, (U32)SW_TEST, data );
+    canTransmit( canREG1, (U32)SW_UPDATE_TD_BROADCAST, data );
 
     return TRUE;
 }