Index: firmware/App/Services/TxParams.c
===================================================================
diff -u -r5cc57a6d8eb3721811a2d6ace3176b7074c52fe8 -r027a8c7ac2a20cae3304dd6d72d54a1edbc19820
--- firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 5cc57a6d8eb3721811a2d6ace3176b7074c52fe8)
+++ firmware/App/Services/TxParams.c	(.../TxParams.c)	(revision 027a8c7ac2a20cae3304dd6d72d54a1edbc19820)
@@ -7,8 +7,8 @@
 *
 * @file    TxParams.c
 *
-* @author  (last)      Vijay Pamula
-* @date    (last)      11-Jun-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      02-Jul-2026
 *
 * @author  (original)  Varshini Nagabooshanam
 * @date    (original)  02-Dec-2025
@@ -21,6 +21,7 @@
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "Messaging.h"
+#include "ModeStandby.h"
 #include "ModeTreatment.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
@@ -140,10 +141,10 @@
 {   //         type                min           max         default
 
     { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=100},  {.uInt=50}   }, // TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW
-    { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=100},  {.uInt=50}   }, // TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW
-    { CRITICAL_DATA_TYPE_U32, {.uInt=20},   {.uInt=35},   {.uInt=35}   }, // TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC
+    { CRITICAL_DATA_TYPE_U32, {.uInt=50},   {.uInt=100},  {.uInt=50}   }, // TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW
+    { CRITICAL_DATA_TYPE_U32, {.uInt=20},   {.uInt=35},   {.uInt=35}   }, // TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW
     { CRITICAL_DATA_TYPE_U32, {.uInt=20},   {.uInt=50},   {.uInt=20}   }, // TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW
-    { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=500},  {.uInt=200}  }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATEs
+    { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=500},  {.uInt=200}  }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE
     { CRITICAL_DATA_TYPE_U32, {.uInt=300},  {.uInt=1000}, {.uInt=300}  }, // TREATMENT_PARAM_PRIME_DISCARD_VOLUME
     { CRITICAL_DATA_TYPE_U32, {.uInt=70},   {.uInt=140},  {.uInt=90}   }, // TREATMENT_PARAM_SYSTOLIC_BP_LOW_ALARM_LIMIT
     { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=260},  {.uInt=200}  }, // TREATMENT_PARAM_SYSTOLIC_BP_HIGH_ALARM_LIMIT
@@ -575,11 +576,11 @@
 
     switch ( txType )
     {
-        case TREATMENT_MODALITY_HDF:
+        case TREATMENT_MODALITY_HDF_ONLINE_FLUID:
             result = FALSE;
             break;
 
-        case TREATMENT_MODALITY_HD:
+        case TREATMENT_MODALITY_HD_SALINE_FLUID:
             result = ( ( ( param == TREATMENT_PARAM_HDF_DILUTION ) || ( param == TREATMENT_PARAM_SUBST_FLUID_VOLUME ) ) ? TRUE : FALSE );
             break;
 
@@ -738,6 +739,7 @@
     F32  hepDR  = stagedParams[ TREATMENT_PARAM_HEPARIN_DELIVERY_RATE ].sFlt;
     F32  hepBV  = stagedParams[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].sFlt;
     F32  txVol  = hepBV + ( hepDR * ( hepST / (F32)SEC_PER_MIN ) ) + SYRINGE_PUMP_PRIME_VOLUME_ML + SYRINGE_PUMP_FILL_VOLUME_OFFSET_ML;
+    TREATMENT_TYPE_T modality = (TREATMENT_TYPE_T)stagedParams[ TREATMENT_PARAM_TREATMENT_MODALITY ].uInt;
 
     // Variable to validate acid conversion factor consistency
     U32 acidType        = stagedParams[ TREATMENT_PARAM_ACID_CONCENTRATE ].uInt;
@@ -768,6 +770,13 @@
         result = FALSE;
     }
 
+    // Verify Rx entered modality with the treatment initiation modality
+    if ( modality != getModality() )
+    {
+        reasons[ TREATMENT_PARAM_TREATMENT_MODALITY ] = REQUEST_REJECT_REASON_MODALITY_MISMATCH;
+        result = FALSE;
+    }
+
     return result;
 }
 
@@ -1808,12 +1817,12 @@
             response.arterialPressureLimitWindowRejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         }
 
-        if ( FALSE == isVenousPressureLimitWindowValid( request.venousPressureLimitWindowMMHG ) )
+        if ( FALSE == isVenousPressureLimitWindowValid( request.venousHighPressureLimitWindowMMHG ) )
         {
             response.venousPressureLimitWindowRejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         }
 
-        if ( FALSE == isVenousAsymmetricPressureLimitWindowValid( request.venousAsymmetricPressureLimitWindowMMHG ) )
+        if ( FALSE == isVenousAsymmetricPressureLimitWindowValid( request.venousLowPressureLimitWindowMMHG ) )
         {
             response.venousAsymmetricPressureLimitWindowRejectionReason = REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE;
         }
@@ -1833,9 +1842,9 @@
         {
             setSysConfigTreatmentParameterU32( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, request.arterialPressureLimitWindowMMHG );
 
-            setSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, request.venousPressureLimitWindowMMHG );
+            setSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW, request.venousHighPressureLimitWindowMMHG );
 
-            setSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC, request.venousAsymmetricPressureLimitWindowMMHG );
+            setSysConfigTreatmentParameterU32( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW, request.venousLowPressureLimitWindowMMHG );
 
             setSysConfigTreatmentParameterU32( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW, request.tmpPressureLimitWindowMMHG );
 
@@ -1902,8 +1911,8 @@
 
     pressureValid = isPressureLimitValueValid(
                         value,
-                        getU32SysConfigTreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW ),
-                        getU32SysConfigTreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW ) );
+                        getU32SysConfigTreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW ),
+                        getU32SysConfigTreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW ) );
 
     return pressureValid;
 }
@@ -1923,8 +1932,8 @@
 
     pressureValid = isPressureLimitValueValid(
                             value,
-                            getU32SysConfigTreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC ),
-                            getU32SysConfigTreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC ) );
+                            getU32SysConfigTreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW ),
+                            getU32SysConfigTreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW ) );
 
     return pressureValid;
 }