reverted to old battery name conventions for sake of pull request.