From 7a23f3e43274f074194340e52ee4985d74cf710c Mon Sep 17 00:00:00 2001
From: root <root@legistorm-to-openstates-nwxk162r>
Date: Mon, 9 Dec 2024 03:52:29 +0000
Subject: [PATCH] People update tx 2024-12-09-03-51

---
 ...o-19c22134-0632-4b9a-ac8e-64288ea9c1ba.yml | 10 ++++---
 ...n-2fd6fcd3-9676-42a4-b879-e317576ff18f.yml |  6 ++---
 ...z-4f98520b-d88b-4053-acc5-3cb2fff14660.yml |  8 +++---
 ...s-7f893a20-0547-4ad9-9a94-1084a9ef6469.yml |  6 ++---
 ...r-2f826108-f4d8-4af1-99c8-c0a335fb9c0a.yml |  8 +++---
 ...n-895887ba-73cd-4321-827d-bb06d4eedfdf.yml |  6 ++---
 ...r-aa0d12c3-c318-4c97-a0d4-c63795ec50d9.yml |  6 ++---
 ...n-2a9478ef-b573-4de6-ab96-bb3f6091346f.yml |  6 ++---
 ...n-45f3ddfb-5994-4f05-b2c8-e0e3b2a99c47.yml |  6 ++---
 ...z-e2d786e9-5e46-4807-be42-546203016996.yml |  8 +++---
 ...e-3caafbc8-6561-4bf8-8247-aaf398573ba8.yml |  8 +++---
 ...s-9c37e80d-af10-4433-a78a-408b2b798fb6.yml |  6 ++---
 ...r-ba43365e-63dc-4bdc-aadc-e3939aa7465b.yml |  6 ++---
 ...l-013d69b7-a958-490c-a4a2-7224a30efa08.yml |  6 ++---
 ...a-51591894-e9ff-48d3-81c5-897ec1c5e600.yml |  8 +++---
 ...s-3475b324-1c9b-4513-90e6-063aba5ac04e.yml |  6 ++---
 ...y-e3533cbc-f3ab-46bc-a591-c68657f82527.yml |  6 ++---
 ...n-7adac635-f380-409b-8ec4-1b220bbc5025.yml |  6 ++---
 ...l-44a23037-5ccd-4781-9e93-c4b950f74355.yml |  6 ++---
 ...n-b1bf46ac-e99e-49f6-8f40-cf07aca12187.yml |  6 ++---
 ...n-065c24a0-401a-4dc5-a19c-e7d96dcbffc5.yml |  6 ++---
 ...f-83030f8b-5f1f-4475-b564-a07ae42f6d98.yml |  6 ++---
 ...s-8326538c-c907-43b2-a6db-76434036afd7.yml |  6 ++---
 ...e-f4976334-0e0e-4474-b5b4-3264e8d73f1d.yml |  6 ++---
 ...r-c5d16702-0b70-4f46-a0ba-3c47acd352f0.yml |  8 +++---
 ...o-e78373de-6d96-44db-b552-6da34ed992fc.yml |  6 ++---
 ...s-72920206-cbe7-4429-b42b-c6fc746a1d56.yml |  7 ++---
 ...c-64221b86-e3ca-4b67-b2bb-3f4f9641e133.yml |  6 ++---
 ...l-33f871c9-15a6-4094-9181-ff822cd9eca4.yml |  8 +++---
 ...m-41f4a5e2-a2d5-4e54-aae3-9c99f9ea5eba.yml |  6 ++---
 ...y-6522ba2d-f263-455a-9470-cec0aa03033b.yml |  8 +++---
 ...r-d7d0bd69-2615-4d0c-84df-4cdb75809343.yml |  6 ++---
 ...n-65a42043-6243-4f79-b1e0-69b3b8b4af29.yml | 10 ++++---
 ...r-a5e2021c-8221-41ba-b45c-cc89d13b2af2.yml |  8 +++---
 ...l-26090510-8782-4d64-b981-3d1cde573090.yml | 10 ++++---
 ...s-791e4399-56bb-4d4c-8561-71f0979fb999.yml |  8 +++---
 ...z-6feda596-fd20-429b-ae4e-bedab7e5a1c5.yml |  6 ++---
 ...s-baafecd4-6f74-4a97-b564-691c1e938291.yml |  6 ++---
 ...t-3194ee5e-f4d8-4449-8ff6-ec47c0822a3d.yml |  8 +++---
 ...r-43bbf34a-6bc4-41f9-9bdc-3e944c5b8495.yml |  8 +++---
 ...n-74225274-40f8-4ef8-b2b5-bb7e4f8b5115.yml |  6 ++---
 ...n-7952d7d7-0fe5-4712-9967-6cb9bcedff05.yml |  7 +++--
 ...k-2d5f629c-76a7-455b-aff7-262d8c1c23f6.yml |  8 +++---
 ...r-36338558-c2b0-4b43-b656-261dccbee871.yml | 10 +++----
 ...s-a5e6ba30-dfa5-4e59-baa3-c96f0dcf775f.yml |  6 ++---
 ...l-e05f502a-0d27-4c51-8cad-d3b5eca585b1.yml |  8 +++---
 ...l-7847295c-78f3-4f8c-adb6-3536fca2782e.yml |  6 ++---
 ...l-9f80cd7f-1067-4322-8777-62bc129cd6f2.yml |  8 +++---
 ...d-349071fd-3c36-43c6-aaca-6d7f9d04322d.yml |  2 +-
 ...y-40f0e868-e021-4453-8675-a9d2357e41e1.yml |  6 ++---
 ...r-f1332c39-f120-4ccd-ac64-cae40b2be91a.yml |  6 ++---
 ...s-fff5eb4f-2c41-4d00-a1c5-e566a15b063e.yml |  8 +++---
 ...n-9fb69a65-467d-491c-9663-3892583795c5.yml |  8 +++---
 ...s-c84056d0-47e0-4a0c-94e1-9f90c2d90a15.yml |  8 +++---
 ...s-b91e1420-1732-4063-9f3d-edcc5e71d416.yml |  8 +++---
 ...r-34590156-1109-4ab6-84bc-bbe07764f365.yml |  6 ++---
 ...z-2cadcb59-210a-4a71-af9f-7dba9ab06112.yml |  6 ++---
 ...r-b55d57f4-bd06-4487-8860-0b6eeb9a1dea.yml |  2 +-
 ...s-0b54bd1c-fe8a-4af1-9627-ae9371a3ff30.yml |  8 +++---
 ...a-d731c9f0-44ff-4abf-92c4-0069c07f6b26.yml |  8 +++---
 ...e-7e01abb6-d4c5-40e9-bdef-7a7efd11aaca.yml |  6 ++---
 ...r-10277692-2a2f-43d8-b120-70e591db636f.yml |  3 ++-
 ...s-5ff88048-ebd8-4ac3-af9c-d02e1305ef37.yml |  2 ++
 ...r-26617394-4276-4aa7-878c-d20552b260a4.yml |  8 +++---
 ...n-54769259-df18-4363-818e-127341188531.yml |  8 +++---
 ...u-5556a81a-eca2-451d-bb29-74cfb00d1959.yml |  6 ++---
 ...a-1f9ed42e-27de-4cd1-b2bf-f890ee33cb49.yml |  2 +-
 ...e-40ecf6ee-92a4-4daf-b950-ac70b6cdfeee.yml |  8 +++---
 ...s-b95a6eac-71b2-47ef-918e-91a5ae413a4e.yml |  6 ++---
 ...n-d0fbfb15-2f0c-4167-b8b4-d6135bbb6616.yml |  6 ++---
 ...r-85d064ed-6f3d-4a81-93ee-1baf49c7f2c3.yml | 10 ++++---
 ...o-5c2743d2-fe0e-41d6-969d-de830d5787f8.yml |  8 +++---
 ...e-0b3fe2fc-7445-4986-b34b-0c3ca545eab8.yml |  8 +++---
 ...o-a43f2db5-4b24-4dfa-af7f-a2c7cbc5ea21.yml |  6 ++---
 ...n-8c82ede2-a4c6-4625-92ca-2b24c370de17.yml |  8 +++---
 ...k-6cbb02e6-5876-47a1-86aa-98566fe0073a.yml |  8 +++---
 ...o-5e4e2fd2-e8a9-46f3-aab5-ffbc782afa8b.yml |  2 +-
 ...z-a732704e-9b03-449c-b24f-f4c567b5acdd.yml |  7 ++---
 ...n-e926ca11-64dd-4e15-97bd-1f7b0915de36.yml | 10 ++++---
 ...n-1ffa3f66-7055-4dda-b497-f2d368e6cdc7.yml |  8 +++---
 ...n-37886d81-901f-43b4-841b-f3ffbfeeb257.yml |  6 ++---
 ...h-40a678a3-7d85-486e-bf38-5d070142aa83.yml |  8 +++---
 ...z-8eeb1aad-24b6-487b-bbc0-31c2238b1ccd.yml |  6 ++---
 ...n-127dce12-cb90-4469-a18a-3e3c7ad6bc9a.yml |  9 ++++---
 ...n-1997b231-45f7-4f29-a435-9f52e60ebea4.yml |  6 ++---
 ...y-5898294d-5b10-4aaf-a084-b8522e69623c.yml |  8 +++---
 ...t-4e07d8dc-f5b5-47e7-a1de-83f36d3b734f.yml |  6 ++---
 ...I-53b19d1e-5b07-4f6e-87a9-27baecddaf70.yml |  2 +-
 ...l-93474b2b-546e-49e4-9399-5c208bbcb524.yml |  6 ++---
 ...n-fbd66d9f-2a93-4cbf-b75d-b51cb01e955e.yml |  2 +-
 ...y-6613aff4-3874-44c6-960b-121eb6b0b2d2.yml |  6 ++---
 ...e-3cac81cd-62ca-41d6-aa4a-8e4156244dec.yml |  6 ++---
 ...s-45cd43ff-77b3-467c-aa61-890ebee8ece5.yml |  6 ++---
 ...l-ab211984-06a9-447c-9ded-564d200bee60.yml |  2 +-
 ...z-8bb90ee9-e764-44da-b27f-b5bc3cdb394e.yml |  6 ++---
 ...a-1ec50565-379f-4a8b-ab18-c54d31df9929.yml |  2 +-
 ...a-72766791-084c-4a20-a12c-6e809b51e95c.yml | 10 +++----
 ...i-c7aad3b7-ca16-4989-bf68-87ed72498a6b.yml |  6 ++---
 ...n-b40c5c95-3141-4ac5-9b0e-28b3b3162bf5.yml |  2 +-
 ...d-798a9db1-dee4-48cd-ae0a-9b43d9f287a7.yml |  8 +++---
 ...l-fe47f6d5-2db3-495b-8da6-5cd12e0dc677.yml |  8 +++---
 ...k-043dfef3-3605-4c75-b72d-965985edfdd5.yml |  6 ++---
 ...g-d9f32e07-7835-4edf-b986-7a2cf16d608b.yml |  8 +++---
 ...s-aa6deb86-b21b-4ed2-ad67-bd6217238afc.yml |  8 +++---
 ...h-5bbe665a-bde8-469f-8c92-958c457236f0.yml |  6 ++---
 ...l-28512987-3275-4a5d-8af5-b8f3b7be2457.yml |  6 ++---
 ...l-2609ba13-abf1-40b5-9f4c-a4c1135e56e2.yml |  6 ++---
 ...t-28eb71be-bce7-4b32-908d-289ecc265c3c.yml |  6 ++---
 ...s-ab3ddc65-0fb9-476b-993f-b3dc4050127e.yml |  3 ++-
 ...y-9c13f4e5-0ce2-488e-b2f3-50d4bfc2dd9c.yml |  8 +++---
 ...a-a61b0fd1-9fdf-4b4c-abe6-b790cc856023.yml |  7 ++---
 ...o-2c0a4352-9871-4122-97fd-832ec998e907.yml |  6 ++---
 ...z-26244d6a-f0d5-4dbe-b9ed-a38df74a7bac.yml |  8 +++---
 ...z-93379bbe-5fb3-400f-853a-d0b3553e7772.yml |  8 +++---
 ...r-39511354-7239-40f6-b431-5ac53ef3c462.yml |  6 ++---
 ...n-71555c46-28b0-4887-98a1-997dc7482e75.yml |  8 +++---
 ...n-1399b6ba-cbfa-45ca-bf91-6ba89fe777bf.yml |  6 ++---
 ...a-b69579f7-74de-4a71-86ba-033264cc5bc7.yml |  6 ++---
 ...d-df010291-7350-4262-9220-4c576730b2db.yml |  8 +++---
 ...a-df4db9dd-3640-4eaf-bc7e-1ce125a57199.yml |  6 ++---
 ...r-2639e096-d327-4c4d-823f-759b1ce373e0.yml |  6 ++---
 ...n-dee454b1-6da0-4b1b-a232-033e7de8551f.yml |  6 ++---
 ...r-ea169f77-0bd8-4ca0-ac59-f894c9a09e71.yml |  8 +++---
 ...a-896e8f9c-7dca-4f7d-8554-c0324cfa7265.yml | 10 +++----
 ...y-96f1427d-5b57-43a0-b0c2-f656a8109362.yml | 27 +++++++++++++++++++
 ...t-a9f861bf-1a13-4d3b-816a-69589e9b25e7.yml |  6 ++---
 ...w-51a281ff-2983-4b4b-baf4-63ee17812835.yml |  8 +++---
 ...s-682e8ef8-8fc1-4490-a04d-63a7c6d92185.yml |  6 ++---
 ...g-98bef50a-73c7-4139-9b8e-628d0e89d659.yml |  6 ++---
 ...z-12d67093-ab4c-425d-afa3-e5777db09d1c.yml |  6 ++---
 ...a-f72eb41b-2ff9-434f-96cf-75b9724289ab.yml |  8 +++---
 ...o-c0fc4283-3ed5-4165-a066-80de16f492b7.yml |  9 +++----
 ...h-19313ba6-75f3-4979-8642-b55b1008bedc.yml |  6 ++---
 ...z-01ce2f6b-0500-4baa-a47f-386f9c6286b0.yml |  8 +++---
 ...s-69ef7d69-9a5e-42be-b463-8873cb52ad10.yml |  6 ++---
 ...s-f8e0a89e-889a-4fcf-8a0a-1e0e091d89d0.yml |  6 ++---
 ...d-d4a94a68-02a7-44c0-901f-9cd57350229a.yml |  8 +++---
 ...s-26b83cfe-10c0-4ac6-ae02-dac30e2856b1.yml |  6 ++---
 ...z-68767ec3-151c-413f-aeb8-f35dd6c5f35c.yml |  6 ++---
 ...s-72bad853-b403-49c2-9a99-32c5fb3222c7.yml |  8 +++---
 ...t-d6f40682-7b90-4735-980c-7c95ef402a78.yml |  8 +++---
 ...n-f0ede995-2253-4f7b-a922-6da34e4de194.yml |  8 +++---
 ...i-4fb2e1fd-fbb3-4a55-8417-761da2f6048e.yml |  6 ++---
 ...s-2db06a9d-ae17-4881-98b4-5172fdfca19f.yml |  8 +++---
 ...n-ace50d18-fc98-4460-9d90-928c0e88c79a.yml |  8 +++---
 ...z-b7c4e0e7-4949-4dff-bc4c-fdaaada3f37d.yml |  8 +++---
 ...y-26b8304b-24ea-411d-8d85-e348ba6951c7.yml |  8 +++---
 ...n-ddebb940-33f9-4b5c-a8fa-e22c63a594e9.yml |  9 ++++---
 ...e-97805dd7-1f42-482c-bac3-049dfccda311.yml |  2 +-
 ...s-97fc1e34-35fb-470f-a098-4ba8f0c3c8d4.yml |  6 ++---
 ...t-a4e4115b-d488-4e93-8354-80e361c0c260.yml |  2 +-
 ...k-0cd2f092-40a7-46d1-a9c2-507d14282954.yml |  8 +++---
 ...n-a8926c8d-b4bb-4b7a-96ae-5dac9987c117.yml |  8 +++---
 ...h-6c80914d-b07b-4d27-95e2-0e5aa2b0c7d9.yml |  6 ++---
 ...i-51927936-c6fc-453b-8afd-5f0b53de7d46.yml |  6 ++---
 ...n-cee6cb7a-8d88-4c34-be27-dd10d1f31768.yml |  8 +++---
 ...s-3e4ae7d4-dbb2-4991-8b44-8ada6023d7da.yml |  8 +++---
 ...n-ec19bc97-3146-4100-8294-329b88aec0e8.yml |  6 ++---
 ...a-bdecc388-4028-48e2-b211-75c59c1c5ec2.yml |  6 ++---
 ...r-9447575b-d8a1-45dd-bd68-77b12fe347ab.yml | 10 ++++---
 ...k-d4d5c127-1ef6-445d-a89b-d9f02c812365.yml | 10 ++++---
 ...n-79ffab1c-4d79-4cfa-89b4-5f7ee95ca1bf.yml |  8 +++---
 ...e-0acfbb85-b501-45ce-9a9b-90537090a455.yml |  8 +++---
 ...t-1ca78d00-1ede-4486-b14e-16bd81ba73e4.yml |  6 ++---
 ...g-ed59d369-82b9-485f-9007-c5c5b77d9468.yml |  8 +++---
 ...y-9a249b0a-a69f-4ca8-b031-7a991baecb99.yml | 10 ++++---
 ...y-68f05872-16c8-4d3a-ab5f-ea667ca52b27.yml |  8 +++---
 ...r-07f5e898-8d5d-435a-bf97-7bfb26fce5ac.yml |  8 +++---
 ...n-7298c6a9-c6be-41cd-a2ba-0cc79c851373.yml |  8 +++---
 ...s-6b2d7f89-d7e0-44d1-b861-3167915f6925.yml |  2 ++
 ...e-e6b8a84b-b408-4f26-9f73-eebca76f3fff.yml |  8 +++---
 ...n-25157308-7474-4600-8b83-173d79e16a21.yml |  2 +-
 ...f-e7a379ec-9de2-48a2-918b-5ba58e1fd3f3.yml |  8 +++---
 ...s-3f38bf62-86ba-4833-9737-2e084ae6255d.yml | 10 ++++---
 174 files changed, 626 insertions(+), 566 deletions(-)
 create mode 100644 data/tx/legislature/Pat-Curry-96f1427d-5b57-43a0-b0c2-f656a8109362.yml

diff --git a/data/tx/legislature/Abel-Herrero-19c22134-0632-4b9a-ac8e-64288ea9c1ba.yml b/data/tx/legislature/Abel-Herrero-19c22134-0632-4b9a-ac8e-64288ea9c1ba.yml
index 224cec3ab0..97370187d6 100644
--- a/data/tx/legislature/Abel-Herrero-19c22134-0632-4b9a-ac8e-64288ea9c1ba.yml
+++ b/data/tx/legislature/Abel-Herrero-19c22134-0632-4b9a-ac8e-64288ea9c1ba.yml
@@ -15,16 +15,17 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '34'
 offices:
-- classification: capitol-mail
-  address: Room 3S.2, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0462
-  fax: 512-463-1705
 - classification: district
   address: 101 E. Main Ave., Robstown, TX 78380
   voice: 361-387-0457
+- classification: district-mail
+  address: Room 3S.2, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0462
+  fax: 512-463-1705
 links:
 - url: https://house.texas.gov/members/member-page/?district=34
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A3140
+- url: https://house.texas.gov/members/3140
 other_names:
 - name: A. Herrero
 - name: Herrero, A.
@@ -40,5 +41,6 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Abel_Herrero
 - url: https://en.wikipedia.org/wiki/Abel_Herrero
+- url: https://house.texas.gov/members/3140
 - url: https://house.texas.gov/members/member-page/?district=34
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A3140
diff --git a/data/tx/legislature/Alma-A-Allen-2fd6fcd3-9676-42a4-b879-e317576ff18f.yml b/data/tx/legislature/Alma-A-Allen-2fd6fcd3-9676-42a4-b879-e317576ff18f.yml
index d7d0df7be8..90f28ba1f7 100644
--- a/data/tx/legislature/Alma-A-Allen-2fd6fcd3-9676-42a4-b879-e317576ff18f.yml
+++ b/data/tx/legislature/Alma-A-Allen-2fd6fcd3-9676-42a4-b879-e317576ff18f.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '131'
 offices:
-- classification: capitol-mail
-  address: Room 4N.10, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0744
 - classification: district
   address: 10101 Fondren Road Suite 500, Houston, TX 77096
   voice: 713-776-0505
   fax: 713-776-1490
+- classification: district-mail
+  address: Room 4N.10, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0744
 links:
 - url: https://house.texas.gov/members/member-page/?district=131
 - url: https://house.texas.gov/members/2100
diff --git a/data/tx/legislature/Ana-Hernandez-4f98520b-d88b-4053-acc5-3cb2fff14660.yml b/data/tx/legislature/Ana-Hernandez-4f98520b-d88b-4053-acc5-3cb2fff14660.yml
index de34ddbabb..06a49a6759 100644
--- a/data/tx/legislature/Ana-Hernandez-4f98520b-d88b-4053-acc5-3cb2fff14660.yml
+++ b/data/tx/legislature/Ana-Hernandez-4f98520b-d88b-4053-acc5-3cb2fff14660.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '143'
 offices:
-- classification: capitol-mail
-  address: Room 1W.11, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0614
-  fax: 512-463-0612
 - classification: district
   address: 1233 Mercury Drive, Houston, TX 77029
   voice: 713-675-8596
   fax: 713-675-8599
+- classification: district-mail
+  address: Room 1W.11, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0614
+  fax: 512-463-0612
 links:
 - url: https://house.texas.gov/members/member-page/?district=143
 - url: https://house.texas.gov/members/3155
diff --git a/data/tx/legislature/Ana-Maria-Ramos-7f893a20-0547-4ad9-9a94-1084a9ef6469.yml b/data/tx/legislature/Ana-Maria-Ramos-7f893a20-0547-4ad9-9a94-1084a9ef6469.yml
index 222e8588d7..e248fe4877 100644
--- a/data/tx/legislature/Ana-Maria-Ramos-7f893a20-0547-4ad9-9a94-1084a9ef6469.yml
+++ b/data/tx/legislature/Ana-Maria-Ramos-7f893a20-0547-4ad9-9a94-1084a9ef6469.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '102'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 13140 Coit Road Suite 412, Dallas, TX 75240
+- classification: district-mail
   address: Room E2.318, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0454
   fax: 512-463-1121
-- classification: district
-  address: 13140 Coit Road Suite 412, Dallas, TX 75240
 links:
 - url: https://house.texas.gov/members/member-page/?district=102
 - url: https://www.texasrepramos.com/
diff --git a/data/tx/legislature/Andrew-Murr-2f826108-f4d8-4af1-99c8-c0a335fb9c0a.yml b/data/tx/legislature/Andrew-Murr-2f826108-f4d8-4af1-99c8-c0a335fb9c0a.yml
index 6dba61a294..69e088311b 100644
--- a/data/tx/legislature/Andrew-Murr-2f826108-f4d8-4af1-99c8-c0a335fb9c0a.yml
+++ b/data/tx/legislature/Andrew-Murr-2f826108-f4d8-4af1-99c8-c0a335fb9c0a.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '53'
 offices:
-- classification: capitol-mail
-  address: Room E1.308, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0536
-  fax: 512-463-1449
 - classification: district
   address: 507 Earl Garrett St., Kerrville, TX 78028
   voice: 830-257-0432
+- classification: district-mail
+  address: Room E1.308, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0536
+  fax: 512-463-1449
 links:
 - url: https://house.texas.gov/members/member-page/?district=53
 - url: https://house.texas.gov/members/2965
diff --git a/data/tx/legislature/Angela-Paxton-895887ba-73cd-4321-827d-bb06d4eedfdf.yml b/data/tx/legislature/Angela-Paxton-895887ba-73cd-4321-827d-bb06d4eedfdf.yml
index 8533725776..53b185743c 100644
--- a/data/tx/legislature/Angela-Paxton-895887ba-73cd-4321-827d-bb06d4eedfdf.yml
+++ b/data/tx/legislature/Angela-Paxton-895887ba-73cd-4321-827d-bb06d4eedfdf.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '8'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0108
 - classification: district
   address: 604 S. Watters Road Suite 100, Allen, TX 75013
   voice: 972-908-3424
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0108
 links:
 - url: https://senate.texas.gov/member.php?d=8
 other_names:
