Index: firmware/App/Monitors/Battery.h
===================================================================
diff -u -r78d196593cdcc9c3cd7166f02a99a7408a3e0b32 -rbbc62d810da9b094ea4f0fc765e1586ed37f0b34
--- firmware/App/Monitors/Battery.h	(.../Battery.h)	(revision 78d196593cdcc9c3cd7166f02a99a7408a3e0b32)
+++ firmware/App/Monitors/Battery.h	(.../Battery.h)	(revision bbc62d810da9b094ea4f0fc765e1586ed37f0b34)
@@ -32,20 +32,20 @@
 
 // ********** public definitions **********
 
-/// Payload record structure for battery data broadcast message
+/// Payload record structure for battery data broadcast message.
 typedef struct
 {
-    U32 RemainingCapacity;      ///< Remaining capacity in mAh.
-    U32 BatteryStatus;          ///< Battery pack status.
-    U32 BatteryChargerStatus;   ///< Battery charger status.
-    U32 BatteryI2CStatus;       ///< Battery I2C status.
-    U32 FaultStatus;            ///< Charger fault status.
-    U32 TS;                     ///< Thermistor percentage.
-    U32 VBAT;                   ///< Battery voltage in mV.
-    U32 VSYS;                   ///< System voltage in mV.
-    U32 IBAT;                   ///< Battery current in mA.
-    U32 RelativeStateOfCharge;  ///< Relative state of charge.
-    U32 FullChargeCapacity;     ///< Full charge capacity in mAh.
+    U32 remainingCapacity;       ///< Remaining capacity in mAh.
+    U32 batteryStatus;           ///< Battery pack status.
+    U32 batteryChargerStatus;    ///< Battery charger status.
+    U32 batteryI2cStatus;        ///< Battery I2C status.
+    U32 faultStatus;             ///< Charger fault status.
+    U32 ts;                      ///< Thermistor percentage.
+    U32 vbat;                    ///< Battery voltage in mV.
+    U32 vsys;                    ///< System voltage in mV.
+    U32 ibat;                    ///< Battery current in mA.
+    U32 relativeStateOfCharge;   ///< Relative state of charge.
+    U32 fullChargeCapacity;      ///< Full charge capacity in mAh.
 } BATTERY_DATA_PAYLOAD_T;
 
 //********** public function prototypes **********
@@ -54,9 +54,7 @@
 void execBatteryMonitor( void );
 BOOL isBatteryCharged( void );
 
-BOOL testBatteryRemainingCapacityOverride( MESSAGE_T *message );
-BOOL testBatteryStatusOverride( MESSAGE_T *message );
-BOOL testBatteryChargerStatusOverride( MESSAGE_T *message );
+BOOL testBatteryRegisterOverride( MESSAGE_T *message );
 
 /**@}*/