diff --git a/game/data/aaa_db.py b/game/data/aaa_db.py
index fba276a3..3008011e 100644
--- a/game/data/aaa_db.py
+++ b/game/data/aaa_db.py
@@ -7,9 +7,9 @@ AAA_UNITS = [
     AirDefence.AAA_ZU_23_Closed_Emplacement,
     AirDefence.AAA_ZU_23_Emplacement,
     AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375,
-    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent,
+    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement,
     AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375,
-    AirDefence.AAA_ZU_23_Insurgent,
+    AirDefence.AAA_ZU_23_Insurgent_Emplacement,
     AirDefence.AAA_8_8cm_Flak_18,
     AirDefence.AAA_Flak_38_20mm,
     AirDefence.AAA_8_8cm_Flak_36,
@@ -17,6 +17,6 @@ AAA_UNITS = [
     AirDefence.AAA_Flak_Vierling_38_Quad_20mm,
     AirDefence.AAA_SP_Kdo_G_40,
     AirDefence.AAA_8_8cm_Flak_41,
-    AirDefence.AAA_40mm_Bofors,
+    AirDefence.AAA_Bofors_40mm,
     AirDefence.AAA_S_60_57mm,
 ]
diff --git a/game/data/alic.py b/game/data/alic.py
index de99075c..84436837 100644
--- a/game/data/alic.py
+++ b/game/data/alic.py
@@ -9,7 +9,7 @@ class AlicCodes:
         AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR.id: 103,
         AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR.id: 104,
         AirDefence.SAM_SA_11_Buk_Gadfly_Snow_Drift_SR.id: 107,
-        AirDefence.SAM_SA_6_Kub_Long_Track_STR.id: 108,
+        AirDefence.SAM_SA_6_Kub_Straight_Flush_STR.id: 108,
         AirDefence.MCC_SR_Sborka_Dog_Ear_SR.id: 109,
         AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR.id: 110,
         AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL.id: 115,
diff --git a/game/data/radar_db.py b/game/data/radar_db.py
index 0dcf9cc2..a8bec9b4 100644
--- a/game/data/radar_db.py
+++ b/game/data/radar_db.py
@@ -32,7 +32,7 @@ UNITS_WITH_RADAR = [
     AirDefence.SPAAA_Vulcan_M163,
     AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish,
     AirDefence.EWR_1L13,
-    AirDefence.SAM_SA_6_Kub_Long_Track_STR,
+    AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
     AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR,
     AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR,
     AirDefence.EWR_55G6,
diff --git a/game/data/weapons.py b/game/data/weapons.py
index 9b6d8e0c..b7dd530b 100644
--- a/game/data/weapons.py
+++ b/game/data/weapons.py
@@ -154,7 +154,7 @@ _WEAPON_FALLBACKS = [
         Weapons.BRU_57_with_2_x_AGM_154A___JSOW_CEB__CBU_type_,
         None,
     ),  # doesn't exist on any aircraft yet
-    (Weapons.AGM_154B___JSOW_Anti_Armour, Weapons.CBU_105___10_x_CEM__CBU_with_WCMD),
+    (Weapons.AGM_154B___JSOW_Anti_Armour, Weapons.CBU_105___10_x_SFW__CBU_with_WCMD),
     (Weapons.AGM_154C___JSOW_Unitary_BROACH, Weapons.GBU_12),
     (
         Weapons.BRU_55_with_2_x_AGM_154C___JSOW_Unitary_BROACH,
@@ -483,29 +483,29 @@ _WEAPON_FALLBACKS = [
     # CBU-87 CEM
     (Weapons.CBU_87___202_x_CEM_Cluster_Bomb, Weapons.Mk_82),
     (
-        Weapons.TER_9A_with_2_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb,
+        Weapons.TER_9A_with_2_x_CBU_87___202_x_CEM_Cluster_Bomb,
         Weapons.TER_9A_with_2_x_Mk_82___500lb_GP_Bomb_LD,
     ),
     (
-        Weapons.TER_9A_with_2_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb_,
+        Weapons.TER_9A_with_2_x_CBU_87___202_x_CEM_Cluster_Bomb_,
         Weapons.TER_9A_with_2_x_Mk_82___500lb_GP_Bomb_LD,
     ),
     (
-        Weapons.TER_9A_with_3_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb,
+        Weapons.TER_9A_with_3_x_CBU_87___202_x_CEM_Cluster_Bomb,
         Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD,
     ),
     # CBU-97
-    (Weapons.CBU_97___10_x_CEM_Cluster_Bomb, Weapons.Mk_82),
+    (Weapons.CBU_97___10_x_SFW_Cluster_Bomb, Weapons.Mk_82),
     (
-        Weapons.TER_9A_with_2_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb,
+        Weapons.TER_9A_with_2_x_CBU_97___10_x_SFW_Cluster_Bomb,
         Weapons.TER_9A_with_2_x_Mk_82___500lb_GP_Bomb_LD,
     ),
     (
-        Weapons.TER_9A_with_2_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb_,
+        Weapons.TER_9A_with_2_x_CBU_97___10_x_SFW_Cluster_Bomb_,
         Weapons.TER_9A_with_2_x_Mk_82___500lb_GP_Bomb_LD_,
     ),
     (
-        Weapons.TER_9A_with_3_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb,
+        Weapons.TER_9A_with_3_x_CBU_97___10_x_SFW_Cluster_Bomb,
         Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD,
     ),
     # CBU-99 (It's a bomb made in 1968, I'm not bothering right now with backups)
@@ -515,7 +515,7 @@ _WEAPON_FALLBACKS = [
         Weapons.CBU_87___202_x_CEM_Cluster_Bomb,
     ),
     # CBU-105
-    (Weapons.CBU_105___10_x_CEM__CBU_with_WCMD, Weapons.CBU_97___10_x_CEM_Cluster_Bomb),
+    (Weapons.CBU_105___10_x_SFW__CBU_with_WCMD, Weapons.CBU_97___10_x_SFW_Cluster_Bomb),
     (
         Weapons.LAU_131_pod___7_x_2_75_Hydra__Laser_Guided_Rkts_M151__HE_APKWS,
         Weapons.LAU_131_pod___7_x_2_75_Hydra__UnGd_Rkts_M151__HE,
@@ -971,26 +971,14 @@ WEAPON_INTRODUCTION_YEARS = {
     Weapon.from_pydcs(Weapons.CBU_52B___220_x_HE_Frag_bomblets): 1970,
     # CBU-87 CEM
     Weapon.from_pydcs(Weapons.CBU_87___202_x_CEM_Cluster_Bomb): 1986,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_2_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb
-    ): 1986,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_2_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb_
-    ): 1986,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_3_x_CBU_87___202_x_Anti_Armor_Skeet_SFW_Cluster_Bomb
-    ): 1986,
+    Weapon.from_pydcs(Weapons.TER_9A_with_2_x_CBU_87___202_x_CEM_Cluster_Bomb): 1986,
+    Weapon.from_pydcs(Weapons.TER_9A_with_2_x_CBU_87___202_x_CEM_Cluster_Bomb_): 1986,
+    Weapon.from_pydcs(Weapons.TER_9A_with_3_x_CBU_87___202_x_CEM_Cluster_Bomb): 1986,
     # CBU-97
-    Weapon.from_pydcs(Weapons.CBU_97___10_x_CEM_Cluster_Bomb): 1992,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_2_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb
-    ): 1992,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_2_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb_
-    ): 1992,
-    Weapon.from_pydcs(
-        Weapons.TER_9A_with_3_x_CBU_97___10_x_Anti_Armor_Skeet_SFW_Cluster_Bomb
-    ): 1992,
+    Weapon.from_pydcs(Weapons.CBU_97___10_x_SFW_Cluster_Bomb): 1992,
+    Weapon.from_pydcs(Weapons.TER_9A_with_2_x_CBU_97___10_x_SFW_Cluster_Bomb): 1992,
+    Weapon.from_pydcs(Weapons.TER_9A_with_2_x_CBU_97___10_x_SFW_Cluster_Bomb_): 1992,
+    Weapon.from_pydcs(Weapons.TER_9A_with_3_x_CBU_97___10_x_SFW_Cluster_Bomb): 1992,
     # CBU-99
     Weapon.from_pydcs(
         Weapons.BRU_33_with_2_x_CBU_99___490lbs__247_x_HEAT_Bomblets
@@ -1032,11 +1020,11 @@ WEAPON_INTRODUCTION_YEARS = {
         Weapons.MER2_with_2_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets
     ): 1968,
     # CBU-103
-    Weapon.from_pydcs(Weapons.BRU_57_with_2_x_CBU_103): 2000,
+    Weapon.from_pydcs(Weapons.BRU_57_with_2_x_CBU_103___202_x_CEM__CBU_with_WCMD): 2000,
     Weapon.from_pydcs(Weapons.CBU_103___202_x_CEM__CBU_with_WCMD): 2000,
     # CBU-105
-    Weapon.from_pydcs(Weapons.BRU_57_with_2_x_CBU_105): 2000,
-    Weapon.from_pydcs(Weapons.CBU_105___10_x_CEM__CBU_with_WCMD): 2000,
+    Weapon.from_pydcs(Weapons.BRU_57_with_2_x_CBU_105___10_x_SFW__CBU_with_WCMD): 2000,
+    Weapon.from_pydcs(Weapons.CBU_105___10_x_SFW__CBU_with_WCMD): 2000,
     # APKWS
     Weapon.from_pydcs(
         Weapons.LAU_131_pod___7_x_2_75_Hydra__Laser_Guided_Rkts_M151__HE_APKWS
diff --git a/game/db.py b/game/db.py
index 980f1461..eb2b692f 100644
--- a/game/db.py
+++ b/game/db.py
@@ -485,10 +485,10 @@ PRICES = {
     # armor
     Armor.APC_MTLB: 4,
     Artillery.Grad_MRL_FDDM__FC: 4,
-    Armor.IFV_BRDM_2: 6,
+    Armor.Scout_BRDM_2: 6,
     Armor.APC_BTR_RD: 6,
     Armor.APC_BTR_80: 8,
-    Armor.APC_BTR_82A: 10,
+    Armor.IFV_BTR_82A: 10,
     Armor.MBT_T_55: 18,
     Armor.MBT_T_72B: 20,
     Armor.MBT_T_72B3: 25,
@@ -500,9 +500,9 @@ PRICES = {
     Armor.IFV_BMP_3: 18,
     Armor.ZBD_04A: 12,
     Armor.ZTZ_96B: 30,
-    Armor.APC_Cobra__Scout: 4,
+    Armor.Scout_Cobra: 4,
     Armor.APC_M113: 6,
-    Armor.APC_HMMWV__Scout: 2,
+    Armor.Scout_HMMWV: 2,
     Armor.ATGM_HMMWV: 8,
     Armor.IFV_M2A2_Bradley: 12,
     Armor.IFV_M1126_Stryker_ICV: 10,
@@ -511,8 +511,11 @@ PRICES = {
     Armor.MBT_M60A3_Patton: 16,
     Armor.MBT_M1A2_Abrams: 25,
     Armor.MBT_Leclerc: 25,
-    Armor.MBT_Leopard_1A3: 20,
-    Armor.MBT_Leopard_2: 25,
+    Armor.MBT_Leopard_1A3: 18,
+    Armor.MBT_Leopard_2A4: 20,
+    Armor.MBT_Leopard_2A4_Trs: 20,
+    Armor.MBT_Leopard_2A5: 22,
+    Armor.MBT_Leopard_2A6M: 25,
     Armor.MBT_Merkava_IV: 25,
     Armor.APC_TPz_Fuchs: 5,
     Armor.MBT_Challenger_II: 25,
@@ -521,12 +524,12 @@ PRICES = {
     Armor.IFV_LAV_25: 7,
     Artillery.MLRS_M270_227mm: 55,
     Artillery.SPH_M109_Paladin_155mm: 25,
-    Artillery.SPH_2S9_Nona_120mm_M: 12,
+    Artillery.SPM_2S9_Nona_120mm_M: 12,
     Artillery.SPH_2S1_Gvozdika_122mm: 18,
     Artillery.SPH_2S3_Akatsia_152mm: 24,
     Artillery.SPH_2S19_Msta_152mm: 30,
     Artillery.MLRS_BM_21_Grad_122mm: 15,
-    Artillery.MLRS_BM_27_Uragan_220mm: 50,
+    Artillery.MLRS_9K57_Uragan_BM_27_220mm: 50,
     Artillery.MLRS_9A52_Smerch_HE_300mm: 40,
     Artillery.Mortar_2B11_120mm: 4,
     Artillery.SPH_Dana_vz77_152mm: 26,
@@ -538,7 +541,7 @@ PRICES = {
     Unarmed.Truck_M818_6x6: 3,
     # WW2
     Armor.MT_Pz_Kpfw_V_Panther_Ausf_G: 24,
-    Armor.MT_PzIV_H: 16,
+    Armor.Tk_PzIV_H: 16,
     Armor.HT_Pz_Kpfw_VI_Tiger_I: 24,
     Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II: 26,
     Armor.SPG_Jagdpanther_G1: 18,
@@ -546,7 +549,7 @@ PRICES = {
     Armor.SPG_Sd_Kfz_184_Elefant: 18,
     Armor.APC_Sd_Kfz_251_Halftrack: 4,
     Armor.IFV_Sd_Kfz_234_2_Puma: 8,
-    Armor.MT_M4_Sherman: 12,
+    Armor.Tk_M4_Sherman: 12,
     Armor.MT_M4A4_Sherman_Firefly: 16,
     Armor.CT_Cromwell_IV: 12,
     Unarmed.Carrier_M30_Cargo: 2,
@@ -558,7 +561,7 @@ PRICES = {
     Armor.SPG_StuG_III_Ausf__G: 12,
     Armor.SPG_StuG_IV: 14,
     Artillery.SPG_M12_GMC_155mm: 10,
-    Artillery.SPG_Sturmpanzer_IV_Brummbar: 10,
+    Armor.SPG_Sturmpanzer_IV_Brummbar: 10,
     Armor.Car_Daimler_Armored: 8,
     Armor.LT_Mk_VII_Tetrarch: 8,
     Unarmed.Tractor_M4_Hi_Speed: 2,
@@ -585,7 +588,7 @@ PRICES = {
     AirDefence.SAM_Patriot_CR__AMG_AN_MRC_137: 35,
     AirDefence.SAM_Patriot_ECS: 30,
     AirDefence.SPAAA_Gepard: 24,
-    AirDefence.SAM_Hawk_Generator__PCP: 14,
+    AirDefence.SAM_Hawk_Platoon_Command_Post__PCP: 14,
     AirDefence.SPAAA_Vulcan_M163: 10,
     AirDefence.SAM_Hawk_LN_M192: 8,
     AirDefence.SAM_Chaparral_M48: 16,
@@ -603,15 +606,15 @@ PRICES = {
     AirDefence.AAA_ZU_23_Closed_Emplacement: 6,
     AirDefence.AAA_ZU_23_Emplacement: 6,
     AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375: 7,
-    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent: 6,
+    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement: 6,
     AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 7,
-    AirDefence.AAA_ZU_23_Insurgent: 6,
+    AirDefence.AAA_ZU_23_Insurgent_Emplacement: 6,
     AirDefence.MANPADS_SA_18_Igla_Grouse: 10,
     AirDefence.MANPADS_SA_18_Igla_Grouse_C2: 8,
     AirDefence.MANPADS_SA_18_Igla_S_Grouse: 12,
     AirDefence.MANPADS_SA_18_Igla_S_Grouse_C2: 8,
     AirDefence.EWR_1L13: 30,
-    AirDefence.SAM_SA_6_Kub_Long_Track_STR: 22,
+    AirDefence.SAM_SA_6_Kub_Straight_Flush_STR: 22,
     AirDefence.EWR_55G6: 30,
     AirDefence.MCC_SR_Sborka_Dog_Ear_SR: 10,
     AirDefence.SAM_Hawk_TR__AN_MPQ_46: 14,
@@ -638,7 +641,7 @@ PRICES = {
     AirDefence.PU_Maschinensatz_33: 10,
     AirDefence.AAA_8_8cm_Flak_41: 10,
     AirDefence.EWR_FuMG_401_Freya_LZ: 25,
-    AirDefence.AAA_40mm_Bofors: 8,
+    AirDefence.AAA_Bofors_40mm: 8,
     AirDefence.AAA_S_60_57mm: 8,
     AirDefence.AAA_M1_37mm: 7,
     AirDefence.AAA_M45_Quadmount_HB_12_7mm: 4,
@@ -860,9 +863,9 @@ UNIT_BY_TASK = {
         Artillery.Grad_MRL_FDDM__FC,
         Artillery.Grad_MRL_FDDM__FC,
         Artillery.Grad_MRL_FDDM__FC,
-        Armor.IFV_BRDM_2,
-        Armor.IFV_BRDM_2,
-        Armor.IFV_BRDM_2,
+        Armor.Scout_BRDM_2,
+        Armor.Scout_BRDM_2,
+        Armor.Scout_BRDM_2,
         Armor.APC_BTR_RD,
         Armor.APC_BTR_RD,
         Armor.APC_BTR_RD,
@@ -872,8 +875,8 @@ UNIT_BY_TASK = {
         Armor.APC_BTR_80,
         Armor.APC_BTR_80,
         Armor.APC_BTR_80,
-        Armor.APC_BTR_82A,
-        Armor.APC_BTR_82A,
+        Armor.IFV_BTR_82A,
+        Armor.IFV_BTR_82A,
         Armor.IFV_BMP_1,
         Armor.IFV_BMP_1,
         Armor.IFV_BMP_1,
@@ -896,10 +899,10 @@ UNIT_BY_TASK = {
         Armor.MBT_T_80U,
         Armor.MBT_T_90,
         Armor.ZTZ_96B,
-        Armor.APC_Cobra__Scout,
-        Armor.APC_Cobra__Scout,
-        Armor.APC_Cobra__Scout,
-        Armor.APC_Cobra__Scout,
+        Armor.Scout_Cobra,
+        Armor.Scout_Cobra,
+        Armor.Scout_Cobra,
+        Armor.Scout_Cobra,
         Armor.APC_M113,
         Armor.APC_M113,
         Armor.APC_M113,
@@ -910,8 +913,8 @@ UNIT_BY_TASK = {
         Armor.APC_TPz_Fuchs,
         Armor.ATGM_HMMWV,
         Armor.ATGM_HMMWV,
-        Armor.APC_HMMWV__Scout,
-        Armor.APC_HMMWV__Scout,
+        Armor.Scout_HMMWV,
+        Armor.Scout_HMMWV,
         Armor.IFV_M2A2_Bradley,
         Armor.IFV_M2A2_Bradley,
         Armor.ATGM_Stryker,
@@ -936,11 +939,11 @@ UNIT_BY_TASK = {
         Armor.MBT_Leopard_1A3,
         Armor.MBT_M1A2_Abrams,
         Armor.MBT_Leclerc,
-        Armor.MBT_Leopard_2,
+        Armor.MBT_Leopard_2A6M,
         Armor.MBT_Challenger_II,
         Armor.MBT_Merkava_IV,
         Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
-        Armor.MT_PzIV_H,
+        Armor.Tk_PzIV_H,
         Armor.HT_Pz_Kpfw_VI_Tiger_I,
         Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II,
         Armor.APC_Sd_Kfz_251_Halftrack,
@@ -949,7 +952,7 @@ UNIT_BY_TASK = {
         Armor.APC_Sd_Kfz_251_Halftrack,
         Armor.IFV_Sd_Kfz_234_2_Puma,
         Armor.IFV_Sd_Kfz_234_2_Puma,
-        Armor.MT_M4_Sherman,
+        Armor.Tk_M4_Sherman,
         Armor.MT_M4A4_Sherman_Firefly,
         Armor.CT_Cromwell_IV,
         Unarmed.Carrier_M30_Cargo,
@@ -959,7 +962,7 @@ UNIT_BY_TASK = {
         Armor.APC_M2A1_Halftrack,
         Armor.APC_M2A1_Halftrack,
         Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
-        Armor.MT_PzIV_H,
+        Armor.Tk_PzIV_H,
         Armor.HT_Pz_Kpfw_VI_Tiger_I,
         Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II,
         Armor.SPG_Jagdpanther_G1,
@@ -967,7 +970,7 @@ UNIT_BY_TASK = {
         Armor.SPG_Sd_Kfz_184_Elefant,
         Armor.APC_Sd_Kfz_251_Halftrack,
         Armor.IFV_Sd_Kfz_234_2_Puma,
-        Armor.MT_M4_Sherman,
+        Armor.Tk_M4_Sherman,
         Armor.MT_M4A4_Sherman_Firefly,
         Armor.CT_Cromwell_IV,
         Unarmed.Carrier_M30_Cargo,
@@ -985,23 +988,23 @@ UNIT_BY_TASK = {
         Armor.SPG_StuG_III_Ausf__G,
         Armor.SPG_StuG_IV,
         Artillery.SPG_M12_GMC_155mm,
-        Artillery.SPG_Sturmpanzer_IV_Brummbar,
+        Armor.SPG_Sturmpanzer_IV_Brummbar,
         Armor.Car_Daimler_Armored,
         Armor.LT_Mk_VII_Tetrarch,
         Artillery.MLRS_M270_227mm,
         Artillery.SPH_M109_Paladin_155mm,
-        Artillery.SPH_2S9_Nona_120mm_M,
+        Artillery.SPM_2S9_Nona_120mm_M,
         Artillery.SPH_2S1_Gvozdika_122mm,
         Artillery.SPH_2S3_Akatsia_152mm,
         Artillery.SPH_2S19_Msta_152mm,
         Artillery.MLRS_BM_21_Grad_122mm,
         Artillery.MLRS_BM_21_Grad_122mm,
-        Artillery.MLRS_BM_27_Uragan_220mm,
+        Artillery.MLRS_9K57_Uragan_BM_27_220mm,
         Artillery.MLRS_9A52_Smerch_HE_300mm,
         Artillery.SPH_Dana_vz77_152mm,
         Artillery.PLZ_05,
         Artillery.SPG_M12_GMC_155mm,
-        Artillery.SPG_Sturmpanzer_IV_Brummbar,
+        Armor.SPG_Sturmpanzer_IV_Brummbar,
         AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375,
         AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375,
         AirDefence.SPAAA_ZSU_57_2,
@@ -1022,7 +1025,7 @@ UNIT_BY_TASK = {
         AirDefence.AAA_8_8cm_Flak_36,
         AirDefence.AAA_8_8cm_Flak_37,
         AirDefence.AAA_8_8cm_Flak_41,
-        AirDefence.AAA_40mm_Bofors,
+        AirDefence.AAA_Bofors_40mm,
         AirDefence.AAA_S_60_57mm,
         AirDefence.AAA_M1_37mm,
         AirDefence.AAA_QF_3_7,
@@ -1083,7 +1086,7 @@ SAM_BAN = [
     AirDefence.SAM_SA_6_Kub_Gainful_TEL,
     AirDefence.SAM_SA_8_Osa_Gecko_TEL,
     AirDefence.SAM_SA_3_S_125_Goa_LN,
-    AirDefence.SAM_Hawk_Generator__PCP,
+    AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
     AirDefence.SAM_SA_2_S_75_Guideline_LN,
     AirDefence.SAM_SA_11_Buk_Gadfly_Fire_Dome_TEL,
 ]
@@ -1096,15 +1099,15 @@ SAM_CONVERT = {
     AirDefence.SAM_SA_3_S_125_Low_Blow_TR: AirDefence.SAM_SA_3_S_125_Goa_LN,
     AirDefence.SAM_SA_3_S_125_Goa_LN: AirDefence.SAM_SA_3_S_125_Goa_LN,
     AirDefence.SAM_SA_6_Kub_Gainful_TEL: AirDefence.SAM_SA_6_Kub_Gainful_TEL,
-    AirDefence.SAM_SA_6_Kub_Long_Track_STR: AirDefence.SAM_SA_6_Kub_Gainful_TEL,
+    AirDefence.SAM_SA_6_Kub_Straight_Flush_STR: AirDefence.SAM_SA_6_Kub_Gainful_TEL,
     AirDefence.SAM_SA_10_S_300_Grumble_TEL_C: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C,
     AirDefence.SAM_SA_10_S_300_Grumble_Clam_Shell_SR: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C,
     AirDefence.SAM_SA_10_S_300_Grumble_Flap_Lid_TR: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C,
     AirDefence.SAM_SA_10_S_300_Grumble_C2: AirDefence.SAM_SA_10_S_300_Grumble_TEL_C,
     AirDefence.SAM_SA_10_S_300_Grumble_Big_Bird_SR: AirDefence.SAM_SA_10_S_300_Grumble_C2,
-    AirDefence.SAM_Hawk_TR__AN_MPQ_46: AirDefence.SAM_Hawk_Generator__PCP,
-    AirDefence.SAM_Hawk_SR__AN_MPQ_50: AirDefence.SAM_Hawk_Generator__PCP,
-    AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_Generator__PCP,
+    AirDefence.SAM_Hawk_TR__AN_MPQ_46: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
+    AirDefence.SAM_Hawk_SR__AN_MPQ_50: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
+    AirDefence.SAM_Hawk_LN_M192: AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
     "except": {
         # this radar is shared between the two S300's. if we attempt to find a SAM site at a base and can't find one
         #  model, we can safely assume the other was deployed
diff --git a/gen/ground_forces/ai_ground_planner_db.py b/gen/ground_forces/ai_ground_planner_db.py
index 36c775de..3fee5901 100644
--- a/gen/ground_forces/ai_ground_planner_db.py
+++ b/gen/ground_forces/ai_ground_planner_db.py
@@ -8,7 +8,10 @@ TYPE_TANKS = [
     Armor.MBT_T_72B3,
     Armor.MBT_T_80U,
     Armor.MBT_T_90,
-    Armor.MBT_Leopard_2,
+    Armor.MBT_Leopard_2A4,
+    Armor.MBT_Leopard_2A4_Trs,
+    Armor.MBT_Leopard_2A5,
+    Armor.MBT_Leopard_2A6M,
     Armor.MBT_Leopard_1A3,
     Armor.MBT_Leclerc,
     Armor.MBT_Challenger_II,
@@ -18,16 +21,17 @@ TYPE_TANKS = [
     Armor.ZTZ_96B,
     # WW2
     Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
-    Armor.MT_PzIV_H,
+    Armor.Tk_PzIV_H,
     Armor.HT_Pz_Kpfw_VI_Tiger_I,
     Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II,
-    Armor.MT_M4_Sherman,
+    Armor.Tk_M4_Sherman,
     Armor.MT_M4A4_Sherman_Firefly,
     Armor.SPG_StuG_IV,
     Armor.CT_Centaur_IV,
     Armor.CT_Cromwell_IV,
     Armor.HIT_Churchill_VII,
     Armor.LT_Mk_VII_Tetrarch,
+    Armor.SPG_Sturmpanzer_IV_Brummbar,
     # Mods
     frenchpack.DIM__TOYOTA_BLUE,
     frenchpack.DIM__TOYOTA_GREEN,
@@ -77,18 +81,18 @@ TYPE_IFV = [
 ]
 
 TYPE_APC = [
-    Armor.APC_HMMWV__Scout,
+    Armor.Scout_HMMWV,
     Armor.IFV_M1126_Stryker_ICV,
     Armor.APC_M113,
     Armor.APC_BTR_80,
-    Armor.APC_BTR_82A,
+    Armor.IFV_BTR_82A,
     Armor.APC_MTLB,
     Armor.APC_M2A1_Halftrack,
-    Armor.APC_Cobra__Scout,
+    Armor.Scout_Cobra,
     Armor.APC_Sd_Kfz_251_Halftrack,
     Armor.APC_AAV_7_Amphibious,
     Armor.APC_TPz_Fuchs,
-    Armor.IFV_BRDM_2,
+    Armor.Scout_BRDM_2,
     Armor.APC_BTR_RD,
     Artillery.Grad_MRL_FDDM__FC,
     # WW2
@@ -105,16 +109,15 @@ TYPE_ARTILLERY = [
     Artillery.SPH_2S1_Gvozdika_122mm,
     Artillery.SPH_2S3_Akatsia_152mm,
     Artillery.MLRS_BM_21_Grad_122mm,
-    Artillery.MLRS_BM_27_Uragan_220mm,
+    Artillery.MLRS_9K57_Uragan_BM_27_220mm,
     Artillery.SPH_M109_Paladin_155mm,
     Artillery.MLRS_M270_227mm,
-    Artillery.SPH_2S9_Nona_120mm_M,
+    Artillery.SPM_2S9_Nona_120mm_M,
     Artillery.SPH_Dana_vz77_152mm,
     Artillery.PLZ_05,
     Artillery.SPH_2S19_Msta_152mm,
     Artillery.MLRS_9A52_Smerch_CM_300mm,
     # WW2
-    Artillery.SPG_Sturmpanzer_IV_Brummbar,
     Artillery.SPG_M12_GMC_155mm,
 ]
 
@@ -175,7 +178,7 @@ TYPE_SHORAD = [
     AirDefence.AAA_8_8cm_Flak_36,
     AirDefence.AAA_8_8cm_Flak_37,
     AirDefence.AAA_8_8cm_Flak_41,
-    AirDefence.AAA_40mm_Bofors,
+    AirDefence.AAA_Bofors_40mm,
     AirDefence.AAA_S_60_57mm,
     AirDefence.AAA_M1_37mm,
     AirDefence.AAA_QF_3_7,
diff --git a/gen/sam/aaa_bofors.py b/gen/sam/aaa_bofors.py
index fc6636d9..6af41922 100644
--- a/gen/sam/aaa_bofors.py
+++ b/gen/sam/aaa_bofors.py
@@ -27,7 +27,7 @@ class BoforsGenerator(AirDefenseGroupGenerator):
             for j in range(grid_y):
                 index = index + 1
                 self.add_unit(
-                    AirDefence.AAA_40mm_Bofors,
+                    AirDefence.AAA_Bofors_40mm,
                     "AAA#" + str(index),
                     self.position.x + spacing * i,
                     self.position.y + spacing * j,
diff --git a/gen/sam/aaa_zu23_insurgent.py b/gen/sam/aaa_zu23_insurgent.py
index 87ef1cd9..96cd1d71 100644
--- a/gen/sam/aaa_zu23_insurgent.py
+++ b/gen/sam/aaa_zu23_insurgent.py
@@ -27,7 +27,7 @@ class ZU23InsurgentGenerator(AirDefenseGroupGenerator):
             for j in range(grid_y):
                 index = index + 1
                 self.add_unit(
-                    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent,
+                    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement,
                     "AAA#" + str(index),
                     self.position.x + spacing * i,
                     self.position.y + spacing * j,
diff --git a/gen/sam/ewrs.py b/gen/sam/ewrs.py
index 7164a09e..d69f2de7 100644
--- a/gen/sam/ewrs.py
+++ b/gen/sam/ewrs.py
@@ -87,7 +87,7 @@ class StraightFlushGenerator(EwrGenerator):
     This is the SA-6 search/track radar, but used as an early warning radar.
     """
 
-    unit_type = AirDefence.SAM_SA_6_Kub_Long_Track_STR
+    unit_type = AirDefence.SAM_SA_6_Kub_Straight_Flush_STR
 
 
 class HawkEwrGenerator(EwrGenerator):
diff --git a/gen/sam/sam_group_generator.py b/gen/sam/sam_group_generator.py
index e13f0f2c..a4968830 100644
--- a/gen/sam/sam_group_generator.py
+++ b/gen/sam/sam_group_generator.py
@@ -105,13 +105,13 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = {
 
 
 SAM_PRICES = {
-    AirDefence.SAM_Hawk_Generator__PCP: 35,
+    AirDefence.SAM_Hawk_Platoon_Command_Post__PCP: 35,
     AirDefence.AAA_ZU_23_Emplacement: 10,
     AirDefence.AAA_ZU_23_Closed_Emplacement: 10,
     AirDefence.SPAAA_ZU_23_2_Mounted_Ural_375: 10,
     AirDefence.SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375: 10,
-    AirDefence.AAA_ZU_23_Closed_Emplacement_Insurgent: 10,
-    AirDefence.AAA_ZU_23_Insurgent: 10,
+    AirDefence.AAA_ZU_23_Insurgent_Closed_Emplacement: 10,
+    AirDefence.AAA_ZU_23_Insurgent_Emplacement: 10,
     AirDefence.SPAAA_ZSU_23_4_Shilka_Gun_Dish: 10,
     AirDefence.SPAAA_Vulcan_M163: 15,
     AirDefence.SAM_Linebacker___Bradley_M6: 20,
@@ -122,7 +122,7 @@ SAM_PRICES = {
     AirDefence.SAM_Patriot_LN: 85,
     AirDefence.SAM_Patriot_EPP_III: 85,
     AirDefence.SAM_Chaparral_M48: 25,
-    AirDefence.AAA_40mm_Bofors: 15,
+    AirDefence.AAA_Bofors_40mm: 15,
     AirDefence.AAA_8_8cm_Flak_36: 15,
     AirDefence.SAM_SA_2_S_75_Guideline_LN: 30,
     AirDefence.SAM_SA_3_S_125_Goa_LN: 35,
diff --git a/gen/sam/sam_hawk.py b/gen/sam/sam_hawk.py
index ab3332cd..f07f8872 100644
--- a/gen/sam/sam_hawk.py
+++ b/gen/sam/sam_hawk.py
@@ -26,7 +26,7 @@ class HawkGenerator(AirDefenseGroupGenerator):
             self.heading,
         )
         self.add_unit(
-            AirDefence.SAM_Hawk_Generator__PCP,
+            AirDefence.SAM_Hawk_Platoon_Command_Post__PCP,
             "PCP",
             self.position.x,
             self.position.y,
diff --git a/gen/sam/sam_sa6.py b/gen/sam/sam_sa6.py
index a1def06d..25746651 100644
--- a/gen/sam/sam_sa6.py
+++ b/gen/sam/sam_sa6.py
@@ -18,7 +18,7 @@ class SA6Generator(AirDefenseGroupGenerator):
 
     def generate(self):
         self.add_unit(
-            AirDefence.SAM_SA_6_Kub_Long_Track_STR,
+            AirDefence.SAM_SA_6_Kub_Straight_Flush_STR,
             "STR",
             self.position.x,
             self.position.y,
diff --git a/pydcs b/pydcs
index ea94bca5..dec648d2 160000
--- a/pydcs
+++ b/pydcs
@@ -1 +1 @@
-Subproject commit ea94bca55c83520038edc7c7fa43648376ec72a4
+Subproject commit dec648d27f74c394dd6e85e83cc09e4cd823653d
diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json
index 7b9743b9..30a6e30b 100644
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -40,7 +40,7 @@
     "IFV_M2A2_Bradley",
     "IFV_M1126_Stryker_ICV",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "APC_TPz_Fuchs",
     "IFV_Warrior",
diff --git a/resources/factions/allies_1940.json b/resources/factions/allies_1940.json
index bc3ca707..1d590b00 100644
--- a/resources/factions/allies_1940.json
+++ b/resources/factions/allies_1940.json
@@ -14,7 +14,7 @@
     "Car_Daimler_Armored",
     "LT_Mk_VII_Tetrarch",
     "AAA_QF_3_7",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
   ],
diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json
index c8cc8d30..98f2a5ec 100644
--- a/resources/factions/allies_1944.json
+++ b/resources/factions/allies_1944.json
@@ -16,7 +16,7 @@
   ],
   "frontline_units": [
     "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
     "CT_Cromwell_IV",
     "CT_Centaur_IV",
@@ -26,7 +26,7 @@
     "Car_Daimler_Armored",
     "LT_Mk_VII_Tetrarch",
     "AAA_QF_3_7",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
     "SPG_M12_GMC_155mm"
diff --git a/resources/factions/allies_1944_free.json b/resources/factions/allies_1944_free.json
index 0fce2438..7e4e7fc9 100644
--- a/resources/factions/allies_1944_free.json
+++ b/resources/factions/allies_1944_free.json
@@ -14,9 +14,9 @@
     "A_20G"
   ],
   "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
   ],
diff --git a/resources/factions/bluefor_modern.json b/resources/factions/bluefor_modern.json
index 81e93e6e..2794fe88 100644
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -37,13 +37,13 @@
   ],
   "frontline_units": [
     "MBT_M1A2_Abrams",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A6M",
     "MBT_Merkava_IV",
     "ATGM_Stryker",
     "IFV_M2A2_Bradley",
     "IFV_Marder",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Linebacker___Bradley_M6",
     "SAM_Avenger__Stinger"
diff --git a/resources/factions/canada_2005.json b/resources/factions/canada_2005.json
index 7d394842..798f01f8 100644
--- a/resources/factions/canada_2005.json
+++ b/resources/factions/canada_2005.json
@@ -17,7 +17,8 @@
   ],
   "frontline_units": [
     "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
+    "MBT_Leopard_2A6M",
     "IFV_LAV_25",
     "APC_M113",
     "IFV_Warrior",
diff --git a/resources/factions/canada_2005_c130.json b/resources/factions/canada_2005_c130.json
index 9620dc24..f44da34e 100644
--- a/resources/factions/canada_2005_c130.json
+++ b/resources/factions/canada_2005_c130.json
@@ -18,7 +18,8 @@
   ],
   "frontline_units": [
     "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
+    "MBT_Leopard_2A6M",
     "IFV_LAV_25",
     "APC_M113",
     "IFV_Warrior",
diff --git a/resources/factions/china_2010.json b/resources/factions/china_2010.json
index 1f47c779..bc1e4c0b 100644
--- a/resources/factions/china_2010.json
+++ b/resources/factions/china_2010.json
@@ -28,7 +28,7 @@
   "artillery_units": [
     "MLRS_9A52_Smerch_HE_300mm",
     "PLZ_05",
-    "SPH_2S9_Nona_120mm_M"
+    "SPM_2S9_Nona_120mm_M"
   ],
   "logistics_units": [
     "Truck_Ural_375",
diff --git a/resources/factions/dprk_1950_fictional.json b/resources/factions/dprk_1950_fictional.json
index 29251c1b..428212d9 100644
--- a/resources/factions/dprk_1950_fictional.json
+++ b/resources/factions/dprk_1950_fictional.json
@@ -15,7 +15,7 @@
   "tankers": [
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "Grad_MRL_FDDM__FC",
     "APC_MTLB",
     "MBT_T_55",
diff --git a/resources/factions/france_1995.json b/resources/factions/france_1995.json
index 30d3e440..e81fca28 100644
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -20,10 +20,10 @@
   "frontline_units": [
     "MBT_Leclerc",
     "APC_TPz_Fuchs",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "ATGM_Stryker",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Roland_ADS"
   ],
diff --git a/resources/factions/gdr_1985.json b/resources/factions/gdr_1985.json
index 9eee25a1..757dcf0c 100644
--- a/resources/factions/gdr_1985.json
+++ b/resources/factions/gdr_1985.json
@@ -17,7 +17,7 @@
   "frontline_units": [
     "IFV_BMP_1",
     "IFV_BMP_2",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_MTLB",
     "MBT_T_55",
     "MBT_T_72B"
diff --git a/resources/factions/georgia_2008.json b/resources/factions/georgia_2008.json
index b1250008..08825296 100644
--- a/resources/factions/georgia_2008.json
+++ b/resources/factions/georgia_2008.json
@@ -13,7 +13,7 @@
   "frontline_units": [
     "APC_BTR_80",
     "APC_MTLB",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "IFV_BMP_1",
     "IFV_BMP_2",
     "MBT_T_72B",
diff --git a/resources/factions/germany_1940.json b/resources/factions/germany_1940.json
index b3a40cab..91d48d3f 100644
--- a/resources/factions/germany_1940.json
+++ b/resources/factions/germany_1940.json
@@ -10,7 +10,7 @@
     "Ju_88A4"
   ],
   "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
     "APC_Sd_Kfz_251_Halftrack",
     "IFV_Sd_Kfz_234_2_Puma",
     "AAA_8_8cm_Flak_18"
diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json
index 927152d5..8aaa385f 100644
--- a/resources/factions/germany_1942.json
+++ b/resources/factions/germany_1942.json
@@ -10,14 +10,14 @@
     "Ju_88A4"
   ],
   "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
     "APC_Sd_Kfz_251_Halftrack",
     "IFV_Sd_Kfz_234_2_Puma",
     "SPG_Jagdpanzer_IV",
-    "AAA_8_8cm_Flak_18"
+    "AAA_8_8cm_Flak_18",
+    "SPG_Sturmpanzer_IV_Brummbar"
   ],
   "artillery_units": [
-    "SPG_Sturmpanzer_IV_Brummbar"
   ],
   "logistics_units": [
     "Truck_Opel_Blitz",
diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json
index a607adfa..26aa55f9 100644
--- a/resources/factions/germany_1944.json
+++ b/resources/factions/germany_1944.json
@@ -11,7 +11,7 @@
   ],
   "frontline_units": [
     "MT_Pz_Kpfw_V_Panther_Ausf_G",
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
     "HT_Pz_Kpfw_VI_Tiger_I",
     "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II",
     "APC_Sd_Kfz_251_Halftrack",
@@ -22,10 +22,10 @@
     "SPG_StuG_III_Ausf__G",
     "SPG_StuG_IV",
     "AAA_8_8cm_Flak_18",
-    "AAA_8_8cm_Flak_41"
+    "AAA_8_8cm_Flak_41",
+    "SPG_Sturmpanzer_IV_Brummbar"
   ],
   "artillery_units": [
-    "SPG_Sturmpanzer_IV_Brummbar"
   ],
   "logistics_units": [
     "Truck_Opel_Blitz",
diff --git a/resources/factions/germany_1944_free.json b/resources/factions/germany_1944_free.json
index 6145a374..0de2b7ab 100644
--- a/resources/factions/germany_1944_free.json
+++ b/resources/factions/germany_1944_free.json
@@ -9,7 +9,7 @@
     "Bf_109K_4"
   ],
   "frontline_units": [
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
     "APC_Sd_Kfz_251_Halftrack",
     "AAA_8_8cm_Flak_18"
   ],
diff --git a/resources/factions/germany_1990.json b/resources/factions/germany_1990.json
index 0190d101..57e5b36e 100644
--- a/resources/factions/germany_1990.json
+++ b/resources/factions/germany_1990.json
@@ -21,7 +21,7 @@
   "frontline_units": [
     "APC_TPz_Fuchs",
     "MBT_Leopard_1A3",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "IFV_Marder",
     "SPAAA_Gepard"
   ],
diff --git a/resources/factions/greece_2005.json b/resources/factions/greece_2005.json
index a390525a..5e20bf24 100644
--- a/resources/factions/greece_2005.json
+++ b/resources/factions/greece_2005.json
@@ -15,10 +15,10 @@
     "KC130"
   ],
   "frontline_units": [
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "MBT_Leopard_1A3",
     "MBT_M60A3_Patton",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "APC_M113",
     "IFV_BMP_1"
@@ -48,4 +48,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ_9_Reaper"
-}
\ No newline at end of file
+}
diff --git a/resources/factions/india_2010.json b/resources/factions/india_2010.json
index 8ea8c8c9..e1099c39 100644
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@@ -26,7 +26,7 @@
     "SAM_SA_19_Tunguska_Grison"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/insurgents.json b/resources/factions/insurgents.json
index 773ea181..9cbec87b 100644
--- a/resources/factions/insurgents.json
+++ b/resources/factions/insurgents.json
@@ -6,9 +6,9 @@
   "aircrafts": [
   ],
   "frontline_units": [
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "APC_MTLB",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "SPAAA_ZU_23_2_Insurgent_Mounted_Ural_375"
   ],
   "artillery_units": [
diff --git a/resources/factions/insurgents_hard.json b/resources/factions/insurgents_hard.json
index 086385cd..b90da386 100644
--- a/resources/factions/insurgents_hard.json
+++ b/resources/factions/insurgents_hard.json
@@ -7,8 +7,8 @@
   ],
   "frontline_units": [
     "ATGM_HMMWV",
-    "APC_HMMWV__Scout",
-    "IFV_BRDM_2",
+    "Scout_HMMWV",
+    "Scout_BRDM_2",
     "APC_BTR_80",
     "APC_BTR_RD",
     "IFV_BMP_1",
diff --git a/resources/factions/iraq_1991.json b/resources/factions/iraq_1991.json
index 25376a66..591b886a 100644
--- a/resources/factions/iraq_1991.json
+++ b/resources/factions/iraq_1991.json
@@ -30,7 +30,7 @@
     "MBT_T_55",
     "MBT_T_72B",
     "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "SPH_2S1_Gvozdika_122mm",
     "SPAAA_ZSU_57_2",
     "SPAAA_ZSU_23_4_Shilka_Gun_Dish"
diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json
index 4d81443e..1a9bf17c 100644
--- a/resources/factions/israel_1948.json
+++ b/resources/factions/israel_1948.json
@@ -14,9 +14,9 @@
   "frontline_units": [
     "MT_M4A4_Sherman_Firefly",
     "APC_M2A1_Halftrack",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "Car_M8_Greyhound_Armored",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
   ],
diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json
index da572305..366ff06e 100644
--- a/resources/factions/israel_1973.json
+++ b/resources/factions/israel_1973.json
@@ -16,7 +16,7 @@
     "KC130"
   ],
   "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
     "MBT_M60A3_Patton",
     "APC_M113",
diff --git a/resources/factions/israel_2000.json b/resources/factions/israel_2000.json
index 5d8d5b60..689396d1 100644
--- a/resources/factions/israel_2000.json
+++ b/resources/factions/israel_2000.json
@@ -21,7 +21,7 @@
   ],
   "frontline_units": [
     "APC_M113",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "MBT_Merkava_IV",
     "SPAAA_Vulcan_M163"
diff --git a/resources/factions/japan_2005.json b/resources/factions/japan_2005.json
index 892e1ed7..5fcfbd6e 100644
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@@ -23,7 +23,7 @@
     "IFV_Marder",
     "APC_TPz_Fuchs",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "SPAAA_Gepard"
   ],
   "artillery_units": [
diff --git a/resources/factions/libya_2011.json b/resources/factions/libya_2011.json
index 10ef96a2..0b83dc6e 100644
--- a/resources/factions/libya_2011.json
+++ b/resources/factions/libya_2011.json
@@ -18,7 +18,7 @@
   ],
   "frontline_units": [
     "IFV_BMP_1",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "MBT_T_72B",
     "MBT_T_55",
     "SPAAA_ZSU_23_4_Shilka_Gun_Dish",
diff --git a/resources/factions/north_korea_2000.json b/resources/factions/north_korea_2000.json
index 565ab250..cbd3d040 100644
--- a/resources/factions/north_korea_2000.json
+++ b/resources/factions/north_korea_2000.json
@@ -19,7 +19,7 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_BTR_80",
     "IFV_BMP_1",
     "MBT_T_55",
@@ -30,7 +30,7 @@
   ],
   "artillery_units": [
     "MLRS_BM_21_Grad_122mm",
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/pakistan_2015.json b/resources/factions/pakistan_2015.json
index 1c8c7ef7..c8e2b4b3 100644
--- a/resources/factions/pakistan_2015.json
+++ b/resources/factions/pakistan_2015.json
@@ -28,7 +28,7 @@
   ],
   "artillery_units": [
     "MLRS_9A52_Smerch_HE_300mm",
-    "SPH_2S9_Nona_120mm_M"
+    "SPM_2S9_Nona_120mm_M"
   ],
   "logistics_units": [
     "Truck_Ural_375",
diff --git a/resources/factions/pmc_russian.json b/resources/factions/pmc_russian.json
index aa273736..81ee1f38 100644
--- a/resources/factions/pmc_russian.json
+++ b/resources/factions/pmc_russian.json
@@ -10,9 +10,9 @@
     "Ka_50"
   ],
   "frontline_units": [
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "SAM_SA_13_Strela_10M3_Gopher_TEL"
   ],
   "artillery_units": [
diff --git a/resources/factions/pmc_us.json b/resources/factions/pmc_us.json
index 293a4b9d..8957f5db 100644
--- a/resources/factions/pmc_us.json
+++ b/resources/factions/pmc_us.json
@@ -10,7 +10,7 @@
     "SA342M"
   ],
   "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "IFV_Warrior",
     "IFV_LAV_25",
     "SAM_Avenger__Stinger"
diff --git a/resources/factions/pmc_us_with_mb339.json b/resources/factions/pmc_us_with_mb339.json
index 8ffdf832..1e9867d5 100644
--- a/resources/factions/pmc_us_with_mb339.json
+++ b/resources/factions/pmc_us_with_mb339.json
@@ -11,7 +11,7 @@
     "SA342M"
   ],
   "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "IFV_Warrior",
     "IFV_LAV_25",
     "SAM_Avenger__Stinger"
diff --git a/resources/factions/poland_2010.json b/resources/factions/poland_2010.json
index 35256cfc..82b638a9 100644
--- a/resources/factions/poland_2010.json
+++ b/resources/factions/poland_2010.json
@@ -13,13 +13,13 @@
     "KC130"
   ],
   "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "IFV_M1126_Stryker_ICV",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "IFV_BMP_1",
     "APC_MTLB",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A6M",
     "MBT_T_72B3"
   ],
   "artillery_units": [
diff --git a/resources/factions/redfor_china_2010.json b/resources/factions/redfor_china_2010.json
index c7b1fe0d..9acd9203 100644
--- a/resources/factions/redfor_china_2010.json
+++ b/resources/factions/redfor_china_2010.json
@@ -31,7 +31,7 @@
   ],
   "frontline_units": [
     "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
     "HQ_7_Self_Propelled_LN",
     "IFV_BMP_1",
     "IFV_BMP_2",
@@ -46,8 +46,8 @@
   ],
   "artillery_units": [
     "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/redfor_russia_2010.json b/resources/factions/redfor_russia_2010.json
index be4023fa..9d23f41c 100644
--- a/resources/factions/redfor_russia_2010.json
+++ b/resources/factions/redfor_russia_2010.json
@@ -31,7 +31,7 @@
   ],
   "frontline_units": [
     "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
     "HQ_7_Self_Propelled_LN",
     "IFV_BMP_1",
     "IFV_BMP_2",
@@ -46,8 +46,8 @@
   ],
   "artillery_units": [
     "MLRS_9A52_Smerch_HE_300mm",
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json
index a3964056..624daaae 100644
--- a/resources/factions/russia_1955.json
+++ b/resources/factions/russia_1955.json
@@ -13,7 +13,7 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "Grad_MRL_FDDM__FC",
     "APC_MTLB",
     "MBT_T_55",
diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json
index 49b21bcc..39685e7b 100644
--- a/resources/factions/russia_1965.json
+++ b/resources/factions/russia_1965.json
@@ -17,7 +17,7 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_BTR_80",
     "APC_BTR_RD",
     "IFV_BMD_1",
diff --git a/resources/factions/russia_1970_limited_air.json b/resources/factions/russia_1970_limited_air.json
index 5ab6a703..3f8cf0aa 100644
--- a/resources/factions/russia_1970_limited_air.json
+++ b/resources/factions/russia_1970_limited_air.json
@@ -10,7 +10,7 @@
     "Mi_24V"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_BTR_80",
     "IFV_BMD_1",
     "IFV_BMP_1",
@@ -19,7 +19,7 @@
   ],
   "artillery_units": [
     "MLRS_BM_21_Grad_122mm",
-    "SPH_2S9_Nona_120mm_M",
+    "SPM_2S9_Nona_120mm_M",
     "SPH_2S1_Gvozdika_122mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json
index d931e313..6fe0f30c 100644
--- a/resources/factions/russia_1975.json
+++ b/resources/factions/russia_1975.json
@@ -23,7 +23,7 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_BTR_80",
     "IFV_BMD_1",
     "IFV_BMP_1",
@@ -32,7 +32,7 @@
   ],
   "artillery_units": [
     "MLRS_BM_21_Grad_122mm",
-    "SPH_2S9_Nona_120mm_M",
+    "SPM_2S9_Nona_120mm_M",
     "SPH_2S1_Gvozdika_122mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json
index ce40dc11..37d74a10 100644
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -35,7 +35,7 @@
     "SAM_SA_13_Strela_10M3_Gopher_TEL"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_2010.json b/resources/factions/russia_2010.json
index d2df9602..29cdf41e 100644
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -34,14 +34,14 @@
     "IFV_BMP_2",
     "IFV_BMP_3",
     "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
     "MBT_T_90",
     "MBT_T_80U",
     "MBT_T_72B3",
     "SAM_SA_19_Tunguska_Grison"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_2010_hds.json b/resources/factions/russia_2010_hds.json
index 23799043..61605e2e 100644
--- a/resources/factions/russia_2010_hds.json
+++ b/resources/factions/russia_2010_hds.json
@@ -34,14 +34,14 @@
     "IFV_BMP_2",
     "IFV_BMP_3",
     "APC_BTR_80",
-    "APC_BTR_82A",
+    "IFV_BTR_82A",
     "MBT_T_90",
     "MBT_T_80U",
     "MBT_T_72B3",
     "SAM_SA_19_Tunguska_Grison"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/russia_2020.json b/resources/factions/russia_2020.json
index 0ada877b..35a5b242 100644
--- a/resources/factions/russia_2020.json
+++ b/resources/factions/russia_2020.json
@@ -39,7 +39,7 @@
     "SAM_SA_19_Tunguska_Grison"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
+    "MLRS_9K57_Uragan_BM_27_220mm",
     "SPH_2S19_Msta_152mm"
   ],
   "logistics_units": [
diff --git a/resources/factions/soviet_union_1943.json b/resources/factions/soviet_union_1943.json
index 3be02dd0..4958d0c7 100644
--- a/resources/factions/soviet_union_1943.json
+++ b/resources/factions/soviet_union_1943.json
@@ -8,11 +8,11 @@
     "I_16"
   ],
   "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
     "Car_Daimler_Armored",
     "LT_Mk_VII_Tetrarch",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
     "MLRS_BM_21_Grad_122mm"
diff --git a/resources/factions/spain_1990.json b/resources/factions/spain_1990.json
index 6dd974be..65b7b03c 100644
--- a/resources/factions/spain_1990.json
+++ b/resources/factions/spain_1990.json
@@ -19,7 +19,7 @@
   ],
   "frontline_units": [
     "MBT_M60A3_Patton",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "APC_M113",
     "SAM_Avenger__Stinger"
   ],
diff --git a/resources/factions/sweden_1970.json b/resources/factions/sweden_1970.json
index 30bcdcb7..3de20841 100644
--- a/resources/factions/sweden_1970.json
+++ b/resources/factions/sweden_1970.json
@@ -17,7 +17,7 @@
   ],
   "frontline_units": [
     "IFV_Warrior",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "IFV_M1126_Stryker_ICV",
     "SAM_Chaparral_M48"
   ],
diff --git a/resources/factions/sweden_1990.json b/resources/factions/sweden_1990.json
index 2ea024b9..42dd4c28 100644
--- a/resources/factions/sweden_1990.json
+++ b/resources/factions/sweden_1990.json
@@ -16,7 +16,7 @@
   ],
   "frontline_units": [
     "IFV_Warrior",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "IFV_M1126_Stryker_ICV",
     "SAM_Avenger__Stinger"
   ],
diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json
index 79cd7438..ad05776d 100644
--- a/resources/factions/syria_1948.json
+++ b/resources/factions/syria_1948.json
@@ -10,9 +10,9 @@
   "frontline_units": [
     "IFV_Sd_Kfz_234_2_Puma",
     "APC_Sd_Kfz_251_Halftrack",
-    "MT_PzIV_H",
-    "MT_M4_Sherman",
-    "AAA_40mm_Bofors"
+    "Tk_PzIV_H",
+    "Tk_M4_Sherman",
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
   ],
diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json
index b2e93159..5e092ed9 100644
--- a/resources/factions/syria_1967.json
+++ b/resources/factions/syria_1967.json
@@ -17,8 +17,8 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
-    "MT_PzIV_H",
+    "Scout_BRDM_2",
+    "Tk_PzIV_H",
     "MBT_T_55",
     "SPAAA_ZU_23_2_Mounted_Ural_375",
     "SPAAA_ZSU_57_2",
diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json
index 34fbaf1d..cfab65fc 100644
--- a/resources/factions/syria_1967_with_ww2_weapons.json
+++ b/resources/factions/syria_1967_with_ww2_weapons.json
@@ -18,9 +18,9 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "MBT_T_55",
-    "MT_PzIV_H",
+    "Tk_PzIV_H",
     "SPG_StuG_III_Ausf__G",
     "SPG_Jagdpanzer_IV",
     "SPAAA_ZSU_57_2",
diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json
index ae2211a5..3a5a3d21 100644
--- a/resources/factions/syria_2011.json
+++ b/resources/factions/syria_2011.json
@@ -26,17 +26,17 @@
     "IFV_BMP_1",
     "IFV_BMP_2",
     "APC_BTR_80",
-    "IFV_BRDM_2",
+    "Scout_BRDM_2",
     "APC_MTLB",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "MBT_T_55",
     "MBT_T_72B",
     "MBT_T_90",
     "SPAAA_ZSU_57_2"
   ],
   "artillery_units": [
-    "MLRS_BM_27_Uragan_220mm",
-    "SPH_2S9_Nona_120mm_M",
+    "MLRS_9K57_Uragan_BM_27_220mm",
+    "SPM_2S9_Nona_120mm_M",
     "MLRS_BM_21_Grad_122mm",
     "SPH_2S1_Gvozdika_122mm"
   ],
diff --git a/resources/factions/turkey_2005.json b/resources/factions/turkey_2005.json
index f5c7847c..dfe8df1e 100644
--- a/resources/factions/turkey_2005.json
+++ b/resources/factions/turkey_2005.json
@@ -17,10 +17,10 @@
     "KC130"
   ],
   "frontline_units": [
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4_Trs",
     "MBT_Leopard_1A3",
     "MBT_M60A3_Patton",
-    "APC_Cobra__Scout",
+    "Scout_Cobra",
     "APC_BTR_80",
     "SAM_Avenger__Stinger"
   ],
diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json
index 32f44303..e8b0a990 100644
--- a/resources/factions/uk_1944.json
+++ b/resources/factions/uk_1944.json
@@ -16,14 +16,14 @@
   ],
   "frontline_units": [
     "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
     "CT_Cromwell_IV",
     "CT_Centaur_IV",
     "HIT_Churchill_VII",
     "Car_Daimler_Armored",
     "LT_Mk_VII_Tetrarch",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
   ],
diff --git a/resources/factions/uk_1990.json b/resources/factions/uk_1990.json
index 9f88bb79..492a3d99 100644
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -20,7 +20,7 @@
   "frontline_units": [
     "MBT_Challenger_II",
     "IFV_Warrior",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Avenger__Stinger"
   ],
@@ -71,4 +71,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ_9_Reaper"
-}
\ No newline at end of file
+}
diff --git a/resources/factions/ukraine_2010.json b/resources/factions/ukraine_2010.json
index d8fd710b..644b9799 100644
--- a/resources/factions/ukraine_2010.json
+++ b/resources/factions/ukraine_2010.json
@@ -20,7 +20,7 @@
     "IL_78M"
   ],
   "frontline_units": [
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "IFV_BMP_3",
     "IFV_BMP_2",
     "APC_BTR_80",
diff --git a/resources/factions/unc_1950_fictional.json b/resources/factions/unc_1950_fictional.json
index dae56d1f..7651897b 100644
--- a/resources/factions/unc_1950_fictional.json
+++ b/resources/factions/unc_1950_fictional.json
@@ -12,11 +12,11 @@
     "P_47D_40"
   ],
   "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "MBT_M60A3_Patton",
     "APC_M2A1_Halftrack",
     "Car_M8_Greyhound_Armored",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
     "SPG_M12_GMC_155mm"
@@ -38,4 +38,4 @@
   "requirements": {
       "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/us_aggressors.json b/resources/factions/us_aggressors.json
index ef43854b..08a898a9 100644
--- a/resources/factions/us_aggressors.json
+++ b/resources/factions/us_aggressors.json
@@ -31,11 +31,11 @@
   ],
   "frontline_units": [
     "MBT_M1A2_Abrams",
-    "MBT_Leopard_2",
+    "MBT_Leopard_2A4",
     "ATGM_Stryker",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "SAM_Avenger__Stinger"
   ],
   "artillery_units": [
@@ -82,4 +82,4 @@
       "vf-74 adversary"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usa_1944.json b/resources/factions/usa_1944.json
index 7b846324..c50e37e8 100644
--- a/resources/factions/usa_1944.json
+++ b/resources/factions/usa_1944.json
@@ -15,7 +15,7 @@
   ],
   "frontline_units": [
     "MT_M4A4_Sherman_Firefly",
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "APC_M2A1_Halftrack",
     "Car_M8_Greyhound_Armored",
     "SPG_M10_GMC",
diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json
index 0dd8262b..8233e991 100644
--- a/resources/factions/usa_1955.json
+++ b/resources/factions/usa_1955.json
@@ -11,10 +11,10 @@
     "P_51D_30_NA"
   ],
   "frontline_units": [
-    "MT_M4_Sherman",
+    "Tk_M4_Sherman",
     "MBT_M60A3_Patton",
     "APC_M2A1_Halftrack",
-    "AAA_40mm_Bofors"
+    "AAA_Bofors_40mm"
   ],
   "artillery_units": [
     "SPG_M12_GMC_155mm"
@@ -34,4 +34,4 @@
   "requirements": {
       "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/"
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usa_1990.json b/resources/factions/usa_1990.json
index 18d18849..40e0030f 100644
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -39,7 +39,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Avenger__Stinger"
   ],
@@ -119,4 +119,4 @@
       "VMFA-323"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usa_2005.json b/resources/factions/usa_2005.json
index 57869deb..90870d7f 100644
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -39,7 +39,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Avenger__Stinger",
     "SAM_Linebacker___Bradley_M6",
@@ -119,4 +119,4 @@
       "VMFA-323"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usa_2005_c130.json b/resources/factions/usa_2005_c130.json
index 54e4823e..a372546f 100644
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -40,7 +40,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Avenger__Stinger",
     "SAM_Linebacker___Bradley_M6"
@@ -121,4 +121,4 @@
       "VMFA-323"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usa_2005_modded.json b/resources/factions/usa_2005_modded.json
index cc8ca114..7b35e379 100644
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -35,7 +35,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV",
     "SAM_Avenger__Stinger",
     "SAM_Linebacker___Bradley_M6"
@@ -116,4 +116,4 @@
       "VMFA-323"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/resources/factions/usn_1985.json b/resources/factions/usn_1985.json
index 0f65fcb6..fc82a2eb 100644
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -21,7 +21,7 @@
   "frontline_units": [
     "MBT_M60A3_Patton",
     "APC_M113",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "SPAAA_Vulcan_M163"
   ],
   "artillery_units": [
@@ -87,4 +87,4 @@
       "VFA-97"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/tests/resources/invalid_faction_country.json b/tests/resources/invalid_faction_country.json
index 245c66f1..50f3fe11 100644
--- a/tests/resources/invalid_faction_country.json
+++ b/tests/resources/invalid_faction_country.json
@@ -30,7 +30,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV"
   ],
   "artillery_units": [
@@ -83,4 +83,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ_9_Reaper"
-}
\ No newline at end of file
+}
diff --git a/tests/resources/valid_faction.json b/tests/resources/valid_faction.json
index c31b2c8a..1ee00e13 100644
--- a/tests/resources/valid_faction.json
+++ b/tests/resources/valid_faction.json
@@ -32,7 +32,7 @@
     "IFV_M1126_Stryker_ICV",
     "IFV_M2A2_Bradley",
     "IFV_LAV_25",
-    "APC_HMMWV__Scout",
+    "Scout_HMMWV",
     "ATGM_HMMWV"
   ],
   "artillery_units": [
@@ -85,4 +85,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ_9_Reaper"
-}
\ No newline at end of file
+}
diff --git a/tests/test_factions.py b/tests/test_factions.py
index 5b65abb5..232786d4 100644
--- a/tests/test_factions.py
+++ b/tests/test_factions.py
@@ -82,7 +82,7 @@ class TestFactionLoader(unittest.TestCase):
             self.assertIn(Armor.IFV_M1126_Stryker_ICV, faction.frontline_units)
             self.assertIn(Armor.IFV_M2A2_Bradley, faction.frontline_units)
             self.assertIn(Armor.IFV_LAV_25, faction.frontline_units)
-            self.assertIn(Armor.APC_HMMWV__Scout, faction.frontline_units)
+            self.assertIn(Armor.Scout_HMMWV, faction.frontline_units)
             self.assertIn(Armor.ATGM_HMMWV, faction.frontline_units)
 
             self.assertIn(Artillery.MLRS_M270_227mm, faction.artillery_units)