diff --git a/data/tx/legislature/Angelia-Orr-aa0d12c3-c318-4c97-a0d4-c63795ec50d9.yml b/data/tx/legislature/Angelia-Orr-aa0d12c3-c318-4c97-a0d4-c63795ec50d9.yml
index 9b46f8dbb9..f8c40e0cd1 100644
--- a/data/tx/legislature/Angelia-Orr-aa0d12c3-c318-4c97-a0d4-c63795ec50d9.yml
+++ b/data/tx/legislature/Angelia-Orr-aa0d12c3-c318-4c97-a0d4-c63795ec50d9.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '13'
 offices:
-- classification: capitol-mail
-  address: Room E1.218, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0600
 - classification: district
   address: 214 E. Elm St., Hillsboro, TX 76645
   voice: 254-580-9008
+- classification: district-mail
+  address: Room E1.218, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0600
 links:
 - url: https://house.texas.gov/members/member-page/?district=13
 - url: https://house.texas.gov/members/4340
diff --git a/data/tx/legislature/Angie-Chen-Button-2a9478ef-b573-4de6-ab96-bb3f6091346f.yml b/data/tx/legislature/Angie-Chen-Button-2a9478ef-b573-4de6-ab96-bb3f6091346f.yml
index af3b1fb7fa..bcf4d60247 100644
--- a/data/tx/legislature/Angie-Chen-Button-2a9478ef-b573-4de6-ab96-bb3f6091346f.yml
+++ b/data/tx/legislature/Angie-Chen-Button-2a9478ef-b573-4de6-ab96-bb3f6091346f.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '112'
 offices:
-- classification: capitol-mail
-  address: Room GW.7, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0486
 - classification: district
   address: 1201 International Parkway Suite 130, Richardson, TX 75081
   voice: 972-234-8980
   fax: 972-470-0789
+- classification: district-mail
+  address: Room GW.7, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0486
 links:
 - url: https://house.texas.gov/members/member-page/?district=112
 - url: https://house.texas.gov/members/2510
diff --git a/data/tx/legislature/Ann-Johnson-45f3ddfb-5994-4f05-b2c8-e0e3b2a99c47.yml b/data/tx/legislature/Ann-Johnson-45f3ddfb-5994-4f05-b2c8-e0e3b2a99c47.yml
index 1fc9136b3c..da86f65ce0 100644
--- a/data/tx/legislature/Ann-Johnson-45f3ddfb-5994-4f05-b2c8-e0e3b2a99c47.yml
+++ b/data/tx/legislature/Ann-Johnson-45f3ddfb-5994-4f05-b2c8-e0e3b2a99c47.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '134'
 offices:
-- classification: capitol-mail
-  address: Room E2.412, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0389
 - classification: district
   address: 5601 W. Loop South Suite C218, Houston, TX 77081
   voice: 713-592-0006
+- classification: district-mail
+  address: Room E2.412, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0389
 links:
 - url: https://house.texas.gov/members/member-page/?district=134
 - url: https://house.texas.gov/members/134
diff --git a/data/tx/legislature/Armando-Mando-Martinez-e2d786e9-5e46-4807-be42-546203016996.yml b/data/tx/legislature/Armando-Mando-Martinez-e2d786e9-5e46-4807-be42-546203016996.yml
index f305e0a696..2f2cdaf802 100644
--- a/data/tx/legislature/Armando-Mando-Martinez-e2d786e9-5e46-4807-be42-546203016996.yml
+++ b/data/tx/legislature/Armando-Mando-Martinez-e2d786e9-5e46-4807-be42-546203016996.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '39'
 offices:
-- classification: capitol-mail
-  address: Room 1N.10, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0530
-  fax: 512-463-0849
 - classification: district
   address: 914 W. Pike Blvd., Weslaco, TX 78596
   voice: 956-447-9473
   fax: 956-447-8683
+- classification: district-mail
+  address: Room 1N.10, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0530
+  fax: 512-463-0849
 links:
 - url: https://house.texas.gov/members/member-page/?district=39
 other_names:
diff --git a/data/tx/legislature/Armando-Walle-3caafbc8-6561-4bf8-8247-aaf398573ba8.yml b/data/tx/legislature/Armando-Walle-3caafbc8-6561-4bf8-8247-aaf398573ba8.yml
index 1c37581410..e01059af9b 100644
--- a/data/tx/legislature/Armando-Walle-3caafbc8-6561-4bf8-8247-aaf398573ba8.yml
+++ b/data/tx/legislature/Armando-Walle-3caafbc8-6561-4bf8-8247-aaf398573ba8.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '140'
 offices:
-- classification: capitol-mail
-  address: Room GW.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0924
-  fax: 512-463-1510
 - classification: district
   address: 2909 E. Aldine Amphitheatre Drive, Suite 207, Houston, TX 77039
   voice: 281-442-2206
+- classification: district-mail
+  address: Room GW.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0924
+  fax: 512-463-1510
 links:
 - url: https://house.texas.gov/members/member-page/?district=140
 - url: https://house.texas.gov/members/4930
diff --git a/data/tx/legislature/Barbara-Gervin-Hawkins-9c37e80d-af10-4433-a78a-408b2b798fb6.yml b/data/tx/legislature/Barbara-Gervin-Hawkins-9c37e80d-af10-4433-a78a-408b2b798fb6.yml
index 5bda3726bf..c03c564e78 100644
--- a/data/tx/legislature/Barbara-Gervin-Hawkins-9c37e80d-af10-4433-a78a-408b2b798fb6.yml
+++ b/data/tx/legislature/Barbara-Gervin-Hawkins-9c37e80d-af10-4433-a78a-408b2b798fb6.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '120'
 offices:
-- classification: capitol-mail
-  address: Room E1.302, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0708
 - classification: district
   address: 3503 NE Parkway, San Antonio, TX 78218
   voice: 210-822-2534
+- classification: district-mail
+  address: Room E1.302, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0708
 links:
 - url: https://house.texas.gov/members/member-page/?district=120
 - url: https://house.texas.gov/members/120
diff --git a/data/tx/legislature/Benjamin-Bumgarner-ba43365e-63dc-4bdc-aadc-e3939aa7465b.yml b/data/tx/legislature/Benjamin-Bumgarner-ba43365e-63dc-4bdc-aadc-e3939aa7465b.yml
index c04d77321b..08fcdb636d 100644
--- a/data/tx/legislature/Benjamin-Bumgarner-ba43365e-63dc-4bdc-aadc-e3939aa7465b.yml
+++ b/data/tx/legislature/Benjamin-Bumgarner-ba43365e-63dc-4bdc-aadc-e3939aa7465b.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '63'
 offices:
-- classification: capitol-mail
-  address: Room E1.418, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0688
 - classification: district
   address: 108 S. Oak St., Roanoke, TX 76262
   voice: 817-491-7305
+- classification: district-mail
+  address: Room E1.418, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0688
 links:
 - url: https://house.texas.gov/members/member-page/?district=63
 - url: https://house.texas.gov/members/63
diff --git a/data/tx/legislature/Bob-Hall-013d69b7-a958-490c-a4a2-7224a30efa08.yml b/data/tx/legislature/Bob-Hall-013d69b7-a958-490c-a4a2-7224a30efa08.yml
index 2dc3b2080d..76bc48b07d 100644
--- a/data/tx/legislature/Bob-Hall-013d69b7-a958-490c-a4a2-7224a30efa08.yml
+++ b/data/tx/legislature/Bob-Hall-013d69b7-a958-490c-a4a2-7224a30efa08.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '2'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0102
 - classification: district
   address: 17585 State Highway 19 Suite 200, Canton, TX 75103
   voice: 903-567-0531
@@ -25,6 +22,9 @@ offices:
   address: Alliance Building 2 6537 Horizon Road, Suite B-1, Rockwall, TX 75032
   voice: 972-722-3131
   fax: 972-722-3132
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0102
 links:
 - url: https://senate.texas.gov/member.php?d=2
 other_names:
diff --git a/data/tx/legislature/Bobby-Guerra-51591894-e9ff-48d3-81c5-897ec1c5e600.yml b/data/tx/legislature/Bobby-Guerra-51591894-e9ff-48d3-81c5-897ec1c5e600.yml
index 58d270994a..3edf0c7adf 100644
--- a/data/tx/legislature/Bobby-Guerra-51591894-e9ff-48d3-81c5-897ec1c5e600.yml
+++ b/data/tx/legislature/Bobby-Guerra-51591894-e9ff-48d3-81c5-897ec1c5e600.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '41'
 offices:
-- classification: capitol-mail
-  address: Room GN.7, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0578
-  fax: 512-463-1482
 - classification: district
   address: 10213 N. 10th St. Suite B, McAllen, TX 78504
   voice: 956-292-0407
   fax: 956-292-0418
+- classification: district-mail
+  address: Room GN.7, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0578
+  fax: 512-463-1482
 links:
 - url: https://house.texas.gov/members/member-page/?district=41
 other_names:
diff --git a/data/tx/legislature/Borris-L-Miles-3475b324-1c9b-4513-90e6-063aba5ac04e.yml b/data/tx/legislature/Borris-L-Miles-3475b324-1c9b-4513-90e6-063aba5ac04e.yml
index d032b706bd..6df9278916 100644
--- a/data/tx/legislature/Borris-L-Miles-3475b324-1c9b-4513-90e6-063aba5ac04e.yml
+++ b/data/tx/legislature/Borris-L-Miles-3475b324-1c9b-4513-90e6-063aba5ac04e.yml
@@ -19,9 +19,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '146'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0113
 - classification: district
   address: 2440 Texas Parkway Suite 110, Missouri City, TX 77489
   voice: 281-261-2360
@@ -31,6 +28,9 @@ offices:
 - classification: district
   address: 5302 Almeda Road Suite A, Houston, TX 77004
   voice: 713-665-8322
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0113
 links:
 - url: https://senate.texas.gov/member.php?d=13
 other_names:
diff --git a/data/tx/legislature/Brad-Buckley-e3533cbc-f3ab-46bc-a591-c68657f82527.yml b/data/tx/legislature/Brad-Buckley-e3533cbc-f3ab-46bc-a591-c68657f82527.yml
index 5ddaa64bdb..f751e62de4 100644
--- a/data/tx/legislature/Brad-Buckley-e3533cbc-f3ab-46bc-a591-c68657f82527.yml
+++ b/data/tx/legislature/Brad-Buckley-e3533cbc-f3ab-46bc-a591-c68657f82527.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '54'
 offices:
-- classification: capitol-mail
-  address: Room E1.324, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0684
 - classification: district
   address: 1301 N. Stagecoach Road, Salado, TX 76571
   voice: 254-947-5026
+- classification: district-mail
+  address: Room E1.324, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0684
 links:
 - url: https://house.texas.gov/members/member-page/?district=54
 - url: https://house.texas.gov/members/54
diff --git a/data/tx/legislature/Brandon-Creighton-7adac635-f380-409b-8ec4-1b220bbc5025.yml b/data/tx/legislature/Brandon-Creighton-7adac635-f380-409b-8ec4-1b220bbc5025.yml
index 3ce0413cc4..89e27f5d42 100644
--- a/data/tx/legislature/Brandon-Creighton-7adac635-f380-409b-8ec4-1b220bbc5025.yml
+++ b/data/tx/legislature/Brandon-Creighton-7adac635-f380-409b-8ec4-1b220bbc5025.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '4'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0104
 - classification: district
   address: 2829 Technology Forest Suite 240, Woodlands, TX 77381
   voice: 281-292-4128
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0104
 links:
 - url: https://senate.texas.gov/member.php?d=4
 other_names:
diff --git a/data/tx/legislature/Brian-Birdwell-44a23037-5ccd-4781-9e93-c4b950f74355.yml b/data/tx/legislature/Brian-Birdwell-44a23037-5ccd-4781-9e93-c4b950f74355.yml
index ff698afe7f..653b657033 100644
--- a/data/tx/legislature/Brian-Birdwell-44a23037-5ccd-4781-9e93-c4b950f74355.yml
+++ b/data/tx/legislature/Brian-Birdwell-44a23037-5ccd-4781-9e93-c4b950f74355.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '22'
 offices:
-- classification: capitol-mail
-  address: Room 1E.3, P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0122
 - classification: district
   address: 1315 Waters Edge Drive Suite 116, Granbury, TX 76048
   voice: 817-573-9622
@@ -29,6 +26,9 @@ offices:
   address: 900 Austin Ave. Suite 500, Waco, TX 76701
   voice: 254-772-6225
   fax: 254-776-2843
+- classification: district-mail
+  address: Room 1E.3, P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0122
 links:
 - url: https://senate.texas.gov/member.php?d=22
 other_names:
diff --git a/data/tx/legislature/Brian-Harrison-b1bf46ac-e99e-49f6-8f40-cf07aca12187.yml b/data/tx/legislature/Brian-Harrison-b1bf46ac-e99e-49f6-8f40-cf07aca12187.yml
index 384114245b..44edd297d1 100644
--- a/data/tx/legislature/Brian-Harrison-b1bf46ac-e99e-49f6-8f40-cf07aca12187.yml
+++ b/data/tx/legislature/Brian-Harrison-b1bf46ac-e99e-49f6-8f40-cf07aca12187.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '10'
 offices:
-- classification: capitol-mail
-  address: Room E2.704, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0516
 - classification: district
   address: 100 N. College St., Suite 306, Waxahachie, TX 75165
   voice: 972-923-0264
+- classification: district-mail
+  address: Room E2.704, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0516
 links:
 - url: https://house.texas.gov/members/member-page/?district=10
 - url: https://house.texas.gov/members/4085
diff --git a/data/tx/legislature/Briscoe-Cain-065c24a0-401a-4dc5-a19c-e7d96dcbffc5.yml b/data/tx/legislature/Briscoe-Cain-065c24a0-401a-4dc5-a19c-e7d96dcbffc5.yml
index 357eda2538..2c8602e6d9 100644
--- a/data/tx/legislature/Briscoe-Cain-065c24a0-401a-4dc5-a19c-e7d96dcbffc5.yml
+++ b/data/tx/legislature/Briscoe-Cain-065c24a0-401a-4dc5-a19c-e7d96dcbffc5.yml
@@ -14,11 +14,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '128'
 offices:
-- classification: capitol-mail
-  address: Room E2.706, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0733
 - classification: district
   address: 120 E. 8th St., Suite 23, Deer Park, TX 77536
+- classification: district-mail
+  address: Room E2.706, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0733
 links:
 - url: https://house.texas.gov/members/member-page/?district=128
 - url: https://house.texas.gov/members/3265
diff --git a/data/tx/legislature/Brooks-Landgraf-83030f8b-5f1f-4475-b564-a07ae42f6d98.yml b/data/tx/legislature/Brooks-Landgraf-83030f8b-5f1f-4475-b564-a07ae42f6d98.yml
index 37c70675d9..49d8ab00ae 100644
--- a/data/tx/legislature/Brooks-Landgraf-83030f8b-5f1f-4475-b564-a07ae42f6d98.yml
+++ b/data/tx/legislature/Brooks-Landgraf-83030f8b-5f1f-4475-b564-a07ae42f6d98.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '81'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 119 W. 4th St., Odessa, TX 79761
+- classification: district-mail
   address: Room E2.602, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0546
   fax: 512-463-8067
-- classification: district
-  address: 119 W. 4th St., Odessa, TX 79761
 links:
 - url: https://house.texas.gov/members/member-page/?district=81
 other_names:
diff --git a/data/tx/legislature/Bryan-Hughes-8326538c-c907-43b2-a6db-76434036afd7.yml b/data/tx/legislature/Bryan-Hughes-8326538c-c907-43b2-a6db-76434036afd7.yml
index 64a63a8bc5..4d16d6a823 100644
--- a/data/tx/legislature/Bryan-Hughes-8326538c-c907-43b2-a6db-76434036afd7.yml
+++ b/data/tx/legislature/Bryan-Hughes-8326538c-c907-43b2-a6db-76434036afd7.yml
@@ -19,9 +19,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '5'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0101
 - classification: district
   address: 110 N. College Ave. Suite 208, Tyler, TX 75702
   voice: 903-581-1776
@@ -39,6 +36,9 @@ offices:
 - classification: district
   address: Texarkana College 2500 N. Robinson Road, Suite 190, Texarkana, TX 75599
   voice: 903-223-7958
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0101
 links:
 - url: https://senate.texas.gov/member.php?d=1
 other_names:
diff --git a/data/tx/legislature/Candy-Noble-f4976334-0e0e-4474-b5b4-3264e8d73f1d.yml b/data/tx/legislature/Candy-Noble-f4976334-0e0e-4474-b5b4-3264e8d73f1d.yml
index d6952c3a5e..50f1dd0069 100644
--- a/data/tx/legislature/Candy-Noble-f4976334-0e0e-4474-b5b4-3264e8d73f1d.yml
+++ b/data/tx/legislature/Candy-Noble-f4976334-0e0e-4474-b5b4-3264e8d73f1d.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '89'
 offices:
-- classification: capitol-mail
-  address: Room E1.414, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0186
 - classification: district
   address: 206 N. Murphy Road, Murphy, TX 75094
   voice: 972-423-6542
+- classification: district-mail
+  address: Room E1.414, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0186
 links:
 - url: https://house.texas.gov/members/member-page/?district=89
 other_names:
diff --git a/data/tx/legislature/Carl-Sherman-Sr-c5d16702-0b70-4f46-a0ba-3c47acd352f0.yml b/data/tx/legislature/Carl-Sherman-Sr-c5d16702-0b70-4f46-a0ba-3c47acd352f0.yml
index 8b6f7bd8ca..419fd0b5fd 100644
--- a/data/tx/legislature/Carl-Sherman-Sr-c5d16702-0b70-4f46-a0ba-3c47acd352f0.yml
+++ b/data/tx/legislature/Carl-Sherman-Sr-c5d16702-0b70-4f46-a0ba-3c47acd352f0.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '109'
 offices:
-- classification: capitol-mail
-  address: Room E2.508, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0953
-  fax: 512-463-5887
 - classification: district
   address: 103 N. Dallas Ave., Lancaster, TX 75146
   voice: 972-227-1064
+- classification: district-mail
+  address: Room E2.508, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0953
+  fax: 512-463-5887
 links:
 - url: https://house.texas.gov/members/member-page/?district=109
 - url: https://house.texas.gov/members/3675
diff --git a/data/tx/legislature/Carol-Alvarado-e78373de-6d96-44db-b552-6da34ed992fc.yml b/data/tx/legislature/Carol-Alvarado-e78373de-6d96-44db-b552-6da34ed992fc.yml
index 202521acbc..7d0b621f36 100644
--- a/data/tx/legislature/Carol-Alvarado-e78373de-6d96-44db-b552-6da34ed992fc.yml
+++ b/data/tx/legislature/Carol-Alvarado-e78373de-6d96-44db-b552-6da34ed992fc.yml
@@ -18,12 +18,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '145'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0106
 - classification: district
   address: 4450 Harrisburg Suite 436, Houston, TX 77011
   voice: 713-926-6257
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0106
 links:
 - url: https://senate.texas.gov/member.php?d=6
 other_names:
diff --git a/data/tx/legislature/Caroline-Harris-72920206-cbe7-4429-b42b-c6fc746a1d56.yml b/data/tx/legislature/Caroline-Harris-72920206-cbe7-4429-b42b-c6fc746a1d56.yml
index c2bcabf82e..970aa1dace 100644
--- a/data/tx/legislature/Caroline-Harris-72920206-cbe7-4429-b42b-c6fc746a1d56.yml
+++ b/data/tx/legislature/Caroline-Harris-72920206-cbe7-4429-b42b-c6fc746a1d56.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '52'
 offices:
-- classification: capitol-mail
-  address: Room E1.312, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0670
 - classification: district
   address: 3010 E. Old Settlers Blvd., Round Rock, TX 78665
   voice: 512-255-6612
+- classification: district-mail
+  address: Room E1.312, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0670
 links:
 - url: https://house.texas.gov/members/member-page/?district=52
 - url: https://house.texas.gov/members/4205
@@ -30,6 +30,7 @@ other_names:
 - name: Harris, Caroline
 sources:
 - url: https://ballotpedia.org/Caroline_Harris
+- url: https://en.wikipedia.org/wiki/Caroline_Harris_(politician)
 - url: https://house.texas.gov/members/4205
 - url: https://house.texas.gov/members/member-page/?district=52
 - url: https://www.linkedin.com/in/caroline-harris-60a3b7153
diff --git a/data/tx/legislature/Carrie-Isaac-64221b86-e3ca-4b67-b2bb-3f4f9641e133.yml b/data/tx/legislature/Carrie-Isaac-64221b86-e3ca-4b67-b2bb-3f4f9641e133.yml
index 30164b432e..8d9647eade 100644
--- a/data/tx/legislature/Carrie-Isaac-64221b86-e3ca-4b67-b2bb-3f4f9641e133.yml
+++ b/data/tx/legislature/Carrie-Isaac-64221b86-e3ca-4b67-b2bb-3f4f9641e133.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '73'
 offices:
-- classification: capitol-mail
-  address: Room E2.702, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0325
 - classification: district
   address: 137 Fredericksburg Road, New Braunfels, TX 78130
   voice: 830-730-6248
+- classification: district-mail
+  address: Room E2.702, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0325
 links:
 - url: https://house.texas.gov/members/member-page/?district=73
 - url: https://house.texas.gov/members/73
diff --git a/data/tx/legislature/Cecil-Bell-33f871c9-15a6-4094-9181-ff822cd9eca4.yml b/data/tx/legislature/Cecil-Bell-33f871c9-15a6-4094-9181-ff822cd9eca4.yml
index 2d416d616d..f32ea202ee 100644
--- a/data/tx/legislature/Cecil-Bell-33f871c9-15a6-4094-9181-ff822cd9eca4.yml
+++ b/data/tx/legislature/Cecil-Bell-33f871c9-15a6-4094-9181-ff822cd9eca4.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '3'
 offices:
-- classification: capitol-mail
-  address: Room E2.708, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0650
-  fax: 512-463-0575
 - classification: district
   address: 18230 FM 1488 Suite 302, Magnolia, TX 77354
   voice: 281-259-3700
   fax: 281-259-3706
+- classification: district-mail
+  address: Room E2.708, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0650
+  fax: 512-463-0575
 links:
 - url: https://house.texas.gov/members/member-page/?district=3
 - url: https://house.texas.gov/members/3
diff --git a/data/tx/legislature/Charles-Cunningham-41f4a5e2-a2d5-4e54-aae3-9c99f9ea5eba.yml b/data/tx/legislature/Charles-Cunningham-41f4a5e2-a2d5-4e54-aae3-9c99f9ea5eba.yml
index b432d44b0f..0f457cb197 100644
--- a/data/tx/legislature/Charles-Cunningham-41f4a5e2-a2d5-4e54-aae3-9c99f9ea5eba.yml
+++ b/data/tx/legislature/Charles-Cunningham-41f4a5e2-a2d5-4e54-aae3-9c99f9ea5eba.yml
@@ -13,11 +13,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '127'
 offices:
-- classification: capitol-mail
-  address: Room E2.402, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0520
 - classification: district
   address: 110 W. Main St., Humble, TX 77338
+- classification: district-mail
+  address: Room E2.402, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0520
 links:
 - url: https://house.texas.gov/members/member-page/?district=127
 - url: https://house.texas.gov/members/4130
diff --git a/data/tx/legislature/Charles-Perry-6522ba2d-f263-455a-9470-cec0aa03033b.yml b/data/tx/legislature/Charles-Perry-6522ba2d-f263-455a-9470-cec0aa03033b.yml
index 03e9e1c477..5ef6f2b028 100644
--- a/data/tx/legislature/Charles-Perry-6522ba2d-f263-455a-9470-cec0aa03033b.yml
+++ b/data/tx/legislature/Charles-Perry-6522ba2d-f263-455a-9470-cec0aa03033b.yml
@@ -14,10 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '28'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0128
-  fax: 512-463-2424
 - classification: district
   address: '11003 Quaker Ave. #101, Lubbock, TX 79424'
   voice: 806-783-9934
@@ -27,6 +23,10 @@ offices:
 - classification: district
   address: '36 W. Beauregard Ave. #510, San Angelo, TX 76903'
   voice: 325-481-0028
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0128
+  fax: 512-463-2424
 links:
 - url: https://senate.texas.gov/member.php?d=28
 other_names:
