Rename  options to  for readability