Index: firmware/App/Monitors/Battery.h
===================================================================
diff -u -r0b606b5cbf2df52ea9845544155eae947ca4b8ee -r9e14f8c931ea3f2afdedc92de71bd497868a4176
--- firmware/App/Monitors/Battery.h	(.../Battery.h)	(revision 0b606b5cbf2df52ea9845544155eae947ca4b8ee)
+++ firmware/App/Monitors/Battery.h	(.../Battery.h)	(revision 9e14f8c931ea3f2afdedc92de71bd497868a4176)
@@ -31,27 +31,22 @@
  */
 
 // ********** public definitions **********
-/// Payload record structure for battery status data broadcast message
+/// Payload record structure for battery data broadcast message
 typedef struct
 {
-    U32 RemainingCapacity;              ///< Remaining capacity (mAh).
-    U32 BatteryStatus;                  ///< Battery status.
-    U32 BatteryChargerStatus;           ///< Battery charge status.
-    U32 BatteryI2CStatus;
-} BATTERY_STATUS_PAYLOAD_T;
+    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;
 
-/// Payload record structure for battery module data broadcast message
-typedef struct
-{
-    U32 FaultStatus;                    ///< Charger fault status.
-    U32 TS;                             ///< Temperature.
-    U32 VBAT;                           ///< Voltage.
-    U32 VSYS;                           ///< System voltage in mV.
-    U32 IBAT;                           ///< Current.
-    U32 RelativeStateOfCharge;          ///< Relative state of charge.
-    U32 FullChargeCapacity;             ///< Full charge capacity.
-} BATTERY_MANAGER_PAYLOAD_T;
-
 /// Enumeration of battery data to be read from the battery pack or battery charger in a round-robin fashion.
 typedef enum BatteryManagementEnum
 {