Edited command line option names and default values

2 jobs for feature/renaming-command-line-options in 1 minute and 25 seconds (queued for 3 seconds)