Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -rb5ca53ca81575a727e615ab8836abfc1a4a0bbc8 -r53a25d66832105280c55adc778923ee251fe0b28
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision b5ca53ca81575a727e615ab8836abfc1a4a0bbc8)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 53a25d66832105280c55adc778923ee251fe0b28)
@@ -135,7 +135,7 @@
 
 // ********** private data **********
 
-static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mAh).
+static OVERRIDE_F32_T batteryRemCapacity_mWh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mWh).
 static U32 lastBatteryMonitorTime;                                          ///< Previous battery monitor time.
 static U32 commFaultPersistentCount;                                        ///< Persistence count for battery comm fault.
 
@@ -214,17 +214,17 @@
  * @brief
  * The getBatteryRemainingCapacity_mWh function returns the latest battery
  * remaining capacity (in mWh).
- * @details Inputs: batteryRemCapacity_mAh
+ * @details Inputs: batteryRemCapacity_mWh
  * @details Outputs: none
  * @return battery remaining capacity (in mWh).
  *************************************************************************/
 static F32 getBatteryRemainingCapacity_mWh( void )
 {
-    F32 result = batteryRemCapacity_mAh.data;
+    F32 result = batteryRemCapacity_mWh.data;
 
-    if ( OVERRIDE_KEY == batteryRemCapacity_mAh.override )
+    if ( OVERRIDE_KEY == batteryRemCapacity_mWh.override )
     {
-        result = batteryRemCapacity_mAh.ovData;
+        result = batteryRemCapacity_mWh.ovData;
     }
 
     return result;
@@ -466,7 +466,7 @@
  * the battery remaining capacity is stored, the battery status alarm is set
  * if necessary, and the loss of AC power alarm is set if necessary.
  * @details Inputs: current_BM_value, BatteryStatusData
- * @details Outputs: batteryRemCapacity_mAh, BatteryManagerData
+ * @details Outputs: batteryRemCapacity_mWh, BatteryManagerData
  * @return none
  *************************************************************************/
 static void getBatteryManagementData(void)
@@ -485,7 +485,7 @@
         case BATTERY_PACK_REMAINING_CAPACITY4:
         case BATTERY_PACK_REMAINING_CAPACITY5:    
             getBatteryData ( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_ADDR_REMAINING_CAPACITY, &BatteryStatusData.RemainingCapacity );
-            batteryRemCapacity_mAh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR;
+            batteryRemCapacity_mWh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR;
             break;
 
         case BATTERY_PACK_BATTERY_STATUS1:
@@ -694,7 +694,7 @@
  * The testSetBatteryRemainingPercentOverride function overrides the battery
  * remaining percent value.
  * @details Inputs: none
- * @details Outputs: batteryRemCapacity_mAh
+ * @details Outputs: batteryRemCapacity_mWh
  * @param value override battery remaining percent
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -705,8 +705,8 @@
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        batteryRemCapacity_mAh.ovData = value;
-        batteryRemCapacity_mAh.override = OVERRIDE_KEY;
+        batteryRemCapacity_mWh.ovData = value;
+        batteryRemCapacity_mWh.override = OVERRIDE_KEY;
     }
 
     return result;
@@ -717,7 +717,7 @@
  * The testResetSetBatteryRemainingPercentOverride function resets the
  * override of the battery remaining percent value.
  * @details Inputs: none
- * @details Outputs: batteryRemCapacity_mAh
+ * @details Outputs: batteryRemCapacity_mWh
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetSetBatteryRemainingPercentOverride( void )
@@ -727,8 +727,8 @@
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        batteryRemCapacity_mAh.override = OVERRIDE_RESET;
-        batteryRemCapacity_mAh.ovData = batteryRemCapacity_mAh.ovInitData;
+        batteryRemCapacity_mWh.override = OVERRIDE_RESET;
+        batteryRemCapacity_mWh.ovData = batteryRemCapacity_mWh.ovInitData;
     }
 
     return result;