Fix broken option names