Changed cli option description and names