Updated the form_alter to use the new field names