diff --git a/data/custodian/NL-FR-LAN-S-L.yaml b/data/custodian/NL-FR-DKN-S-L.yaml
similarity index 93%
rename from data/custodian/NL-FR-LAN-S-L.yaml
rename to data/custodian/NL-FR-DKN-S-L.yaml
index 3ae7884db5..88c463533b 100644
--- a/data/custodian/NL-FR-LAN-S-L.yaml
+++ b/data/custodian/NL-FR-DKN-S-L.yaml
@@ -76,6 +76,8 @@ provenance:
   - Dutch institution (De Knipe, Friesland)
   - Canonical location added via normalize_custodian_files.py on 2025-12-08T23:15:48Z
   - Canonical location added via normalize_custodian_files.py on 2025-12-09T06:59:57Z
+  - 'GHCID location corrected via fix_ghcid_location_mismatches.py on 2026-01-09T10:54:41Z:
+    NL-FR-LAN-S-L -> NL-FR-DKN-S-L'
 zcbs_enrichment:
   zcbs_id: 31
   zcbs_name: Historische Werkgroep Kynhout
@@ -119,46 +121,45 @@ locations:
   longitude: 5.9947032
   location_note: Contact/meeting address for the historical working group
 ghcid:
-  ghcid_current: NL-FR-LAN-S-L
+  ghcid_current: NL-FR-DKN-S-L
   ghcid_original: NL-FR-LAN-S-L
-  ghcid_uuid: e0f004e9-c020-5100-87d9-ba001a5577f7
-  ghcid_uuid_sha256: 5dbc553c-1fc6-8e4b-ae49-bfd337e2c98b
-  ghcid_numeric: 6754367257868385867
+  ghcid_uuid: 398e9afb-aa34-5e16-a9dc-59164b2d19f6
+  ghcid_uuid_sha256: 30be8c5d-3c2d-88dc-a884-c983f416ce61
+  ghcid_numeric: 3512399091465025756
   record_id: 019adf95-0d35-731f-9145-2c9940d470b8
-  generation_timestamp: '2025-12-02T14:56:45.615377+00:00'
+  generation_timestamp: '2026-01-09T10:54:41Z'
   ghcid_history:
   - ghcid: NL-FR-LAN-S-L
     ghcid_numeric: 6754367257868385867
     valid_from: '2025-12-02T14:56:45.615377+00:00'
-    valid_to: null
+    valid_to: '2026-01-09T10:54:41Z'
     reason: GHCID regenerated with Google Maps locality fix (Dec 2025)
+  - ghcid: NL-FR-DKN-S-L
+    ghcid_numeric: 3512399091465025756
+    valid_from: '2026-01-09T10:54:41Z'
+    valid_to: null
+    reason: 'GHCID corrected: location mismatch fix from NL-FR-LAN-S-L to NL-FR-DKN-S-L'
   location_resolution:
-    method: REVERSE_GEOCODE
-    geonames_id: 2751894
-    geonames_name: Langezwaag
+    method: GEONAMES_LOOKUP
+    geonames_id: 6697854
+    geonames_name: De Knipe
     feature_code: PPL
-    population: 615
+    population: 1480
     admin1_code: '02'
     region_code: FR
     country_code: NL
-    source_coordinates:
-      latitude: 52.9657872
-      longitude: 5.9947032
-      source: google_maps
-    distance_km: 2.0494553349639557
-    micro_hamlet_skipped: true
-  geonames_id: 2751894
+  geonames_id: 6697854
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: NL-FR-LAN-S-L
+  identifier_value: NL-FR-DKN-S-L
 - identifier_scheme: GHCID_UUID
-  identifier_value: e0f004e9-c020-5100-87d9-ba001a5577f7
-  identifier_url: urn:uuid:e0f004e9-c020-5100-87d9-ba001a5577f7
+  identifier_value: 398e9afb-aa34-5e16-a9dc-59164b2d19f6
+  identifier_url: urn:uuid:398e9afb-aa34-5e16-a9dc-59164b2d19f6
 - identifier_scheme: GHCID_UUID_SHA256
