Index: firmware/App/Drivers/BatteryDriver.h
===================================================================
diff -u -ree67a27bd69956eb8cfd7c5986538b441b8b7aa7 -r2e75c0c69869132ff4adb46a0509aab7a04d60a3
--- firmware/App/Drivers/BatteryDriver.h	(.../BatteryDriver.h)	(revision ee67a27bd69956eb8cfd7c5986538b441b8b7aa7)
+++ firmware/App/Drivers/BatteryDriver.h	(.../BatteryDriver.h)	(revision 2e75c0c69869132ff4adb46a0509aab7a04d60a3)
@@ -45,20 +45,20 @@
     BATTERY_CHARGER_VSYS,                                                   ///< Battery charger system voltage (in mV)
     BATTERY_CHARGER_FAULT,                                                  ///< Battery charger fault status
     BATTERY_CHARGER_CURRENT,                                                ///< Battery charger current (in mA)
-    END_OF_LIST,                                                            ///< End of battery data list
+    MAXIMUM_BATTERY_REGISTERS,                                                            ///< End of battery data list
 } BATTERY_MANAGEMENT_ENUM_T;
 
 typedef enum BatteryDevicesEnum
 {
     BATTERY_CHARGER_ADDRESS = 0,                                            ///< Battery charger at I2C address
     BATTERY_PACK_ADDRESS,                                                   ///< Battery pack at SMBus address
-    NUM_OF_BATTERY_DEVICES,                                                 ///< Number of battery devices
+    MAXIMUM_DEVICE_ADDRESSES,                                                 ///< Number of battery devices
 } BATTERY_DEVICE_ADDRESS_ENUM_T;
 
 // ********** public function prototypes **********
 
 void initsetupI2CDriver(void);
-BOOL getBatteryData( BATTERY_DEVICE_ADDRESS_ENUM_T devicesel, BATTERY_MANAGEMENT_ENUM_T registersel, U32 * dataPtr );
+BOOL getBatteryData( BATTERY_DEVICE_ADDRESS_ENUM_T deviceSel, BATTERY_MANAGEMENT_ENUM_T registerSel, U32 * dataPtr );
 U32 getI2CStatusRegister( BOOL resetOverride );
 BOOL testBatteryI2CStatusOverride( MESSAGE_T *message );