Made option naming consistent