Changed option names