Index: firmware/App/Drivers/NVDriver.h
===================================================================
diff -u -r63c3a65e681810f037718377c6ed5a28c897d0ca -re17e1dc97bf8878056f1f7e4aa861c2448db52bc
--- firmware/App/Drivers/NVDriver.h	(.../NVDriver.h)	(revision 63c3a65e681810f037718377c6ed5a28c897d0ca)
+++ firmware/App/Drivers/NVDriver.h	(.../NVDriver.h)	(revision e17e1dc97bf8878056f1f7e4aa861c2448db52bc)
@@ -40,32 +40,32 @@
 #define BANK7_SECTOR3_START_ADDRESS          0xF020C000                         ///< Bank7 sector 3 start address.
 #define BANK7_SECTOR3_END_ADDRESS            0xF020FFFF                         ///< Bank7 sector 3 end address.
 
-/// NVDataMgmt memory operation modes enumeration.
-typedef enum NVDataMgmt_Operation
+/// Non Volatile Memory operation modes enumeration.
+typedef enum NVM_Operation
 {
-    NVDATAMGMT_NONE = 0,                                                        ///< Default mode to prevent any accidental ops.
-    NVDATAMGMT_WRITE,                                                           ///< Operation mode write.
-    NVDATAMGMT_READ,                                                            ///< Operation mode read.
-    NVDATAMGMT_ERASE_SECTOR,                                                    ///< Operation mode erase a sector (EEPROM).
-    NUM_OF_NVDATAMGMT_OPS_STATES                                                ///< Total number of operation states.
-} NVDATAMGMT_OPERATION_STATE_T;
+    NVM_NONE = 0,                                                        ///< Default mode to prevent any accidental ops.
+    NVM_OPERATION_WRITE,                                                           ///< Operation mode write.
+    NVM_OPERATION_READ,                                                            ///< Operation mode read.
+    NVM_OPERATION_ERASE,                                                    ///< Operation mode erase a sector (EEPROM).
+    NUM_OF_NVM_OPERATIONS                                                ///< Total number of operation states.
+} NVM_OPERATION_T;
 
-/// NVDataMgmt records' jobs states
-typedef enum NVDataMgmt_Records_Jobs
+/// NVM record type enumeration
+typedef enum NVM_Record_Type
 {
-    NVDATAMGMT_SYSTEM_RECORD = 0,                                               ///< NVDataMgmt process system record.
-    NVDATAMGMT_SERVICE_RECORD,                                                  ///< NVDataMgmt process service record.
-    NVDATAMGMT_CALIBRATION_RECORD,                                              ///< NVDataMgmt process calibration record.
-    NVDATAMGMT_INSTITUTIONAL_RECORD,                                            ///< NVDataMgmt process institutional record.
-    NVDATAMGMT_USAGE_INFO_RECORD,                                               ///< NVDataMgmt process usage info record.
-    NUM_OF_NVDATMGMT_RECORDS_JOBS                                               ///< Number of NVDataMgmt records jobs.
-} RECORD_JOBS_STATE_T;
+    NVM_SYSTEM_RECORD = 0,                                               ///< NVM process system record.
+    NVM_SERVICE_RECORD,                                                  ///< NVM process service record.
+    NVM_CALIBRATION_RECORD,                                              ///< NVM process calibration record.
+    NVM_INSTITUTIONAL_RECORD,                                            ///< NVM process institutional record.
+    NVM_USAGE_INFO_RECORD,                                               ///< NVM process usage info record.
+    NUM_OF_NVM_RECORD_TYPES                                                      ///< Number of NVM records jobs.
+} NVM_RECORD_TYPE_T;
 
 /// Process records job structure
 typedef struct
 {
-    NVDATAMGMT_OPERATION_STATE_T memoryOperation;                               ///< Memory operation.
-    RECORD_JOBS_STATE_T          recordJob;                                     ///< Record job (i.e sector 0).
+    NVM_OPERATION_T memoryOperation;                               ///< Memory operation.
+    NVM_RECORD_TYPE_T          recordJob;                                     ///< Record job (i.e sector 0).
 } PROCESS_RECORD_JOB_T;
 
 // ********** public function prototypes **********