Changed option names to make it easier to remember