Change to full names since using autocomplete anyway