Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -r766708fceb0bdf1af8c7897df29d4f5036bfd3db
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
@@ -49,7 +49,7 @@
 static HD_TREATMENT_PARAMS_MODE_STATE_T currentTreatmentParamsState;    ///< Current state of treatment parameters mode state machine.
 
 /// Treatment parameter properties (types, ranges and defaults).
-const TREATMENT_PARAMS_PROPERTIES_T treatParamsProperties[ NUM_OF_TREATMENT_PARAMS ] =
+const TREATMENT_PARAMS_PROPERTIES_T TREAT_PARAMS_PROPERTIES[ NUM_OF_TREATMENT_PARAMS ] =
 {
     { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=500},  {.uInt=100}  }, // TREATMENT_PARAM_BLOOD_FLOW
     { CRITICAL_DATA_TYPE_U32, {.uInt=100},  {.uInt=600},  {.uInt=100}  }, // TREATMENT_PARAM_DIALYSATE_FLOW
@@ -147,10 +147,10 @@
     for ( param = 0; param < NUM_OF_TREATMENT_PARAMS; param++ )
     {
         // Set type, range, and default value for each treatment parameter
-        treatmentParameters[ param ].typ = treatParamsProperties[ param ].dataType;
-        treatmentParameters[ param ].minimum = treatParamsProperties[ param ].min;
-        treatmentParameters[ param ].maximum = treatParamsProperties[ param ].max;
-        treatmentParameters[ param ].defValue = treatParamsProperties[ param ].def;
+        treatmentParameters[ param ].typ = TREAT_PARAMS_PROPERTIES[ param ].dataType;
+        treatmentParameters[ param ].minimum = TREAT_PARAMS_PROPERTIES[ param ].min;
+        treatmentParameters[ param ].maximum = TREAT_PARAMS_PROPERTIES[ param ].max;
+        treatmentParameters[ param ].defValue = TREAT_PARAMS_PROPERTIES[ param ].def;
         resetCriticalData( &treatmentParameters[ param ] );
         // Set staged parameter values to zero
         stagedParams[ param ].uInt = 0;
@@ -530,23 +530,23 @@
 
     if ( param < NUM_OF_TREATMENT_PARAMS )
     {
-        if ( CRITICAL_DATA_TYPE_U32 == treatParamsProperties[ param ].dataType )
+        if ( CRITICAL_DATA_TYPE_U32 == TREAT_PARAMS_PROPERTIES[ param ].dataType )
         {
-            if ( value.uInt >= treatParamsProperties[ param ].min.uInt && value.uInt <= treatParamsProperties[ param ].max.uInt )
+            if ( value.uInt >= TREAT_PARAMS_PROPERTIES[ param ].min.uInt && value.uInt <= TREAT_PARAMS_PROPERTIES[ param ].max.uInt )
             {
                 result = TRUE;
             }
         }
-        else if ( CRITICAL_DATA_TYPE_S32 == treatParamsProperties[ param ].dataType )
+        else if ( CRITICAL_DATA_TYPE_S32 == TREAT_PARAMS_PROPERTIES[ param ].dataType )
         {
-            if ( value.sInt >= treatParamsProperties[ param ].min.sInt && value.sInt <= treatParamsProperties[ param ].max.sInt )
+            if ( value.sInt >= TREAT_PARAMS_PROPERTIES[ param ].min.sInt && value.sInt <= TREAT_PARAMS_PROPERTIES[ param ].max.sInt )
             {
                 result = TRUE;
             }
         }
         else
         {
-            if ( value.sFlt >= treatParamsProperties[ param ].min.sFlt && value.sFlt <= treatParamsProperties[ param ].max.sFlt )
+            if ( value.sFlt >= TREAT_PARAMS_PROPERTIES[ param ].min.sFlt && value.sFlt <= TREAT_PARAMS_PROPERTIES[ param ].max.sFlt )
             {
                 result = TRUE;
             }
@@ -796,11 +796,11 @@
         if ( TRUE == isTestingActivated() )
         {
             // Set parameter per its type
-            if ( CRITICAL_DATA_TYPE_U32 == treatParamsProperties[ param ].dataType )
+            if ( CRITICAL_DATA_TYPE_U32 == TREAT_PARAMS_PROPERTIES[ param ].dataType )
             {
                 result = setTreatmentParameterU32( param, value.uInt );
             }
-            else if ( CRITICAL_DATA_TYPE_S32 == treatParamsProperties[ param ].dataType )
+            else if ( CRITICAL_DATA_TYPE_S32 == TREAT_PARAMS_PROPERTIES[ param ].dataType )
             {
                 result = setTreatmentParameterS32( param, value.sInt );
             }