Make commandline opts more consistent