Rename options for consistency