Update docs and args with more informative  names and descriptions