diff --git a/data/tx/legislature/Charles-Schwertner-d7d0bd69-2615-4d0c-84df-4cdb75809343.yml b/data/tx/legislature/Charles-Schwertner-d7d0bd69-2615-4d0c-84df-4cdb75809343.yml
index e9f8f4bd88..2e17a60d0c 100644
--- a/data/tx/legislature/Charles-Schwertner-d7d0bd69-2615-4d0c-84df-4cdb75809343.yml
+++ b/data/tx/legislature/Charles-Schwertner-d7d0bd69-2615-4d0c-84df-4cdb75809343.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '5'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0105
 - classification: district
   address: 3000 Briarcrest Drive, Suite 202, Bryan, TX 77802
   voice: 979-776-0222
@@ -25,6 +22,9 @@ offices:
   address: Block 27, 501 S. Austin Ave., Georgetown, TX 78626
   voice: 512-863-8456
   fax: 512-863-8436
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0105
 links:
 - url: https://senate.texas.gov/member.php?d=5
 other_names:
diff --git a/data/tx/legislature/Charlie-Geren-65a42043-6243-4f79-b1e0-69b3b8b4af29.yml b/data/tx/legislature/Charlie-Geren-65a42043-6243-4f79-b1e0-69b3b8b4af29.yml
index 85052ae8bd..25adb875df 100644
--- a/data/tx/legislature/Charlie-Geren-65a42043-6243-4f79-b1e0-69b3b8b4af29.yml
+++ b/data/tx/legislature/Charlie-Geren-65a42043-6243-4f79-b1e0-69b3b8b4af29.yml
@@ -14,16 +14,17 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '99'
 offices:
-- classification: capitol-mail
-  address: Room GW.15, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0610
-  fax: 512-463-8310
 - classification: district
   address: 6713 Telephone Road Suite 301, Lake Worth, TX 76135
   voice: 817-237-2251
   fax: 817-237-2264
+- classification: district-mail
+  address: Room GW.15, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0610
+  fax: 512-463-8310
 links:
 - url: https://house.texas.gov/members/member-page/?district=99
+- url: https://house.texas.gov/members/2945
 other_names:
 - name: C. Geren
 - name: C.L. Geren
@@ -38,5 +39,6 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Charlie_Geren
 - url: https://en.wikipedia.org/wiki/Charlie_Geren
+- url: https://house.texas.gov/members/2945
 - url: https://house.texas.gov/members/member-page/?district=99
 - url: https://justfacts.votesmart.org/candidate/biography/49376/charlie-geren
diff --git a/data/tx/legislature/Chris-Turner-a5e2021c-8221-41ba-b45c-cc89d13b2af2.yml b/data/tx/legislature/Chris-Turner-a5e2021c-8221-41ba-b45c-cc89d13b2af2.yml
index bec981e4c1..193ac5df9f 100644
--- a/data/tx/legislature/Chris-Turner-a5e2021c-8221-41ba-b45c-cc89d13b2af2.yml
+++ b/data/tx/legislature/Chris-Turner-a5e2021c-8221-41ba-b45c-cc89d13b2af2.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '101'
 offices:
-- classification: capitol-mail
-  address: Room 4N.3, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0574
-  fax: 512-463-1481
 - classification: district
   address: 320 Westway Place Suite 501, Arlington, TX 76018
   voice: 817-459-2800
+- classification: district-mail
+  address: Room 4N.3, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0574
+  fax: 512-463-1481
 links:
 - url: https://house.texas.gov/members/member-page/?district=101
 - url: https://house.texas.gov/members/4680
diff --git a/data/tx/legislature/Christian-Manuel-26090510-8782-4d64-b981-3d1cde573090.yml b/data/tx/legislature/Christian-Manuel-26090510-8782-4d64-b981-3d1cde573090.yml
index a234b90f84..0364460a89 100644
--- a/data/tx/legislature/Christian-Manuel-26090510-8782-4d64-b981-3d1cde573090.yml
+++ b/data/tx/legislature/Christian-Manuel-26090510-8782-4d64-b981-3d1cde573090.yml
@@ -13,18 +13,20 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '22'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 2300 Highway 365 Suite 360, Nederland, TX 77627
+  voice: 409-344-4022
+- classification: district-mail
   address: Room E2.320, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0662
-- classification: district
-  address: 2300 Farm to Market 365 Suite 360, Nederland, TX 77627
-  voice: 409-237-5190
 links:
 - url: https://house.texas.gov/members/member-page/?district=22
+- url: https://house.texas.gov/members/4255
 other_names:
 - name: C. Manuel
 - name: Manuel, C.
 sources:
 - url: https://ballotpedia.org/Christian_Hayes
 - url: https://en.wikipedia.org/wiki/Christian_Manuel
+- url: https://house.texas.gov/members/4255
 - url: https://house.texas.gov/members/member-page/?district=22
diff --git a/data/tx/legislature/Christina-Morales-791e4399-56bb-4d4c-8561-71f0979fb999.yml b/data/tx/legislature/Christina-Morales-791e4399-56bb-4d4c-8561-71f0979fb999.yml
index 787722f467..febe54dcd3 100644
--- a/data/tx/legislature/Christina-Morales-791e4399-56bb-4d4c-8561-71f0979fb999.yml
+++ b/data/tx/legislature/Christina-Morales-791e4399-56bb-4d4c-8561-71f0979fb999.yml
@@ -14,16 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '145'
 offices:
-- classification: capitol-mail
-  address: Room E1.510, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0732
-  fax: 512-463-4781
 - classification: district
   address: Room Suite 107, 6960 Rustic St. Parking Garage, Building C, Houston, TX
     77087
   voice: 713-718-5915
 - classification: district-mail
   address: 6815 Rustic St., Houston, TX 77087
+- classification: district-mail
+  address: Room E1.510, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0732
+  fax: 512-463-4781
 links:
 - url: https://house.texas.gov/members/member-page/?district=145
 - url: https://house.texas.gov/members/3910
diff --git a/data/tx/legislature/Claudia-Ordaz-Perez-6feda596-fd20-429b-ae4e-bedab7e5a1c5.yml b/data/tx/legislature/Claudia-Ordaz-Perez-6feda596-fd20-429b-ae4e-bedab7e5a1c5.yml
index 29b7ca3e87..756f1aa94d 100644
--- a/data/tx/legislature/Claudia-Ordaz-Perez-6feda596-fd20-429b-ae4e-bedab7e5a1c5.yml
+++ b/data/tx/legislature/Claudia-Ordaz-Perez-6feda596-fd20-429b-ae4e-bedab7e5a1c5.yml
@@ -18,12 +18,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '76'
 offices:
-- classification: capitol-mail
-  address: Room E2.414, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0622
 - classification: district
   address: 1200 Golden Key Suite 310, El Paso, TX 79925
   voice: 915-591-0299
+- classification: district-mail
+  address: Room E2.414, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0622
 links:
 - url: https://house.texas.gov/members/member-page/?district=76
 - url: https://house.texas.gov/members/member-page/?district=79
diff --git a/data/tx/legislature/Cody-Harris-baafecd4-6f74-4a97-b564-691c1e938291.yml b/data/tx/legislature/Cody-Harris-baafecd4-6f74-4a97-b564-691c1e938291.yml
index 6ddd1211f2..f2a7425eb4 100644
--- a/data/tx/legislature/Cody-Harris-baafecd4-6f74-4a97-b564-691c1e938291.yml
+++ b/data/tx/legislature/Cody-Harris-baafecd4-6f74-4a97-b564-691c1e938291.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '8'
 offices:
-- classification: capitol-mail
-  address: Room E2.606, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0730
 - classification: district
   address: 519 N. Sycamore, Palestine, TX 75801
   voice: 903-731-4005
+- classification: district-mail
+  address: Room E2.606, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0730
 links:
 - url: https://house.texas.gov/members/member-page/?district=8
 - url: https://house.texas.gov/members/3580
diff --git a/data/tx/legislature/Cody-Vasut-3194ee5e-f4d8-4449-8ff6-ec47c0822a3d.yml b/data/tx/legislature/Cody-Vasut-3194ee5e-f4d8-4449-8ff6-ec47c0822a3d.yml
index 5e8a7e9bd8..ce24346cfd 100644
--- a/data/tx/legislature/Cody-Vasut-3194ee5e-f4d8-4449-8ff6-ec47c0822a3d.yml
+++ b/data/tx/legislature/Cody-Vasut-3194ee5e-f4d8-4449-8ff6-ec47c0822a3d.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '25'
 offices:
-- classification: capitol-mail
-  address: Room E2.712, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0564
-  fax: 512-463-8414
 - classification: district
   address: 222 N. Velasco St. Suite 25, Angleton, TX 77515
   voice: 979-848-1770
+- classification: district-mail
+  address: Room E2.712, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0564
+  fax: 512-463-8414
 links:
 - url: https://house.texas.gov/members/member-page/?district=25
 - url: https://house.texas.gov/members/4065
diff --git a/data/tx/legislature/Cole-Hefner-43bbf34a-6bc4-41f9-9bdc-3e944c5b8495.yml b/data/tx/legislature/Cole-Hefner-43bbf34a-6bc4-41f9-9bdc-3e944c5b8495.yml
index eb0fa2e5bb..e00e8887e2 100644
--- a/data/tx/legislature/Cole-Hefner-43bbf34a-6bc4-41f9-9bdc-3e944c5b8495.yml
+++ b/data/tx/legislature/Cole-Hefner-43bbf34a-6bc4-41f9-9bdc-3e944c5b8495.yml
@@ -14,16 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '5'
 offices:
-- classification: capitol-mail
-  address: Room E2.718, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0271
-  fax: 512-463-1515
 - classification: district
   address: 115 W. 1st St., Mount Pleasant, TX 75455
   voice: 903-717-8238
 - classification: district
   address: 520 N. Main St. Suite A-3, Lindale, TX 75711
   voice: 903-882-3254
+- classification: district-mail
+  address: Room E2.718, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0271
+  fax: 512-463-1515
 links:
 - url: https://house.texas.gov/members/member-page/?district=5
 - url: https://house.texas.gov/members/3505
diff --git a/data/tx/legislature/Craig-Goldman-74225274-40f8-4ef8-b2b5-bb7e4f8b5115.yml b/data/tx/legislature/Craig-Goldman-74225274-40f8-4ef8-b2b5-bb7e4f8b5115.yml
index c795ab719b..331acd5951 100644
--- a/data/tx/legislature/Craig-Goldman-74225274-40f8-4ef8-b2b5-bb7e4f8b5115.yml
+++ b/data/tx/legislature/Craig-Goldman-74225274-40f8-4ef8-b2b5-bb7e4f8b5115.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '97'
 offices:
-- classification: capitol-mail
-  address: Room E2.510, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0608
 - classification: district
   address: 4521 S. Hulen St. Suite 208, Fort Worth, TX 76109
   voice: 817-920-5912
+- classification: district-mail
+  address: Room E2.510, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0608
 links:
 - url: https://house.texas.gov/members/member-page/?district=97
 - url: https://house.texas.gov/members/2395
diff --git a/data/tx/legislature/Dade-Phelan-7952d7d7-0fe5-4712-9967-6cb9bcedff05.yml b/data/tx/legislature/Dade-Phelan-7952d7d7-0fe5-4712-9967-6cb9bcedff05.yml
index 758545e93b..3720c73309 100644
--- a/data/tx/legislature/Dade-Phelan-7952d7d7-0fe5-4712-9967-6cb9bcedff05.yml
+++ b/data/tx/legislature/Dade-Phelan-7952d7d7-0fe5-4712-9967-6cb9bcedff05.yml
@@ -14,13 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '21'
 offices:
-- classification: capitol-mail
-  address: Room 2W.11, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-1000
-  fax: 512-463-1861
 - classification: district
   address: 812 N. 16th St., Orange, TX 77630
   voice: 409-745-2777
+- classification: district-mail
+  address: Room 2W.11, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-1000
 links:
 - url: https://house.texas.gov/members/speaker/
 - url: https://house.texas.gov/members/member-page/?district=21
diff --git a/data/tx/legislature/David-Cook-2d5f629c-76a7-455b-aff7-262d8c1c23f6.yml b/data/tx/legislature/David-Cook-2d5f629c-76a7-455b-aff7-262d8c1c23f6.yml
index 2a97d67a80..83fe26e647 100644
--- a/data/tx/legislature/David-Cook-2d5f629c-76a7-455b-aff7-262d8c1c23f6.yml
+++ b/data/tx/legislature/David-Cook-2d5f629c-76a7-455b-aff7-262d8c1c23f6.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '96'
 offices:
-- classification: capitol-mail
-  address: Room E1.402, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0374
-  fax: 512-463-0364
 - classification: district
   address: 309 E. Broad St., Mansfield, TX 76063
   voice: 817-473-1960
+- classification: district-mail
+  address: Room E1.402, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0374
+  fax: 512-463-0364
 links:
 - url: https://house.texas.gov/members/member-page/?district=96
 - url: https://house.texas.gov/members/3960
diff --git a/data/tx/legislature/David-Spiller-36338558-c2b0-4b43-b656-261dccbee871.yml b/data/tx/legislature/David-Spiller-36338558-c2b0-4b43-b656-261dccbee871.yml
index c16b3c330d..89793fe04e 100644
--- a/data/tx/legislature/David-Spiller-36338558-c2b0-4b43-b656-261dccbee871.yml
+++ b/data/tx/legislature/David-Spiller-36338558-c2b0-4b43-b656-261dccbee871.yml
@@ -14,18 +14,18 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '68'
 offices:
-- classification: capitol-mail
-  address: Room E1.318, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0526
-  fax: 512-463-1011
 - classification: district
   address: 110 E. Pecan St., Gainesville, TX 76240
 - classification: district
   address: 501 E. 4th St., Lampasas, TX 76550
 - classification: district
   address: 600 E. Depot St., Brownwood, TX 76801
-- classification: district
+- classification: district-mail
   address: P.O. Box 447, Jacksboro, TX 76458
+- classification: district-mail
+  address: Room E1.318, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0526
+  fax: 512-463-1011
 links:
 - url: https://house.texas.gov/members/member-page/?district=68
 - url: https://house.texas.gov/members/4075
diff --git a/data/tx/legislature/DeWayne-Burns-a5e6ba30-dfa5-4e59-baa3-c96f0dcf775f.yml b/data/tx/legislature/DeWayne-Burns-a5e6ba30-dfa5-4e59-baa3-c96f0dcf775f.yml
index aebe24af6f..4c8a3f510e 100644
--- a/data/tx/legislature/DeWayne-Burns-a5e6ba30-dfa5-4e59-baa3-c96f0dcf775f.yml
+++ b/data/tx/legislature/DeWayne-Burns-a5e6ba30-dfa5-4e59-baa3-c96f0dcf775f.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '58'
 offices:
-- classification: capitol-mail
-  address: Room E2.604, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0538
 - classification: district
   address: 115 S. Main St. Suite 202, Cleburne, TX 76033
   voice: 817-645-3685
+- classification: district-mail
+  address: Room E2.604, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0538
 links:
 - url: https://house.texas.gov/members/member-page/?district=58
 - url: https://house.texas.gov/members/58
diff --git a/data/tx/legislature/Dennis-Paul-e05f502a-0d27-4c51-8cad-d3b5eca585b1.yml b/data/tx/legislature/Dennis-Paul-e05f502a-0d27-4c51-8cad-d3b5eca585b1.yml
index b897a75d85..0a95c70fd7 100644
--- a/data/tx/legislature/Dennis-Paul-e05f502a-0d27-4c51-8cad-d3b5eca585b1.yml
+++ b/data/tx/legislature/Dennis-Paul-e05f502a-0d27-4c51-8cad-d3b5eca585b1.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '129'
 offices:
-- classification: capitol-mail
-  address: Room GN.10, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0734
-  fax: 512-463-0401
 - classification: district
   address: 17225 El Camino Real Blvd. Suite 415, Houston, TX 77058
   voice: 281-488-8900
+- classification: district-mail
+  address: Room GN.10, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0734
+  fax: 512-463-0401
 links:
 - url: https://house.texas.gov/members/member-page/?district=129
 other_names:
diff --git a/data/tx/legislature/Diego-M-Bernal-7847295c-78f3-4f8c-adb6-3536fca2782e.yml b/data/tx/legislature/Diego-M-Bernal-7847295c-78f3-4f8c-adb6-3536fca2782e.yml
index ca1489c8aa..e022aad285 100644
--- a/data/tx/legislature/Diego-M-Bernal-7847295c-78f3-4f8c-adb6-3536fca2782e.yml
+++ b/data/tx/legislature/Diego-M-Bernal-7847295c-78f3-4f8c-adb6-3536fca2782e.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '123'
 offices:
-- classification: capitol-mail
-  address: Room E1.508, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0532
 - classification: district
   address: 9862 Lorene Lane, Suite 102, San Antonio, TX
   voice: 210-308-9700
+- classification: district-mail
+  address: Room E1.508, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0532
 links:
 - url: https://house.texas.gov/members/member-page/?district=123
 - url: https://house.texas.gov/members/3110
diff --git a/data/tx/legislature/Donna-Campbell-9f80cd7f-1067-4322-8777-62bc129cd6f2.yml b/data/tx/legislature/Donna-Campbell-9f80cd7f-1067-4322-8777-62bc129cd6f2.yml
index 076d0c7fe2..3019abde9b 100644
--- a/data/tx/legislature/Donna-Campbell-9f80cd7f-1067-4322-8777-62bc129cd6f2.yml
+++ b/data/tx/legislature/Donna-Campbell-9f80cd7f-1067-4322-8777-62bc129cd6f2.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '25'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0125
-  fax: 512-463-7794
 - classification: district
   address: 229 Hunters Village Suite 105, New Braunfels, TX 78132
   voice: 830-626-0065
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0125
+  fax: 512-463-7794
 links:
 - url: https://senate.texas.gov/member.php?d=25
 other_names:
diff --git a/data/tx/legislature/Donna-Howard-349071fd-3c36-43c6-aaca-6d7f9d04322d.yml b/data/tx/legislature/Donna-Howard-349071fd-3c36-43c6-aaca-6d7f9d04322d.yml
index 99482b7248..5c68d863a5 100644
--- a/data/tx/legislature/Donna-Howard-349071fd-3c36-43c6-aaca-6d7f9d04322d.yml
+++ b/data/tx/legislature/Donna-Howard-349071fd-3c36-43c6-aaca-6d7f9d04322d.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '48'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room GW.11, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0631
   fax: 512-463-0901
diff --git a/data/tx/legislature/Drew-Darby-40f0e868-e021-4453-8675-a9d2357e41e1.yml b/data/tx/legislature/Drew-Darby-40f0e868-e021-4453-8675-a9d2357e41e1.yml
index f5757ecfbc..5afb2f0398 100644
--- a/data/tx/legislature/Drew-Darby-40f0e868-e021-4453-8675-a9d2357e41e1.yml
+++ b/data/tx/legislature/Drew-Darby-40f0e868-e021-4453-8675-a9d2357e41e1.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '72'
 offices:
-- classification: capitol-mail
-  address: Room GW.12, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0331
 - classification: district
   address: 136 W. Twohig Ave. Suite E, San Angelo, TX 76903
   voice: 325-658-7313
+- classification: district-mail
+  address: Room GW.12, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0331
 links:
 - url: https://house.texas.gov/members/member-page/?district=72
 - url: https://house.texas.gov/members/2645
diff --git a/data/tx/legislature/Drew-Springer-f1332c39-f120-4ccd-ac64-cae40b2be91a.yml b/data/tx/legislature/Drew-Springer-f1332c39-f120-4ccd-ac64-cae40b2be91a.yml
index 676d34dc11..60bfcc9924 100644
--- a/data/tx/legislature/Drew-Springer-f1332c39-f120-4ccd-ac64-cae40b2be91a.yml
+++ b/data/tx/legislature/Drew-Springer-f1332c39-f120-4ccd-ac64-cae40b2be91a.yml
@@ -20,9 +20,6 @@ roles:
   district: '68'
   end_reason: Elected to Texas Senate
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0130
 - classification: district
   address: 100 Austin Ave. Suite 103, Weatherford, TX 76086
   voice: 817-594-7105
@@ -31,6 +28,9 @@ offices:
   address: Denton Square Business Center 723 S-I35 East, Suite 222, Denton, TX 76205
   voice: 940-323-9338
   fax: 940-323-9341
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0130
 links:
 - url: https://senate.texas.gov/member.php?d=30
 other_names:
diff --git a/data/tx/legislature/Dustin-Burrows-fff5eb4f-2c41-4d00-a1c5-e566a15b063e.yml b/data/tx/legislature/Dustin-Burrows-fff5eb4f-2c41-4d00-a1c5-e566a15b063e.yml
index 3a48163ba2..0b31bae9cc 100644
--- a/data/tx/legislature/Dustin-Burrows-fff5eb4f-2c41-4d00-a1c5-e566a15b063e.yml
+++ b/data/tx/legislature/Dustin-Burrows-fff5eb4f-2c41-4d00-a1c5-e566a15b063e.yml
@@ -14,14 +14,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '83'
 offices:
-- classification: capitol-mail
-  address: Room E2.610, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0542
 - classification: district
   address: 10507 Quaker Ave. Suite 103, Lubbock, TX 79424
   voice: 806-795-0635
+- classification: district-mail
+  address: Room E2.610, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0542
 links:
 - url: https://house.texas.gov/members/member-page/?district=83
+- url: https://house.texas.gov/members/3055
 other_names:
 - name: Burrows, D.
 - name: D. Burrows
@@ -34,6 +35,7 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Dustin_Burrows
 - url: https://en.wikipedia.org/wiki/Dustin_Burrows
+- url: https://house.texas.gov/members/3055
 - url: https://house.texas.gov/members/member-page/?district=83
 - url: https://justfacts.votesmart.org/candidate/biography/155511/dustin-burrows
 - url: https://www.linkedin.com/in/dustin-burrows-16a29a4
diff --git a/data/tx/legislature/Ed-Thompson-9fb69a65-467d-491c-9663-3892583795c5.yml b/data/tx/legislature/Ed-Thompson-9fb69a65-467d-491c-9663-3892583795c5.yml
index 8f89de1f18..b1f7d2a5aa 100644
--- a/data/tx/legislature/Ed-Thompson-9fb69a65-467d-491c-9663-3892583795c5.yml
+++ b/data/tx/legislature/Ed-Thompson-9fb69a65-467d-491c-9663-3892583795c5.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '29'
 offices:
-- classification: capitol-mail
-  address: Room 4S.3, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0707
-  fax: 512-463-8717
 - classification: district
   address: 2341 N. Galveston Ave. Suite 120, Pearland, TX 77581
   voice: 281-485-6565
+- classification: district-mail
+  address: Room 4S.3, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0707
+  fax: 512-463-8717
 links:
 - url: https://house.texas.gov/members/member-page/?district=29
 - url: https://house.texas.gov/members/29
diff --git a/data/tx/legislature/Eddie-Morales-c84056d0-47e0-4a0c-94e1-9f90c2d90a15.yml b/data/tx/legislature/Eddie-Morales-c84056d0-47e0-4a0c-94e1-9f90c2d90a15.yml
index c66efe4f6c..81b93bc165 100644
--- a/data/tx/legislature/Eddie-Morales-c84056d0-47e0-4a0c-94e1-9f90c2d90a15.yml
+++ b/data/tx/legislature/Eddie-Morales-c84056d0-47e0-4a0c-94e1-9f90c2d90a15.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '74'
 offices:
-- classification: capitol-mail
-  address: Room E1.212, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0566
-  fax: 512-463-0220
 - classification: district
   address: 100 S. Monroe St., Eagle Pass, TX 78852
 - classification: district
   address: 1915 Veterans Blvd., Del Rio, TX 78840
+- classification: district-mail
+  address: Room E1.212, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0566
+  fax: 512-463-0220
 links:
 - url: https://house.texas.gov/members/member-page/?district=74
 - url: https://house.texas.gov/members/4000
diff --git a/data/tx/legislature/Elizabeth-Liz-Campos-b91e1420-1732-4063-9f3d-edcc5e71d416.yml b/data/tx/legislature/Elizabeth-Liz-Campos-b91e1420-1732-4063-9f3d-edcc5e71d416.yml
index 9d4d2caf82..17e0bc6768 100644
--- a/data/tx/legislature/Elizabeth-Liz-Campos-b91e1420-1732-4063-9f3d-edcc5e71d416.yml
+++ b/data/tx/legislature/Elizabeth-Liz-Campos-b91e1420-1732-4063-9f3d-edcc5e71d416.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '119'
 offices:
-- classification: capitol-mail
-  address: Room E1.306, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0452
-  fax: 512-463-1447
 - classification: district
   address: 3124 Sidney Brooks Suite A, San Antonio, TX 78235
   voice: 210-806-0899
+- classification: district-mail
+  address: Room E1.306, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0452
+  fax: 512-463-1447
 links:
 - url: https://house.texas.gov/members/member-page/?district=119
 - url: https://house.texas.gov/members/119
diff --git a/data/tx/legislature/Ellen-Troxclair-34590156-1109-4ab6-84bc-bbe07764f365.yml b/data/tx/legislature/Ellen-Troxclair-34590156-1109-4ab6-84bc-bbe07764f365.yml
index 72b5c8f579..e3812dfe9e 100644
--- a/data/tx/legislature/Ellen-Troxclair-34590156-1109-4ab6-84bc-bbe07764f365.yml
+++ b/data/tx/legislature/Ellen-Troxclair-34590156-1109-4ab6-84bc-bbe07764f365.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '19'
 offices:
-- classification: capitol-mail
-  address: Room E1.208, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0490
 - classification: district
   address: 100 Avenue G 3rd Floor, Marble Falls, TX 78654
 - classification: district
   address: 624 N. Main St. Suite 102, Boerne, TX 78006
+- classification: district-mail
+  address: Room E1.208, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0490
 links:
 - url: https://house.texas.gov/members/member-page/?district=19
 - url: https://house.texas.gov/members/19
diff --git a/data/tx/legislature/Erin-Elizabeth-Gmez-2cadcb59-210a-4a71-af9f-7dba9ab06112.yml b/data/tx/legislature/Erin-Elizabeth-Gmez-2cadcb59-210a-4a71-af9f-7dba9ab06112.yml
index c89ba074c0..43f65c28e4 100644
--- a/data/tx/legislature/Erin-Elizabeth-Gmez-2cadcb59-210a-4a71-af9f-7dba9ab06112.yml
+++ b/data/tx/legislature/Erin-Elizabeth-Gmez-2cadcb59-210a-4a71-af9f-7dba9ab06112.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '38'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 777 E. Harrison St. 2nd Floor, Brownsville, TX 78520
+- classification: district-mail
   address: Room E2.420, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0606
   fax: 512-463-0660
-- classification: district
-  address: 777 E. Harrison St. 2nd Floor, Brownsville, TX 78520
 links:
 - url: https://house.texas.gov/members/member-page/?district=38
 - url: https://house.texas.gov/members/38
diff --git a/data/tx/legislature/Erin-Zwiener-b55d57f4-bd06-4487-8860-0b6eeb9a1dea.yml b/data/tx/legislature/Erin-Zwiener-b55d57f4-bd06-4487-8860-0b6eeb9a1dea.yml
index 113d259bf8..e2bce09f29 100644
--- a/data/tx/legislature/Erin-Zwiener-b55d57f4-bd06-4487-8860-0b6eeb9a1dea.yml
+++ b/data/tx/legislature/Erin-Zwiener-b55d57f4-bd06-4487-8860-0b6eeb9a1dea.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '45'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.908, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0647
   fax: 512-463-3573
diff --git a/data/tx/legislature/Ernest-Bailes-0b54bd1c-fe8a-4af1-9627-ae9371a3ff30.yml b/data/tx/legislature/Ernest-Bailes-0b54bd1c-fe8a-4af1-9627-ae9371a3ff30.yml
index 53a873d39f..18c2a07e85 100644
--- a/data/tx/legislature/Ernest-Bailes-0b54bd1c-fe8a-4af1-9627-ae9371a3ff30.yml
+++ b/data/tx/legislature/Ernest-Bailes-0b54bd1c-fe8a-4af1-9627-ae9371a3ff30.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '18'
 offices:
-- classification: capitol-mail
-  address: Room E2.818, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0570
-- classification: district
+- classification: district-mail
   address: P.O. Box 1116 10501 Highway 150, Suite B, Shepherd, TX 77371
   voice: 936-628-6687
+- classification: district-mail
+  address: Room E2.818, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0570
 links:
 - url: https://house.texas.gov/members/member-page/?district=18
 - url: https://house.texas.gov/members/3200
diff --git a/data/tx/legislature/Evelina-Lina-Ortega-d731c9f0-44ff-4abf-92c4-0069c07f6b26.yml b/data/tx/legislature/Evelina-Lina-Ortega-d731c9f0-44ff-4abf-92c4-0069c07f6b26.yml
index 63bef8d7c9..0a3f0e639e 100644
--- a/data/tx/legislature/Evelina-Lina-Ortega-d731c9f0-44ff-4abf-92c4-0069c07f6b26.yml
+++ b/data/tx/legislature/Evelina-Lina-Ortega-d731c9f0-44ff-4abf-92c4-0069c07f6b26.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '77'
 offices:
-- classification: capitol-mail
-  address: Room E2.204, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0638
-  fax: 512-463-8908
 - classification: district
   address: 310 N. Mesa Suite 424, El Paso, TX 79901
   voice: 915-351-4031
+- classification: district-mail
+  address: Room E2.204, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0638
+  fax: 512-463-8908
 links:
 - url: https://house.texas.gov/members/member-page/?district=77
 - url: https://house.texas.gov/members/3545
diff --git a/data/tx/legislature/Four-Price-7e01abb6-d4c5-40e9-bdef-7a7efd11aaca.yml b/data/tx/legislature/Four-Price-7e01abb6-d4c5-40e9-bdef-7a7efd11aaca.yml
index b24c50f592..6feb671e62 100644
--- a/data/tx/legislature/Four-Price-7e01abb6-d4c5-40e9-bdef-7a7efd11aaca.yml
+++ b/data/tx/legislature/Four-Price-7e01abb6-d4c5-40e9-bdef-7a7efd11aaca.yml
@@ -15,15 +15,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '87'
 offices:
-- classification: capitol-mail
-  address: Room 1N.9, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0470
 - classification: district
   address: Amarillo National Bank 500 S. Taylor St., Plaza Two, Suite 506, Amarillo,
     TX 79101
   voice: 806-374-8787
 - classification: district-mail
   address: P.O. Box 2848, Amarillo, TX 79105
+- classification: district-mail
+  address: Room 1N.9, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0470
 links:
 - url: https://house.texas.gov/members/member-page/?district=87
 other_names:
diff --git a/data/tx/legislature/Frederick-Frazier-10277692-2a2f-43d8-b120-70e591db636f.yml b/data/tx/legislature/Frederick-Frazier-10277692-2a2f-43d8-b120-70e591db636f.yml
index 444102cc90..e0afb40c9a 100644
--- a/data/tx/legislature/Frederick-Frazier-10277692-2a2f-43d8-b120-70e591db636f.yml
+++ b/data/tx/legislature/Frederick-Frazier-10277692-2a2f-43d8-b120-70e591db636f.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '61'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E1.412, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0738
 links:
@@ -26,6 +26,7 @@ other_names:
 - name: Frederick
 sources:
 - url: https://ballotpedia.org/Frederick_Frazier
+- url: https://en.wikipedia.org/wiki/Frederick_Frazier
 - url: https://house.texas.gov/members/4155
 - url: https://house.texas.gov/members/member-page/?district=61
 - url: https://www.linkedin.com/in/frederick-frazier-480b0a2
diff --git a/data/tx/legislature/Gary-Gates-5ff88048-ebd8-4ac3-af9c-d02e1305ef37.yml b/data/tx/legislature/Gary-Gates-5ff88048-ebd8-4ac3-af9c-d02e1305ef37.yml
index 9d0288b7e2..aadf158da9 100644
--- a/data/tx/legislature/Gary-Gates-5ff88048-ebd8-4ac3-af9c-d02e1305ef37.yml
+++ b/data/tx/legislature/Gary-Gates-5ff88048-ebd8-4ac3-af9c-d02e1305ef37.yml
@@ -19,6 +19,7 @@ offices:
   voice: 512-463-0657
 links:
 - url: https://house.texas.gov/members/member-page/?district=28
+- url: https://house.texas.gov/members/3920
 other_names:
 - name: G. Gates
 - name: G.W. Gates
@@ -26,4 +27,5 @@ other_names:
 sources:
 - url: https://ballotpedia.org/Gary_Gates
 - url: https://en.wikipedia.org/wiki/Gary_Gates_(politician)
+- url: https://house.texas.gov/members/3920
 - url: https://house.texas.gov/members/member-page/?district=28
diff --git a/data/tx/legislature/Gary-VanDeaver-26617394-4276-4aa7-878c-d20552b260a4.yml b/data/tx/legislature/Gary-VanDeaver-26617394-4276-4aa7-878c-d20552b260a4.yml
index e38fa24cd4..c9057a95d0 100644
--- a/data/tx/legislature/Gary-VanDeaver-26617394-4276-4aa7-878c-d20552b260a4.yml
+++ b/data/tx/legislature/Gary-VanDeaver-26617394-4276-4aa7-878c-d20552b260a4.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '1'
 offices:
-- classification: capitol-mail
-  address: Room E1.304, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0692
-  fax: 512-463-0902
 - classification: district
   address: 710 James Bowie Drive, New Boston, TX 75570
   voice: 903-628-0361
+- classification: district-mail
+  address: Room E1.304, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0692
+  fax: 512-463-0902
 links:
 - url: https://house.texas.gov/members/member-page/?district=1
 - url: https://house.texas.gov/members/2540
diff --git a/data/tx/legislature/Geanie-W-Morrison-54769259-df18-4363-818e-127341188531.yml b/data/tx/legislature/Geanie-W-Morrison-54769259-df18-4363-818e-127341188531.yml
index 53cc55f178..674106b5df 100644
--- a/data/tx/legislature/Geanie-W-Morrison-54769259-df18-4363-818e-127341188531.yml
+++ b/data/tx/legislature/Geanie-W-Morrison-54769259-df18-4363-818e-127341188531.yml
@@ -15,14 +15,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '30'
 offices:
-- classification: capitol-mail
-  address: Room 1W.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0456
-  fax: 512-463-0158
 - classification: district
   address: 311 E. Constitution St. Suite 100, Victoria, TX 77901
   voice: 361-572-0196
   fax: 361-576-0747
+- classification: district-mail
+  address: Room 1W.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0456
+  fax: 512-463-0158
 links:
 - url: https://house.texas.gov/members/member-page/?district=30
 other_names:
diff --git a/data/tx/legislature/Gene-Wu-5556a81a-eca2-451d-bb29-74cfb00d1959.yml b/data/tx/legislature/Gene-Wu-5556a81a-eca2-451d-bb29-74cfb00d1959.yml
index ae35f23588..da48565a29 100644
--- a/data/tx/legislature/Gene-Wu-5556a81a-eca2-451d-bb29-74cfb00d1959.yml
+++ b/data/tx/legislature/Gene-Wu-5556a81a-eca2-451d-bb29-74cfb00d1959.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '137'
 offices:
-- classification: capitol-mail
-  address: Room GW.8, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0492
 - classification: district
   address: 6500 Rookin, Building C, Houston, TX 77074
   voice: 713-271-3900
   fax: 713-271-3902
+- classification: district-mail
+  address: Room GW.8, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0492
 links:
 - url: https://house.texas.gov/members/member-page/?district=137
 other_names:
diff --git a/data/tx/legislature/Gina-Hinojosa-1f9ed42e-27de-4cd1-b2bf-f890ee33cb49.yml b/data/tx/legislature/Gina-Hinojosa-1f9ed42e-27de-4cd1-b2bf-f890ee33cb49.yml
index 191fefca9d..c21a88c49b 100644
--- a/data/tx/legislature/Gina-Hinojosa-1f9ed42e-27de-4cd1-b2bf-f890ee33cb49.yml
+++ b/data/tx/legislature/Gina-Hinojosa-1f9ed42e-27de-4cd1-b2bf-f890ee33cb49.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '49'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.214, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0668
   fax: 512-463-0957
diff --git a/data/tx/legislature/Giovanni-Capriglione-40ecf6ee-92a4-4daf-b950-ac70b6cdfeee.yml b/data/tx/legislature/Giovanni-Capriglione-40ecf6ee-92a4-4daf-b950-ac70b6cdfeee.yml
index 9a66222be6..2e49e88738 100644
--- a/data/tx/legislature/Giovanni-Capriglione-40ecf6ee-92a4-4daf-b950-ac70b6cdfeee.yml
+++ b/data/tx/legislature/Giovanni-Capriglione-40ecf6ee-92a4-4daf-b950-ac70b6cdfeee.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '98'
 offices:
-- classification: capitol-mail
-  address: Room E1.506, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0690
-- classification: district
+- classification: district-mail
   address: P.O. Box 770 1100 Bear Creek Parkway, Keller, TX 76244
   voice: 817-431-5339
+- classification: district-mail
+  address: Room E1.506, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0690
 links:
 - url: https://house.texas.gov/members/member-page/?district=98
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2345
diff --git a/data/tx/legislature/Glenn-Rogers-b95a6eac-71b2-47ef-918e-91a5ae413a4e.yml b/data/tx/legislature/Glenn-Rogers-b95a6eac-71b2-47ef-918e-91a5ae413a4e.yml
index aafee7d480..f45dd283f3 100644
--- a/data/tx/legislature/Glenn-Rogers-b95a6eac-71b2-47ef-918e-91a5ae413a4e.yml
+++ b/data/tx/legislature/Glenn-Rogers-b95a6eac-71b2-47ef-918e-91a5ae413a4e.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '60'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 103 South Oaks Suite 102, Mineral Wells, TX 76067
+- classification: district-mail
   address: Room E2.820, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0656
   fax: 512-463-1111
-- classification: district
-  address: 103 South Oaks Suite 102, Mineral Wells, TX 76067
 links:
 - url: https://house.texas.gov/members/member-page/?district=60
 - url: https://house.texas.gov/members/4025
diff --git a/data/tx/legislature/Greg-Bonnen-d0fbfb15-2f0c-4167-b8b4-d6135bbb6616.yml b/data/tx/legislature/Greg-Bonnen-d0fbfb15-2f0c-4167-b8b4-d6135bbb6616.yml
index 4c4661ebd7..4465e1bf3c 100644
--- a/data/tx/legislature/Greg-Bonnen-d0fbfb15-2f0c-4167-b8b4-d6135bbb6616.yml
+++ b/data/tx/legislature/Greg-Bonnen-d0fbfb15-2f0c-4167-b8b4-d6135bbb6616.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '24'
 offices:
-- classification: capitol-mail
-  address: Room E2.502, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0729
 - classification: district
   address: 174 Calder Road Suite 1000, League City, TX 77573
   voice: 281-338-0924
+- classification: district-mail
+  address: Room E2.502, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0729
 links:
 - url: https://house.texas.gov/members/member-page/?district=24
 - url: https://house.texas.gov/members/24
diff --git a/data/tx/legislature/Harold-V-Dutton-Jr-85d064ed-6f3d-4a81-93ee-1baf49c7f2c3.yml b/data/tx/legislature/Harold-V-Dutton-Jr-85d064ed-6f3d-4a81-93ee-1baf49c7f2c3.yml
index 5308fcfc23..d38e040f36 100644
--- a/data/tx/legislature/Harold-V-Dutton-Jr-85d064ed-6f3d-4a81-93ee-1baf49c7f2c3.yml
+++ b/data/tx/legislature/Harold-V-Dutton-Jr-85d064ed-6f3d-4a81-93ee-1baf49c7f2c3.yml
@@ -14,15 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '142'
 offices:
-- classification: capitol-mail
-  address: Room 3N.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0510
-  fax: 512-463-8333
 - classification: district
   address: 8799 N. Loop East Suite 305, Houston, TX 77029
   voice: 713-692-9192
+- classification: district-mail
+  address: Room 3N.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0510
+  fax: 512-463-8333
 links:
 - url: https://house.texas.gov/members/member-page/?district=142
+- url: https://house.texas.gov/members/2650
 other_names:
 - name: Dutton, H.
 - name: Dutton, Harold
@@ -41,5 +42,6 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Harold_Dutton_Jr.
 - url: https://en.wikipedia.org/wiki/Harold_Dutton_Jr.
+- url: https://house.texas.gov/members/2650
 - url: https://house.texas.gov/members/member-page/?district=142
 - url: https://justfacts.votesmart.org/candidate/biography/5498/harold-dutton-jr
diff --git a/data/tx/legislature/Hubert-Vo-5c2743d2-fe0e-41d6-969d-de830d5787f8.yml b/data/tx/legislature/Hubert-Vo-5c2743d2-fe0e-41d6-969d-de830d5787f8.yml
index ac421b4785..d906478669 100644
--- a/data/tx/legislature/Hubert-Vo-5c2743d2-fe0e-41d6-969d-de830d5787f8.yml
+++ b/data/tx/legislature/Hubert-Vo-5c2743d2-fe0e-41d6-969d-de830d5787f8.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '149'
 offices:
-- classification: capitol-mail
-  address: Room 4N.8, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0568
-  fax: 512-463-0548
 - classification: district
   address: 7474 S. Kirkwood Suite 106, Houston, TX 77072
   voice: 281-988-0212
+- classification: district-mail
+  address: Room 4N.8, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0568
+  fax: 512-463-0548
 links:
 - url: https://house.texas.gov/members/member-page/?district=149
 other_names:
diff --git a/data/tx/legislature/Hugh-Shine-0b3fe2fc-7445-4986-b34b-0c3ca545eab8.yml b/data/tx/legislature/Hugh-Shine-0b3fe2fc-7445-4986-b34b-0c3ca545eab8.yml
index 4130b678aa..305f9ffe17 100644
--- a/data/tx/legislature/Hugh-Shine-0b3fe2fc-7445-4986-b34b-0c3ca545eab8.yml
+++ b/data/tx/legislature/Hugh-Shine-0b3fe2fc-7445-4986-b34b-0c3ca545eab8.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '55'
 offices:
-- classification: capitol-mail
-  address: Room GS.2, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0630
-  fax: 512-463-0937
 - classification: district
   address: 101 E. Central Ave., Suite 122, Belton, TX 76513
   voice: 254-831-2298
+- classification: district-mail
+  address: Room GS.2, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0630
+  fax: 512-463-0937
 links:
 - url: https://house.texas.gov/members/member-page/?district=55
 - url: https://house.texas.gov/members/55
diff --git a/data/tx/legislature/J-M-Lozano-a43f2db5-4b24-4dfa-af7f-a2c7cbc5ea21.yml b/data/tx/legislature/J-M-Lozano-a43f2db5-4b24-4dfa-af7f-a2c7cbc5ea21.yml
index 448d2949be..4b70d252b9 100644
--- a/data/tx/legislature/J-M-Lozano-a43f2db5-4b24-4dfa-af7f-a2c7cbc5ea21.yml
+++ b/data/tx/legislature/J-M-Lozano-a43f2db5-4b24-4dfa-af7f-a2c7cbc5ea21.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '43'
 offices:
-- classification: capitol-mail
-  address: Room 1W.4, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0463
 - classification: district
   address: '1211 US Highway 181 #106, Portland, TX 78374'
   voice: 361-643-0063
+- classification: district-mail
+  address: Room 1W.4, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0463
 links:
 - url: https://house.texas.gov/members/member-page/?district=43
 other_names:
diff --git a/data/tx/legislature/Jacey-Jetton-8c82ede2-a4c6-4625-92ca-2b24c370de17.yml b/data/tx/legislature/Jacey-Jetton-8c82ede2-a4c6-4625-92ca-2b24c370de17.yml
index e80fe96b66..96cae30980 100644
--- a/data/tx/legislature/Jacey-Jetton-8c82ede2-a4c6-4625-92ca-2b24c370de17.yml
+++ b/data/tx/legislature/Jacey-Jetton-8c82ede2-a4c6-4625-92ca-2b24c370de17.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '26'
 offices:
-- classification: capitol-mail
-  address: Room E1.220, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0710
-  fax: 512-463-0711
 - classification: district
   address: 22333 Grand Corner Drive Suite 151, Katy, TX 77494
   voice: 281-392-5898
+- classification: district-mail
+  address: Room E1.220, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0710
+  fax: 512-463-0711
 links:
 - url: https://house.texas.gov/members/member-page/?district=26
 - url: https://house.texas.gov/members/3980
diff --git a/data/tx/legislature/James-Frank-6cbb02e6-5876-47a1-86aa-98566fe0073a.yml b/data/tx/legislature/James-Frank-6cbb02e6-5876-47a1-86aa-98566fe0073a.yml
index 90d65e5ffa..2c3e1e95cb 100644
--- a/data/tx/legislature/James-Frank-6cbb02e6-5876-47a1-86aa-98566fe0073a.yml
+++ b/data/tx/legislature/James-Frank-6cbb02e6-5876-47a1-86aa-98566fe0073a.yml
@@ -13,13 +13,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '69'
 offices:
-- classification: capitol-mail
-  address: Room 4S.2, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0534
-  fax: 512-463-8161
 - classification: district
   address: 1206 Hatton Rd., Wichita Falls, TX 76302
   voice: 940-767-1700
+- classification: district-mail
+  address: Room 4S.2, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0534
+  fax: 512-463-8161
 links:
 - url: https://house.texas.gov/members/member-page/?district=69
 - url: https://house.texas.gov/members/2385
diff --git a/data/tx/legislature/James-Talarico-5e4e2fd2-e8a9-46f3-aab5-ffbc782afa8b.yml b/data/tx/legislature/James-Talarico-5e4e2fd2-e8a9-46f3-aab5-ffbc782afa8b.yml
index d1a7321a44..c40bc6fa22 100644
--- a/data/tx/legislature/James-Talarico-5e4e2fd2-e8a9-46f3-aab5-ffbc782afa8b.yml
+++ b/data/tx/legislature/James-Talarico-5e4e2fd2-e8a9-46f3-aab5-ffbc782afa8b.yml
@@ -18,7 +18,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '52'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.902, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0821
   fax: 512-463-1469
diff --git a/data/tx/legislature/Janie-Lopez-a732704e-9b03-449c-b24f-f4c567b5acdd.yml b/data/tx/legislature/Janie-Lopez-a732704e-9b03-449c-b24f-f4c567b5acdd.yml
index 9061044f8d..d2fa27c395 100644
--- a/data/tx/legislature/Janie-Lopez-a732704e-9b03-449c-b24f-f4c567b5acdd.yml
+++ b/data/tx/legislature/Janie-Lopez-a732704e-9b03-449c-b24f-f4c567b5acdd.yml
@@ -13,11 +13,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '37'
 offices:
-- classification: capitol-mail
-  address: Room E2.802, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0640
 - classification: district
   address: 1390 W. Expressway 83, San Benito, TX 78586
+- classification: district-mail
+  address: Room E2.802, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0640
 links:
 - url: https://house.texas.gov/members/member-page/?district=37
 - url: https://house.texas.gov/members/37
@@ -27,5 +27,6 @@ other_names:
 - name: Lopez, Janie
 sources:
 - url: https://ballotpedia.org/Janie_Lopez
+- url: https://en.wikipedia.org/wiki/Janie_Lopez
 - url: https://house.texas.gov/members/37
 - url: https://house.texas.gov/members/member-page/?district=37
diff --git a/data/tx/legislature/Jared-Patterson-e926ca11-64dd-4e15-97bd-1f7b0915de36.yml b/data/tx/legislature/Jared-Patterson-e926ca11-64dd-4e15-97bd-1f7b0915de36.yml
index 33a37882f7..a19cb9d79f 100644
--- a/data/tx/legislature/Jared-Patterson-e926ca11-64dd-4e15-97bd-1f7b0915de36.yml
+++ b/data/tx/legislature/Jared-Patterson-e926ca11-64dd-4e15-97bd-1f7b0915de36.yml
@@ -14,15 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '106'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 5533 FM 423 Suite 503, Frisco, TX 75036
+  voice: 214-494-6498
+- classification: district-mail
   address: Room E1.310, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0694
   fax: 512-463-1130
-- classification: district
-  address: 5533 FM 423 Suite 503, Frisco, TX 75034
-  voice: 214-494-6498
 links:
 - url: https://house.texas.gov/members/member-page/?district=106
