diff --git a/data/missals/propriumdesanctis_US_2011/propriumdesanctis_US_2011.json b/data/missals/propriumdesanctis_US_2011/propriumdesanctis_US_2011.json
index 495a16f3..c1120570 100644
--- a/data/missals/propriumdesanctis_US_2011/propriumdesanctis_US_2011.json
+++ b/data/missals/propriumdesanctis_US_2011/propriumdesanctis_US_2011.json
@@ -9,7 +9,7 @@
         "common": [
             "Proper"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -31,7 +31,7 @@
         "common": [
             "Proper"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -53,7 +53,7 @@
         "common": [
             "Holy Men and Women:For Religious"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -76,7 +76,7 @@
             "Masses and Prayers for Various Needs and Occasions:For Giving Thanks to God for the Gift of Human Life",
             "Preservation of Peace and Justice"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "purple",
             "white"
@@ -99,7 +99,7 @@
         "common": [
             "Virgins:For One Virgin"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -121,7 +121,7 @@
         "common": [
             "Pastors:For Missionaries"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -143,7 +143,7 @@
         "common": [
             "Holy Men and Women:For One Saint"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -166,7 +166,7 @@
             "Pastors:For One Pastor",
             "Pastors:For Missionaries"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -188,7 +188,7 @@
         "common": [
             "Proper"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -210,7 +210,7 @@
         "common": [
             "Virgins:For One Virgin"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -233,7 +233,7 @@
             "Pastors:For One Pastor",
             "Holy Men and Women:For Those Who Practiced Works of Mercy"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -255,7 +255,7 @@
         "common": [
             "Virgins:For One Virgin"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -278,7 +278,7 @@
             "Virgins:For One Virgin",
             "Holy Men and Women:For Those Who Practiced Works of Mercy"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -300,7 +300,7 @@
         "common": [
             "Virgins:For One Virgin"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white"
         ],
@@ -323,7 +323,7 @@
             "Martyrs:For One Martyr",
             "Pastors:For One Pastor"
         ],
-        "calendar": "USA",
+        "calendar": "US",
         "color": [
             "white",
             "red"
diff --git a/data/nations/US/US.json b/data/nations/US/US.json
index 16fc7c16..3b2293b5 100644
--- a/data/nations/US/US.json
+++ b/data/nations/US/US.json
@@ -25,7 +25,7 @@
             },
             "metadata": {
                 "action": "moveFestivity",
-                "missal": "USA_2011",
+                "missal": "US_2011",
                 "reason": "National Day of Prayer for the Unborn",
                 "since_year": 1970
             }
@@ -52,7 +52,7 @@
             },
             "metadata": {
                 "action": "moveFestivity",
-                "missal": "USA_2011",
+                "missal": "US_2011",
                 "reason": "Saint John Brebeuf (elevated to memorial)",
                 "since_year": 1970
             }
@@ -122,7 +122,7 @@
             },
             "metadata": {
                 "action": "moveFestivity",
-                "missal": "USA_2011",
+                "missal": "US_2011",
                 "reason": "Blessed Kateri Tekakwitha",
                 "since_year": 1970
             }
@@ -149,7 +149,7 @@
             },
             "metadata": {
                 "action": "moveFestivity",
-                "missal": "USA_2011",
+                "missal": "US_2011",
                 "reason": "Independence Day",
                 "since_year": 1970
             }
diff --git a/tests/PrayerUnbornTest.json b/tests/PrayerUnbornTest.json
index ba171609..76b8e571 100644
--- a/tests/PrayerUnbornTest.json
+++ b/tests/PrayerUnbornTest.json
@@ -5,7 +5,7 @@
     "test_type": "exactCorrespondenceSince",
     "year_since": 2011,
     "applies_to": {
-        "national_calendar": "USA"
+        "national_calendar": "US"
     },
     "assertions": [
         {
diff --git a/tests/ROTTERDAM_HLaurentiusdiakenenmartelaarpatroonvanhetbisdomTest.json b/tests/ROTTERDAM_HLaurentiusdiakenenmartelaarpatroonvanhetbisdomTest.json
index a1032d7a..92f27c36 100644
--- a/tests/ROTTERDAM_HLaurentiusdiakenenmartelaarpatroonvanhetbisdomTest.json
+++ b/tests/ROTTERDAM_HLaurentiusdiakenenmartelaarpatroonvanhetbisdomTest.json
@@ -202,6 +202,6 @@
     ],
     "event_key": "ROTTERDAM_HLaurentiusdiakenenmartelaarpatroonvanhetbisdom",
     "applies_to": {
-        "diocesan_calendar": "ROTTERDAM"
+        "diocesan_calendar": "rotter_nl"
     }
 }