Update the form_alter to match the new field names