Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r98e24f0db83de34e3d44c4bd72df9f506f8ceddc -r07012e0a841e4b35049bd5aa4609a2b37978f65b
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 98e24f0db83de34e3d44c4bd72df9f506f8ceddc)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 07012e0a841e4b35049bd5aa4609a2b37978f65b)
@@ -398,10 +398,10 @@
             for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ )
             {
                 isFanRPMOutOfRange = ( getMeasuredFanRPM( fan ) < fansMinAllowedRPM ) || ( getMeasuredFanRPM( fan ) > fansMaxAllowedRPM );
-                isPersistentAlarmTriggered( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, isFanRPMOutOfRange );
+                isPersistentAlarmTriggered( ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE, isFanRPMOutOfRange );
 
                 // If the RPM out of range alarm has been raised, do not raise it again, until its alarm silence time has been elapsed
-                hasAlarmBeenRaised = ( TRUE == isAlarmActive( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE ) ? TRUE : FALSE );
+                hasAlarmBeenRaised = ( TRUE == isAlarmActive( ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE ) ? TRUE : FALSE );
             }
         }
 
Index: firmware/App/Controllers/Fans.h
===================================================================
diff -u -r98e24f0db83de34e3d44c4bd72df9f506f8ceddc -r07012e0a841e4b35049bd5aa4609a2b37978f65b
--- firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 98e24f0db83de34e3d44c4bd72df9f506f8ceddc)
+++ firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 07012e0a841e4b35049bd5aa4609a2b37978f65b)
@@ -6,14 +6,14 @@
 
 /**
  *  @defgroup Fans Fans
- *  @brief Fans monitor/controller module. Controls and monitors the DG fans.
+ *  @brief Fans monitor/controller module. Controls and monitors the HD fans.
  *
  *  @addtogroup Fans
  *  @{
  */
 
 /// Fans names
-typedef enum DG_fans
+typedef enum HD_fans
 {
     FAN_INLET_1 = 0,          ///< Fan inlet 1
     NUM_OF_FANS_NAMES         ///< Number of fans names
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -r98e24f0db83de34e3d44c4bd72df9f506f8ceddc -r07012e0a841e4b35049bd5aa4609a2b37978f65b
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 98e24f0db83de34e3d44c4bd72df9f506f8ceddc)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 07012e0a841e4b35049bd5aa4609a2b37978f65b)
@@ -137,7 +137,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HD_TEMPERATURES_INALID_EXEC_STATE, temperaturesExecState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_TEMPERATURES_INALID_EXEC_STATE, temperaturesExecState );
             temperaturesExecState = TEMPERATURES_EXEC_STATE_GET_ADC_VALUES_STATE;
             break;
     }
@@ -306,7 +306,7 @@
 
             default:
                 // Wrong sensor was called, raise an alarm
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEMPERATURE_SENSOR_SELECTED, sensor );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEMPERATURE_SENSOR_SELECTED, sensor );
                 // Wrong sensor, return temperature to be -1
                 temperature = -1.0;
                 break;