+- url: https://house.texas.gov/members/3655
 other_names:
 - name: J. Patterson
 - name: J.L. Patterson
@@ -30,5 +31,6 @@ other_names:
 sources:
 - url: https://ballotpedia.org/Jared_Patterson
 - url: https://en.wikipedia.org/wiki/Jared_Patterson
+- url: https://house.texas.gov/members/3655
 - url: https://house.texas.gov/members/member-page/?district=106
 - url: https://www.linkedin.com/in/jaredpattersonconsulting
diff --git a/data/tx/legislature/Jarvis-Johnson-1ffa3f66-7055-4dda-b497-f2d368e6cdc7.yml b/data/tx/legislature/Jarvis-Johnson-1ffa3f66-7055-4dda-b497-f2d368e6cdc7.yml
index 401d3a1766..906432e0b0 100644
--- a/data/tx/legislature/Jarvis-Johnson-1ffa3f66-7055-4dda-b497-f2d368e6cdc7.yml
+++ b/data/tx/legislature/Jarvis-Johnson-1ffa3f66-7055-4dda-b497-f2d368e6cdc7.yml
@@ -15,14 +15,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '139'
 offices:
-- classification: capitol-mail
-  address: Room E2.904, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0554
-  fax: 512-463-8380
 - classification: district
   address: 6112 Wheatley St., Houston, TX 77091
   voice: 713-699-3043
   fax: 713-699-3498
+- classification: district-mail
+  address: Room E2.904, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0554
+  fax: 512-463-8380
 links:
 - url: https://house.texas.gov/members/member-page/?district=139
 - url: https://house.texas.gov/members/3185
diff --git a/data/tx/legislature/Jay-Dean-37886d81-901f-43b4-841b-f3ffbfeeb257.yml b/data/tx/legislature/Jay-Dean-37886d81-901f-43b4-841b-f3ffbfeeb257.yml
index f794b66039..97f7e9cb3e 100644
--- a/data/tx/legislature/Jay-Dean-37886d81-901f-43b4-841b-f3ffbfeeb257.yml
+++ b/data/tx/legislature/Jay-Dean-37886d81-901f-43b4-841b-f3ffbfeeb257.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '7'
 offices:
-- classification: capitol-mail
-  address: Room E2.422, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0750
 - classification: district
   address: 101 E. Methvin Suite 103, Longview, TX 75601
   voice: 903-238-8452
+- classification: district-mail
+  address: Room E2.422, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0750
 links:
 - url: https://house.texas.gov/members/member-page/?district=7
 - url: https://house.texas.gov/members/7
diff --git a/data/tx/legislature/Jeff-Leach-40a678a3-7d85-486e-bf38-5d070142aa83.yml b/data/tx/legislature/Jeff-Leach-40a678a3-7d85-486e-bf38-5d070142aa83.yml
index 4a01960fc8..d5d9281302 100644
--- a/data/tx/legislature/Jeff-Leach-40a678a3-7d85-486e-bf38-5d070142aa83.yml
+++ b/data/tx/legislature/Jeff-Leach-40a678a3-7d85-486e-bf38-5d070142aa83.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '67'
 offices:
-- classification: capitol-mail
-  address: Room GN.11, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0544
-  fax: 512-463-9974
 - classification: district
   address: '300 E. Davis St., #170, McKinney, TX 75069'
   voice: 214-491-1537
+- classification: district-mail
+  address: Room GN.11, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0544
+  fax: 512-463-9974
 links:
 - url: https://house.texas.gov/members/member-page/?district=67
 - url: https://house.texas.gov/members/2475
diff --git a/data/tx/legislature/Jessica-Gonzlez-8eeb1aad-24b6-487b-bbc0-31c2238b1ccd.yml b/data/tx/legislature/Jessica-Gonzlez-8eeb1aad-24b6-487b-bbc0-31c2238b1ccd.yml
index 9b7f01dfbb..56745270bc 100644
--- a/data/tx/legislature/Jessica-Gonzlez-8eeb1aad-24b6-487b-bbc0-31c2238b1ccd.yml
+++ b/data/tx/legislature/Jessica-Gonzlez-8eeb1aad-24b6-487b-bbc0-31c2238b1ccd.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '104'
 offices:
-- classification: capitol-mail
-  address: Room E2.212, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0408
 - classification: district
   address: 400 S. Zang Blvd. Suite 1214, Dallas, TX 75208
   voice: 214-944-5441
+- classification: district-mail
+  address: Room E2.212, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0408
 links:
 - url: https://house.texas.gov/members/member-page/?district=104
 - url: https://house.texas.gov/members/3335
diff --git a/data/tx/legislature/Jill-Dutton-127dce12-cb90-4469-a18a-3e3c7ad6bc9a.yml b/data/tx/legislature/Jill-Dutton-127dce12-cb90-4469-a18a-3e3c7ad6bc9a.yml
index f2df18a46d..a2c772cca7 100644
--- a/data/tx/legislature/Jill-Dutton-127dce12-cb90-4469-a18a-3e3c7ad6bc9a.yml
+++ b/data/tx/legislature/Jill-Dutton-127dce12-cb90-4469-a18a-3e3c7ad6bc9a.yml
@@ -14,14 +14,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '2'
 offices:
-- classification: capitol-mail
-  address: Room E2.714, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0880
-  fax: 512-463-2188
 - classification: district
   address: 220 Burnett Trail, Canton, TX 75103
 - classification: district
   address: 2410 Lee St. Suite 201, Greenville, TX 75402
+  voice: 903-263-0395
+- classification: district-mail
+  address: Room E2.714, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0880
+  fax: 512-463-2188
 links:
 - url: https://house.texas.gov/members/member-page/?district=2
 - url: https://house.texas.gov/members/4390
diff --git a/data/tx/legislature/Joan-Huffman-1997b231-45f7-4f29-a435-9f52e60ebea4.yml b/data/tx/legislature/Joan-Huffman-1997b231-45f7-4f29-a435-9f52e60ebea4.yml
index 9a546504c6..207bfab897 100644
--- a/data/tx/legislature/Joan-Huffman-1997b231-45f7-4f29-a435-9f52e60ebea4.yml
+++ b/data/tx/legislature/Joan-Huffman-1997b231-45f7-4f29-a435-9f52e60ebea4.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '17'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0117
 - classification: district
   address: 129 Circle Way Suite 101, Lake Jackson, TX 77566
   voice: 979-480-0994
@@ -24,6 +21,9 @@ offices:
 - classification: district
   address: 16010 Barkers Point Lane Suite 265, Houston, TX 77079
   voice: 281-497-2450
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0117
 links:
 - url: https://senate.texas.gov/member.php?d=17
 other_names:
diff --git a/data/tx/legislature/Joe-Moody-5898294d-5b10-4aaf-a084-b8522e69623c.yml b/data/tx/legislature/Joe-Moody-5898294d-5b10-4aaf-a084-b8522e69623c.yml
index 0e1722c944..deec733186 100644
--- a/data/tx/legislature/Joe-Moody-5898294d-5b10-4aaf-a084-b8522e69623c.yml
+++ b/data/tx/legislature/Joe-Moody-5898294d-5b10-4aaf-a084-b8522e69623c.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '78'
 offices:
-- classification: capitol-mail
-  address: Room GW.18, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0728
-  fax: 512-463-0397
 - classification: district
   address: 7365 Remcon Circle, C-301, El Paso, TX 79912
   voice: 915-751-2700
   fax: 915-751-2702
+- classification: district-mail
+  address: Room GW.18, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0728
+  fax: 512-463-0397
 links:
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A3850
 - url: https://house.texas.gov/members/member-page/?district=78
diff --git a/data/tx/legislature/John-Bryant-4e07d8dc-f5b5-47e7-a1de-83f36d3b734f.yml b/data/tx/legislature/John-Bryant-4e07d8dc-f5b5-47e7-a1de-83f36d3b734f.yml
index 395437a932..899241332e 100644
--- a/data/tx/legislature/John-Bryant-4e07d8dc-f5b5-47e7-a1de-83f36d3b734f.yml
+++ b/data/tx/legislature/John-Bryant-4e07d8dc-f5b5-47e7-a1de-83f36d3b734f.yml
@@ -14,11 +14,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '114'
 offices:
-- classification: capitol-mail
-  address: Room 4N.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0576
 - classification: district
   address: 6301 Gaston Ave. Suite 1110, Dallas, TX 75214
+- classification: district-mail
+  address: Room 4N.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0576
 links:
 - url: https://house.texas.gov/members/member-page/?district=114
 - url: https://house.texas.gov/members/4120
diff --git a/data/tx/legislature/John-Bucy-III-53b19d1e-5b07-4f6e-87a9-27baecddaf70.yml b/data/tx/legislature/John-Bucy-III-53b19d1e-5b07-4f6e-87a9-27baecddaf70.yml
index 6d18c409c0..85c6756389 100644
--- a/data/tx/legislature/John-Bucy-III-53b19d1e-5b07-4f6e-87a9-27baecddaf70.yml
+++ b/data/tx/legislature/John-Bucy-III-53b19d1e-5b07-4f6e-87a9-27baecddaf70.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '136'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.306, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0696
   fax: 512-463-9333
diff --git a/data/tx/legislature/John-Kuempel-93474b2b-546e-49e4-9399-5c208bbcb524.yml b/data/tx/legislature/John-Kuempel-93474b2b-546e-49e4-9399-5c208bbcb524.yml
index 1d6a206d21..0572cdfa70 100644
--- a/data/tx/legislature/John-Kuempel-93474b2b-546e-49e4-9399-5c208bbcb524.yml
+++ b/data/tx/legislature/John-Kuempel-93474b2b-546e-49e4-9399-5c208bbcb524.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '44'
 offices:
-- classification: capitol-mail
-  address: Room GW.17, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0602
 - classification: district
   address: '200 N. River St., #100-E, Seguin, TX 78155'
   voice: 830-379-8732
+- classification: district-mail
+  address: Room GW.17, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0602
 links:
 - url: https://house.texas.gov/members/member-page/?district=44
 - url: https://house.texas.gov/members/2310
diff --git a/data/tx/legislature/John-Lujan-fbd66d9f-2a93-4cbf-b75d-b51cb01e955e.yml b/data/tx/legislature/John-Lujan-fbd66d9f-2a93-4cbf-b75d-b51cb01e955e.yml
index 5adfc6d38a..d92c21736a 100644
--- a/data/tx/legislature/John-Lujan-fbd66d9f-2a93-4cbf-b75d-b51cb01e955e.yml
+++ b/data/tx/legislature/John-Lujan-fbd66d9f-2a93-4cbf-b75d-b51cb01e955e.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '118'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.812, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0714
 - classification: district-mail
diff --git a/data/tx/legislature/John-Raney-6613aff4-3874-44c6-960b-121eb6b0b2d2.yml b/data/tx/legislature/John-Raney-6613aff4-3874-44c6-960b-121eb6b0b2d2.yml
index 673bc4c918..39b472b19f 100644
--- a/data/tx/legislature/John-Raney-6613aff4-3874-44c6-960b-121eb6b0b2d2.yml
+++ b/data/tx/legislature/John-Raney-6613aff4-3874-44c6-960b-121eb6b0b2d2.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '14'
 offices:
-- classification: capitol-mail
-  address: Room 1N.12, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0698
 - classification: district
   address: 4103 S. Texas Ave. Suite 103, Bryan, TX 77802
   voice: 979-260-5040
+- classification: district-mail
+  address: Room 1N.12, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0698
 links:
 - url: https://house.texas.gov/members/member-page/?district=14
 - url: https://house.texas.gov/members/2315
diff --git a/data/tx/legislature/John-T-Smithee-3cac81cd-62ca-41d6-aa4a-8e4156244dec.yml b/data/tx/legislature/John-T-Smithee-3cac81cd-62ca-41d6-aa4a-8e4156244dec.yml
index d3811dc312..163a2dbf94 100644
--- a/data/tx/legislature/John-T-Smithee-3cac81cd-62ca-41d6-aa4a-8e4156244dec.yml
+++ b/data/tx/legislature/John-T-Smithee-3cac81cd-62ca-41d6-aa4a-8e4156244dec.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '86'
 offices:
-- classification: capitol-mail
-  address: Room 1W.10, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0702
 - classification: district
   address: 320 S. Polk 1st Floor, Lobby Box 28, Amarillo, TX 79101
   voice: 806-372-3327
+- classification: district-mail
+  address: Room 1W.10, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0702
 links:
 - url: https://house.texas.gov/members/member-page/?district=86
 other_names:
diff --git a/data/tx/legislature/Jolanda-Jo-Jones-45cd43ff-77b3-467c-aa61-890ebee8ece5.yml b/data/tx/legislature/Jolanda-Jo-Jones-45cd43ff-77b3-467c-aa61-890ebee8ece5.yml
index 6911637116..36d2e22ffe 100644
--- a/data/tx/legislature/Jolanda-Jo-Jones-45cd43ff-77b3-467c-aa61-890ebee8ece5.yml
+++ b/data/tx/legislature/Jolanda-Jo-Jones-45cd43ff-77b3-467c-aa61-890ebee8ece5.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '147'
 offices:
-- classification: capitol-mail
-  address: Room E1.424, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0524
 - classification: district
   address: 5445 Almeda Road Suite 501, Houston, TX 77004
   voice: 713-522-0555
+- classification: district-mail
+  address: Room E1.424, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0524
 links:
 - url: https://house.texas.gov/members/member-page/?district=147
 - url: https://house.texas.gov/members/4105
diff --git a/data/tx/legislature/Jon-Rosenthal-ab211984-06a9-447c-9ded-564d200bee60.yml b/data/tx/legislature/Jon-Rosenthal-ab211984-06a9-447c-9ded-564d200bee60.yml
index 3730415cc0..2e4a06ff72 100644
--- a/data/tx/legislature/Jon-Rosenthal-ab211984-06a9-447c-9ded-564d200bee60.yml
+++ b/data/tx/legislature/Jon-Rosenthal-ab211984-06a9-447c-9ded-564d200bee60.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '135'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.210, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0722
 - classification: district-mail
diff --git a/data/tx/legislature/Jos-Menndez-8bb90ee9-e764-44da-b27f-b5bc3cdb394e.yml b/data/tx/legislature/Jos-Menndez-8bb90ee9-e764-44da-b27f-b5bc3cdb394e.yml
index c522a4f5e2..9cbad1ec41 100644
--- a/data/tx/legislature/Jos-Menndez-8bb90ee9-e764-44da-b27f-b5bc3cdb394e.yml
+++ b/data/tx/legislature/Jos-Menndez-8bb90ee9-e764-44da-b27f-b5bc3cdb394e.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '26'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0126
 - classification: district
   address: 4522 Fredericksburg Road, A-22, San Antonio, TX 78201
   voice: 210-733-6604
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0126
 links:
 - url: https://senate.texas.gov/member.php?d=26
 other_names:
diff --git a/data/tx/legislature/Josey-Garcia-1ec50565-379f-4a8b-ab18-c54d31df9929.yml b/data/tx/legislature/Josey-Garcia-1ec50565-379f-4a8b-ab18-c54d31df9929.yml
index 864e7d7a89..cda9c79021 100644
--- a/data/tx/legislature/Josey-Garcia-1ec50565-379f-4a8b-ab18-c54d31df9929.yml
+++ b/data/tx/legislature/Josey-Garcia-1ec50565-379f-4a8b-ab18-c54d31df9929.yml
@@ -13,7 +13,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '124'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.304, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0634
 links:
diff --git a/data/tx/legislature/Juan-Chuy-Hinojosa-72766791-084c-4a20-a12c-6e809b51e95c.yml b/data/tx/legislature/Juan-Chuy-Hinojosa-72766791-084c-4a20-a12c-6e809b51e95c.yml
index 8e9587c7f8..300058297d 100644
--- a/data/tx/legislature/Juan-Chuy-Hinojosa-72766791-084c-4a20-a12c-6e809b51e95c.yml
+++ b/data/tx/legislature/Juan-Chuy-Hinojosa-72766791-084c-4a20-a12c-6e809b51e95c.yml
@@ -14,10 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '20'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0120
-  fax: 512-463-0229
 - classification: district
   address: 1508 S. Lone Star Way Suite 6A, Edinburg, TX 78539
   voice: 956-318-0725
@@ -26,15 +22,19 @@ offices:
   address: 602 N. Staples St. Suite 200, Corpus Christi, TX 78401
   voice: 361-882-0900
   fax: 361-882-0902
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0120
+  fax: 512-463-0229
 links:
 - url: https://senate.texas.gov/member.php?d=20
 other_names:
 - name: C. Hinojosa
 - name: Hinojosa, C.
+- name: Hinojosa, Juan "Chuy"
 - name: J.J. Hinojosa
 - name: Juan "Chuy" Hinojosa
 - name: Juan Hinojosa
-- name: Hinojosa, Juan "Chuy"
 other_identifiers:
 - scheme: legacy_openstates
   identifier: TXL000195
diff --git a/data/tx/legislature/Judith-Zaffirini-c7aad3b7-ca16-4989-bf68-87ed72498a6b.yml b/data/tx/legislature/Judith-Zaffirini-c7aad3b7-ca16-4989-bf68-87ed72498a6b.yml
index 51407b2a1f..3ba1012a78 100644
--- a/data/tx/legislature/Judith-Zaffirini-c7aad3b7-ca16-4989-bf68-87ed72498a6b.yml
+++ b/data/tx/legislature/Judith-Zaffirini-c7aad3b7-ca16-4989-bf68-87ed72498a6b.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '21'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0121
 - classification: district
   address: 1407 Washington St., Laredo, TX 78040
   voice: 956-722-2293
   fax: 956-722-8586
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0121
 links:
 - url: https://senate.texas.gov/member.php?d=21
 other_names:
diff --git a/data/tx/legislature/Julie-Johnson-b40c5c95-3141-4ac5-9b0e-28b3b3162bf5.yml b/data/tx/legislature/Julie-Johnson-b40c5c95-3141-4ac5-9b0e-28b3b3162bf5.yml
index 4f969620e6..3704e78c3f 100644
--- a/data/tx/legislature/Julie-Johnson-b40c5c95-3141-4ac5-9b0e-28b3b3162bf5.yml
+++ b/data/tx/legislature/Julie-Johnson-b40c5c95-3141-4ac5-9b0e-28b3b3162bf5.yml
@@ -15,7 +15,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '115'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.310, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0468
   fax: 512-463-1044
diff --git a/data/tx/legislature/Justin-Holland-798a9db1-dee4-48cd-ae0a-9b43d9f287a7.yml b/data/tx/legislature/Justin-Holland-798a9db1-dee4-48cd-ae0a-9b43d9f287a7.yml
index 7018c8e4ed..54a7d1eb6f 100644
--- a/data/tx/legislature/Justin-Holland-798a9db1-dee4-48cd-ae0a-9b43d9f287a7.yml
+++ b/data/tx/legislature/Justin-Holland-798a9db1-dee4-48cd-ae0a-9b43d9f287a7.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '33'
 offices:
-- classification: capitol-mail
-  address: Room E2.608, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0484
-  fax: 512-463-7834
 - classification: district
   address: '101 E. Rusk St. #201, Rockwall, TX 75087'
   voice: 972-722-7521
+- classification: district-mail
+  address: Room E2.608, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0484
+  fax: 512-463-7834
 links:
 - url: https://house.texas.gov/members/member-page/?district=33
 other_names:
diff --git a/data/tx/legislature/Keith-Bell-fe47f6d5-2db3-495b-8da6-5cd12e0dc677.yml b/data/tx/legislature/Keith-Bell-fe47f6d5-2db3-495b-8da6-5cd12e0dc677.yml
index 77f26dfc33..3a892573d8 100644
--- a/data/tx/legislature/Keith-Bell-fe47f6d5-2db3-495b-8da6-5cd12e0dc677.yml
+++ b/data/tx/legislature/Keith-Bell-fe47f6d5-2db3-495b-8da6-5cd12e0dc677.yml
@@ -14,16 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '4'
 offices:
-- classification: capitol-mail
-  address: Room E2.410, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0458
-  fax: 512-463-2040
 - classification: district
   address: 100 E. Corsicana St. Suite 204, Athens, TX 75751
   voice: 903-675-3069
 - classification: district
   address: 771 E. Highway 80 Suite 208, Forney, TX 75126
   voice: 972-552-5573
+- classification: district-mail
+  address: Room E2.410, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0458
+  fax: 512-463-2040
 links:
 - url: https://house.texas.gov/members/member-page/?district=4
 - url: https://house.texas.gov/members/3695/
diff --git a/data/tx/legislature/Kelly-Hancock-043dfef3-3605-4c75-b72d-965985edfdd5.yml b/data/tx/legislature/Kelly-Hancock-043dfef3-3605-4c75-b72d-965985edfdd5.yml
index 6d2a4a6ca0..9f194cbc79 100644
--- a/data/tx/legislature/Kelly-Hancock-043dfef3-3605-4c75-b72d-965985edfdd5.yml
+++ b/data/tx/legislature/Kelly-Hancock-043dfef3-3605-4c75-b72d-965985edfdd5.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '9'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0109
 - classification: district
   address: 306 W. 7th St. Suite 508, Fort Worth, TX 76102
   voice: 817-332-1131
   fax: 817-332-1176
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0109
 links:
 - url: https://senate.texas.gov/member.php?d=9
 other_names:
diff --git a/data/tx/legislature/Ken-King-d9f32e07-7835-4edf-b986-7a2cf16d608b.yml b/data/tx/legislature/Ken-King-d9f32e07-7835-4edf-b986-7a2cf16d608b.yml
index 0966519be7..f8e3ef3ba1 100644
--- a/data/tx/legislature/Ken-King-d9f32e07-7835-4edf-b986-7a2cf16d608b.yml
+++ b/data/tx/legislature/Ken-King-d9f32e07-7835-4edf-b986-7a2cf16d608b.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '88'
 offices:
-- classification: capitol-mail
+- classification: district-mail
+  address: P.O. Box 507, Canadian, TX 79014
+  voice: 806-323-8870
+- classification: district-mail
   address: Room E2.808, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0736
   fax: 512-463-0211
-- classification: district
-  address: P.O. Box 507, Canadian, TX 79014
-  voice: 806-323-8870
 links:
 - url: https://house.texas.gov/members/member-page/?district=88
 other_names:
diff --git a/data/tx/legislature/Kevin-Sparks-aa6deb86-b21b-4ed2-ad67-bd6217238afc.yml b/data/tx/legislature/Kevin-Sparks-aa6deb86-b21b-4ed2-ad67-bd6217238afc.yml
index 08965ae8ac..f0b41750e4 100644
--- a/data/tx/legislature/Kevin-Sparks-aa6deb86-b21b-4ed2-ad67-bd6217238afc.yml
+++ b/data/tx/legislature/Kevin-Sparks-aa6deb86-b21b-4ed2-ad67-bd6217238afc.yml
@@ -13,16 +13,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '31'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0131
 - classification: district
   address: ClayDesta Center 6 Desta Drive, Suite 1325, Midland, TX 79705
   voice: 432-685-6031
 - classification: district
   address: Historic Federal Building 620 S. Taylor St., Suite 203, Amarillo, TX 79101
   voice: 806-374-8994
-- classification: district
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0131
+- classification: district-mail
   address: P.O. Box 2463, Big Spring, TX 79721
   voice: 432-994-2377
 links:
diff --git a/data/tx/legislature/Kronda-Thimesch-5bbe665a-bde8-469f-8c92-958c457236f0.yml b/data/tx/legislature/Kronda-Thimesch-5bbe665a-bde8-469f-8c92-958c457236f0.yml
index e23695d95d..18d79895c5 100644
--- a/data/tx/legislature/Kronda-Thimesch-5bbe665a-bde8-469f-8c92-958c457236f0.yml
+++ b/data/tx/legislature/Kronda-Thimesch-5bbe665a-bde8-469f-8c92-958c457236f0.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '65'
 offices:
-- classification: capitol-mail
-  address: Room E1.216, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0478
 - classification: district
   address: 6200 Canyon Falls Drive, Flower Mound, TX 76226
   voice: 940-240-0083
+- classification: district-mail
+  address: Room E1.216, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0478
 links:
 - url: https://house.texas.gov/members/member-page/?district=65
 - url: https://house.texas.gov/members/65