-  identifier_value: 5dbc553c-1fc6-8e4b-ae49-bfd337e2c98b
-  identifier_url: urn:uuid:5dbc553c-1fc6-8e4b-ae49-bfd337e2c98b
+  identifier_value: 30be8c5d-3c2d-88dc-a884-c983f416ce61
+  identifier_url: urn:uuid:30be8c5d-3c2d-88dc-a884-c983f416ce61
 - identifier_scheme: GHCID_NUMERIC
-  identifier_value: '6754367257868385867'
+  identifier_value: '3512399091465025756'
 - identifier_scheme: RECORD_ID
   identifier_value: 019adf95-0d35-731f-9145-2c9940d470b8
   identifier_url: urn:uuid:019adf95-0d35-731f-9145-2c9940d470b8
@@ -375,19 +376,19 @@ unesco_ich_enrichment:
       state of repair. With a declining number of people earning their livelihood
       from the craft, millers today also play a key role in transmitting the cultur...
 location:
-  latitude: 52.9657872
-  longitude: 5.9947032
+  latitude: 52.96829
+  longitude: 5.97116
   coordinate_provenance:
     source_type: GOOGLE_MAPS
     source_path: google_maps_enrichment.coordinates
-  city: Langezwaag
+  city: De Knipe
   region: Friesland
   region_code: FR
   country: NL
-  geonames_id: 2751894
-  geonames_name: Langezwaag
+  geonames_id: 6697854
+  geonames_name: De Knipe
   feature_code: PPL
-  normalization_timestamp: '2025-12-09T06:59:57.612686+00:00'
+  normalization_timestamp: '2026-01-09T10:54:41Z'
 firecrawl_enrichment:
   fetch_timestamp: '2025-12-14T16:44:26.936740+00:00'
   source_url: http://www.beeldbankdeknipe.nl
diff --git a/data/custodian/NL-LI-HEE-A-CRGR.yaml b/data/custodian/NL-LI-MAA-A-CRGR.yaml
similarity index 95%
rename from data/custodian/NL-LI-HEE-A-CRGR.yaml
rename to data/custodian/NL-LI-MAA-A-CRGR.yaml
index bab4e3ca6c..050ca452d3 100644
--- a/data/custodian/NL-LI-HEE-A-CRGR.yaml
+++ b/data/custodian/NL-LI-MAA-A-CRGR.yaml
@@ -92,6 +92,8 @@ provenance:
   - claim_level_provenance available in sources section
   - Canonical location added via normalize_custodian_files.py on 2025-12-08T23:16:47Z
   - Canonical location added via normalize_custodian_files.py on 2025-12-09T07:02:39Z
+  - 'GHCID location corrected via fix_ghcid_location_mismatches.py on 2026-01-09T10:54:21Z:
+    NL-LI-HEE-A-CRGR -> NL-LI-MAA-A-CRGR'
 enrichment_date: '2025-11-28'
 organization_details:
   current_name: Historisch Centrum Limburg
@@ -191,15 +193,15 @@ identifiers:
   assigned_date: '2024-01-22'
   source: Nationaal Archief ISIL Registry 2025-11-06
 - identifier_scheme: GHCID
-  identifier_value: NL-LI-HEE-A-CRGR
+  identifier_value: NL-LI-MAA-A-CRGR
 - identifier_scheme: GHCID_UUID
-  identifier_value: fa44ddf7-59d8-5819-b02f-6562019fd3d5
-  identifier_url: urn:uuid:fa44ddf7-59d8-5819-b02f-6562019fd3d5
+  identifier_value: de9fd3c4-5ac6-541e-a3f1-54e7ace0fbce
+  identifier_url: urn:uuid:de9fd3c4-5ac6-541e-a3f1-54e7ace0fbce
 - identifier_scheme: GHCID_UUID_SHA256
-  identifier_value: 2b7fdc47-d27c-8151-9353-159bc8d29a6f
-  identifier_url: urn:uuid:2b7fdc47-d27c-8151-9353-159bc8d29a6f
+  identifier_value: 3fe9e980-dcb6-86b9-9ef7-0a3109e650b7
+  identifier_url: urn:uuid:3fe9e980-dcb6-86b9-9ef7-0a3109e650b7
 - identifier_scheme: GHCID_NUMERIC
