Renamed/moved the options