diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index 93fcaaf84..4de947594 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -1140,9 +1140,9 @@ def get_sort_fields(cls):
         """
         # Coalesce is used to replace federal_type of None with ZZZZZ
         return [
-            "converted_generic_org_type",
-            Coalesce("converted_federal_type", Value("ZZZZZ")),
-            "converted_federal_agency",
+            "organization_type",
+            Coalesce("federal_type", Value("ZZZZZ")),
+            "federal_agency",
             "domain__name",
         ]
 
@@ -1250,9 +1250,9 @@ def get_sort_fields(cls):
         """
         # Coalesce is used to replace federal_type of None with ZZZZZ
         return [
-            "converted_generic_org_type",
-            Coalesce("converted_federal_type", Value("ZZZZZ")),
-            "converted_federal_agency",
+            "organization_type",
+            Coalesce("federal_type", Value("ZZZZZ")),
+            "federal_agency",
             "domain__name",
         ]