Better battery names