Updated form_alter with the new field names.