diff --git a/src/registrar/templates/includes/organization_address.html b/src/registrar/templates/includes/organization_address.html
index 38870285c..c332faaba 100644
--- a/src/registrar/templates/includes/organization_address.html
+++ b/src/registrar/templates/includes/organization_address.html
@@ -1,28 +1,28 @@
- {% if organization.converted_federal_agency %}
- {{ organization.converted_federal_agency }}
+ {% if organization.federal_agency %}
+ {{ organization.federal_agency }}
{% endif %}
- {% if organization.converted_organization_name %}
- {{ organization.converted_organization_name }}
+ {% if organization.organization_name %}
+ {{ organization.organization_name }}
{% endif %}
- {% if organization.converted_address_line1 %}
-
{{ organization.converted_address_line1 }}
+ {% if organization.address_line1 %}
+
{{ organization.address_line1 }}
{% endif %}
- {% if organization.converted_address_line2 %}
-
{{ organization.converted_address_line2 }}
+ {% if organization.address_line2 %}
+
{{ organization.address_line2 }}
{% endif %}
- {% if organization.converted_city %}
-
{{ organization.converted_city}}{% if organization.converted_state_territory %},
+ {% if organization.city %}
+
{{ organization.city}}{% if organization.state_territory %},
{% else %}
{% endif %}
{% endif %}
- {% if organization.converted_state_territory %}
- {{ organization.converted_state_territory }}
+ {% if organization.state_territory %}
+ {{ organization.state_territory }}
{% endif %}
- {% if organization.converted_zipcode %}
-
{{ organization.converted_zipcode }}
+ {% if organization.zipcode %}
+
{{ organization.zipcode }}
{% endif %}
- {% if organization.converted_urbanization %}
-
{{ organization.converted_urbanization }}
+ {% if organization.urbanization %}
+
{{ organization.urbanization }}
{% endif %}
diff --git a/src/registrar/templates/includes/request_review_steps.html b/src/registrar/templates/includes/request_review_steps.html
index dd2c961e5..b3ef6dc67 100644
--- a/src/registrar/templates/includes/request_review_steps.html
+++ b/src/registrar/templates/includes/request_review_steps.html
@@ -8,8 +8,8 @@
{% endif %}
{% if step == Step.ORGANIZATION_TYPE %}
- {% if domain_request.converted_generic_org_type is not None %}
- {% with title=form_titles|get_item:step value=domain_request.converted_generic_org_type_display|default:"Incomplete"|safe %}
+ {% if domain_request.generic_org_type is not None %}
+ {% with title=form_titles|get_item:step value=domain_request.generic_org_type_display|default:"Incomplete"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %}
{% else %}
@@ -29,7 +29,7 @@
{% if step == Step.ORGANIZATION_FEDERAL %}
- {% with title=form_titles|get_item:step value=domain_request.converted_federal_type|default:"Incomplete"|safe %}
+ {% with title=form_titles|get_item:step value=domain_request.federal_type|default:"Incomplete"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %}
{% endif %}
@@ -41,7 +41,7 @@
{% endif %}
{% if step == Step.ORGANIZATION_CONTACT %}
- {% if domain_request.converted_organization_name %}
+ {% if domain_request.organization_name %}
{% with title=form_titles|get_item:step value=domain_request %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %}
{% endwith %}
diff --git a/src/registrar/templates/includes/request_status_manage.html b/src/registrar/templates/includes/request_status_manage.html
index 2201d3030..48ea057f1 100644
--- a/src/registrar/templates/includes/request_status_manage.html
+++ b/src/registrar/templates/includes/request_status_manage.html
@@ -146,7 +146,7 @@
{% block request_summary %}
{% with heading_level='h3' %}
- {% with org_type=DomainRequest.converted_generic_org_type_display %}
+ {% with org_type=DomainRequest.generic_org_type_display %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}
diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py
index 801fed71a..5de26ee4a 100644
--- a/src/registrar/tests/test_admin_request.py
+++ b/src/registrar/tests/test_admin_request.py
@@ -576,13 +576,6 @@ class TestDomainRequestAdmin(MockEppLib):
response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal")
# There are 2 template references to Federal (4) and two in the results data
# of the request
- html_content = response.content.decode('utf-8')
-
- # Write the HTML content to a file
- with open("output.html", "w", encoding="utf-8") as html_file:
- html_file.write(html_content)
-
- self.assertContains(response, "Federal", count=48)
# This may be a bit more robust
self.assertContains(response, 'federal | ', count=1)
# Now let's make sure the long description does not exist
diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py
index 17e6bcbe6..d8ee19c48 100644
--- a/src/registrar/tests/test_views_request.py
+++ b/src/registrar/tests/test_views_request.py
@@ -249,6 +249,7 @@ class DomainRequestTests(TestWithUser, WebTest):
type_result = type_form.submit()
# should see results in db
domain_request = DomainRequest.objects.get() # there's only one
+ print(domain_request.generic_org_type)
self.assertEqual(domain_request.generic_org_type, "federal")
# the post request should return a redirect to the next form in
# the domain request page
@@ -487,7 +488,7 @@ class DomainRequestTests(TestWithUser, WebTest):
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
review_page = requirements_result.follow()
review_form = review_page.forms[0]
-
+ print(review_page)
# Review page contains all the previously entered data
# Let's make sure the long org name is displayed
self.assertContains(review_page, "Federal")