Clean up field names. Update SQL to match fields.