diff --git a/data/tx/legislature/Kyle-Kacal-28512987-3275-4a5d-8af5-b8f3b7be2457.yml b/data/tx/legislature/Kyle-Kacal-28512987-3275-4a5d-8af5-b8f3b7be2457.yml
index 5aab5a17c2..01c424f981 100644
--- a/data/tx/legislature/Kyle-Kacal-28512987-3275-4a5d-8af5-b8f3b7be2457.yml
+++ b/data/tx/legislature/Kyle-Kacal-28512987-3275-4a5d-8af5-b8f3b7be2457.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '12'
 offices:
-- classification: capitol-mail
-  address: Room GS.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0412
 - classification: district
   address: 3000 Briarcrest Drive Suite 203, Bryan, TX 77802
   voice: 979-774-7276
+- classification: district-mail
+  address: Room GS.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0412
 links:
 - url: https://house.texas.gov/members/member-page/?district=12
 - url: https://house.texas.gov/members/2445
diff --git a/data/tx/legislature/Lacey-Hull-2609ba13-abf1-40b5-9f4c-a4c1135e56e2.yml b/data/tx/legislature/Lacey-Hull-2609ba13-abf1-40b5-9f4c-a4c1135e56e2.yml
index ccbe19194c..1066912aeb 100644
--- a/data/tx/legislature/Lacey-Hull-2609ba13-abf1-40b5-9f4c-a4c1135e56e2.yml
+++ b/data/tx/legislature/Lacey-Hull-2609ba13-abf1-40b5-9f4c-a4c1135e56e2.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '138'
 offices:
-- classification: capitol-mail
-  address: Room E1.322, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0727
 - classification: district
   address: 10190 Katy Freeway Suite 555G, Houston, TX 77043
   voice: 713-647-0042
+- classification: district-mail
+  address: Room E1.322, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0727
 links:
 - url: https://house.texas.gov/members/member-page/?district=138
 - url: https://house.texas.gov/members/3975
diff --git a/data/tx/legislature/Lois-W-Kolkhorst-28eb71be-bce7-4b32-908d-289ecc265c3c.yml b/data/tx/legislature/Lois-W-Kolkhorst-28eb71be-bce7-4b32-908d-289ecc265c3c.yml
index 64ee391f7d..055643a38b 100644
--- a/data/tx/legislature/Lois-W-Kolkhorst-28eb71be-bce7-4b32-908d-289ecc265c3c.yml
+++ b/data/tx/legislature/Lois-W-Kolkhorst-28eb71be-bce7-4b32-908d-289ecc265c3c.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '18'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0118
 - classification: district
   address: 18230 Farm to Market Road 1488 Suite 314, Magnolia, TX 77354
   voice: 281-259-8513
@@ -29,6 +26,9 @@ offices:
 - classification: district
   address: 'Room #208, 2000 S. Market St., Brenham, TX 77833'
   voice: 979-251-7888
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0118
 links:
 - url: https://senate.texas.gov/member.php?d=18
 other_names:
diff --git a/data/tx/legislature/Lulu-Flores-ab3ddc65-0fb9-476b-993f-b3dc4050127e.yml b/data/tx/legislature/Lulu-Flores-ab3ddc65-0fb9-476b-993f-b3dc4050127e.yml
index f9e0d393f0..1c5389918b 100644
--- a/data/tx/legislature/Lulu-Flores-ab3ddc65-0fb9-476b-993f-b3dc4050127e.yml
+++ b/data/tx/legislature/Lulu-Flores-ab3ddc65-0fb9-476b-993f-b3dc4050127e.yml
@@ -13,7 +13,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '51'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.312, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0674
 links:
@@ -25,6 +25,7 @@ other_names:
 - name: M.L. Flores
 sources:
 - url: https://ballotpedia.org/Lulu_Flores
+- url: https://en.wikipedia.org/wiki/Lulu_Flores
 - url: https://hendlerlaw.com/attorneys/maria-luisa-lulu-flores
 - url: https://house.texas.gov/members/4150
 - url: https://house.texas.gov/members/member-page/?district=51
diff --git a/data/tx/legislature/Lynn-Stucky-9c13f4e5-0ce2-488e-b2f3-50d4bfc2dd9c.yml b/data/tx/legislature/Lynn-Stucky-9c13f4e5-0ce2-488e-b2f3-50d4bfc2dd9c.yml
index 0e21a003e6..a4b27da7ea 100644
--- a/data/tx/legislature/Lynn-Stucky-9c13f4e5-0ce2-488e-b2f3-50d4bfc2dd9c.yml
+++ b/data/tx/legislature/Lynn-Stucky-9c13f4e5-0ce2-488e-b2f3-50d4bfc2dd9c.yml
@@ -15,15 +15,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '64'
 offices:
-- classification: capitol-mail
-  address: Room E2.822, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0582
-  fax: 512-463-0471
 - classification: district
   address: 205 N. State St., Decatur, TX 76234
 - classification: district
   address: 400 W. Oak St. Suite 106, Denton, TX 76201
   voice: 940-243-0230
+- classification: district-mail
+  address: Room E2.822, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0582
+  fax: 512-463-0471
 links:
 - url: https://house.texas.gov/members/member-page/?district=64
 other_names:
diff --git a/data/tx/legislature/Mano-DeAyala-a61b0fd1-9fdf-4b4c-abe6-b790cc856023.yml b/data/tx/legislature/Mano-DeAyala-a61b0fd1-9fdf-4b4c-abe6-b790cc856023.yml
index a99c930105..3131313168 100644
--- a/data/tx/legislature/Mano-DeAyala-a61b0fd1-9fdf-4b4c-abe6-b790cc856023.yml
+++ b/data/tx/legislature/Mano-DeAyala-a61b0fd1-9fdf-4b4c-abe6-b790cc856023.yml
@@ -13,11 +13,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '133'
 offices:
-- classification: capitol-mail
-  address: Room E2.416, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0514
 - classification: district
   address: 9525 Katy Freeway Suite 215B, Houston, TX 77024
+- classification: district-mail
+  address: Room E2.416, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0514
 links:
 - url: https://house.texas.gov/members/member-page/?district=133
 - url: https://house.texas.gov/members/4135
@@ -27,6 +27,7 @@ other_names:
 - name: M. DeAyala
 sources:
 - url: https://ballotpedia.org/Mano_Deayala
+- url: https://en.wikipedia.org/wiki/Mano_DeAyala
 - url: https://house.texas.gov/members/4135
 - url: https://house.texas.gov/members/member-page/?district=133
 - url: https://www.linkedin.com/in/mano-deayala-2b35448
diff --git a/data/tx/legislature/Mark-Dorazio-2c0a4352-9871-4122-97fd-832ec998e907.yml b/data/tx/legislature/Mark-Dorazio-2c0a4352-9871-4122-97fd-832ec998e907.yml
index 7c22986e75..61cff6d9b3 100644
--- a/data/tx/legislature/Mark-Dorazio-2c0a4352-9871-4122-97fd-832ec998e907.yml
+++ b/data/tx/legislature/Mark-Dorazio-2c0a4352-9871-4122-97fd-832ec998e907.yml
@@ -13,11 +13,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '122'
 offices:
-- classification: capitol-mail
-  address: Room E1.416, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0646
 - classification: district
   address: 4634 De Zavala Road, San Antonio, TX 78249
+- classification: district-mail
+  address: Room E1.416, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0646
 links:
 - url: https://house.texas.gov/members/member-page/?district=122
 - url: https://house.texas.gov/members/122
diff --git a/data/tx/legislature/Mary-Ann-Perez-26244d6a-f0d5-4dbe-b9ed-a38df74a7bac.yml b/data/tx/legislature/Mary-Ann-Perez-26244d6a-f0d5-4dbe-b9ed-a38df74a7bac.yml
index 3978a9fd7b..6b211f2297 100644
--- a/data/tx/legislature/Mary-Ann-Perez-26244d6a-f0d5-4dbe-b9ed-a38df74a7bac.yml
+++ b/data/tx/legislature/Mary-Ann-Perez-26244d6a-f0d5-4dbe-b9ed-a38df74a7bac.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '144'
 offices:
-- classification: capitol-mail
-  address: Room E2.406, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0460
-  fax: 512-463-0763
 - classification: district
   address: 101 S. Richey St. Suite F107, Pasadena, TX 77506
   voice: 713-740-8153
   fax: 512-463-0763
+- classification: district-mail
+  address: Room E2.406, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0460
+  fax: 512-463-0763
 links:
 - url: https://house.texas.gov/members/member-page/?district=144
 other_names:
diff --git a/data/tx/legislature/Mary-Gonzlez-93379bbe-5fb3-400f-853a-d0b3553e7772.yml b/data/tx/legislature/Mary-Gonzlez-93379bbe-5fb3-400f-853a-d0b3553e7772.yml
index d274458bb1..11adfb2a7e 100644
--- a/data/tx/legislature/Mary-Gonzlez-93379bbe-5fb3-400f-853a-d0b3553e7772.yml
+++ b/data/tx/legislature/Mary-Gonzlez-93379bbe-5fb3-400f-853a-d0b3553e7772.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '75'
 offices:
-- classification: capitol-mail
+- classification: district-mail
+  address: P.O. Box 1343 1498 Main St., San Elizario, TX 79849
+  voice: 915-851-6632
+- classification: district-mail
   address: Room E1.504, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0613
   fax: 512-463-1237
-- classification: district
-  address: P.O. Box 1343 1498 Main St., San Elizario, TX 79849
-  voice: 915-851-6632
 links:
 - url: https://house.texas.gov/members/member-page/?district=75
 other_names:
diff --git a/data/tx/legislature/Matt-Schaefer-39511354-7239-40f6-b431-5ac53ef3c462.yml b/data/tx/legislature/Matt-Schaefer-39511354-7239-40f6-b431-5ac53ef3c462.yml
index b7d2b57f99..9f89eba0bb 100644
--- a/data/tx/legislature/Matt-Schaefer-39511354-7239-40f6-b431-5ac53ef3c462.yml
+++ b/data/tx/legislature/Matt-Schaefer-39511354-7239-40f6-b431-5ac53ef3c462.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '6'
 offices:
-- classification: capitol-mail
-  address: Room GN.8, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0584
 - classification: district
   address: 200 E. Ferguson St., Suite 435, Tyler, TX 75702
   voice: 903-592-0900
+- classification: district-mail
+  address: Room GN.8, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0584
 links:
 - url: https://house.texas.gov/members/member-page/?district=6
 - url: https://house.texas.gov/members/2725
diff --git a/data/tx/legislature/Matt-Shaheen-71555c46-28b0-4887-98a1-997dc7482e75.yml b/data/tx/legislature/Matt-Shaheen-71555c46-28b0-4887-98a1-997dc7482e75.yml
index 6c679b7919..8ec4161c19 100644
--- a/data/tx/legislature/Matt-Shaheen-71555c46-28b0-4887-98a1-997dc7482e75.yml
+++ b/data/tx/legislature/Matt-Shaheen-71555c46-28b0-4887-98a1-997dc7482e75.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '66'
 offices:
-- classification: capitol-mail
-  address: Room E1.320, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0594
-  fax: 512-463-1021
 - classification: district
   address: TX
   voice: 469-642-8708
+- classification: district-mail
+  address: Room E1.320, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0594
+  fax: 512-463-1021
 links:
 - url: https://house.texas.gov/members/member-page/?district=66
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2995
diff --git a/data/tx/legislature/Mayes-Middleton-1399b6ba-cbfa-45ca-bf91-6ba89fe777bf.yml b/data/tx/legislature/Mayes-Middleton-1399b6ba-cbfa-45ca-bf91-6ba89fe777bf.yml
index ab211c6bd3..2b3725b4d3 100644
--- a/data/tx/legislature/Mayes-Middleton-1399b6ba-cbfa-45ca-bf91-6ba89fe777bf.yml
+++ b/data/tx/legislature/Mayes-Middleton-1399b6ba-cbfa-45ca-bf91-6ba89fe777bf.yml
@@ -18,9 +18,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '23'
 offices:
-- classification: capitol-mail
-  address: Capitol Station P.O. Box 12068, Austin, TX 78711
-  voice: 512-463-0111
 - classification: district
   address: 174 Calder Road Suite 900, League City, TX 77573
   voice: 281-332-1000
@@ -32,6 +29,9 @@ offices:
   voice: 281-485-9800
 - classification: district
   address: 825 Rollingbrook Drive Suite B, Baytown, TX 77521
+- classification: district-mail
+  address: Capitol Station P.O. Box 12068, Austin, TX 78711
+  voice: 512-463-0111
 links:
 - url: https://house.texas.gov/members/member-page/?district=23
 - url: https://senate.texas.gov/member.php?d=11
diff --git a/data/tx/legislature/Mihaela-Plesa-b69579f7-74de-4a71-86ba-033264cc5bc7.yml b/data/tx/legislature/Mihaela-Plesa-b69579f7-74de-4a71-86ba-033264cc5bc7.yml
index ab258fc5ea..4749e1d3c1 100644
--- a/data/tx/legislature/Mihaela-Plesa-b69579f7-74de-4a71-86ba-033264cc5bc7.yml
+++ b/data/tx/legislature/Mihaela-Plesa-b69579f7-74de-4a71-86ba-033264cc5bc7.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '70'
 offices:
-- classification: capitol-mail
-  address: Room E2.316, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0356
 - classification: district
   address: 900 E. Park Blvd. Suite 140-C, Plano, TX 75074
   voice: 972-423-1227
+- classification: district-mail
+  address: Room E2.316, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0356
 links:
 - url: https://house.texas.gov/members/member-page/?district=70
 - url: https://house.texas.gov/members/70
diff --git a/data/tx/legislature/Mike-Schofield-df010291-7350-4262-9220-4c576730b2db.yml b/data/tx/legislature/Mike-Schofield-df010291-7350-4262-9220-4c576730b2db.yml
index 17749230ef..79170d2cc5 100644
--- a/data/tx/legislature/Mike-Schofield-df010291-7350-4262-9220-4c576730b2db.yml
+++ b/data/tx/legislature/Mike-Schofield-df010291-7350-4262-9220-4c576730b2db.yml
@@ -19,13 +19,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '132'
 offices:
-- classification: capitol-mail
-  address: Room E2.418, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0528
-  fax: 512-463-7820
 - classification: district
   address: 22910 Colonial Parkway Suite 1001, Katy, TX 77449
   voice: 281-492-0684
+- classification: district-mail
+  address: Room E2.418, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0528
+  fax: 512-463-7820
 links:
 - url: https://house.texas.gov/members/member-page/?district=132
 - url: https://house.texas.gov/members/3095
diff --git a/data/tx/legislature/Morgan-LaMantia-df4db9dd-3640-4eaf-bc7e-1ce125a57199.yml b/data/tx/legislature/Morgan-LaMantia-df4db9dd-3640-4eaf-bc7e-1ce125a57199.yml
index 589f2a5a95..7b2035d945 100644
--- a/data/tx/legislature/Morgan-LaMantia-df4db9dd-3640-4eaf-bc7e-1ce125a57199.yml
+++ b/data/tx/legislature/Morgan-LaMantia-df4db9dd-3640-4eaf-bc7e-1ce125a57199.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '27'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0127
 - classification: district
   address: 1324 E. Madison, Brownsville, TX 78520
   voice: 956-542-2211
@@ -30,6 +27,9 @@ offices:
 - classification: district
   address: 700 Farm to Market Road 3168, Raymondville, TX 78580
   voice: 956-542-2211
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0127
 links:
 - url: https://senate.texas.gov/member.php?d=27
 other_names:
diff --git a/data/tx/legislature/Morgan-Meyer-2639e096-d327-4c4d-823f-759b1ce373e0.yml b/data/tx/legislature/Morgan-Meyer-2639e096-d327-4c4d-823f-759b1ce373e0.yml
index fb6bf8d9d1..49b9630dc0 100644
--- a/data/tx/legislature/Morgan-Meyer-2639e096-d327-4c4d-823f-759b1ce373e0.yml
+++ b/data/tx/legislature/Morgan-Meyer-2639e096-d327-4c4d-823f-759b1ce373e0.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '108'
 offices:
-- classification: capitol-mail
-  address: Room GN.12, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0367
 - classification: district
   address: '3131 McKinney Ave. #649, Dallas, TX 75204'
   voice: 214-239-1257
+- classification: district-mail
+  address: Room GN.12, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0367
 links:
 - url: https://house.texas.gov/members/member-page/?district=108
 - url: https://house.texas.gov/members/3075
diff --git a/data/tx/legislature/Nathan-Johnson-dee454b1-6da0-4b1b-a232-033e7de8551f.yml b/data/tx/legislature/Nathan-Johnson-dee454b1-6da0-4b1b-a232-033e7de8551f.yml
index b3bc937ae1..c7df0c54fe 100644
--- a/data/tx/legislature/Nathan-Johnson-dee454b1-6da0-4b1b-a232-033e7de8551f.yml
+++ b/data/tx/legislature/Nathan-Johnson-dee454b1-6da0-4b1b-a232-033e7de8551f.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '16'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0116
 - classification: district
   address: Merit Tower 12222 Merit Drive, Suite 1010, Dallas, TX 75251
   voice: 972-701-0349
   fax: 972-661-1512
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0116
 links:
 - url: https://senate.texas.gov/member.php?d=16
 other_names:
diff --git a/data/tx/legislature/Nicole-Collier-ea169f77-0bd8-4ca0-ac59-f894c9a09e71.yml b/data/tx/legislature/Nicole-Collier-ea169f77-0bd8-4ca0-ac59-f894c9a09e71.yml
index 282cc74071..6f422626f4 100644
--- a/data/tx/legislature/Nicole-Collier-ea169f77-0bd8-4ca0-ac59-f894c9a09e71.yml
+++ b/data/tx/legislature/Nicole-Collier-ea169f77-0bd8-4ca0-ac59-f894c9a09e71.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '95'
 offices:
-- classification: capitol-mail
-  address: Room 4S.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0716
-  fax: 512-463-1516
 - classification: district
   address: 101. S. Jennings Suite 103A, Fort Worth, TX 76104
   voice: 817-332-1180
+- classification: district-mail
+  address: Room 4S.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0716
+  fax: 512-463-1516
 links:
 - url: https://house.texas.gov/members/member-page/?district=95
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2360
diff --git a/data/tx/legislature/Oscar-Longoria-896e8f9c-7dca-4f7d-8554-c0324cfa7265.yml b/data/tx/legislature/Oscar-Longoria-896e8f9c-7dca-4f7d-8554-c0324cfa7265.yml
index cd34906b95..5ebbbfbe30 100644
--- a/data/tx/legislature/Oscar-Longoria-896e8f9c-7dca-4f7d-8554-c0324cfa7265.yml
+++ b/data/tx/legislature/Oscar-Longoria-896e8f9c-7dca-4f7d-8554-c0324cfa7265.yml
@@ -14,17 +14,17 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '35'
 offices:
-- classification: capitol-mail
-  address: Room 4N.4, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0645
-  fax: 512-463-0559
 - classification: district
   address: 126 E. Commercial Ave., La Feria, TX 78559
   voice: 956-797-2101
-- classification: district
+- classification: district-mail
   address: P.O. Box 1029 1320 S. Main St., Penitas, TX 78576
   voice: 956-580-6944
   fax: 956-580-2233
+- classification: district-mail
+  address: Room 4N.4, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0645
+  fax: 512-463-0559
 links:
 - url: https://house.texas.gov/members/member-page/?district=35
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2485
diff --git a/data/tx/legislature/Pat-Curry-96f1427d-5b57-43a0-b0c2-f656a8109362.yml b/data/tx/legislature/Pat-Curry-96f1427d-5b57-43a0-b0c2-f656a8109362.yml
new file mode 100644
index 0000000000..5d2fdc0c88
--- /dev/null
+++ b/data/tx/legislature/Pat-Curry-96f1427d-5b57-43a0-b0c2-f656a8109362.yml
@@ -0,0 +1,27 @@
+id: ocd-person/96f1427d-5b57-43a0-b0c2-f656a8109362
+name: Pat Curry
+given_name: Pat
+family_name: Curry
+gender: Male
+image: https://storage.googleapis.com/enview-public-general/legislative-people-photos/160610.jpg
+party:
+- name: Republican
+roles:
+- start_date: 2024-11-18
+  type: lower
+  jurisdiction: ocd-jurisdiction/country:us/state:tx/government
+  district: '56'
+offices:
+- classification: district-mail
+  address: Room 1N.8, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0135
+links:
+- url: https://house.texas.gov/members/4415
+other_names:
+- name: P. Curry
+- name: P.J. Curry
+- name: Curry, P.
+sources:
+- url: https://ballotpedia.org/Pat_Curry
+- url: https://house.texas.gov/members/4415
+- url: https://www.linkedin.com/in/pat-curry-693b2a16
diff --git a/data/tx/legislature/Paul-Bettencourt-a9f861bf-1a13-4d3b-816a-69589e9b25e7.yml b/data/tx/legislature/Paul-Bettencourt-a9f861bf-1a13-4d3b-816a-69589e9b25e7.yml
index 4336266d92..666e3ec088 100644
--- a/data/tx/legislature/Paul-Bettencourt-a9f861bf-1a13-4d3b-816a-69589e9b25e7.yml
+++ b/data/tx/legislature/Paul-Bettencourt-a9f861bf-1a13-4d3b-816a-69589e9b25e7.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '7'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0107
 - classification: district
   address: 11451 Katy Freeway Suite 209, Houston, TX 77079
   voice: 713-464-0282
   fax: 713-461-0108
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0107
 links:
 - url: https://senate.texas.gov/member.php?d=7
 other_names:
diff --git a/data/tx/legislature/Penny-Morales-Shaw-51a281ff-2983-4b4b-baf4-63ee17812835.yml b/data/tx/legislature/Penny-Morales-Shaw-51a281ff-2983-4b4b-baf4-63ee17812835.yml
index ff2ec20594..07abebf111 100644
--- a/data/tx/legislature/Penny-Morales-Shaw-51a281ff-2983-4b4b-baf4-63ee17812835.yml
+++ b/data/tx/legislature/Penny-Morales-Shaw-51a281ff-2983-4b4b-baf4-63ee17812835.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '148'
 offices:
-- classification: capitol-mail
-  address: Room E1.406, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0620
-  fax: 512-463-0894
 - classification: district
   address: 10900 NW Freeway, Suite 210 D, Houston, TX 77092
   voice: 713-861-6721
+- classification: district-mail
+  address: Room E1.406, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0620
+  fax: 512-463-0894
 links:
 - url: https://house.texas.gov/members/member-page/?district=148
 - url: https://house.texas.gov/members/4035
diff --git a/data/tx/legislature/Pete-Flores-682e8ef8-8fc1-4490-a04d-63a7c6d92185.yml b/data/tx/legislature/Pete-Flores-682e8ef8-8fc1-4490-a04d-63a7c6d92185.yml
index 8208f9838e..d855765904 100644
--- a/data/tx/legislature/Pete-Flores-682e8ef8-8fc1-4490-a04d-63a7c6d92185.yml
+++ b/data/tx/legislature/Pete-Flores-682e8ef8-8fc1-4490-a04d-63a7c6d92185.yml
@@ -13,9 +13,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '24'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0124
 - classification: district
   address: 2180 N. Main St. H1 & H2, Belton, TX 76513
   voice: 254-939-3854
@@ -25,6 +22,9 @@ offices:
 - classification: district
   address: Schreiner One Center 819 Water St., Suite 164, Kerrville, TX 78028
   voice: 830-896-9816
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0124
 links:
 - url: https://senate.texas.gov/member.php?d=24
 other_names:
diff --git a/data/tx/legislature/Phil-King-98bef50a-73c7-4139-9b8e-628d0e89d659.yml b/data/tx/legislature/Phil-King-98bef50a-73c7-4139-9b8e-628d0e89d659.yml
index 2a4f851687..0ba089b1b3 100644
--- a/data/tx/legislature/Phil-King-98bef50a-73c7-4139-9b8e-628d0e89d659.yml
+++ b/data/tx/legislature/Phil-King-98bef50a-73c7-4139-9b8e-628d0e89d659.yml
@@ -18,15 +18,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '61'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0110
 - classification: district
   address: Heritage Rock II 2340 W. Interstate 20, Suite 218, Arlington, TX 76017
   voice: 817-465-2506
 - classification: district
   address: Nan and Bob Kingsley Building 1710 Martin Drive, Weatherford, TX 76086
   voice: 817-596-4796
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0110
 links:
 - url: https://house.texas.gov/members/member-page/?district=61
 - url: https://senate.texas.gov/member.php?d=10