-  identifier_value: '3134466066705289553'
+  identifier_value: '4605468833631065785'
 - identifier_scheme: RECORD_ID
   identifier_value: 019adf94-3b15-7486-9598-893daf252315
   identifier_url: urn:uuid:019adf94-3b15-7486-9598-893daf252315
@@ -378,34 +380,34 @@ nan_isil_enrichment:
       yaml_lines: 5118-5140
       yaml_path: /[232]/csv_isil_code
 ghcid:
-  ghcid_current: NL-LI-HEE-A-CRGR
+  ghcid_current: NL-LI-MAA-A-CRGR
   ghcid_original: NL-LI-HEE-A-CRGR
-  ghcid_uuid: fa44ddf7-59d8-5819-b02f-6562019fd3d5
-  ghcid_uuid_sha256: 2b7fdc47-d27c-8151-9353-159bc8d29a6f
-  ghcid_numeric: 3134466066705289553
+  ghcid_uuid: de9fd3c4-5ac6-541e-a3f1-54e7ace0fbce
+  ghcid_uuid_sha256: 3fe9e980-dcb6-86b9-9ef7-0a3109e650b7
+  ghcid_numeric: 4605468833631065785
   record_id: 019adf94-3b15-7486-9598-893daf252315
-  generation_timestamp: '2025-12-02T14:56:45.615377+00:00'
+  generation_timestamp: '2026-01-09T10:54:21Z'
   ghcid_history:
   - ghcid: NL-LI-HEE-A-CRGR
     ghcid_numeric: 3134466066705289553
     valid_from: '2025-12-02T14:56:45.615377+00:00'
-    valid_to: null
+    valid_to: '2026-01-09T10:54:21Z'
     reason: GHCID regenerated with Google Maps locality fix (Dec 2025)
+  - ghcid: NL-LI-MAA-A-CRGR
+    ghcid_numeric: 4605468833631065785
+    valid_from: '2026-01-09T10:54:21Z'
+    valid_to: null
+    reason: 'GHCID corrected: location mismatch fix from NL-LI-HEE-A-CRGR to NL-LI-MAA-A-CRGR'
   location_resolution:
-    method: GOOGLE_MAPS_LOCALITY
-    google_maps_locality: Heerlen
-    geonames_id: 2754652
-    geonames_name: Heerlen
-    feature_code: PPL
-    population: 93084
+    method: GEONAMES_LOOKUP
+    geonames_id: 2751283
+    geonames_name: Maastricht
+    feature_code: PPLA
+    population: 122378
     admin1_code: '05'
     region_code: LI
     country_code: NL
-    source_coordinates:
-      latitude: 50.9221808
-      longitude: 5.9653716999999995
-      source: google_maps
-  geonames_id: 2754652
+  geonames_id: 2751283
 custodian_name:
   claim_type: custodian_name
   claim_value: Centrum voor Regionale Geschiedenis Rijckheyt
@@ -503,25 +505,25 @@ unesco_ich_enrichment:
       state of repair. With a declining number of people earning their livelihood
       from the craft, millers today also play a key role in transmitting the cultur...
 location:
-  latitude: 50.9221808
-  longitude: 5.9653716999999995
+  latitude: 50.84833
+  longitude: 5.68889
   coordinate_provenance:
     source_type: GOOGLE_MAPS
     source_path: google_maps_enrichment.coordinates
     original_timestamp: '2025-11-28T09:52:22.810494+00:00'
     entity_id: ChIJ6b1hhry9wEcRItTX-4xRJsc
     api_endpoint: https://maps.googleapis.com/maps/api/place/textsearch
-  city: Heerlen
+  city: Maastricht
   region: Limburg
   region_code: LI
   country: NL
   postal_code: 6414 HE
   street_address: Navolaan 83, Heerlen
   formatted_address: Navolaan 83, 6414 HE Heerlen
