Change field names and add help text