Changed some redundant option names