Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -70,7 +70,7 @@
 static BOOL alarmLampOn = FALSE;                                        ///< Flag indicates whether an any lamp is currently on.
 
 /// Two step alarm lamp patterns (repeating).
-const struct LampPatterns lampPatterns[ NUM_OF_LAMP_PATTERNS ] = {
+const struct LampPatterns LAMP_PATTERNS[ NUM_OF_LAMP_PATTERNS ] = {
     { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_OFF
     { { 500, 500 },   { LAMP_STATE_ON,  LAMP_STATE_ON  }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_OK
     { { 250, 250 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_FAULT
@@ -134,7 +134,7 @@
     if ( getCurrentAlarmLampPattern() != LAMP_PATTERN_MANUAL )
     {
         // if pattern step duration has elapsed, move to next step
-        if ( lampPatternStepTimer >= lampPatterns[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] )
+        if ( lampPatternStepTimer >= LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] )
         {
             // increment pattern step
             currentLampPatternStep++;
@@ -279,17 +279,17 @@
 
     alarmLampOn = FALSE;
     lampPatternStepTimer = 0;
-    if ( lampPatterns[ getCurrentAlarmLampPattern() ].green[ currentLampPatternStep ] == LAMP_STATE_ON )
+    if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].green[ currentLampPatternStep ] == LAMP_STATE_ON )
     {
         green = PIN_SIGNAL_HIGH;
         alarmLampOn = TRUE;
     }
-    if ( lampPatterns[ getCurrentAlarmLampPattern() ].blue[ currentLampPatternStep ] == LAMP_STATE_ON )
+    if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].blue[ currentLampPatternStep ] == LAMP_STATE_ON )
     {
         blue = PIN_SIGNAL_HIGH;
         alarmLampOn = TRUE;
     }
-    if ( lampPatterns[ getCurrentAlarmLampPattern() ].red[ currentLampPatternStep ] == LAMP_STATE_ON )
+    if ( LAMP_PATTERNS[ getCurrentAlarmLampPattern() ].red[ currentLampPatternStep ] == LAMP_STATE_ON )
     {
         red = PIN_SIGNAL_HIGH;
         alarmLampOn = TRUE;
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -197,16 +197,16 @@
 
 static OVERRIDE_U32_T valvesPositionOverride[ NUM_OF_VALVES ] = { VALVE_POSITION_C_CLOSE, VALVE_POSITION_C_CLOSE, 0, 0 };          ///< Valves position override
 
-static const U16 valvesControlModesSetBits[ NUM_OF_VALVES ][ NUM_OF_VALVE_CONTROL_MODES ] =
-                                           { { VDI_SET_PID_BIT_MASK, VDI_SET_BYPASS_BIT_MASK, VDI_RESET_CONTROL_BIT_MASK },
-                                             { VDO_SET_PID_BIT_MASK, VDO_SET_BYPASS_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK },
-                                             { VBA_SET_PID_BIT_MASK, VBA_SET_BYPASS_BIT_MASK, VBA_RESET_CONTROL_BIT_MASK },
-                                             { VBV_SET_PID_BIT_MASK, VBV_SET_BYPASS_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK } };      ///< Valves control mode set bits
+static const U16 VALVE_CONTROL_MODES_SET_BITS[ NUM_OF_VALVES ][ NUM_OF_VALVE_CONTROL_MODES ] =
+                                             { { VDI_SET_PID_BIT_MASK, VDI_SET_BYPASS_BIT_MASK, VDI_RESET_CONTROL_BIT_MASK },
+                                               { VDO_SET_PID_BIT_MASK, VDO_SET_BYPASS_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK },
+                                               { VBA_SET_PID_BIT_MASK, VBA_SET_BYPASS_BIT_MASK, VBA_RESET_CONTROL_BIT_MASK },
+                                               { VBV_SET_PID_BIT_MASK, VBV_SET_BYPASS_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK } };    ///< Valves control mode set bits
 
-static const U16 valvesControlModesResetBits[ NUM_OF_VALVES ] = { VDI_RESET_CONTROL_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK,
-                                                                  VBA_RESET_CONTROL_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK };        ///< Valves control modes rest bits
+static const U16 VALVE_CONTROL_MODES_RESET_BITS[ NUM_OF_VALVES ] = { VDI_RESET_CONTROL_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK,
+                                                                     VBA_RESET_CONTROL_BIT_MASK, VBV_RESET_CONTROL_BIT_MASK };     ///< Valves control modes rest bits
 
-static const U16 valvesControlStatusBits[ NUM_OF_VALVES ][ NUM_OF_VALVE_CONTROL_STATUS ] =
+static const U16 VALVE_CONTROL_STATUS_BITS[ NUM_OF_VALVES ][ NUM_OF_VALVE_CONTROL_STATUS ] =
   { { VDI_INIT_STATUS_BIT_MASK, VDI_ENABLE_PID_STATUS_BIT_MASK, VDI_ENABLE_BYPASS_STATUS_BIT_MASK, VDI_RESET_CONTROL_BIT_MASK },
     { VDO_INIT_STATUS_BIT_MASK, VDO_ENABLE_PID_STATUS_BIT_MASK, VDO_ENABLE_BYPASS_STATUS_BIT_MASK, VDO_RESET_CONTROL_BIT_MASK },
     { VBA_INIT_STATUS_BIT_MASK, VBA_ENABLE_PID_STATUS_BIT_MASK, VBA_ENABLE_BYPASS_STATUS_BIT_MASK, VBA_RESET_CONTROL_BIT_MASK },
@@ -895,8 +895,8 @@
 static void setValveControlMode( VALVE_T valve, VALVE_MODE_T mode )
 {
     // Get the set and reset bits for the particular valve
-    U16 control = valvesControlModesSetBits[ valve ][ mode ];
-    U16 reset = valvesControlModesResetBits[ valve ];
+    U16 control = VALVE_CONTROL_MODES_SET_BITS[ valve ][ mode ];
+    U16 reset = VALVE_CONTROL_MODES_RESET_BITS[ valve ];
 
     // Reset the control bits of the particular valve
     valvesControlSetBits &= reset;
@@ -963,28 +963,28 @@
         // Depending on the control mode of the valve, different bit masks will be checked
         if ( mode == VALVE_CONTROL_MODE_ENABLE_PID )
         {
-            if ( ! ( status & valvesControlStatusBits[ valve ][ VALVE_CONTROL_STATUS_INITIALIZED ] ) )
+            if ( ! ( status & VALVE_CONTROL_STATUS_BITS[ valve ][ VALVE_CONTROL_STATUS_INITIALIZED ] ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_NOT_FUNCTIONAL, (U32)valve, (U32)mode );
                 result = FALSE;
             }
-            if ( ! ( status & valvesControlStatusBits[ valve ][ VALVE_CONTROL_STATUS_PID_ENABLED ] ) )
+            if ( ! ( status & VALVE_CONTROL_STATUS_BITS[ valve ][ VALVE_CONTROL_STATUS_PID_ENABLED ] ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_NOT_FUNCTIONAL, (U32)valve, (U32)mode );
                 result = FALSE;
             }
         }
         else if ( mode == VALVE_CONTORL_MODE_ENABLE_BYPASS )
         {
-            if ( ! ( status & valvesControlStatusBits[ valve ][ VALVE_CONTROL_STATUS_BYPASS_ENABLED ] ) )
+            if ( ! ( status & VALVE_CONTROL_STATUS_BITS[ valve ][ VALVE_CONTROL_STATUS_BYPASS_ENABLED ] ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_NOT_FUNCTIONAL, (U32)valve, (U32)mode );
                 result = FALSE;
             }
         }
         else if ( mode == VALVE_CONTROL_MODE_DISABLE_ALL )
         {
-            if ( ! ( status & ( ~valvesControlStatusBits[ valve ][ VALVE_CONTROL_STATUS_DISABLED ] ) ) )
+            if ( ! ( status & ( ~VALVE_CONTROL_STATUS_BITS[ valve ][ VALVE_CONTROL_STATUS_DISABLED ] ) ) )
             {
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_NOT_FUNCTIONAL, (U32)valve, (U32)mode );
                 result = FALSE;
Index: firmware/App/Drivers/InternalADC.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -32,7 +32,7 @@
 #define ROLLING_AVG_SHIFT_DIVIDER       4       ///< rolling average shift divider.
 
 /// Mapping from enumerated used ADC channel to processor channel ID.
-const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[ MAX_ADC_CHANNELS ] =
+const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] =
 {
     INT_ADC_DIAL_IN_PUMP_SPEED,         // 0
     INT_ADC_NOT_USED,                   // 1
@@ -137,7 +137,7 @@
         // process readings from last conversion
         for ( i = 0; i < adcRawReadingsCount; i++ )
         {
-            U32 ch = adcChannelNum2ChannelId[ adcRawReadings[ i ].id ];
+            U32 ch = ADC_CHANNEL_NUM_TO_CHANNEL_ID[ adcRawReadings[ i ].id ];
 
             adcReadingsTotals[ ch ] -= adcReadings[ ch ][ adcReadingsIdx[ ch ] ];
             adcReadings[ ch ][ adcReadingsIdx[ ch ] ] = adcRawReadings[i].value;
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        4
 #define HD_VERSION_MICRO        5
-#define HD_VERSION_BUILD        11
+#define HD_VERSION_BUILD        0
 
 // ********** development build switches **********
 
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 933a18d740285e70be9d00696ed0f5a5381bc8e4)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -53,7 +53,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
@@ -151,10 +151,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;
@@ -502,23 +502,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;
             }
@@ -768,11 +768,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 );
             }
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0ca8364b86f7b7d7841bc884eae5f674fd5618d4 -ref95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0ca8364b86f7b7d7841bc884eae5f674fd5618d4)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ef95a6c8bdfb5ada99e6cffb9627155b6d3cd8c6)
@@ -42,7 +42,7 @@
 U08 alarmTableSizeAssertion[ ( ( sizeof( ALARM_TABLE ) / sizeof( ALARM_T ) ) == NUM_OF_ALARM_IDS ? 1 : -1 ) ];
 
 /// A blank alarm data record for alarms that do not include alarm data when triggered.
-const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };
+const ALARM_DATA_T BLANK_ALARM_DATA = { ALARM_DATA_TYPE_NONE, 0 };
 
 // pin assignment for backup alarm audio enable
 #define BACKUP_AUDIO_ENABLE_SPI3_PORT_MASK    0x00000001                                                ///< pin SPI3-CS0 - re-purposed as output GPIO for back audio enable.
@@ -201,7 +201,7 @@
     // broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ] )
     {
-        broadcastAlarmTriggered( (U16)alarm, blankAlarmData, blankAlarmData );
+        broadcastAlarmTriggered( (U16)alarm, BLANK_ALARM_DATA, BLANK_ALARM_DATA );
     }
     activateAlarm( alarm );
 #ifdef DEBUG_ENABLED
@@ -234,7 +234,7 @@
     // broadcast alarm and data if alarm not already active
     if ( FALSE == alarmIsActive[ alarm ] )
     {
-        broadcastAlarmTriggered( (U16)alarm, alarmData, blankAlarmData );
+        broadcastAlarmTriggered( (U16)alarm, alarmData, BLANK_ALARM_DATA );
     }
     activateAlarm( alarm );
 #ifdef DEBUG_ENABLED