Rename option field names