diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 2203ec8cc..5937f47cc 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1695,13 +1695,13 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"last_status_update",
"status",
"custom_election_board",
- "state_territory",
"investigator",
"converted_generic_org_type",
"converted_organization_name",
"converted_federal_agency",
"converted_federal_type",
"converted_city",
+ "converted_state_territory"
]
orderable_fk_fields = [
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index 3684b9053..e66d0b274 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1386,7 +1386,7 @@ class DomainRequest(TimeStampedModel):
return self.city
@property
- def converted_state_terrority(self):
+ def converted_state_territory(self):
if self.portfolio:
return self.portfolio.state_territory
return self.state_territory
diff --git a/src/registrar/templates/includes/organization_address.html b/src/registrar/templates/includes/organization_address.html
index 32aedf2b0..38870285c 100644
--- a/src/registrar/templates/includes/organization_address.html
+++ b/src/registrar/templates/includes/organization_address.html
@@ -12,7 +12,7 @@
{{ organization.converted_address_line2 }}
{% endif %}
{% if organization.converted_city %}
-
{{ organization.converted_city}}{% if organization.state_territory %},
+
{{ organization.converted_city}}{% if organization.converted_state_territory %},
{% else %}
{% endif %}
{% endif %}
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index 4edfbe680..1902d1d8e 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -193,7 +193,7 @@ class GenericTestHelper(TestCase):
response = self.admin.changelist_view(dummy_request)
response.render() # Render the response before accessing its content
returned_sort_order = list(response.context_data["cl"].result_list)
-
+
self.assertEqual(expected_sort_order, returned_sort_order)
def _mock_user_request_for_factory(self, request):
diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index ce710ef53..1ab5ec218 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -1267,11 +1267,11 @@ class DomainRequestExport(BaseExport):
"""
# Handle the federal_type field. Defaults to the wrong format.
- federal_type = model.get("federal_type")
+ federal_type = model.get("converted_federal_type")
human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None
# Handle the org_type field
- org_type = model.get("generic_org_type") or model.get("organization_type")
+ org_type = model.get("converted_generic_org_type") or model.get("converted_organization_type")
human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None
# Handle the status field. Defaults to the wrong format.
@@ -1279,7 +1279,7 @@ class DomainRequestExport(BaseExport):
status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None
# Handle the region field.
- state_territory = model.get("state_territory")
+ state_territory = model.get("converted_state_territory")
region = get_region(state_territory) if state_territory else None
# Handle the requested_domain field (add a default if None)
@@ -1319,7 +1319,7 @@ class DomainRequestExport(BaseExport):
"Other contacts": model.get("all_other_contacts"),
"Current websites": model.get("all_current_websites"),
# Untouched FK fields - passed into the request dict.
- "Federal agency": model.get("federal_agency__agency"),
+ "Federal agency": model.get("converted_federal_agency__agency"),
"SO first name": model.get("senior_official__first_name"),
"SO last name": model.get("senior_official__last_name"),
"SO email": model.get("senior_official__email"),
@@ -1329,9 +1329,9 @@ class DomainRequestExport(BaseExport):
"Creator email": model.get("creator__email"),
"Investigator": model.get("investigator__email"),
# Untouched fields
- "Organization name": model.get("organization_name"),
- "City": model.get("city"),
- "State/territory": model.get("state_territory"),
+ "Organization name": model.get("converted_organization_name"),
+ "City": model.get("converted_city"),
+ "State/territory": model.get("converted_state_territory"),
"Request purpose": model.get("purpose"),
"CISA regional representative": model.get("cisa_representative_email"),
"Last submitted date": model.get("last_submitted_date"),