Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r12978a9cc2442759dbb42d71ffcbc8057a1a7d14 -rd71d1e6c2be627158cac9a8bc56adac7cdefd1c8
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 12978a9cc2442759dbb42d71ffcbc8057a1a7d14)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d71d1e6c2be627158cac9a8bc56adac7cdefd1c8)
@@ -26,6 +26,7 @@
 #include "Comm.h"
 #include "Interrupts.h"
 #include "MsgQueues.h"
+#include "Utilities.h"
 #include "SystemCommMessages.h"
 
 #ifdef RM46_EVAL_BOARD_TARGET
@@ -714,7 +715,7 @@
         if ( TRUE == isThereMsgRcvd )
         {
             // TODO - check CRC before processing a message
-            if ( 1 )
+            if ( message.crc == crc8( (U08*)(&message), sizeof(MESSAGE_HEADER_T) + message.msg.hdr.payloadLen ) )
             {
                 processReceivedMessage( &message.msg );
             }
@@ -810,12 +811,12 @@
                 handleTestBloodFlowMeasuredOverrideRequest( message );
                 break;
 
-            case MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE:
-                handleTestBloodPumpMeasuredSpeedOverrideRequest( message );
+            case MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE:
+                handleTestBloodPumpMCMeasuredSpeedOverrideRequest( message );
                 break;
 
-            case MSG_ID_BLOOD_PUMP_MEAS_CURR_OVERRIDE:
-                handleTestBloodPumpMeasuredCurrentOverrideRequest( message );
+            case MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE:
+                handleTestBloodPumpMCMeasuredCurrentOverrideRequest( message );
                 break;
 
             case MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE: