Changed option names to be more consistent