Standardise connection option handling

Just name the command-line options after their API counterparts.