Unify option names