diff --git a/Client/mods/deathmatch/logic/CVehicleNames.cpp b/Client/mods/deathmatch/logic/CVehicleNames.cpp
index 32bcc3e7e6f..12210bc3c8a 100644
--- a/Client/mods/deathmatch/logic/CVehicleNames.cpp
+++ b/Client/mods/deathmatch/logic/CVehicleNames.cpp
@@ -20,218 +20,201 @@ struct SVehicleName
     const char* szName_replaced;            // Compatability
 };
 
-static const SFixedArray<SVehicleName, 212> VehicleNames = {{{"Landstalker"},
-                                                             {"Bravura"},
-                                                             {"Buffalo"},
-                                                             {"Linerunner"},
-                                                             {"Perennial"},
-                                                             {"Sentinel"},
-                                                             {"Dumper"},
-                                                             {"Fire Truck"},
-                                                             {"Trashmaster"},
-                                                             {"Stretch"},
-                                                             {"Manana"},
-                                                             {"Infernus"},
-                                                             {"Voodoo"},
-                                                             {"Pony"},
-                                                             {"Mule"},
-                                                             {"Cheetah"},
+static const SFixedArray<SVehicleName, 212> VehicleNames = {{{"Admiral"},
+                                                             {"Air Tug"},
+                                                             {"Alpha"},
                                                              {"Ambulance"},
-                                                             {"Leviathan"},
-                                                             {"Moonbeam"},
-                                                             {"Esperanto"},
-                                                             {"Taxi"},
-                                                             {"Washington"},
-                                                             {"Bobcat"},
-                                                             {"Mr. Whoopee"},
-                                                             {"BF Injection"},
-                                                             {"Hunter"},
-                                                             {"Premier"},
-                                                             {"Enforcer"},
-                                                             {"Securicar"},
+                                                             {"Andromada"},
+                                                             {"Baggage"},
+                                                             {"Baggage Trailer (covered)"},
+                                                             {"Baggage Trailer (Uncovered)"},
                                                              {"Banshee"},
-                                                             {"Predator"},
-                                                             {"Bus"},
-                                                             {"Rhino"},
                                                              {"Barracks"},
-                                                             {"Hotknife"},
-                                                             {"Trailer 1"},
-                                                             {"Previon"},
-                                                             {"Coach"},
+                                                             {"BF Injection"},
+                                                             {"BF-400"},
+                                                             {"Bike"},
+                                                             {"Blade"},
+                                                             {"Blista Compact"},
+                                                             {"Bloodring Banger"},
+                                                             {"Bobcat"},
+                                                             {"Box Freight"},
+                                                             {"Boxville"},
+                                                             {"Boxville Mission"},
+                                                             {"Broadway"},
+                                                             {"Bravura"},
+                                                             {"Bucanneer"},
+                                                             {"Buffalo"},
+                                                             {"Bullet"},
+                                                             {"Burrito"},
+                                                             {"Bus"},
                                                              {"Cabbie"},
-                                                             {"Stallion"},
-                                                             {"Rumpo"},
-                                                             {"RC Bandit"},
-                                                             {"Romero"},
-                                                             {"Packer"},
-                                                             {"Monster 1", "Monster"},
-                                                             {"Admiral"},
-                                                             {"Squalo"},
-                                                             {"Seasparrow"},
-                                                             {"Pizzaboy"},
-                                                             {"Tram"},
-                                                             {"Trailer 2"},
-                                                             {"Turismo"},
-                                                             {"Speeder"},
-                                                             {"Reefer"},
-                                                             {"Tropic"},
-                                                             {"Flatbed"},
-                                                             {"Yankee"},
                                                              {"Caddy"},
-                                                             {"Solair"},
-                                                             {"Berkley's RC Van"},
-                                                             {"Skimmer"},
-                                                             {"PCJ-600"},
-                                                             {"Faggio"},
-                                                             {"Freeway"},
-                                                             {"RC Baron"},
-                                                             {"RC Raider"},
-                                                             {"Glendale"},
-                                                             {"Oceanic"},
-                                                             {"Sanchez"},
-                                                             {"Sparrow"},
-                                                             {"Patriot"},
-                                                             {"Quadbike"},
-                                                             {"Coastguard"},
-                                                             {"Dinghy"},
-                                                             {"Hermes"},
-                                                             {"Sabre"},
-                                                             {"Rustler"},
-                                                             {"ZR-350"},
-                                                             {"Walton"},
-                                                             {"Regina"},
-                                                             {"Comet"},
-                                                             {"BMX"},
-                                                             {"Burrito"},
+                                                             {"Cadrona"},
                                                              {"Camper"},
-                                                             {"Marquis"},
-                                                             {"Baggage"},
+                                                             {"Cargobob"},
+                                                             {"Cement Truck"},
+                                                             {"Cheetah"},
+                                                             {"Clover"},
+                                                             {"Club"},
+                                                             {"Coach"},
+                                                             {"Comet"},
+                                                             {"Combine Harvester"},
+                                                             {"Cropduster"},
+                                                             {"DFT-30"},
+                                                             {"Dinghy"},
+                                                             {"Dodo"},
                                                              {"Dozer"},
-                                                             {"Maverick"},
-                                                             {"News Chopper"},
-                                                             {"Rancher"},
-                                                             {"FBI Rancher"},
-                                                             {"Virgo"},
-                                                             {"Greenwood"},
-                                                             {"Jetmax"},
-                                                             {"Hotring Racer"},
-                                                             {"Sandking"},
-                                                             {"Blista Compact"},
-                                                             {"Police Maverick"},
-                                                             {"Boxville"},
-                                                             {"Benson"},
-                                                             {"Mesa"},
-                                                             {"RC Goblin"},
-                                                             {"Hotring Racer 3"},
-                                                             {"Hotring Racer 2"},
-                                                             {"Bloodring Banger"},
-                                                             {"Rancher Lure"},
-                                                             {"Super GT"},
+                                                             {"Dumper"},
+                                                             {"Dune"},
                                                              {"Elegant"},
-                                                             {"Journey"},
-                                                             {"Bike"},
-                                                             {"Mountain Bike"},
-                                                             {"Beagle"},
-                                                             {"Cropduster"},
-                                                             {"Stuntplane"},
-                                                             {"Tanker"},
-                                                             {"Roadtrain"},
-                                                             {"Nebula"},
-                                                             {"Majestic"},
-                                                             {"Buccaneer"},
-                                                             {"Shamal"},
-                                                             {"Hydra"},
-                                                             {"FCR-900"},
-                                                             {"NRG-500"},
-                                                             {"HPV1000"},
-                                                             {"Cement Truck"},
-                                                             {"Towtruck"},
-                                                             {"Fortune"},
-                                                             {"Cadrona"},
+                                                             {"Elegy"},
+                                                             {"Emperor"},
+                                                             {"Enforcer"},
+                                                             {"Esperanto"},
+                                                             {"Euros"},
+                                                             {"Faggio"},
+                                                             {"FBI Rancher"},
                                                              {"FBI Truck"},
-                                                             {"Willard"},
-                                                             {"Forklift"},
-                                                             {"Tractor"},
-                                                             {"Combine Harvester"},
+                                                             {"FCR-900"},
                                                              {"Feltzer"},
-                                                             {"Remington"},
-                                                             {"Slamvan"},
-                                                             {"Blade"},
-                                                             {"Freight"},
-                                                             {"Streak"},
-                                                             {"Vortex"},
-                                                             {"Vincent"},
-                                                             {"Bullet"},
-                                                             {"Clover"},
-                                                             {"Sadler"},
+                                                             {"Fire Truck"},
                                                              {"Fire Truck Ladder"},
+                                                             {"Flash"},
+                                                             {"Flatbed"},
+                                                             {"Forklift"},
+                                                             {"Fortune"},
+                                                             {"Freeway"},
+                                                             {"Freight"},
+                                                             {"Freight Train Flatbed"},
+                                                             {"Glendale"},
+                                                             {"Glendale Damaged"},
+                                                             {"Greenwood"},
+                                                             {"Hermes"},
+                                                             {"Hotdog"},
+                                                             {"Hotknife"},
+                                                             {"Hotring Racer"},
+                                                             {"Hotring Racer 2"},
+                                                             {"Hotring Racer 3"},
+                                                             {"Hunter"},
+                                                             {"Huntley"},
                                                              {"Hustler"},
+                                                             {"Hydra"},
+                                                             {"Infernus"},
                                                              {"Intruder"},
-                                                             {"Primo"},
-                                                             {"Cargobob"},
-                                                             {"Tampa"},
-                                                             {"Sunrise"},
-                                                             {"Merit"},
-                                                             {"Utility Van"},
-                                                             {"Nevada"},
-                                                             {"Yosemite"},
-                                                             {"Windsor"},
-                                                             {"Monster 2"},
-                                                             {"Monster 3"},
-                                                             {"Uranus"},
                                                              {"Jester"},
-                                                             {"Sultan"},
-                                                             {"Stratum"},
-                                                             {"Elegy"},
-                                                             {"Raindance"},
-                                                             {"RC Tiger"},
-                                                             {"Flash"},
-                                                             {"Tahoma"},
-                                                             {"Savanna"},
-                                                             {"Bandito"},
-                                                             {"Freight Train Flatbed"},
-                                                             {"Streak Train Trailer"},
+                                                             {"Jetmax"},
+                                                             {"Journey"},
                                                              {"Kart"},
+                                                             {"Landstalker"},
+                                                             {"Launch"},
+                                                             {"Leviathan"},
+                                                             {"Linerunner"},
+                                                             {"Majestic"},
+                                                             {"Manana"},
+                                                             {"Marquis"},
+                                                             {"Maverick"},
+                                                             {"Mesa"},
+                                                             {"Monster 1", "Monster"},
+                                                             {"Monster 2"},
+                                                             {"Monster 3"},
+                                                             {"Moonbeam"},
                                                              {"Mower"},
-                                                             {"Dune"},
-                                                             {"Sweeper"},
-                                                             {"Broadway"},
-                                                             {"Tornado"},
-                                                             {"AT-400"},
-                                                             {"DFT-30"},
-                                                             {"Huntley"},
-                                                             {"Stafford"},
-                                                             {"BF-400"},
+                                                             {"Mr. Whoopee"},
+                                                             {"Mule"},
+                                                             {"Nebula"},
+                                                             {"News Chopper"},
                                                              {"Newsvan"},
-                                                             {"Tug"},
-                                                             {"Trailer (Tanker Commando)"},
-                                                             {"Emperor"},
-                                                             {"Wayfarer"},
-                                                             {"Euros"},
-                                                             {"Hotdog"},
-                                                             {"Club"},
-                                                             {"Box Freight"},
-                                                             {"Trailer 3"},
-                                                             {"Andromada"},
-                                                             {"Dodo"},
-                                                             {"RC Cam"},
-                                                             {"Launch"},
+                                                             {"NRG-500"},
+                                                             {"Oceanic"},
+                                                             {"Packer"},
+                                                             {"Patriot"},
+                                                             {"PCJ-600"},
+                                                             {"Perennial"},
+                                                             {"Phoenix"},
+                                                             {"Picador"},
                                                              {"Police LS", "Police"},
-                                                             {"Police SF"},
                                                              {"Police LV"},
+                                                             {"Police Maverick"},
                                                              {"Police Ranger", "Ranger"},
-                                                             {"Picador"},
+                                                             {"Police SF"},
+                                                             {"Pony"},
+                                                             {"Premier"},
+                                                             {"Previon"},
+                                                             {"Primo"},
+                                                             {"Quadbike"},
+                                                             {"Raindance"},
+                                                             {"Rancher"},
+                                                             {"Rancher Lure"},
+                                                             {"RC Baron"},
+                                                             {"RC Bandit"},
+                                                             {"RC Cam"},
+                                                             {"RC Goblin"},
+                                                             {"RC Raider"},
+                                                             {"RC Tiger"},
+                                                             {"Reefer"},
+                                                             {"Regina"},
+                                                             {"Remington"},
+                                                             {"Rhino"},
+                                                             {"Roadtrain"},
+                                                             {"Romero"},
+                                                             {"Rumpo"},
+                                                             {"Rustler"},
                                                              {"S.W.A.T."},
-                                                             {"Alpha"},
-                                                             {"Phoenix"},
-                                                             {"Glendale Damaged"},
+                                                             {"Sabre"},
+                                                             {"Sadler"},
                                                              {"Sadler", "Sadler Damaged"},
-                                                             {"Baggage Trailer (covered)"},
-                                                             {"Baggage Trailer (Uncovered)"},
+                                                             {"Sanchez"},
+                                                             {"Sandking"},
+                                                             {"Savanna"},
+                                                             {"Seasparrow"},
+                                                             {"Securicar"},
+                                                             {"Sentinel"},
+                                                             {"Shamal"},
+                                                             {"Skimmer"},
+                                                             {"Slamvan"},
+                                                             {"Solair"},
+                                                             {"Stallion"},
+                                                             {"Stratum"},
+                                                             {"Streak"},
+                                                             {"Streak Train Trailer"},
+                                                             {"Stretch"},
+                                                             {"Stuntplane"},
+                                                             {"Sultan"},
+                                                             {"Sunrise"},
+                                                             {"Super GT"},
+                                                             {"Sweeper"},
+                                                             {"Tampa"},
+                                                             {"Tanker"},
+                                                             {"Tanker Trailer"},
+                                                             {"Tahoma"},
+                                                             {"Taxi"},
+                                                             {"Topfun Van (Berkley's RC)"},
+                                                             {"Tornado"},
+                                                             {"Towtruck"},
+                                                             {"Trailer 1"},
+                                                             {"Trailer 2"},
+                                                             {"Trailer 3"},
                                                              {"Trailer (Stairs)"},
-                                                             {"Boxville Mission"},
-                                                             {"Farm Trailer"},
-                                                             {"Street Clean Trailer"}}};
+                                                             {"Trailer (Tanker Commando)"},
+                                                             {"Tractor"},
+                                                             {"Tram"},
+                                                             {"Trashmaster"},
+                                                             {"Tropic"},
+                                                             {"Tug"},
+                                                             {"Turismo"},
+                                                             {"Utility Van"},
+                                                             {"Vincent"},
+                                                             {"Virgo"},
+                                                             {"Voodoo"},
+                                                             {"Vortex"},
+                                                             {"Walton"},
+                                                             {"Washington"},
+                                                             {"Wayfarer"},
+                                                             {"Willard"},
+                                                             {"Windsor"},
+                                                             {"Yankee"},
+                                                             {"Yosemite"},
+                                                             {"ZR-350"}}};
 
 static const SFixedArray<SVehicleName, 10> VehicleTypes = {
     {{"Automobile"}, {"Plane"}, {"Bike"}, {"Helicopter"}, {"Boat"}, {"Train"}, {"Trailer"}, {"BMX"}, {"Monster Truck"}, {"Quad"}}};