diff --git a/src/registrar/templates/includes/domain_request_status_manage.html b/src/registrar/templates/includes/domain_request_status_manage.html
index 2a254df4b..ed9bfc764 100644
--- a/src/registrar/templates/includes/domain_request_status_manage.html
+++ b/src/registrar/templates/includes/domain_request_status_manage.html
@@ -163,8 +163,8 @@
Summary of your domain request
{% endif %}
- {% if DomainRequest.get_federal_type_display %}
- {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
+ {% if DomainRequest.converted_federal_type %}
+ {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.converted_federal_type heading_level=heading_level %}
{% endif %}
{% if DomainRequest.is_election_board %}
@@ -173,7 +173,7 @@ Summary of your domain request
{% endwith %}
{% endif %}
- {% if DomainRequest.organization_name %}
+ {% if DomainRequest.converted_organization_name %}
{% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}
diff --git a/src/registrar/templates/includes/organization_address.html b/src/registrar/templates/includes/organization_address.html
index d6126d681..49e2c1097 100644
--- a/src/registrar/templates/includes/organization_address.html
+++ b/src/registrar/templates/includes/organization_address.html
@@ -1,28 +1,28 @@
- {% if organization.federal_agency %}
- {{ organization.federal_agency }}
+ {% if organization.converted_federal_agency %}
+ {{ organization.converted_federal_agency }}
{% endif %}
- {% if organization.organization_name %}
- {{ organization.organization_name }}
+ {% if organization.converted_organization_name %}
+ {{ organization.converted_organization_name }}
{% endif %}
- {% if organization.address_line1 %}
-
{{ organization.address_line1 }}
+ {% if organization.converted_address_line1 %}
+
{{ organization.converted_address_line1 }}
{% endif %}
- {% if organization.address_line2 %}
-
{{ organization.address_line2 }}
+ {% if organization.converted_address_line2 %}
+
{{ organization.converted_address_line2 }}
{% endif %}
- {% if organization.city %}
-
{{ organization.city }}{% if organization.state_territory %},
+ {% if organization.converted_city %}
+
{{ organization.converted_city }}{% if organization.converted_state_territory %},
{% else %}
{% endif %}
{% endif %}
- {% if organization.state_territory %}
- {{ organization.state_territory }}
+ {% if organization.converted_state_territory %}
+ {{ organization.converted_state_territory }}
{% endif %}
- {% if organization.zipcode %}
-
{{ organization.zipcode }}
+ {% if organization.converted_zipcode %}
+
{{ organization.converted_zipcode }}
{% endif %}
- {% if organization.urbanization %}
-
{{ organization.urbanization }}
+ {% if organization.converted_urbanization %}
+
{{ organization.converted_urbanization }}
{% endif %}
diff --git a/src/registrar/templates/includes/request_status_manage.html b/src/registrar/templates/includes/request_status_manage.html
index 2a254df4b..80389b393 100644
--- a/src/registrar/templates/includes/request_status_manage.html
+++ b/src/registrar/templates/includes/request_status_manage.html
@@ -146,7 +146,7 @@ Summary of your domain request
{% block request_summary %}
{% with heading_level='h3' %}
- {% with org_type=DomainRequest.get_generic_org_type_display %}
+ {% with org_type=DomainRequest.converted_generic_org_type%}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}
@@ -163,8 +163,8 @@ Summary of your domain request
{% endif %}
- {% if DomainRequest.get_federal_type_display %}
- {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
+ {% if DomainRequest.converted_federal_type %}
+ {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.converted_federal_type heading_level=heading_level %}
{% endif %}
{% if DomainRequest.is_election_board %}
@@ -173,8 +173,8 @@ Summary of your domain request
{% endwith %}
{% endif %}
- {% if DomainRequest.organization_name %}
- {% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
+ {% if DomainRequest.converted_organization_name %}
+ {% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}
{% if DomainRequest.about_your_organization %}