Re-evaluate short and long option names for CLI arguments

IMO should names should be used sparingly, and it should be obvious what they are intended for. We now have checks for conflicts, but perhaps there are some instances where we can/should use a short name other than the default values.

Long names are generally easier, but there may still be some room for improvement (e.g. maybe we want `--addr` instead of `--address`, etc.)