unify option names