Improve and simplify option synonyms