Merge "Revert "Update name of field used from BatterySipper""