diff --git a/data/tx/legislature/Philip-Cortez-12d67093-ab4c-425d-afa3-e5777db09d1c.yml b/data/tx/legislature/Philip-Cortez-12d67093-ab4c-425d-afa3-e5777db09d1c.yml
index ffa545f54b..bab0b2ca1d 100644
--- a/data/tx/legislature/Philip-Cortez-12d67093-ab4c-425d-afa3-e5777db09d1c.yml
+++ b/data/tx/legislature/Philip-Cortez-12d67093-ab4c-425d-afa3-e5777db09d1c.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '117'
 offices:
-- classification: capitol-mail
-  address: Room GW.4, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0269
 - classification: district
   address: 2600 SW Military Drive Suite 211, San Antonio, TX 78224
   voice: 210-923-3638
   fax: 210-923-3646
+- classification: district-mail
+  address: Room GW.4, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0269
 links:
 - url: https://house.texas.gov/members/member-page/?district=117
 - url: https://house.texas.gov/members/2365
diff --git a/data/tx/legislature/Rafael-Anchia-f72eb41b-2ff9-434f-96cf-75b9724289ab.yml b/data/tx/legislature/Rafael-Anchia-f72eb41b-2ff9-434f-96cf-75b9724289ab.yml
index a2037e4c3c..ebb304442b 100644
--- a/data/tx/legislature/Rafael-Anchia-f72eb41b-2ff9-434f-96cf-75b9724289ab.yml
+++ b/data/tx/legislature/Rafael-Anchia-f72eb41b-2ff9-434f-96cf-75b9724289ab.yml
@@ -14,14 +14,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '103'
 offices:
-- classification: capitol-mail
-  address: Room 1N.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0746
 - classification: district
   address: 1111 W. Mockingbird Lane Suite 1010, Dallas, TX 75247
   voice: 214-943-6081
+- classification: district-mail
+  address: Room 1N.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0746
 links:
 - url: https://house.texas.gov/members/member-page/?district=103
+- url: https://house.texas.gov/members/2150
 other_names:
 - name: "Anch\xEDa"
 - name: "Anch\xEDa, R."
@@ -38,6 +39,7 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Rafael_Anchia
 - url: https://en.wikipedia.org/wiki/Rafael_Anchia
+- url: https://house.texas.gov/members/2150
 - url: https://house.texas.gov/members/member-page/?district=103
 - url: https://justfacts.votesmart.org/candidate/biography/49874/rafael-anchia
 - url: https://www.linkedin.com/in/rafael-anchia-426a114
diff --git a/data/tx/legislature/Ramon-Jr-Romero-c0fc4283-3ed5-4165-a066-80de16f492b7.yml b/data/tx/legislature/Ramon-Jr-Romero-c0fc4283-3ed5-4165-a066-80de16f492b7.yml
index 584662890a..108e52ecbd 100644
--- a/data/tx/legislature/Ramon-Jr-Romero-c0fc4283-3ed5-4165-a066-80de16f492b7.yml
+++ b/data/tx/legislature/Ramon-Jr-Romero-c0fc4283-3ed5-4165-a066-80de16f492b7.yml
@@ -14,14 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '90'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 1500 N. Main St. Suite 212, Fort Worth, TX 76164
+  voice: 817-924-6788
+- classification: district-mail
   address: Room GN.9, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0740
   fax: 512-463-1075
-- classification: district
-  address: 3663 Airport Freeway Suite 102, Fort Worth, TX 76111
-  voice: 817-924-6788
-  fax: 817-924-1997
 links:
 - url: https://house.texas.gov/members/member-page/?district=90
 - url: https://house.texas.gov/members/3060
diff --git a/data/tx/legislature/Reggie-Smith-19313ba6-75f3-4979-8642-b55b1008bedc.yml b/data/tx/legislature/Reggie-Smith-19313ba6-75f3-4979-8642-b55b1008bedc.yml
index d8a848cabd..310f1bac21 100644
--- a/data/tx/legislature/Reggie-Smith-19313ba6-75f3-4979-8642-b55b1008bedc.yml
+++ b/data/tx/legislature/Reggie-Smith-19313ba6-75f3-4979-8642-b55b1008bedc.yml
@@ -15,12 +15,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '62'
 offices:
-- classification: capitol-mail
-  address: Room E1.314, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0297
 - classification: district
   address: 300 N. Travis St. Suite 3, Sherman, TX 75090
   voice: 903-891-7297
+- classification: district-mail
+  address: Room E1.314, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0297
 links:
 - url: https://house.texas.gov/members/member-page/?district=62
 - url: https://house.texas.gov/members/3765/
diff --git a/data/tx/legislature/Reynaldo-T-Ray-Lopez-01ce2f6b-0500-4baa-a47f-386f9c6286b0.yml b/data/tx/legislature/Reynaldo-T-Ray-Lopez-01ce2f6b-0500-4baa-a47f-386f9c6286b0.yml
index 7231f74b05..90e4ff08ba 100644
--- a/data/tx/legislature/Reynaldo-T-Ray-Lopez-01ce2f6b-0500-4baa-a47f-386f9c6286b0.yml
+++ b/data/tx/legislature/Reynaldo-T-Ray-Lopez-01ce2f6b-0500-4baa-a47f-386f9c6286b0.yml
@@ -14,14 +14,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '125'
 offices:
-- classification: capitol-mail
-  address: Room E1.422, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0669
 - classification: district
   address: '5309 Wurzbach Road #100-7, San Antonio, TX 78238'
   voice: 210-684-5419
+- classification: district-mail
+  address: Room E1.422, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0669
 links:
 - url: https://house.texas.gov/members/member-page/?district=125
+- url: https://house.texas.gov/members/3915
 other_names:
 - name: Lopez, R.
 - name: Lopez, Ray
@@ -33,6 +34,7 @@ other_names:
 sources:
 - url: https://ballotpedia.org/Ray_Lopez
 - url: https://en.wikipedia.org/wiki/Ray_Lopez
+- url: https://house.texas.gov/members/3915
 - url: https://house.texas.gov/members/member-page/?district=125
 - url: https://justfacts.votesmart.org/candidate/biography/116274/ray-lopez
 - url: https://www.linkedin.com/in/ray-lopez-abb65644
diff --git a/data/tx/legislature/Rhetta-Bowers-69ef7d69-9a5e-42be-b463-8873cb52ad10.yml b/data/tx/legislature/Rhetta-Bowers-69ef7d69-9a5e-42be-b463-8873cb52ad10.yml
index 823a76e17b..b54472de6f 100644
--- a/data/tx/legislature/Rhetta-Bowers-69ef7d69-9a5e-42be-b463-8873cb52ad10.yml
+++ b/data/tx/legislature/Rhetta-Bowers-69ef7d69-9a5e-42be-b463-8873cb52ad10.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '113'
 offices:
-- classification: capitol-mail
-  address: Room E2.906, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0464
 - classification: district
   address: 3200 Broadway Blvd. Suite 275, Garland, TX 75043
   voice: 972-272-6237
+- classification: district-mail
+  address: Room E2.906, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0464
 links:
 - url: https://house.texas.gov/members/member-page/?district=113
 - url: https://house.texas.gov/members/3565
diff --git a/data/tx/legislature/Richard-Hayes-f8e0a89e-889a-4fcf-8a0a-1e0e091d89d0.yml b/data/tx/legislature/Richard-Hayes-f8e0a89e-889a-4fcf-8a0a-1e0e091d89d0.yml
index d8a0762f7b..73d6cc5eb1 100644
--- a/data/tx/legislature/Richard-Hayes-f8e0a89e-889a-4fcf-8a0a-1e0e091d89d0.yml
+++ b/data/tx/legislature/Richard-Hayes-f8e0a89e-889a-4fcf-8a0a-1e0e091d89d0.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '57'
 offices:
-- classification: capitol-mail
-  address: Room E2.302, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0556
 - classification: district
   address: 2000 S. Stemmons Freeway Suite 203, Lake Dallas, TX 75065
   voice: 940-321-7574
+- classification: district-mail
+  address: Room E2.302, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0556
 links:
 - url: https://house.texas.gov/members/member-page/?district=57
 - url: https://house.texas.gov/members/4165
diff --git a/data/tx/legislature/Richard-Pea-Raymond-d4a94a68-02a7-44c0-901f-9cd57350229a.yml b/data/tx/legislature/Richard-Pea-Raymond-d4a94a68-02a7-44c0-901f-9cd57350229a.yml
index bbd93d0b68..4f1fe0d09b 100644
--- a/data/tx/legislature/Richard-Pea-Raymond-d4a94a68-02a7-44c0-901f-9cd57350229a.yml
+++ b/data/tx/legislature/Richard-Pea-Raymond-d4a94a68-02a7-44c0-901f-9cd57350229a.yml
@@ -13,14 +13,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '42'
 offices:
-- classification: capitol-mail
-  address: Room 1W.2, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0558
-  fax: 512-463-6296
 - classification: district
   address: W. End Washington St., Laredo, TX 78040
   voice: 956-753-7722
   fax: 956-753-7729
+- classification: district-mail
+  address: Room 1W.2, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0558
+  fax: 512-463-6296
 links:
 - url: https://house.texas.gov/members/member-page/?district=42
 - url: https://house.texas.gov/members/4215
diff --git a/data/tx/legislature/Robert-Nichols-26b83cfe-10c0-4ac6-ae02-dac30e2856b1.yml b/data/tx/legislature/Robert-Nichols-26b83cfe-10c0-4ac6-ae02-dac30e2856b1.yml
index 99a46abe39..092aed133c 100644
--- a/data/tx/legislature/Robert-Nichols-26b83cfe-10c0-4ac6-ae02-dac30e2856b1.yml
+++ b/data/tx/legislature/Robert-Nichols-26b83cfe-10c0-4ac6-ae02-dac30e2856b1.yml
@@ -14,9 +14,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '3'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0103
 - classification: district
   address: 202 E. Pilar St. Suite 309, Nacogdoches, TX 75961
   voice: 936-564-4252
@@ -33,6 +30,9 @@ offices:
   address: 769 S. Main St. Suite 100, Lumberton, TX 77657
   voice: 409-755-9893
   fax: 409-755-9899
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0103
 links:
 - url: https://senate.texas.gov/member.php?d=3
 other_names:
diff --git a/data/tx/legislature/Roland-Gutierrez-68767ec3-151c-413f-aeb8-f35dd6c5f35c.yml b/data/tx/legislature/Roland-Gutierrez-68767ec3-151c-413f-aeb8-f35dd6c5f35c.yml
index a5b4e1fe4b..4b41fa6219 100644
--- a/data/tx/legislature/Roland-Gutierrez-68767ec3-151c-413f-aeb8-f35dd6c5f35c.yml
+++ b/data/tx/legislature/Roland-Gutierrez-68767ec3-151c-413f-aeb8-f35dd6c5f35c.yml
@@ -19,9 +19,6 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '119'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0119
 - classification: district
   address: 1313 SE Military Drive Suite 207, San Antonio, TX 78214
   voice: 210-532-2302
@@ -29,6 +26,9 @@ offices:
 - classification: district
   address: 2401 Garner Field Road Building Q2, Uvalde, TX 78801
   voice: 830-278-1234
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0119
 links:
 - url: https://house.texas.gov/members/member-page/?district=119
 - url: https://senate.texas.gov/member.php?d=19
diff --git a/data/tx/legislature/Ron-Reynolds-72bad853-b403-49c2-9a99-32c5fb3222c7.yml b/data/tx/legislature/Ron-Reynolds-72bad853-b403-49c2-9a99-32c5fb3222c7.yml
index f26aca08ef..e0f1692c50 100644
--- a/data/tx/legislature/Ron-Reynolds-72bad853-b403-49c2-9a99-32c5fb3222c7.yml
+++ b/data/tx/legislature/Ron-Reynolds-72bad853-b403-49c2-9a99-32c5fb3222c7.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '27'
 offices:
-- classification: capitol-mail
-  address: Room 4N.7, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0494
-  fax: 512-463-1403
 - classification: district
   address: 2440 Texas Parkway Suite 102, Missouri City, TX 77489
   voice: 281-208-3574
   fax: 281-208-3696
+- classification: district-mail
+  address: Room 4N.7, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0494
+  fax: 512-463-1403
 links:
 - url: https://house.texas.gov/members/member-page/?district=27
 - url: https://house.texas.gov/members/2040
diff --git a/data/tx/legislature/Royce-West-d6f40682-7b90-4735-980c-7c95ef402a78.yml b/data/tx/legislature/Royce-West-d6f40682-7b90-4735-980c-7c95ef402a78.yml
index 17e7150ea9..a09ec97dc7 100644
--- a/data/tx/legislature/Royce-West-d6f40682-7b90-4735-980c-7c95ef402a78.yml
+++ b/data/tx/legislature/Royce-West-d6f40682-7b90-4735-980c-7c95ef402a78.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '23'
 offices:
-- classification: capitol-mail
-  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
-  voice: 512-463-0123
-  fax: 512-463-0299
 - classification: district
   address: 5787 S. Hampton Road Suite 385, Dallas, TX 75232
   voice: 214-467-0123
   fax: 214-467-0050
+- classification: district-mail
+  address: P.O. Box 12068 Capitol Station, Austin, TX 78711
+  voice: 512-463-0123
+  fax: 512-463-0299
 links:
 - url: https://senate.texas.gov/member.php?d=23
 other_names:
diff --git a/data/tx/legislature/Ryan-Guillen-f0ede995-2253-4f7b-a922-6da34e4de194.yml b/data/tx/legislature/Ryan-Guillen-f0ede995-2253-4f7b-a922-6da34e4de194.yml
index eea4e6e467..6674b6a394 100644
--- a/data/tx/legislature/Ryan-Guillen-f0ede995-2253-4f7b-a922-6da34e4de194.yml
+++ b/data/tx/legislature/Ryan-Guillen-f0ede995-2253-4f7b-a922-6da34e4de194.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '31'
 offices:
-- classification: capitol-mail
-  address: Room 3N.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0416
-  fax: 512-463-1012
 - classification: district
   address: 100 North F.M. 3167 Suite 212, Rio Grande City, TX 78582
   voice: 956-716-4838
   fax: 956-716-8219
+- classification: district-mail
+  address: Room 3N.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0416
+  fax: 512-463-1012
 links:
 - url: https://house.texas.gov/members/member-page/?district=31
 other_names:
diff --git a/data/tx/legislature/Salman-Bhojani-4fb2e1fd-fbb3-4a55-8417-761da2f6048e.yml b/data/tx/legislature/Salman-Bhojani-4fb2e1fd-fbb3-4a55-8417-761da2f6048e.yml
index 3c8dc858f1..aefc81af85 100644
--- a/data/tx/legislature/Salman-Bhojani-4fb2e1fd-fbb3-4a55-8417-761da2f6048e.yml
+++ b/data/tx/legislature/Salman-Bhojani-4fb2e1fd-fbb3-4a55-8417-761da2f6048e.yml
@@ -14,11 +14,11 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '92'
 offices:
-- classification: capitol-mail
-  address: Room E2.314, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0522
 - classification: district
   address: 1001 W. Euless Blvd. Suite 210, Euless, TX 75040
+- classification: district-mail
+  address: Room E2.314, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0522
 links:
 - url: https://house.texas.gov/members/member-page/?district=92
 - url: https://house.texas.gov/members/92
diff --git a/data/tx/legislature/Sam-Harless-2db06a9d-ae17-4881-98b4-5172fdfca19f.yml b/data/tx/legislature/Sam-Harless-2db06a9d-ae17-4881-98b4-5172fdfca19f.yml
index 47e0518bf8..61c01f0a4f 100644
--- a/data/tx/legislature/Sam-Harless-2db06a9d-ae17-4881-98b4-5172fdfca19f.yml
+++ b/data/tx/legislature/Sam-Harless-2db06a9d-ae17-4881-98b4-5172fdfca19f.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '126'
 offices:
-- classification: capitol-mail
-  address: Room E2.810, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0496
-  fax: 512-463-1507
 - classification: district
   address: 6630 Cypresswood Drive Suite 150, Spring, TX 77379
   voice: 281-251-0194
+- classification: district-mail
+  address: Room E2.810, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0496
+  fax: 512-463-1507
 links:
 - url: https://house.texas.gov/members/member-page/?district=126
 other_names:
diff --git a/data/tx/legislature/Senfronia-Thompson-ace50d18-fc98-4460-9d90-928c0e88c79a.yml b/data/tx/legislature/Senfronia-Thompson-ace50d18-fc98-4460-9d90-928c0e88c79a.yml
index ab0f7edc6e..121e6539cd 100644
--- a/data/tx/legislature/Senfronia-Thompson-ace50d18-fc98-4460-9d90-928c0e88c79a.yml
+++ b/data/tx/legislature/Senfronia-Thompson-ace50d18-fc98-4460-9d90-928c0e88c79a.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '141'
 offices:
-- classification: capitol-mail
-  address: Room 3S.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0720
-  fax: 512-463-6306
 - classification: district
   address: 350 N. Sam Houston Parkway Suite B202, Houston, TX 77060
   voice: 713-633-3390
   fax: 713-633-7830
+- classification: district-mail
+  address: Room 3S.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0720
+  fax: 512-463-6306
 links:
 - url: https://house.texas.gov/members/member-page/?district=141
 - url: https://house.texas.gov/members/4630
diff --git a/data/tx/legislature/Sergio-Jr-Muoz-b7c4e0e7-4949-4dff-bc4c-fdaaada3f37d.yml b/data/tx/legislature/Sergio-Jr-Muoz-b7c4e0e7-4949-4dff-bc4c-fdaaada3f37d.yml
index 4047678a53..efe7ef4644 100644
--- a/data/tx/legislature/Sergio-Jr-Muoz-b7c4e0e7-4949-4dff-bc4c-fdaaada3f37d.yml
+++ b/data/tx/legislature/Sergio-Jr-Muoz-b7c4e0e7-4949-4dff-bc4c-fdaaada3f37d.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '36'
 offices:
-- classification: capitol-mail
-  address: Room 1W.3, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0704
-  fax: 512-463-5364
 - classification: district
   address: 121 E. Tom Landry, Mission, TX 78572
   voice: 956-584-8999
+- classification: district-mail
+  address: Room 1W.3, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0704
+  fax: 512-463-5364
 links:
 - url: https://house.texas.gov/members/member-page/?district=36
 - url: https://house.texas.gov/members/2060
diff --git a/data/tx/legislature/Shawn-Thierry-26b8304b-24ea-411d-8d85-e348ba6951c7.yml b/data/tx/legislature/Shawn-Thierry-26b8304b-24ea-411d-8d85-e348ba6951c7.yml
index 5b84b45e23..a1184929e9 100644
--- a/data/tx/legislature/Shawn-Thierry-26b8304b-24ea-411d-8d85-e348ba6951c7.yml
+++ b/data/tx/legislature/Shawn-Thierry-26b8304b-24ea-411d-8d85-e348ba6951c7.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '146'
 offices:
-- classification: capitol-mail
-  address: Room E1.408, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0518
-  fax: 512-463-0941
 - classification: district
   address: '4410 Reed Road, Office #2122, Houston, TX 77051'
   voice: 713-667-4146
+- classification: district-mail
+  address: Room E1.408, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0518
+  fax: 512-463-0941
 links:
 - url: https://house.texas.gov/members/member-page/?district=146
 - url: https://house.texas.gov/members/146
diff --git a/data/tx/legislature/Shelby-Slawson-ddebb940-33f9-4b5c-a8fa-e22c63a594e9.yml b/data/tx/legislature/Shelby-Slawson-ddebb940-33f9-4b5c-a8fa-e22c63a594e9.yml
index 17f2c399c3..ea9d2844e0 100644
--- a/data/tx/legislature/Shelby-Slawson-ddebb940-33f9-4b5c-a8fa-e22c63a594e9.yml
+++ b/data/tx/legislature/Shelby-Slawson-ddebb940-33f9-4b5c-a8fa-e22c63a594e9.yml
@@ -14,13 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '59'
 offices:
-- classification: capitol-mail
-  address: Room E2.804, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0628
-  fax: 512-463-3644
 - classification: district
   address: Historical Hood County Courthouse 100 E. Pearl St., Room 305, Granbury,
     TX 76048
+  voice: 254-523-4620
+- classification: district-mail
+  address: Room E2.804, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0628
+  fax: 512-463-3644
 links:
 - url: https://house.texas.gov/members/member-page/?district=59
 - url: https://house.texas.gov/members/4055
diff --git a/data/tx/legislature/Sheryl-Cole-97805dd7-1f42-482c-bac3-049dfccda311.yml b/data/tx/legislature/Sheryl-Cole-97805dd7-1f42-482c-bac3-049dfccda311.yml
index ac15b0cdc3..6416bb0ff8 100644
--- a/data/tx/legislature/Sheryl-Cole-97805dd7-1f42-482c-bac3-049dfccda311.yml
+++ b/data/tx/legislature/Sheryl-Cole-97805dd7-1f42-482c-bac3-049dfccda311.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '46'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.910, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0506
 links:
diff --git a/data/tx/legislature/Stan-Gerdes-97fc1e34-35fb-470f-a098-4ba8f0c3c8d4.yml b/data/tx/legislature/Stan-Gerdes-97fc1e34-35fb-470f-a098-4ba8f0c3c8d4.yml
index 19da95eb18..8849ba52a9 100644
--- a/data/tx/legislature/Stan-Gerdes-97fc1e34-35fb-470f-a098-4ba8f0c3c8d4.yml
+++ b/data/tx/legislature/Stan-Gerdes-97fc1e34-35fb-470f-a098-4ba8f0c3c8d4.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '17'
 offices:
-- classification: capitol-mail
-  address: Room E2.816, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0682
 - classification: district
   address: '1011 Alley A St., #B, Bastrop, TX 78602'
   voice: 512-321-3720
+- classification: district-mail
+  address: Room E2.816, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0682
 links:
 - url: https://house.texas.gov/members/member-page/?district=17
 - url: https://house.texas.gov/members/4195
diff --git a/data/tx/legislature/Stan-Lambert-a4e4115b-d488-4e93-8354-80e361c0c260.yml b/data/tx/legislature/Stan-Lambert-a4e4115b-d488-4e93-8354-80e361c0c260.yml
index 3028174649..3b8626e040 100644
--- a/data/tx/legislature/Stan-Lambert-a4e4115b-d488-4e93-8354-80e361c0c260.yml
+++ b/data/tx/legislature/Stan-Lambert-a4e4115b-d488-4e93-8354-80e361c0c260.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '71'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.814, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0718
   fax: 512-463-0994
diff --git a/data/tx/legislature/Stephanie-Klick-0cd2f092-40a7-46d1-a9c2-507d14282954.yml b/data/tx/legislature/Stephanie-Klick-0cd2f092-40a7-46d1-a9c2-507d14282954.yml
index b14661e626..5ce6e9a13c 100644
--- a/data/tx/legislature/Stephanie-Klick-0cd2f092-40a7-46d1-a9c2-507d14282954.yml
+++ b/data/tx/legislature/Stephanie-Klick-0cd2f092-40a7-46d1-a9c2-507d14282954.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '91'
 offices:
-- classification: capitol-mail
-  address: Room E2.504, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0599
-  fax: 512-463-0751
 - classification: district
   address: 6851 NE Loop 820 Suite 230, North Richland, TX 76180
   voice: 817-281-0079
+- classification: district-mail
+  address: Room E2.504, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0599
+  fax: 512-463-0751
 links:
 - url: https://house.texas.gov/members/member-page/?district=91
 - url: https://house.texas.gov/members/2460
diff --git a/data/tx/legislature/Steve-Allison-a8926c8d-b4bb-4b7a-96ae-5dac9987c117.yml b/data/tx/legislature/Steve-Allison-a8926c8d-b4bb-4b7a-96ae-5dac9987c117.yml
index 72bf07098e..33806824d6 100644
--- a/data/tx/legislature/Steve-Allison-a8926c8d-b4bb-4b7a-96ae-5dac9987c117.yml
+++ b/data/tx/legislature/Steve-Allison-a8926c8d-b4bb-4b7a-96ae-5dac9987c117.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '121'
 offices:
