Fix option names