-  geonames_id: 2754652
-  geonames_name: Heerlen
-  feature_code: PPL
-  normalization_timestamp: '2025-12-09T07:02:39.374491+00:00'
+  geonames_id: 2751283
+  geonames_name: Maastricht
+  feature_code: PPLA
+  normalization_timestamp: '2026-01-09T10:54:21Z'
 crawl4ai_enrichment:
   retrieval_timestamp: '2025-12-14T17:42:24.190308+00:00'
   retrieval_agent: crawl4ai
diff --git a/data/custodian/NL-NB-MID-S-M.yaml b/data/custodian/NL-NB-BER-S-M.yaml
similarity index 91%
rename from data/custodian/NL-NB-MID-S-M.yaml
rename to data/custodian/NL-NB-BER-S-M.yaml
index b85f2d5dc4..c5d4fae91e 100644
--- a/data/custodian/NL-NB-MID-S-M.yaml
+++ b/data/custodian/NL-NB-BER-S-M.yaml
@@ -63,6 +63,8 @@ provenance:
     type TOP.GEO (not GRP.HER heritage custodian)'
   - Canonical location added via normalize_custodian_files.py on 2025-12-08T23:17:20Z
   - Canonical location added via normalize_custodian_files.py on 2025-12-09T07:03:58Z
+  - 'GHCID location corrected via fix_ghcid_location_mismatches.py on 2026-01-09T10:54:41Z:
+    NL-NB-MID-S-M -> NL-NB-BER-S-M'
 zcbs_enrichment:
   zcbs_id: 87
   zcbs_name: Heemkundekring De Plaets
@@ -117,46 +119,45 @@ locations:
   location_note: User-provided location (Koesteeg 37); official listing at Clarissenhoeve
     52
 ghcid:
-  ghcid_current: NL-NB-MID-S-M
+  ghcid_current: NL-NB-BER-S-M
   ghcid_original: NL-NB-MID-S-M
-  ghcid_uuid: fddd19db-1a3b-55ed-9a90-6024d69c5ece
-  ghcid_uuid_sha256: d651a0dc-2269-86a3-ac5b-68c400e75e96
-  ghcid_numeric: 15443301464560744099
+  ghcid_uuid: 189715d0-2d9b-57d8-9369-d31269d967af
+  ghcid_uuid_sha256: be4c2dba-6db3-808e-b5eb-190b5503f9d1
+  ghcid_numeric: 13712385244163936398
   record_id: 019adf95-0d37-75cf-9981-4bdec514eb67
-  generation_timestamp: '2025-12-02T14:56:45.615377+00:00'
+  generation_timestamp: '2026-01-09T10:54:41Z'
   ghcid_history:
   - ghcid: NL-NB-MID-S-M
     ghcid_numeric: 15443301464560744099
     valid_from: '2025-12-02T14:56:45.615377+00:00'
-    valid_to: null
+    valid_to: '2026-01-09T10:54:41Z'
     reason: GHCID regenerated with Google Maps locality fix (Dec 2025)
+  - ghcid: NL-NB-BER-S-M
+    ghcid_numeric: 13712385244163936398
+    valid_from: '2026-01-09T10:54:41Z'
+    valid_to: null
+    reason: 'GHCID corrected: location mismatch fix from NL-NB-MID-S-M to NL-NB-BER-S-M'
   location_resolution:
-    method: REVERSE_GEOCODE
-    geonames_id: 2750870
-    geonames_name: Middelrode
+    method: GEONAMES_LOOKUP
+    geonames_id: 2759059
+    geonames_name: Berlicum
     feature_code: PPL
-    population: 1465
+    population: 4250
     admin1_code: '06'
     region_code: NB
     country_code: NL
-    source_coordinates:
-      latitude: 51.6851289
-      longitude: 5.4367943
-      source: google_maps
-    distance_km: 3.0204387378795836
-    micro_hamlet_skipped: true
-  geonames_id: 2750870
+  geonames_id: 2759059
 identifiers:
 - identifier_scheme: GHCID
-  identifier_value: NL-NB-MID-S-M
+  identifier_value: NL-NB-BER-S-M
 - identifier_scheme: GHCID_UUID
