diff --git a/Script/Library/ObjectNames.lua b/Script/Library/ObjectNames.lua
index e796a9a..54d81c8 100644
--- a/Script/Library/ObjectNames.lua
+++ b/Script/Library/ObjectNames.lua
@@ -48,253 +48,253 @@ do
     local namesTable = {
         ["1L13 EWR"] = "EWR 1L13",
         ["2B11 mortar"] = "Mortar 2B11 120mm",
-        ["2S6 Tunguska"] = "SAM SA-19 Tunguska \"Grison\" ",
+        ["2S6 Tunguska"] = "SA-19",
         ["55G6 EWR"] = "EWR 55G6",
-        ["5p73 s-125 ln"] = "SAM SA-3 S-125 \"Goa\" LN",
+        ["5p73 s-125 ln"] = "SA-3 launcher",
         ["A-10A"] = "A-10A",
         ["A-10C"] = "A-10C",
-        ["A-10C_2"] = "A-10C II",
+        ["A-10C_2"] = "A-10C",
         ["A-20G"] = "A-20G",
         ["A-50"] = "A-50",
-        ["AA8"] = "Firefighter Vehicle AA-7.2/60",
-        ["AAV7"] = "APC AAV-7 Amphibious",
+        ["AA8"] = "fire truck",
+        ["AAV7"] = "AAV-7",
         ["AH-1W"] = "AH-1W",
         ["AH-64A"] = "AH-64A",
         ["AH-64D"] = "AH-64D",
-        ["AH-64D_BLK_II"] = "AH-64D BLK.II",
+        ["AH-64D_BLK_II"] = "AH-64D",
         ["AJS37"] = "AJS37",
-        ["ALBATROS"] = "Corvette 1124.4 Grisha",
-        ["ATMZ-5"] = "Refueler ATMZ-5",
-        ["ATZ-10"] = "Refueler ATZ-10",
-        ["ATZ-5"] = "Refueler ATZ-5",
-        ["ATZ-60_Maz"] = "Refueler ATZ-60 Tractor (MAZ-7410)",
-        ["AV8BNA"] = "AV-8B N/A",
-        ["Allies_Director"] = "Allies Rangefinder (DRT)",
+        ["ALBATROS"] = "Grisha-class corvette",
+        ["ATMZ-5"] = "ATMZ-5 fuel truck",
+        ["ATZ-10"] = "ATZ-10 fuel truck",
+        ["ATZ-5"] = "ATZ-5 fuel truck",
+        ["ATZ-60_Maz"] = "ATZ-60 fuel truck",
+        ["AV8BNA"] = "AV-8B",
+        ["Allies_Director"] = "Allies Rangefinder",
         ["An-26B"] = "An-26B",
         ["An-30M"] = "An-30M",
         ["B-17G"] = "B-17G",
         ["B-1B"] = "B-1B",
         ["B-52H"] = "B-52H",
-        ["B600_drivable"] = "M92 B600 drivable",
-        ["BDK-775"] = "LS Ropucha",
-        ["BMD-1"] = "IFV BMD-1",
-        ["BMP-1"] = "IFV BMP-1",
-        ["BMP-2"] = "IFV BMP-2",
-        ["BMP-3"] = "IFV BMP-3",
-        ["BRDM-2"] = "Scout BRDM-2",
-        ["BTR-80"] = "APC BTR-80",
-        ["BTR-82A"] = "IFV BTR-82A",
-        ["BTR_D"] = "APC BTR-RD",
-        ["Bedford_MWD"] = "Truck Bedford",
-        ["Bf-109K-4"] = "Bf 109 K-4",
-        ["Blitz_36-6700A"] = "Truck Opel Blitz",
+        ["B600_drivable"] = "B600 tug",
+        ["BDK-775"] = "Ropucha-class landing ship",
+        ["BMD-1"] = "BMD-1 IFV",
+        ["BMP-1"] = "BMP-1 IFV",
+        ["BMP-2"] = "BMP-2 IFV",
+        ["BMP-3"] = "BMP-3 IFV",
+        ["BRDM-2"] = "BRDM-2 APC",
+        ["BTR-80"] = "BTR-80 APC",
+        ["BTR-82A"] = "BTR-82A IFV",
+        ["BTR_D"] = "BTR-RD APC",
+        ["Bedford_MWD"] = "Bedford truck",
+        ["Bf-109K-4"] = "Bf 109",
+        ["Blitz_36-6700A"] = "Opel Blitz truck",
         ["Boxcartrinity"] = "Flatcar",
-        ["Bunker"] = "Bunker 2",
+        ["Bunker"] = "Bunker",
         ["C-101CC"] = "C-101CC",
         ["C-101EB"] = "C-101EB",
         ["C-130"] = "C-130",
         ["C-17A"] = "C-17A",
         ["C-47"] = "C-47",
-        ["CCKW_353"] = "Truck GMC \"Jimmy\" 6x6",
+        ["CCKW_353"] = "CCKW 353 truck",
         ["CH-47D"] = "CH-47D",
         ["CH-47Fbl1"] = "CH-47F",
         ["CH-53E"] = "CH-53E",
-        ["CVN_71"] = "CVN-71 Theodore Roosevelt",
-        ["CVN_72"] = "CVN-72 Abraham Lincoln",
-        ["CVN_73"] = "CVN-73 George Washington",
-        ["CVN_75"] = "CVN-75 Harry S. Truman",
-        ["CV_1143_5"] = "CV 1143.5 Admiral Kuznetsov(2017)",
-        ["CastleClass_01"] = "Castle Class",
-        ["Centaur_IV"] = "Tk Centaur IV CS",
-        ["Challenger2"] = "MBT Challenger II",
-        ["Chieftain_mk3"] = "MBT Chieftain Mk.3",
+        ["CVN_71"] = "Nimitz-class carrier",
+        ["CVN_72"] = "Nimitz-class carrier",
+        ["CVN_73"] = "Nimitz-class carrier",
+        ["CVN_75"] = "Nimitz-class carrier",
+        ["CV_1143_5"] = "Kuznetsov-class carrier",
+        ["CastleClass_01"] = "Castle-class ship",
+        ["Centaur_IV"] = "Centaur IV tank",
+        ["Challenger2"] = "Challenger II MBT",
+        ["Chieftain_mk3"] = "Chieftain tank",
         ["Christen Eagle II"] = "Christen Eagle II",
-        ["Churchill_VII"] = "Tk Churchill VII",
-        ["Coach a passenger"] = "Passenger Car",
-        ["Coach a platform"] = "Coach Platform",
-        ["Coach a tank blue"] = "Tank Car blue",
-        ["Coach a tank yellow"] = "Tank Car yellow",
-        ["Coach cargo"] = "Freight Van",
-        ["Coach cargo open"] = "Open Wagon",
-        ["Cobra"] = "Scout Cobra",
-        ["Cromwell_IV"] = "Tk Cromwell IV",
-        ["DRG_Class_86"] = "Loco DRG Class 86",
-        ["DR_50Ton_Flat_Wagon"] = "DR 50-ton flat wagon",
-        ["Daimler_AC"] = "Car Daimler Armored",
-        ["Dog Ear radar"] = "MCC-SR Sborka \"Dog Ear\" SR",
-        ["Dry-cargo ship-1"] = "Bulker Yakushev",
-        ["Dry-cargo ship-2"] = "Cargo Ivanov",
+        ["Churchill_VII"] = "Churchill VII tank",
+        ["Coach a passenger"] = "passenger car",
+        ["Coach a platform"] = "coach",
+        ["Coach a tank blue"] = "coach",
+        ["Coach a tank yellow"] = "coach",
+        ["Coach cargo"] = "freight van",
+        ["Coach cargo open"] = "open wagon",
+        ["Cobra"] = "Cobra APC",
+        ["Cromwell_IV"] = "Cromwell tank",
+        ["DRG_Class_86"] = "armored locomotive",
+        ["DR_50Ton_Flat_Wagon"] = "armored train wagon",
+        ["Daimler_AC"] = "Daimler armoured car",
+        ["Dog Ear radar"] = "\"Dog Ear\" search radar",
+        ["Dry-cargo ship-1"] = "cargo ship",
+        ["Dry-cargo ship-2"] = "cargo ship",
         ["E-2C"] = "E-2D",
         ["E-3A"] = "E-3A",
-        ["ELNYA"] = "Tanker Elnya 160",
-        ["ES44AH"] = "Loco ES44AH",
-        ["Electric locomotive"] = "Loco VL80 Electric",
-        ["Elefant_SdKfz_184"] = "SPG Elefant TD",
-        ["Essex"] = "Essex Class Carrier 1944",
+        ["ELNYA"] = "Altay-class oiler",
+        ["ES44AH"] = "locomotive",
+        ["Electric locomotive"] = "locomotive",
+        ["Elefant_SdKfz_184"] = "Jagdpanzer Elefant",
+        ["Essex"] = "Essex-class carrier",
         ["F-117A"] = "F-117A",
         ["F-14A"] = "F-14A",
-        ["F-14A-135-GR"] = "F-14A-135-GR",
+        ["F-14A-135-GR"] = "F-14A",
         ["F-14B"] = "F-14B",
         ["F-15C"] = "F-15C",
         ["F-15E"] = "F-15E",
-        ["F-15ESE"] = "F-15E S4+",
+        ["F-15ESE"] = "F-15E",
         ["F-16A"] = "F-16A",
-        ["F-16A MLU"] = "F-16A MLU",
-        ["F-16C bl.50"] = "F-16C bl.50",
-        ["F-16C bl.52d"] = "F-16C bl.52d",
-        ["F-16C_50"] = "F-16CM bl.50",
+        ["F-16A MLU"] = "F-16A",
+        ["F-16C bl.50"] = "F-16C",
+        ["F-16C bl.52d"] = "F-16C",
+        ["F-16C_50"] = "F-16C",
         ["F-4E"] = "F-4E",
-        ["F-4E-45MC"] = "F-4E-45MC",
+        ["F-4E-45MC"] = "F-4E",
         ["F-5E"] = "F-5E",
-        ["F-5E-3"] = "F-5E-3",
-        ["F-5E-3_FC"] = "F-5E FC",
+        ["F-5E-3"] = "F-5E",
+        ["F-5E-3_FC"] = "F-5E",
         ["F-86F Sabre"] = "F-86F",
-        ["F-86F_FC"] = "F-86F FC",
+        ["F-86F_FC"] = "F-86F",
         ["F/A-18A"] = "F/A-18A",
         ["F/A-18C"] = "F/A-18C",
-        ["F4U-1D"] = "F4U-1D",
-        ["F4U-1D_CW"] = "F4U-1D Mk.IV",
-        ["FA-18C_hornet"] = "F/A-18C Lot 20",
-        ["FPS-117"] = "EWR AN/FPS-117 Radar",
-        ["FPS-117 Dome"] = "EWR AN/FPS-117 Radar (domed)",
-        ["FPS-117 ECS"] = "EWR AN/FPS-117 ECS",
-        ["FW-190A8"] = "Fw 190 A-8",
-        ["FW-190D9"] = "Fw 190 D-9",
-        ["Falcon_Gyrocopter"] = "Falcon Assault Gyrocopter",
-        ["Flakscheinwerfer_37"] = "SL Flakscheinwerfer 37",
-        ["Forrestal"] = "CV-59 Forrestal",
-        ["FuMG-401"] = "EWR FuMG-401 Freya LZ",
-        ["FuSe-65"] = "EWR FuSe-65 Würzburg-Riese",
-        ["GAZ-3307"] = "Truck GAZ-3307",
-        ["GAZ-3308"] = "Truck GAZ-3308",
-        ["GAZ-66"] = "Truck GAZ-66",
-        ["GD-20"] = "GD-20 Lift Truck",
-        ["Gepard"] = "SPAAA Gepard",
-        ["German_covered_wagon_G10"] = "Wagon G10 (Germany)",
-        ["German_tank_wagon"] = "Tank Car (Germany)",
-        ["Grad-URAL"] = "MLRS BM-21 Grad 122mm",
-        ["Grad_FDDM"] = "Grad MRL FDDM (FC)",
+        ["F4U-1D"] = "F4U Corsair",
+        ["F4U-1D_CW"] = "F4U Corsair",
+        ["FA-18C_hornet"] = "F/A-18C",
+        ["FPS-117"] = "FPS-117 search radar",
+        ["FPS-117 Dome"] = "FPS-117 radar dome",
+        ["FPS-117 ECS"] = "FPS-117 search radar",
+        ["FW-190A8"] = "Fw 190",
+        ["FW-190D9"] = "Fw 190",
+        ["Falcon_Gyrocopter"] = "gyrocopter",
+        ["Flakscheinwerfer_37"] = "Flakscheinwerfer 37",
+        ["Forrestal"] = "Forrestal-class carrier",
+        ["FuMG-401"] = "Freya radar",
+        ["FuSe-65"] = "Würzburg radar",
+        ["GAZ-3307"] = "GAZ-3307 truck",
+        ["GAZ-3308"] = "GAZ-3308 truck",
+        ["GAZ-66"] = "GAZ-66 truck",
+        ["GD-20"] = "GD-20 lift truck",
+        ["Gepard"] = "Flakpanzer Gepard",
+        ["German_covered_wagon_G10"] = "covered wagon",
+        ["German_tank_wagon"] = "tank wagon",
+        ["Grad-URAL"] = "BM-21 Grad MLRS",
+        ["Grad_FDDM"] = "Grad MRL FDDM (FC)", -- TODO
         ["H-6J"] = "H-6J",
-        ["HEMTT TFFT"] = "Firefighter HEMMT TFFT",
-        ["HEMTT_C-RAM_Phalanx"] = "LPWS C-RAM",
-        ["HL_B8M1"] = "MLRS HL with B8M1 80mm",
-        ["HL_DSHK"] = "Scout HL with DSHK 12.7mm",
-        ["HL_KORD"] = "Scout HL with KORD 12.7mm",
-        ["HL_ZU-23"] = "SPAAA HL with ZU-23",
-        ["HQ-7_LN_P"] = "HQ-7 SHORAD TELAR (Player)",
-        ["HQ-7_LN_SP"] = "HQ-7B SHORAD TELAR",
-        ["HQ-7_STR_SP"] = "HQ-7B SHORAD SR",
-        ["HandyWind"] = "Bulker Handy Wind",
-        ["HarborTug"] = "Harbor Tug",
+        ["HEMTT TFFT"] = "HEMMT TFFT fire truck",
+        ["HEMTT_C-RAM_Phalanx"] = "Centurion C-RAM",
+        ["HL_B8M1"] = "MLRS HL with B8M1 80mm", -- TODO
+        ["HL_DSHK"] = "Scout HL with DSHK 12.7mm", -- TODO
+        ["HL_KORD"] = "Scout HL with KORD 12.7mm", -- TODO
+        ["HL_ZU-23"] = "SPAAA HL with ZU-23", -- TODO
+        ["HQ-7_LN_P"] = "HQ-7 SHORAD",
+        ["HQ-7_LN_SP"] = "HQ-7B SHORAD",
+        ["HQ-7_STR_SP"] = "HQ-7B SHORAD search radar",
+        ["HandyWind"] = "bulker ship",
+        ["HarborTug"] = "harbor tug",
         ["Hawk"] = "Hawk",
-        ["Hawk cwar"] = "SAM Hawk CWAR AN/MPQ-55",
-        ["Hawk ln"] = "SAM Hawk LN M192",
-        ["Hawk pcp"] = "SAM Hawk Platoon Command Post (PCP)",
-        ["Hawk sr"] = "SAM Hawk SR (AN/MPQ-50)",
-        ["Hawk tr"] = "SAM Hawk TR (AN/MPQ-46)",
-        ["Higgins_boat"] = "Boat LCVP Higgins",
-        ["Horch_901_typ_40_kfz_21"] = "LUV Horch 901 Staff Car",
-        ["Hummer"] = "LUV HMMWV Jeep",
+        ["Hawk cwar"] = "Hawk SAM radar",
+        ["Hawk ln"] = "Hawk SAM launcher",
+        ["Hawk pcp"] = "Hawk SAM command post",
+        ["Hawk sr"] = "Hawk SAM search radar",
+        ["Hawk tr"] = "Hawk SAM tracker radar",
+        ["Higgins_boat"] = "Higgins landing craft",
+        ["Horch_901_typ_40_kfz_21"] = "Horch 901 car",
+        ["Hummer"] = "Hummer",
         ["I-16"] = "I-16",
-        ["IKARUS Bus"] = "Bus IKARUS-280",
+        ["IKARUS Bus"] = "IKARUS-280 bus",
         ["IL-76MD"] = "IL-76MD",
         ["IL-78M"] = "IL-78M",
-        ["IMPROVED_KILO"] = "SSK 636 Improved Kilo",
-        ["Igla manpad INS"] = "MANPADS SA-18 Igla \"Grouse\" Ins",
-        ["Infantry AK"] = "Infantry AK-74 Rus ver1",
-        ["Infantry AK Ins"] = "Insurgent AKM",
-        ["Infantry AK ver2"] = "Infantry AK-74 Rus ver2",
-        ["Infantry AK ver3"] = "Infantry AK-74 Rus ver3",
+        ["IMPROVED_KILO"] = "Kilo-class submarine",
+        ["Igla manpad INS"] = "SA-18 MANPADS",
+        ["Infantry AK"] = "infantry",
+        ["Infantry AK Ins"] = "infantry",
+        ["Infantry AK ver2"] = "infantry",
+        ["Infantry AK ver3"] = "infantry",
         ["J-11A"] = "J-11A",
         ["JF-17"] = "JF-17",
         ["JTAC"] = "JTAC",
-        ["JagdPz_IV"] = "SPG Jagdpanzer IV TD",
-        ["Jagdpanther_G1"] = "SPG Jagdpanther TD",
-        ["Ju-88A4"] = "Ju 88 A-4",
-        ["KAMAZ Truck"] = "Truck KAMAZ 43101",
+        ["JagdPz_IV"] = "Jagdpanzer IV",
+        ["Jagdpanther_G1"] = "Jagdpanther",
+        ["Ju-88A4"] = "Junkers Ju 88",
+        ["KAMAZ Truck"] = "KAMAZ 43101 truck",
         ["KC-135"] = "KC-135",
         ["KC130"] = "KC-130",
         ["KC135MPRS"] = "KC-135MPRS",
-        ["KDO_Mod40"] = "AAA Kdo.G.40",
-        ["KILO"] = "SSK 877V Kilo",
-        ["KJ-2000"] = "KJ-2000",
-        ["KS-19"] = "AAA KS-19 100mm",
-        ["KUZNECOW"] = "CV 1143.5 Admiral Kuznetsov",
+        ["KDO_Mod40"] = "AAA Kdo.G.40", -- TODO
+        ["KILO"] = "Kilo-class submarine",
+        ["KJ-2000"] = "KJ-2000", -- TODO
+        ["KS-19"] = "KS-19 AAA",
+        ["KUZNECOW"] = "Kuznetsov-class carrier",
         ["Ka-27"] = "Ka-27",
         ["Ka-50"] = "Ka-50",
-        ["Ka-50_3"] = "Ka-50 III",
-        ["KrAZ6322"] = "Truck KrAZ-6322 6x6",
-        ["Kub 1S91 str"] = "SAM SA-6 Kub \"Straight Flush\" STR",
-        ["Kub 2P25 ln"] = "SAM SA-6 Kub \"Gainful\" TEL",
-        ["Kubelwagen_82"] = "LUV Kubelwagen Jeep",
+        ["Ka-50_3"] = "Ka-50",
+        ["KrAZ6322"] = "KrAZ-6322 truck",
+        ["Kub 1S91 str"] = "SA-6 radar",
+        ["Kub 2P25 ln"] = "SA-6 TEL",
+        ["Kubelwagen_82"] = "Kübelwagen Jeep",
         ["L-39C"] = "L-39C",
         ["L-39ZA"] = "L-39ZA",
-        ["L118_Unit"] = "L118 Light Artillery Gun",
-        ["LARC-V"] = "Truck LARC-V",
-        ["LAV-25"] = "IFV LAV-25",
-        ["LAZ Bus"] = "Bus LAZ-695",
-        ["LHA_Tarawa"] = "LHA-1 Tarawa",
-        ["LST_Mk2"] = "LST Mk.II",
-        ["La_Combattante_II"] = "FAC La Combattante IIa",
-        ["Land_Rover_101_FC"] = "Truck Land Rover 101 FC",
-        ["Land_Rover_109_S3"] = "LUV Land Rover 109",
-        ["LeFH_18-40-105"] = "FH LeFH-18 105mm",
-        ["Leclerc"] = "MBT Leclerc",
-        ["Leopard-2"] = "MBT Leopard-2A6M",
-        ["Leopard-2A5"] = "MBT Leopard-2A5",
-        ["Leopard1A3"] = "MBT Leopard 1A3",
-        ["LiAZ Bus"] = "Bus LiAZ-677",
-        ["Locomotive"] = "Loco CHME3T",
-        ["M 818"] = "Truck M939 Heavy",
-        ["M-1 Abrams"] = "MBT M1A2 Abrams",
-        ["M-109"] = "SPH M109 Paladin 155mm",
-        ["M-113"] = "APC M113",
-        ["M-2 Bradley"] = "IFV M2A2 Bradley",
-        ["M-2000C"] = "M-2000C",
-        ["M-60"] = "MBT M60A3 Patton",
-        ["M1043 HMMWV Armament"] = "Scout HMMWV",
-        ["M1045 HMMWV TOW"] = "ATGM HMMWV",
-        ["M1097 Avenger"] = "SAM Avenger (Stinger)",
-        ["M10_GMC"] = "SPG M10 GMC TD",
-        ["M1126 Stryker ICV"] = "IFV M1126 Stryker ICV",
-        ["M1128 Stryker MGS"] = "SPG Stryker MGS",
-        ["M1134 Stryker ATGM"] = "ATGM Stryker",
-        ["M12_GMC"] = "SPH M12 GMC 155mm",
-        ["M1A2C_SEP_V3"] = "MBT M1A2C SEP v3 Abrams",
-        ["M1_37mm"] = "AAA M1 37mm",
-        ["M2A1-105"] = "FH M2A1 105mm",
-        ["M2A1_halftrack"] = "APC M2A1 Halftrack",
-        ["M30_CC"] = "Ammo M30 Cargo Carrier",
-        ["M45_Quadmount"] = "AAA M45 Quadmount HB 12.7mm",
-        ["M48 Chaparral"] = "SAM Chaparral M48",
-        ["M4A4_Sherman_FF"] = "Tk M4A4 Sherman Firefly",
-        ["M4_Sherman"] = "Tk M4 Sherman",
-        ["M4_Tractor"] = "Tractor M4 High Speed",
-        ["M6 Linebacker"] = "SAM Linebacker - Bradley M6",
-        ["M8_Greyhound"] = "Scout M8 Greyhound AC",
-        ["M978 HEMTT Tanker"] = "Refueler M978 HEMTT",
-        ["MAZ-6303"] = "Truck MAZ-6303",
+        ["L118_Unit"] = "L118 light gun",
+        ["LARC-V"] = "LARC-V truck",
+        ["LAV-25"] = "LAV-25 IFV",
+        ["LAZ Bus"] = "LAZ-695 bus",
+        ["LHA_Tarawa"] = "Tarawa-class landing ship",
+        ["LST_Mk2"] = "Landing Ship Tank",
+        ["La_Combattante_II"] = "La Combattante-class missile boat",
+        ["Land_Rover_101_FC"] = "Land Rover 101 truck",
+        ["Land_Rover_109_S3"] = "Land Rover 109 truck",
+        ["LeFH_18-40-105"] = "leFH 18 howitzer",
+        ["Leclerc"] = "Leclerc MBT",
+        ["Leopard-2"] = "Leopard 2 MBT",
+        ["Leopard-2A5"] = "Leopard 2 MBT",
+        ["Leopard1A3"] = "Leopard MBT",
+        ["LiAZ Bus"] = "LiAZ-677 bus",
+        ["Locomotive"] = "locomotive",
+        ["M 818"] = "M939 truck",
+        ["M-1 Abrams"] = "M1 Abrams MBT",
+        ["M-109"] = "M109 Paladin howitzer",
+        ["M-113"] = "M113 APC",
+        ["M-2 Bradley"] = "M2 Bradley IFV",
+        ["M-2000C"] = "Mirage 2000C",
+        ["M-60"] = "M60 Patton MBT",
+        ["M1043 HMMWV Armament"] = "Humvee",
+        ["M1045 HMMWV TOW"] = "Humvee",
+        ["M1097 Avenger"] = "Avenger SAM",
+        ["M10_GMC"] = "M10 tank destroyer",
+        ["M1126 Stryker ICV"] = "Stryker IFV",
+        ["M1128 Stryker MGS"] = "Stryker mobile gun",
+        ["M1134 Stryker ATGM"] = "Stryker ATGM",
+        ["M12_GMC"] = "M12 gun motor carriage",
+        ["M1A2C_SEP_V3"] = "M1 Abrams MBT",
+        ["M1_37mm"] = "M1 37mm AAA",
+        ["M2A1-105"] = "M2A1 howitzer",
+        ["M2A1_halftrack"] = "M2A1 half-track",
+        ["M30_CC"] = "M30 cargo carrier",
+        ["M45_Quadmount"] = "M45 quad mount AAA",
+        ["M48 Chaparral"] = "M48 Chaparral SAM",
+        ["M4A4_Sherman_FF"] = "M4 Sherman tank",
+        ["M4_Sherman"] = "M4 Sherman tank",
+        ["M4_Tractor"] = "M4 tractor",
+        ["M6 Linebacker"] = "Linebacker SAM",
+        ["M8_Greyhound"] = "M8 Greyhound scout",
+        ["M978 HEMTT Tanker"] = "M978 HEMTT fuel truck",
+        ["MAZ-6303"] = "MAZ-6303 truck",
         ["MB-339A"] = "MB-339A",
-        ["MB-339APAN"] = "MB-339A/PAN",
-        ["MCV-80"] = "IFV Warrior ",
-        ["MJ-1_drivable"] = "M92 MJ-1 drivable",
-        ["MLRS"] = "MLRS M270 227mm",
-        ["MLRS FDDM"] = "MRLS FDDM (FC)",
-        ["MOLNIYA"] = "Corvette 1241.1 Molniya",
-        ["MOSCOW"] = "Cruiser 1164 Moskva",
+        ["MB-339APAN"] = "MB-339A",
+        ["MCV-80"] = "FV510 Warrior IFV",
+        ["MJ-1_drivable"] = "M92 MJ-1 drivable", -- TODO
+        ["MLRS"] = "M270 MLRS",
+        ["MLRS FDDM"] = "Hummer", -- TODO: weird, check
+        ["MOLNIYA"] = "Tarantul-class corvette",
+        ["MOSCOW"] = "Slava-class cruiser",
         ["MQ-9 Reaper"] = "MQ-9 Reaper",
-        ["MTLB"] = "APC MTLB",
-        ["Marder"] = "IFV Marder",
-        ["Maschinensatz_33"] = "Maschinensatz 33 Gen",
-        ["MaxxPro_MRAP"] = "APC MRAP MaxxPro",
-        ["Merkava_Mk4"] = "MBT Merkava IV",
+        ["MTLB"] = "MTLB APC",
+        ["Marder"] = "Marder IFV",
+        ["Maschinensatz_33"] = "generator",
+        ["MaxxPro_MRAP"] = "MRAP MaxxPro APC",
+        ["Merkava_Mk4"] = "Merkava IV MBT",
         ["Mi-24P"] = "Mi-24P",
         ["Mi-24V"] = "Mi-24V",
         ["Mi-26"] = "Mi-26",
         ["Mi-28N"] = "Mi-28N",
-        ["Mi-8MT"] = "Mi-8MTV2",
+        ["Mi-8MT"] = "Mi-8MT",
         ["MiG-15bis"] = "MiG-15bis",
-        ["MiG-15bis_FC"] = "MiG-15bis FC",
+        ["MiG-15bis_FC"] = "MiG-15bis",
         ["MiG-19P"] = "MiG-19P",
         ["MiG-21Bis"] = "MiG-21Bis",
         ["MiG-23MLD"] = "MiG-23MLD",
@@ -329,25 +329,26 @@ do
         ["Mirage-F1EH"] = "Mirage F1EH",
         ["Mirage-F1EQ"] = "Mirage F1EQ",
         ["Mirage-F1JA"] = "Mirage F1JA",
-        ["Mirage-F1M-CE"] = "Mirage F1M (C.14 1-25/32-51)",
-        ["Mirage-F1M-EE"] = "Mirage F1M (C.14 52-73)",
-        ["MosquitoFBMkVI"] = "Mosquito FB Mk. VI",
-        ["NASAMS_Command_Post"] = "SAM NASAMS C2",
-        ["NASAMS_LN_B"] = "SAM NASAMS LN AIM-120B",
-        ["NASAMS_LN_C"] = "SAM NASAMS LN AIM-120C",
-        ["NASAMS_Radar_MPQ64F1"] = "SAM NASAMS SR MPQ64F1",
-        ["NEUSTRASH"] = "Frigate 11540 Neustrashimy",
+        ["Mirage-F1M-CE"] = "Mirage F1M",
+        ["Mirage-F1M-EE"] = "Mirage F1M",
+        ["MosquitoFBMkVI"] = "DH.98 Mosquito",
+        ["NASAMS_Command_Post"] = "NASAMS SAM CC",
+        ["NASAMS_LN_B"] = "NASAMS SAM launcher",
+        ["NASAMS_LN_C"] = "NASAMS SAM launcher",
+        ["NASAMS_Radar_MPQ64F1"] = "NASAMS SAM search radar",
+        ["NEUSTRASH"] = "Neustrashimy-class frigate",
         ["OH-58D"] = "OH-58D",
-        ["OH58D"] = "OH-58D(R)",
-        ["Osa 9A33 ln"] = "SAM SA-8 Osa \"Gecko\" TEL",
-        ["P-47D-30"] = "P-47D-30",
-        ["P-47D-30bl1"] = "P-47D-30 (Early)",
-        ["P-47D-40"] = "P-47D-40",
-        ["P-51D"] = "P-51D-25-NA",
-        ["P-51D-30-NA"] = "P-51D-30-NA",
-        ["P20_drivable"] = "M92 P20 drivable",
-        ["PERRY"] = "FFG Oliver Hazard Perry",
-        ["PIOTR"] = "Battlecruiser 1144.2 Pyotr Velikiy",
+        ["OH58D"] = "OH-58D",
+        ["Osa 9A33 ln"] = "SA-8 SAM",
+        ["P-47D-30"] = "P-47D",
+        ["P-47D-30bl1"] = "P-47D",
+        ["P-47D-40"] = "P-47D",
+        ["P-51D"] = "P-51D",
+        ["P-51D-30-NA"] = "P-51D",
+        ["P20_drivable"] = "M92 P20 drivable", -- TODO
+        ["PERRY"] = "Perry-class frigate",
+        ["PIOTR"] = "Kirov-class battlecruiser",
+        -- TODO: end of the list
         ["PL5EII Loadout"] = "Payload PL-5EII",
         ["PL8 Loadout"] = "Payload PL-8",
         ["PLZ05"] = "PLZ-05",