unify options class names