-  identifier_value: fddd19db-1a3b-55ed-9a90-6024d69c5ece
-  identifier_url: urn:uuid:fddd19db-1a3b-55ed-9a90-6024d69c5ece
+  identifier_value: 189715d0-2d9b-57d8-9369-d31269d967af
+  identifier_url: urn:uuid:189715d0-2d9b-57d8-9369-d31269d967af
 - identifier_scheme: GHCID_UUID_SHA256
-  identifier_value: d651a0dc-2269-86a3-ac5b-68c400e75e96
-  identifier_url: urn:uuid:d651a0dc-2269-86a3-ac5b-68c400e75e96
+  identifier_value: be4c2dba-6db3-808e-b5eb-190b5503f9d1
+  identifier_url: urn:uuid:be4c2dba-6db3-808e-b5eb-190b5503f9d1
 - identifier_scheme: GHCID_NUMERIC
-  identifier_value: '15443301464560744099'
+  identifier_value: '13712385244163936398'
 - identifier_scheme: RECORD_ID
   identifier_value: 019adf95-0d37-75cf-9981-4bdec514eb67
   identifier_url: urn:uuid:019adf95-0d37-75cf-9981-4bdec514eb67
@@ -276,19 +277,19 @@ unesco_ich_enrichment:
       state of repair. With a declining number of people earning their livelihood
       from the craft, millers today also play a key role in transmitting the cultur...
 location:
-  latitude: 51.6851289
-  longitude: 5.4367943
+  latitude: 51.6775
+  longitude: 5.4
   coordinate_provenance:
     source_type: GOOGLE_MAPS
     source_path: google_maps_enrichment.coordinates
-  city: Middelrode
+  city: Berlicum
   region: Noord-Brabant
   region_code: NB
   country: NL
-  geonames_id: 2750870
-  geonames_name: Middelrode
+  geonames_id: 2759059
+  geonames_name: Berlicum
   feature_code: PPL
-  normalization_timestamp: '2025-12-09T07:03:58.354828+00:00'
+  normalization_timestamp: '2026-01-09T10:54:41Z'
 crawl4ai_enrichment:
   retrieval_timestamp: '2025-12-14T17:50:37.358130+00:00'
   retrieval_agent: crawl4ai
diff --git a/data/custodian/NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn.yaml b/data/custodian/NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn.yaml
similarity index 92%
rename from data/custodian/NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn.yaml
rename to data/custodian/NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn.yaml
index c8922e966b..a366be5dae 100644
--- a/data/custodian/NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn.yaml
+++ b/data/custodian/NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn.yaml
@@ -61,6 +61,8 @@ provenance:
   - Institution not found in original NDE dataset
   - ISIL code assigned 2025-08-06 - recently registered
   - Canonical location normalized on 2025-12-09T13:15:41Z
+  - 'GHCID location corrected via fix_ghcid_location_mismatches.py on 2026-01-09T10:54:21Z:
+    NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn -> NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn'
 nan_isil_enrichment:
   source: Nationaal Archief ISIL Registry
   source_file: ISIL-codes_2025-11-06.yaml
@@ -93,16 +95,16 @@ identifiers:
   assigned_date: '2025-08-06'
   source: Nationaal Archief ISIL Registry 2025-11-06
 - identifier_scheme: GHCID
-  identifier_value: NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn
+  identifier_value: NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn
   identifier_url: https://w3id.org/heritage/custodian/NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn
 - identifier_scheme: GHCID_UUID
-  identifier_value: 7899a098-f4ce-5395-b039-4caeaaaf1bb1
-  identifier_url: urn:uuid:c133ff33-5311-5c89-a15f-4720cf3e41af
+  identifier_value: 12f8f727-a49c-5481-8140-d4c0f1638629
+  identifier_url: urn:uuid:12f8f727-a49c-5481-8140-d4c0f1638629
 - identifier_scheme: GHCID_UUID_SHA256
