Change option names to be closer to zanata-cli