Audit naming choices for CLI parameters and functions

[mvadari]

A lot of the same parameters are labeled differently in different methods. These should be better aligned.

There are likely other poor naming choices that should be resolved.