-  identifier_value: 3acee5c1-ad82-8995-b2af-9b1dace37bf4
-  identifier_url: urn:uuid:3acee5c1-ad82-8995-b2af-9b1dace37bf4
+  identifier_value: 093b40ed-ff49-87da-9203-e623e6e33958
+  identifier_url: urn:uuid:093b40ed-ff49-87da-9203-e623e6e33958
 - identifier_scheme: GHCID_NUMERIC
-  identifier_value: '17365929270967612247'
+  identifier_value: '665196760901699546'
 - identifier_scheme: RECORD_ID
   identifier_value: 019adf95-07f3-7316-961a-22bc02ef3218
   identifier_url: urn:uuid:019adf95-07f3-7316-961a-22bc02ef3218
@@ -272,10 +274,10 @@ google_maps_enrichment:
 google_maps_status: SUCCESS
 google_maps_search_query: Gemeente Hellendoorn (HLDN), Hellendoorn, Netherlands
 ghcid:
-  ghcid_current: NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn
-  ghcid_uuid: 7899a098-f4ce-5395-b039-4caeaaaf1bb1
-  ghcid_uuid_sha256: 0b3fa64b-f261-520f-8af7-8511b04b5dca
-  ghcid_numeric: 17365929270967612247
+  ghcid_current: NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn
+  ghcid_uuid: 12f8f727-a49c-5481-8140-d4c0f1638629
+  ghcid_uuid_sha256: 093b40ed-ff49-87da-9203-e623e6e33958
+  ghcid_numeric: 665196760901699546
   generated_at: '2025-12-14T21:59:29.002071+00:00'
   ghcid_history:
   - ghcid: NL-OV-NIJ-A-GH-gemeente_hellendoorn
@@ -291,6 +293,23 @@ ghcid:
     valid_to: '2025-12-14T21:59:29.002071+00:00'
     reason: 'Collision fix: had partner''s GHCID, corrected to institution''s own
       GHCID based on name ''Gemeente Hellendoorn (HLDN)'''
+  - ghcid: NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn
+    ghcid_numeric: 665196760901699546
+    valid_from: '2026-01-09T10:54:21Z'
+    valid_to: null
+    reason: 'GHCID corrected: location mismatch fix from NL-OV-NIJ-A-GH-gemeente_hellendoorn_hldn
+      to NL-OV-HEL-A-GH-gemeente_hellendoorn_hldn'
+  generation_timestamp: '2026-01-09T10:54:21Z'
+  location_resolution:
+    method: GEONAMES_LOOKUP
+    geonames_id: 2754457
+    geonames_name: Hellendoorn
+    feature_code: PPL
+    population: 660
+    admin1_code: '15'
+    region_code: OV
+    country_code: NL
+  geonames_id: 2754457
 custodian_name:
   claim_type: custodian_name
   claim_value: Gemeente Hellendoorn
@@ -542,24 +561,24 @@ wikidata_enrichment:
     email: mailto:gemeente@hellendoorn.nl
     phone_number: '+31548630000'
 location:
-  latitude: 52.3640441
-  longitude: 6.461802
+  latitude: 52.38833
+  longitude: 6.45139
   coordinate_provenance:
     source_type: GOOGLE_MAPS
     source_path: google_maps_enrichment.coordinates
     original_timestamp: '2025-11-30T17:51:47.512518+00:00'
     entity_id: ChIJeyBupg36x0cRPujlSbZBHrs
-  city: Nijverdal
+  city: Hellendoorn
   region: Overijssel
   region_code: OV
   country: NL
   postal_code: 7442 MA
   street_address: Willem Alexanderstraat 7, Nijverdal
   formatted_address: Willem Alexanderstraat 7, 7442 MA Nijverdal
-  geonames_id: 2750039
-  geonames_name: Nijverdal
+  geonames_id: 2754457
+  geonames_name: Hellendoorn
   feature_code: PPL
-  normalization_timestamp: '2025-12-09T13:15:41.616125+00:00'
+  normalization_timestamp: '2026-01-09T10:54:21Z'
 web-enrichments:
   extraction_timestamp: '2025-12-13T19:46:27.234537+00:00'
   extraction_method: hybrid_llm_pattern_layout_v1