diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json
index 3433ba10..60edc2c5 100644
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -76,10 +76,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/resources/factions/australia_2005.json b/resources/factions/australia_2005.json
index 64558060..fbb7a648 100644
--- a/resources/factions/australia_2005.json
+++ b/resources/factions/australia_2005.json
@@ -41,7 +41,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/australia_2005_c130.json b/resources/factions/australia_2005_c130.json
index 76894af4..868f6696 100644
--- a/resources/factions/australia_2005_c130.json
+++ b/resources/factions/australia_2005_c130.json
@@ -42,7 +42,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json
index 472a38bc..7d9392dc 100644
--- a/resources/factions/bluefor_coldwar.json
+++ b/resources/factions/bluefor_coldwar.json
@@ -49,10 +49,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json
index c3ccf522..07612aae 100644
--- a/resources/factions/bluefor_coldwar_a4.json
+++ b/resources/factions/bluefor_coldwar_a4.json
@@ -50,10 +50,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json
index 1060b02a..23893280 100644
--- a/resources/factions/bluefor_coldwar_a4_mb339.json
+++ b/resources/factions/bluefor_coldwar_a4_mb339.json
@@ -51,10 +51,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json
index 2b61fc6b..9a5089ab 100644
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json
index 336ee889..fa91b93e 100644
--- a/resources/factions/china_2010.json
+++ b/resources/factions/china_2010.json
@@ -66,7 +66,7 @@
   ],
   "coastal_group_count": 2,
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",
diff --git a/resources/factions/france_1985_frenchpack.json b/resources/factions/france_1985_frenchpack.json
index a36e5bf8..f443f1c4 100644
--- a/resources/factions/france_1985_frenchpack.json
+++ b/resources/factions/france_1985_frenchpack.json
@@ -51,7 +51,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json
index 2f692146..87c73a8a 100644
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -50,7 +50,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa",
diff --git a/resources/factions/france_2005_frenchpack.json b/resources/factions/france_2005_frenchpack.json
index d4ba2c3d..eee15cb0 100644
--- a/resources/factions/france_2005_frenchpack.json
+++ b/resources/factions/france_2005_frenchpack.json
@@ -55,10 +55,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json
index d775e505..9ef3630d 100644
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@@ -59,7 +59,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],
diff --git a/resources/factions/italy_1990.json b/resources/factions/italy_1990.json
index 566ff00e..f528a81b 100644
--- a/resources/factions/italy_1990.json
+++ b/resources/factions/italy_1990.json
@@ -44,7 +44,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/resources/factions/italy_1990_mb339.json b/resources/factions/italy_1990_mb339.json
index 44a662d6..8ffb80ac 100644
--- a/resources/factions/italy_1990_mb339.json
+++ b/resources/factions/italy_1990_mb339.json
@@ -45,7 +45,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json
index 6af92beb..a3bd9fcc 100644
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@@ -51,7 +51,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json
index bc1b8937..b8cc7c7d 100644
--- a/resources/factions/redfor_china_2010.json
+++ b/resources/factions/redfor_china_2010.json
@@ -85,7 +85,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",
diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json
index 11caccf9..9041f92a 100644
--- a/resources/factions/redfor_russia_2010.json
+++ b/resources/factions/redfor_russia_2010.json
@@ -88,7 +88,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [
     "Type_071_Amphibious_Transport_Dock"
diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json
index 61708103..22afa47f 100644
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -75,7 +75,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],
diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json
index 07bb483d..791e2b67 100644
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -78,7 +78,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],
diff --git a/resources/factions/russia_2010_hds.json b/resources/factions/russia_2010_hds.json
index a4954096..f61612b4 100644
--- a/resources/factions/russia_2010_hds.json
+++ b/resources/factions/russia_2010_hds.json
@@ -75,7 +75,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],
diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json
index 2d3f13e5..d20fa37f 100644
--- a/resources/factions/russia_2020.json
+++ b/resources/factions/russia_2020.json
@@ -74,7 +74,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],
diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json
index fd39b099..13ed6812 100644
--- a/resources/factions/spain_1990.json
+++ b/resources/factions/spain_1990.json
@@ -44,10 +44,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json
index f8d7a585..38ae53d2 100644
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -50,10 +50,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json
index 35655b97..0519f175 100644
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -70,10 +70,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",
diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json
index bf309c15..b2afc54c 100644
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/usa_2005_c130.json b/resources/factions/usa_2005_c130.json
index 04c573dd..d59e133e 100644
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json
index 118fb334..1ba82e75 100644
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -68,10 +68,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"
diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json
index 916a6040..05ccf915 100644
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -46,10 +46,10 @@
     "VulcanGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"
diff --git a/tests/resources/invalid_faction_country.json b/tests/resources/invalid_faction_country.json
index eb56760e..41255ff6 100644
--- a/tests/resources/invalid_faction_country.json
+++ b/tests/resources/invalid_faction_country.json
@@ -51,10 +51,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",
diff --git a/tests/resources/valid_faction.json b/tests/resources/valid_faction.json
index 80bb7b3b..bec78164 100644
--- a/tests/resources/valid_faction.json
+++ b/tests/resources/valid_faction.json
@@ -53,10 +53,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",