Improve consistency regarding options

Use --exchange for both cases to avoid confusion for those who don't
know that --exchange and -X are the same.
Fix minor formatting issue