-- classification: capitol-mail
-  address: Room E2.322, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0686
-  fax: 512-463-0164
 - classification: district
   address: 1635 NE Loop 410 Suite 506, San Antonio, TX 78209
   voice: 512-463-0686
+- classification: district-mail
+  address: Room E2.322, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0686
+  fax: 512-463-0164
 links:
 - url: https://house.texas.gov/members/member-page/?district=121
 - url: https://house.texas.gov/members/3800
diff --git a/data/tx/legislature/Steve-Toth-6c80914d-b07b-4d27-95e2-0e5aa2b0c7d9.yml b/data/tx/legislature/Steve-Toth-6c80914d-b07b-4d27-95e2-0e5aa2b0c7d9.yml
index 49579ac9dc..9bb2f92729 100644
--- a/data/tx/legislature/Steve-Toth-6c80914d-b07b-4d27-95e2-0e5aa2b0c7d9.yml
+++ b/data/tx/legislature/Steve-Toth-6c80914d-b07b-4d27-95e2-0e5aa2b0c7d9.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '15'
 offices:
-- classification: capitol-mail
-  address: Room E1.404, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0797
 - classification: district
   address: 25700 Interstate Highway 45 Suite 100, Spring, TX 77386
   voice: 346-220-0300
+- classification: district-mail
+  address: Room E1.404, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0797
 links:
 - url: https://house.texas.gov/members/member-page/?district=15
 - url: https://house.texas.gov/members/2825
diff --git a/data/tx/legislature/Suleman-Lalani-51927936-c6fc-453b-8afd-5f0b53de7d46.yml b/data/tx/legislature/Suleman-Lalani-51927936-c6fc-453b-8afd-5f0b53de7d46.yml
index a02254f350..68a9ebd5aa 100644
--- a/data/tx/legislature/Suleman-Lalani-51927936-c6fc-453b-8afd-5f0b53de7d46.yml
+++ b/data/tx/legislature/Suleman-Lalani-51927936-c6fc-453b-8afd-5f0b53de7d46.yml
@@ -13,12 +13,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '76'
 offices:
-- classification: capitol-mail
-  address: Room E1.512, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0596
 - classification: district
   address: 12550 Emily Court Suite 300, Sugar Land, TX 77478
   voice: 281-494-0151
+- classification: district-mail
+  address: Room E1.512, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0596
 links:
 - url: https://house.texas.gov/members/member-page/?district=76
 - url: https://house.texas.gov/members/4285
diff --git a/data/tx/legislature/Terri-Leo-Wilson-cee6cb7a-8d88-4c34-be27-dd10d1f31768.yml b/data/tx/legislature/Terri-Leo-Wilson-cee6cb7a-8d88-4c34-be27-dd10d1f31768.yml
index b7ed3bdf71..e2d49c6fd2 100644
--- a/data/tx/legislature/Terri-Leo-Wilson-cee6cb7a-8d88-4c34-be27-dd10d1f31768.yml
+++ b/data/tx/legislature/Terri-Leo-Wilson-cee6cb7a-8d88-4c34-be27-dd10d1f31768.yml
@@ -13,20 +13,20 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '23'
 offices:
-- classification: capitol-mail
-  address: Room E2.720, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0502
 - classification: district
   address: 305 21st St. Suite 241, Galveston, TX 77550
   voice: 409-762-0202
+- classification: district-mail
+  address: Room E2.720, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0502
 links:
 - url: https://house.texas.gov/members/member-page/?district=23
 - url: https://house.texas.gov/members/4290
 other_names:
+- name: Leo Wilson
 - name: Leo-Wilson, T.
 - name: T. Leo-Wilson
 - name: T.S. Leo-Wilson
-- name: Leo Wilson
 sources:
 - url: https://ballotpedia.org/Terri_Leo-Wilson
 - url: https://house.texas.gov/members/4290
diff --git a/data/tx/legislature/Terry-Canales-3e4ae7d4-dbb2-4991-8b44-8ada6023d7da.yml b/data/tx/legislature/Terry-Canales-3e4ae7d4-dbb2-4991-8b44-8ada6023d7da.yml
index 6222cc9fb4..a4bd3a8923 100644
--- a/data/tx/legislature/Terry-Canales-3e4ae7d4-dbb2-4991-8b44-8ada6023d7da.yml
+++ b/data/tx/legislature/Terry-Canales-3e4ae7d4-dbb2-4991-8b44-8ada6023d7da.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '40'
 offices:
-- classification: capitol-mail
-  address: Room 4S.4, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0426
-  fax: 512-463-0043
 - classification: district
   address: 602 W. University Drive Suite B, Edinburg, TX 78539
   voice: 956-383-0860
   fax: 956-383-4334
+- classification: district-mail
+  address: Room 4S.4, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0426
+  fax: 512-463-0043
 links:
 - url: https://house.texas.gov/members/member-page/?district=40
 - url: https://house.texas.gov/members/2340
diff --git a/data/tx/legislature/Terry-Wilson-ec19bc97-3146-4100-8294-329b88aec0e8.yml b/data/tx/legislature/Terry-Wilson-ec19bc97-3146-4100-8294-329b88aec0e8.yml
index 3f96a3715c..fbc508508b 100644
--- a/data/tx/legislature/Terry-Wilson-ec19bc97-3146-4100-8294-329b88aec0e8.yml
+++ b/data/tx/legislature/Terry-Wilson-ec19bc97-3146-4100-8294-329b88aec0e8.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '20'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 710 Main St. Suite 242, Georgetown, TX 78626
+- classification: district-mail
   address: Room E2.722, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0309
   fax: 512-463-0049
-- classification: district
-  address: 710 Main St. Suite 242, Georgetown, TX 78626
 links:
 - url: https://house.texas.gov/members/member-page/?district=20
 - url: https://house.texas.gov/members/3525
diff --git a/data/tx/legislature/Thresa-Terry-Meza-bdecc388-4028-48e2-b211-75c59c1c5ec2.yml b/data/tx/legislature/Thresa-Terry-Meza-bdecc388-4028-48e2-b211-75c59c1c5ec2.yml
index d8a11b1f03..074fe9c208 100644
--- a/data/tx/legislature/Thresa-Terry-Meza-bdecc388-4028-48e2-b211-75c59c1c5ec2.yml
+++ b/data/tx/legislature/Thresa-Terry-Meza-bdecc388-4028-48e2-b211-75c59c1c5ec2.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '105'
 offices:
-- classification: capitol-mail
+- classification: district
+  address: 613 N. O'Connor Road Suite 21B, Irving, TX 75061
+- classification: district-mail
   address: Room E1.204, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0641
   fax: 512-463-0044
-- classification: district
-  address: 613 N. O'Connor Road Suite 21B, Irving, TX 75061
 links:
 - url: https://house.texas.gov/members/member-page/?district=105
 - url: https://house.texas.gov/members/3455
diff --git a/data/tx/legislature/Todd-Hunter-9447575b-d8a1-45dd-bd68-77b12fe347ab.yml b/data/tx/legislature/Todd-Hunter-9447575b-d8a1-45dd-bd68-77b12fe347ab.yml
index 24e8d8728a..e9c5955184 100644
--- a/data/tx/legislature/Todd-Hunter-9447575b-d8a1-45dd-bd68-77b12fe347ab.yml
+++ b/data/tx/legislature/Todd-Hunter-9447575b-d8a1-45dd-bd68-77b12fe347ab.yml
@@ -14,16 +14,17 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '32'
 offices:
-- classification: capitol-mail
-  address: Room 1W.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0672
-  fax: 512-463-2101
 - classification: district
   address: 15217 S. Padre Island Drive Suite 201, Corpus Christi, TX 78418
   voice: 361-949-4603
   fax: 361-949-4634
+- classification: district-mail
+  address: Room 1W.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0672
+  fax: 512-463-2101
 links:
 - url: https://house.texas.gov/members/member-page/?district=32
+- url: https://house.texas.gov/members/3365
 other_names:
 - name: Hunter, T.
 - name: T. Hunter
@@ -38,6 +39,7 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Todd_Hunter
 - url: https://en.wikipedia.org/wiki/Todd_Ames_Hunter
+- url: https://house.texas.gov/members/3365
 - url: https://house.texas.gov/members/member-page/?district=32
 - url: https://justfacts.votesmart.org/candidate/biography/5532/todd-hunter
 - url: https://www.linkedin.com/in/todd-hunter-556aa98
diff --git a/data/tx/legislature/Tom-Craddick-d4d5c127-1ef6-445d-a89b-d9f02c812365.yml b/data/tx/legislature/Tom-Craddick-d4d5c127-1ef6-445d-a89b-d9f02c812365.yml
index f0a25bf418..24d1d3de7c 100644
--- a/data/tx/legislature/Tom-Craddick-d4d5c127-1ef6-445d-a89b-d9f02c812365.yml
+++ b/data/tx/legislature/Tom-Craddick-d4d5c127-1ef6-445d-a89b-d9f02c812365.yml
@@ -14,15 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '82'
 offices:
-- classification: capitol-mail
-  address: Room 1W.9, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0500
-  fax: 512-463-7722
 - classification: district
   address: 500 W. Texas Suite 880, Midland, TX 79701
   voice: 432-682-3000
+- classification: district-mail
+  address: Room 1W.9, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0500
+  fax: 512-463-7722
 links:
 - url: https://house.texas.gov/members/member-page/?district=82
+- url: https://house.texas.gov/members/2610
 other_names:
 - name: Craddick, T.
 - name: T. Craddick
@@ -37,5 +38,6 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Tom_Craddick
 - url: https://en.wikipedia.org/wiki/Tom_Craddick
+- url: https://house.texas.gov/members/2610
 - url: https://house.texas.gov/members/member-page/?district=82
 - url: https://justfacts.votesmart.org/candidate/biography/5485/tom-craddick
diff --git a/data/tx/legislature/Tom-Oliverson-79ffab1c-4d79-4cfa-89b4-5f7ee95ca1bf.yml b/data/tx/legislature/Tom-Oliverson-79ffab1c-4d79-4cfa-89b4-5f7ee95ca1bf.yml
index 020669dca4..2882412150 100644
--- a/data/tx/legislature/Tom-Oliverson-79ffab1c-4d79-4cfa-89b4-5f7ee95ca1bf.yml
+++ b/data/tx/legislature/Tom-Oliverson-79ffab1c-4d79-4cfa-89b4-5f7ee95ca1bf.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '130'
 offices:
-- classification: capitol-mail
-  address: Room E2.408, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0661
-  fax: 512-463-4130
 - classification: district
   address: 11803 Grant Road Suite 201, Cypress, TX 77429
   voice: 281-257-4984
+- classification: district-mail
+  address: Room E2.408, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0661
+  fax: 512-463-4130
 links:
 - url: https://house.texas.gov/members/member-page/?district=130
 - url: https://house.texas.gov/members/3535
diff --git a/data/tx/legislature/Toni-Rose-0acfbb85-b501-45ce-9a9b-90537090a455.yml b/data/tx/legislature/Toni-Rose-0acfbb85-b501-45ce-9a9b-90537090a455.yml
index 20f0248075..0fa27d9fb1 100644
--- a/data/tx/legislature/Toni-Rose-0acfbb85-b501-45ce-9a9b-90537090a455.yml
+++ b/data/tx/legislature/Toni-Rose-0acfbb85-b501-45ce-9a9b-90537090a455.yml
@@ -14,16 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '110'
 offices:
-- classification: capitol-mail
-  address: Room 4N.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0664
-  fax: 512-463-0476
 - classification: district
   address: 12450 Elam Road, Balch Springs, TX 75180
 - classification: district
   address: 3155 S. Lancaster Road Suite 220, Dallas, TX 75216
   voice: 214-371-3300
   fax: 214-371-3304
+- classification: district-mail
+  address: Room 4N.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0664
+  fax: 512-463-0476
 links:
 - url: https://house.texas.gov/members/member-page/?district=110
 - url: https://house.texas.gov/members/2555
diff --git a/data/tx/legislature/Tony-Tinderholt-1ca78d00-1ede-4486-b14e-16bd81ba73e4.yml b/data/tx/legislature/Tony-Tinderholt-1ca78d00-1ede-4486-b14e-16bd81ba73e4.yml
index 005718968b..cd19230ebe 100644
--- a/data/tx/legislature/Tony-Tinderholt-1ca78d00-1ede-4486-b14e-16bd81ba73e4.yml
+++ b/data/tx/legislature/Tony-Tinderholt-1ca78d00-1ede-4486-b14e-16bd81ba73e4.yml
@@ -14,12 +14,12 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '94'
 offices:
-- classification: capitol-mail
-  address: Room E1.420, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0624
 - classification: district
   address: 1000 Ballpark Way Suite 301, Arlington, TX 76011
   voice: 817-476-2660
+- classification: district-mail
+  address: Room E1.420, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0624
 links:
 - url: https://house.texas.gov/members/member-page/?district=94
 - url: https://house.texas.gov/members/3065
diff --git a/data/tx/legislature/Tracy-O-King-ed59d369-82b9-485f-9007-c5c5b77d9468.yml b/data/tx/legislature/Tracy-O-King-ed59d369-82b9-485f-9007-c5c5b77d9468.yml
index 0b74fb9951..e33e0f8f4c 100644
--- a/data/tx/legislature/Tracy-O-King-ed59d369-82b9-485f-9007-c5c5b77d9468.yml
+++ b/data/tx/legislature/Tracy-O-King-ed59d369-82b9-485f-9007-c5c5b77d9468.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '80'
 offices:
-- classification: capitol-mail
-  address: Room GW.16, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0194
-  fax: 512-463-1220
 - classification: district
   address: Room 130, 5500 S. Zapata Highway Building F, Laredo, TX 78046
   voice: 956-307-6248
+- classification: district-mail
+  address: Room GW.16, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0194
+  fax: 512-463-1220
 links:
 - url: https://house.texas.gov/members/member-page/?district=80
 other_names:
diff --git a/data/tx/legislature/Travis-Clardy-9a249b0a-a69f-4ca8-b031-7a991baecb99.yml b/data/tx/legislature/Travis-Clardy-9a249b0a-a69f-4ca8-b031-7a991baecb99.yml
index febe178183..c5b3e16ace 100644
--- a/data/tx/legislature/Travis-Clardy-9a249b0a-a69f-4ca8-b031-7a991baecb99.yml
+++ b/data/tx/legislature/Travis-Clardy-9a249b0a-a69f-4ca8-b031-7a991baecb99.yml
@@ -15,17 +15,18 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '11'
 offices:
-- classification: capitol-mail
-  address: Room GW.6, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0592
-  fax: 512-463-8792
 - classification: district
   address: Room 310, 202 E. Pilar St., Nacogdoches, TX 75961
   voice: 936-560-3982
   fax: 936-564-0051
+- classification: district-mail
+  address: Room GW.6, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0592
+  fax: 512-463-8792
 links:
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2355
 - url: https://house.texas.gov/members/member-page/?district=11
+- url: https://house.texas.gov/members/2355
 other_names:
 - name: Clardy, T.
 - name: T. Clardy
@@ -38,6 +39,7 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Travis_Clardy
 - url: https://en.wikipedia.org/wiki/Travis_Clardy
+- url: https://house.texas.gov/members/2355
 - url: https://house.texas.gov/members/member-page/?district=11
 - url: https://justfacts.votesmart.org/candidate/biography/138316/travis-clardy
 - url: https://legdir.capitol.texas.gov/MemberInfo.aspx?Chamber=H&Code=A2355
diff --git a/data/tx/legislature/Trent-Ashby-68f05872-16c8-4d3a-ab5f-ea667ca52b27.yml b/data/tx/legislature/Trent-Ashby-68f05872-16c8-4d3a-ab5f-ea667ca52b27.yml
index 97bb25fe92..06e4025243 100644
--- a/data/tx/legislature/Trent-Ashby-68f05872-16c8-4d3a-ab5f-ea667ca52b27.yml
+++ b/data/tx/legislature/Trent-Ashby-68f05872-16c8-4d3a-ab5f-ea667ca52b27.yml
@@ -18,13 +18,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '57'
 offices:
-- classification: capitol-mail
-  address: Room E2.806, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0508
-  fax: 512-463-5896
 - classification: district
   address: 2915 Atkinson Drive, Lufkin, TX 75901
   voice: 936-634-2762
+- classification: district-mail
+  address: Room E2.806, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0508
+  fax: 512-463-5896
 links:
 - url: https://house.texas.gov/members/member-page/?district=57
 - url: https://house.texas.gov/members/member-page/?district=09
diff --git a/data/tx/legislature/Trey-Martinez-Fischer-07f5e898-8d5d-435a-bf97-7bfb26fce5ac.yml b/data/tx/legislature/Trey-Martinez-Fischer-07f5e898-8d5d-435a-bf97-7bfb26fce5ac.yml
index 2a611047a4..3135b0b4d2 100644
--- a/data/tx/legislature/Trey-Martinez-Fischer-07f5e898-8d5d-435a-bf97-7bfb26fce5ac.yml
+++ b/data/tx/legislature/Trey-Martinez-Fischer-07f5e898-8d5d-435a-bf97-7bfb26fce5ac.yml
@@ -14,13 +14,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '116'
 offices:
-- classification: capitol-mail
-  address: Room 4S.5, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0616
-  fax: 512-463-4873
 - classification: district
   address: 4243 E. Piedras Drive Suite 256, San Antonio, TX 78228
   voice: 210-733-8391
+- classification: district-mail
+  address: Room 4S.5, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0616
+  fax: 512-463-4873
 links:
 - url: https://house.texas.gov/members/member-page/?district=116
 - url: https://house.texas.gov/members/2835
diff --git a/data/tx/legislature/Valoree-Swanson-7298c6a9-c6be-41cd-a2ba-0cc79c851373.yml b/data/tx/legislature/Valoree-Swanson-7298c6a9-c6be-41cd-a2ba-0cc79c851373.yml
index fc67cf4b0f..ce5a50841e 100644
--- a/data/tx/legislature/Valoree-Swanson-7298c6a9-c6be-41cd-a2ba-0cc79c851373.yml
+++ b/data/tx/legislature/Valoree-Swanson-7298c6a9-c6be-41cd-a2ba-0cc79c851373.yml
@@ -14,15 +14,15 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '150'
 offices:
-- classification: capitol-mail
-  address: Room E2.710, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0572
-  fax: 512-463-1908
 - classification: district
   address: 23008 Northcrest Drive, Spring, TX 77389
   voice: 281-257-4222
 - classification: district-mail
   address: 6010 G Root Road, Spring, TX 77389
+- classification: district-mail
+  address: Room E2.710, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0572
+  fax: 512-463-1908
 links:
 - url: https://house.texas.gov/members/member-page/?district=150
 other_names:
diff --git a/data/tx/legislature/Venton-Jones-6b2d7f89-d7e0-44d1-b861-3167915f6925.yml b/data/tx/legislature/Venton-Jones-6b2d7f89-d7e0-44d1-b861-3167915f6925.yml
index 8ca0498441..6cbbffae83 100644
--- a/data/tx/legislature/Venton-Jones-6b2d7f89-d7e0-44d1-b861-3167915f6925.yml
+++ b/data/tx/legislature/Venton-Jones-6b2d7f89-d7e0-44d1-b861-3167915f6925.yml
@@ -22,6 +22,7 @@ offices:
   voice: 214-421-0744
 links:
 - url: https://house.texas.gov/members/member-page/?district=100
+- url: https://house.texas.gov/members/4275
 other_names:
 - name: Jones, V.
 - name: Jones, Venton
@@ -29,5 +30,6 @@ other_names:
 sources:
 - url: https://ballotpedia.org/Venton_Jones
 - url: https://en.wikipedia.org/wiki/Venton_Jones
+- url: https://house.texas.gov/members/4275
 - url: https://house.texas.gov/members/member-page/?district=100
 - url: https://www.linkedin.com/in/ventonj
diff --git a/data/tx/legislature/Victoria-Neave-e6b8a84b-b408-4f26-9f73-eebca76f3fff.yml b/data/tx/legislature/Victoria-Neave-e6b8a84b-b408-4f26-9f73-eebca76f3fff.yml
index 9f20deb887..8b96158e49 100644
--- a/data/tx/legislature/Victoria-Neave-e6b8a84b-b408-4f26-9f73-eebca76f3fff.yml
+++ b/data/tx/legislature/Victoria-Neave-e6b8a84b-b408-4f26-9f73-eebca76f3fff.yml
@@ -15,13 +15,13 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '107'
 offices:
-- classification: capitol-mail
-  address: Room E2.308, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0244
-  fax: 512-463-9967
 - classification: district
   address: 317 S. Galloway Suite B, Mesquite, TX 75149
   voice: 972-288-9438
+- classification: district-mail
+  address: Room E2.308, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0244
+  fax: 512-463-9967
 links:
 - url: https://house.texas.gov/members/member-page/?district=107
 - url: https://house.texas.gov/members/3235
diff --git a/data/tx/legislature/Vikki-Goodwin-25157308-7474-4600-8b83-173d79e16a21.yml b/data/tx/legislature/Vikki-Goodwin-25157308-7474-4600-8b83-173d79e16a21.yml
index 6046c1ad0b..7c40cb0625 100644
--- a/data/tx/legislature/Vikki-Goodwin-25157308-7474-4600-8b83-173d79e16a21.yml
+++ b/data/tx/legislature/Vikki-Goodwin-25157308-7474-4600-8b83-173d79e16a21.yml
@@ -14,7 +14,7 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '47'
 offices:
-- classification: capitol-mail
+- classification: district-mail
   address: Room E2.208, P.O. Box 2910, Austin, TX 78768
   voice: 512-463-0652
   fax: 512-463-0565
diff --git a/data/tx/legislature/Will-Metcalf-e7a379ec-9de2-48a2-918b-5ba58e1fd3f3.yml b/data/tx/legislature/Will-Metcalf-e7a379ec-9de2-48a2-918b-5ba58e1fd3f3.yml
index 31166650e0..dfc32b3aa2 100644
--- a/data/tx/legislature/Will-Metcalf-e7a379ec-9de2-48a2-918b-5ba58e1fd3f3.yml
+++ b/data/tx/legislature/Will-Metcalf-e7a379ec-9de2-48a2-918b-5ba58e1fd3f3.yml
@@ -14,14 +14,14 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '16'
 offices:
-- classification: capitol-mail
-  address: Room 1N.7, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0726
-  fax: 512-463-8428
 - classification: district
   address: 100 Nugent St., Conroe, TX 77301
   voice: 936-539-0068
   fax: 936-539-0066
+- classification: district-mail
+  address: Room 1N.7, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0726
+  fax: 512-463-8428
 links:
 - url: https://house.texas.gov/members/member-page/?district=16
 other_names:
diff --git a/data/tx/legislature/Yvonne-Davis-3f38bf62-86ba-4833-9737-2e084ae6255d.yml b/data/tx/legislature/Yvonne-Davis-3f38bf62-86ba-4833-9737-2e084ae6255d.yml
index 1918083a36..62615772b3 100644
--- a/data/tx/legislature/Yvonne-Davis-3f38bf62-86ba-4833-9737-2e084ae6255d.yml
+++ b/data/tx/legislature/Yvonne-Davis-3f38bf62-86ba-4833-9737-2e084ae6255d.yml
@@ -14,15 +14,16 @@ roles:
   jurisdiction: ocd-jurisdiction/country:us/state:tx/government
   district: '111'
 offices:
-- classification: capitol-mail
-  address: Room 4N.9, P.O. Box 2910, Austin, TX 78768
-  voice: 512-463-0598
-  fax: 512-463-2297
 - classification: district
   address: 5787 S. Hampton Road Suite 447, Dallas, TX 75232
   voice: 214-941-3895
+- classification: district-mail
+  address: Room 4N.9, P.O. Box 2910, Austin, TX 78768
+  voice: 512-463-0598
+  fax: 512-463-2297
 links:
 - url: https://house.texas.gov/members/member-page/?district=111
+- url: https://house.texas.gov/members/2625
 other_names:
 - name: Davis, Y.
 - name: Y. Davis
@@ -36,5 +37,6 @@ other_identifiers:
 sources:
 - url: https://ballotpedia.org/Yvonne_Davis
 - url: https://en.wikipedia.org/wiki/Yvonne_Davis
+- url: https://house.texas.gov/members/2625
 - url: https://house.texas.gov/members/member-page/?district=111
 - url: https://justfacts.votesmart.org/candidate/biography/5491/yvonne-davis