Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -re9e339870c5ed01230963f00d400331ab879c91f -r71790af85fc9277dc6471d58caacb5b8cd2db4ab
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision e9e339870c5ed01230963f00d400331ab879c91f)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 71790af85fc9277dc6471d58caacb5b8cd2db4ab)
@@ -190,8 +190,8 @@
 static BOOL checkTreatmentParamsInRange( U32 *reasons );
 static BOOL checkTreatmentParamsDependencies( U32 *reasons );
 static BOOL checkUFDependencies( U32 *reasons );
-static void extractTreatmentParamsFromPayload( TREATMENT_PARAMS_DATA_PAYLOAD_T payload );
-//static void checkPressureParamsRange( TREATMENT_PARAMS_DATA_PAYLOAD_T* txParams );
+static void extractTreatmentParamsFromPayload( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T payload );
+//static void checkPressureParamsRange( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T* txParams );
 static void sendTreatmentParamsResponse( BOOL rejected, U32 *reasons );
 //static void getInstitutionalRecordEdgeValue( TREATMENT_PARAM_T param, CRITICAL_DATAS_T* value, BOOL isMin );
 
@@ -438,7 +438,7 @@
     BOOL paramsAreInRange, paramsAreConsistent, isUFValid;
     BOOL result = FALSE;
     BOOL paramsConfirmed = FALSE;
-    TREATMENT_PARAMS_DATA_PAYLOAD_T params;
+    TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T params;
     U32 rejReasons[ NUM_OF_TREATMENT_PARAMS ];
 
     // Initialize reject reasons to zeroes
@@ -448,7 +448,7 @@
     if ( sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         // copy only the treatment parameters excluding the confirmation payload field
-        memcpy( &params, message->payload + sizeof(BOOL), sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) - sizeof(BOOL) );
+        memcpy( &params, message->payload + sizeof(BOOL), sizeof( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T ) );
 
         // Flag indicating if the user have sent the tx params validation from pre-treatment create rx state,
         // so that if all params are valid, TD software will transition state to patient connection
@@ -488,7 +488,7 @@
                 setCriticalData( &treatmentParameters[ param ], stagedParams[ param ] );
             }
             // Send latest and final treatment parameters to UI
-            sendMessage( MSG_ID_TD_VALIDATED_TREATMENT_PARAMS, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&stagedParams), sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) );
+            sendMessage( MSG_ID_TD_VALIDATED_TREATMENT_PARAMS, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&stagedParams), sizeof( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T ) );
         }
 
         // Respond to set treatment parameters request message
@@ -871,10 +871,10 @@
  * @param payload message payload record containing received treatment parameters
  * @return none
  *************************************************************************/
-static void extractTreatmentParamsFromPayload( TREATMENT_PARAMS_DATA_PAYLOAD_T payload )
+static void extractTreatmentParamsFromPayload( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T payload )
 {
     // Pull treatment parameters into data array so we can more easily work with them
-    memcpy( &stagedParams[0], &payload, sizeof(TREATMENT_PARAMS_DATA_PAYLOAD_T) );
+    memcpy( &stagedParams[0], &payload, sizeof(TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T) );
 }
 
 /*********************************************************************//**
@@ -894,7 +894,7 @@
     TREATMENT_PARAMS_VAL_RESP_DATA_PAYLOAD_T payload;
 
     payload.accepted = ( TRUE == rejected ? FALSE : TRUE );
-    memcpy( &payload.reason[0], &reasons[0], sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) );
+    memcpy( &payload.reason[0], &reasons[0], sizeof( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T ) );
     sendMessage( MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&payload), sizeof( TREATMENT_PARAMS_VAL_RESP_DATA_PAYLOAD_T ) );
 }
 
@@ -1466,16 +1466,16 @@
     // Verify payload length
     if ( 0 == message->hdr.payloadLen )
     {
-        TREATMENT_PARAMS_DATA_PAYLOAD_T payload;
+        TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T payload;
         TREATMENT_PARAM_T param;
 
         // Build and publish current treatment parameters record
         for ( param = (TREATMENT_PARAM_T)0; param < NUM_OF_TREATMENT_PARAMS; param++ )
         {
             stagedParams[ param ] = treatmentParameters[ param ].data;
         }
-        memcpy( (U08*)&payload, (U08*)&stagedParams[0], sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) );
-        sendMessage( MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS, COMM_BUFFER_OUT_CAN_PC, (U08*)&payload, sizeof( TREATMENT_PARAMS_DATA_PAYLOAD_T ) );
+        memcpy( (U08*)&payload, (U08*)&stagedParams[0], sizeof( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T ) );
+        sendMessage( MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS, COMM_BUFFER_OUT_CAN_PC, (U08*)&payload, sizeof( TREATMENT_PARAMS_DATA_RESPONSE_PAYLOAD_T ) );
 
         result = TRUE;
     }