Making the option names consistent