standardize command line option names