diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index d289b1f55..416a036d1 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -74,15 +74,15 @@ class PurposeForm(forms.Form): })) class AuthorizingOfficialForm(forms.Form): - ao_given_name = forms.CharField(label="First name/given name") - ao_middle_name = forms.CharField( + given_name = forms.CharField(label="First name/given name") + middle_name = forms.CharField( required=False, label="Middle name (optional)", ) - ao_family_name = forms.CharField(label="Last name/family name") - ao_title = forms.CharField(label="Title or role in your organization") - ao_email = forms.EmailField(label="Email") - ao_phone = forms.CharField(label="Phone") + family_name = forms.CharField(label="Last name/family name") + title = forms.CharField(label="Title or role in your organization") + email = forms.EmailField(label="Email") + phone = forms.CharField(label="Phone") # List of forms in our wizard. Each entry is a tuple of a name and a form # subclass diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 4ad3a30b7..71da33340 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -26,23 +26,23 @@ {% csrf_token %}
- {{ wizard.form.ao_given_name|add_label_class:"usa-label" }} - {{ wizard.form.ao_given_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.given_name|add_label_class:"usa-label" }} + {{ wizard.form.given_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} - {{ wizard.form.ao_middle_name|add_label_class:"usa-label" }} - {{ wizard.form.ao_middle_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.middle_name|add_label_class:"usa-label" }} + {{ wizard.form.middle_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} - {{ wizard.form.ao_family_name|add_label_class:"usa-label" }} - {{ wizard.form.ao_family_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.family_name|add_label_class:"usa-label" }} + {{ wizard.form.family_name|add_class:"usa-input"|attr:"aria-describedby:instructions" }} - {{ wizard.form.ao_title|add_label_class:"usa-label" }} - {{ wizard.form.ao_title|add_class:"usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.title|add_label_class:"usa-label" }} + {{ wizard.form.title|add_class:"usa-input"|attr:"aria-describedby:instructions" }} - {{ wizard.form.ao_email|add_label_class:"usa-label" }} - {{ wizard.form.ao_email|add_class:"usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.email|add_label_class:"usa-label" }} + {{ wizard.form.email|add_class:"usa-input"|attr:"aria-describedby:instructions" }} - {{ wizard.form.ao_phone|add_label_class:"usa-label" }} - {{ wizard.form.ao_phone|add_class:"usa-input usa-input"|attr:"aria-describedby:instructions" }} + {{ wizard.form.phone|add_label_class:"usa-label" }} + {{ wizard.form.phone|add_class:"usa-input usa-input"|attr:"aria-describedby:instructions" }}