diff --git a/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs b/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
index 46a1bb7db7..edd7d51889 100644
--- a/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
+++ b/OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
@@ -33,23 +33,23 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 
 			// Atreides:
 			{ 4, Pair.New("wall", "Atreides") },
-			{ 5, Pair.New("power", "Atreides") },
-			{ 8, Pair.New("conyard", "Atreides") },
+			{ 5, Pair.New("wind_trap", "Atreides") },
+			{ 8, Pair.New("construction_yard", "Atreides") },
 			{ 11, Pair.New("barracks", "Atreides") },
 			{ 14, Pair.New("refinery", "Atreides") },
-			{ 17, Pair.New("radar", "Atreides") },
-			{ 63, Pair.New("light", "Atreides") },
+			{ 17, Pair.New("outpost", "Atreides") },
+			{ 63, Pair.New("light_factory", "Atreides") },
 			{ 69, Pair.New("silo", "Atreides") },
-			{ 72, Pair.New("heavy", "Atreides") },
-			{ 75, Pair.New("repair", "Atreides") },
-			{ 78, Pair.New("guntower", "Atreides") },
-			{ 120, Pair.New("hightech", "Atreides") },
-			{ 123, Pair.New("rockettower", "Atreides") },
-			{ 126, Pair.New("research", "Atreides") },
+			{ 72, Pair.New("heavy_factory", "Atreides") },
+			{ 75, Pair.New("repair_pad", "Atreides") },
+			{ 78, Pair.New("medium_gun_turret", "Atreides") },
+			{ 120, Pair.New("high_tech_factory", "Atreides") },
+			{ 123, Pair.New("large_gun_turret", "Atreides") },
+			{ 126, Pair.New("research_centre", "Atreides") },
 			{ 129, Pair.New("starport", "Atreides") },
 			{ 132, Pair.New("palace", "Atreides") },
-			{ 180, Pair.New("rifle", "Atreides") },
-			{ 181, Pair.New("bazooka", "Atreides") },
+			{ 180, Pair.New("light_inf", "Atreides") },
+			{ 181, Pair.New("trooper", "Atreides") },
 			{ 182, Pair.New("fremen", "Atreides") },
 			{ 183, Pair.New("sardaukar", "Atreides") },
 			{ 184, Pair.New("engineer", "Atreides") },
@@ -57,31 +57,31 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			{ 186, Pair.New("mcv", "Atreides") },
 			{ 187, Pair.New("trike", "Atreides") },
 			{ 188, Pair.New("quad", "Atreides") },
-			{ 189, Pair.New("combata", "Atreides") },
-			{ 190, Pair.New("missiletank", "Atreides") },
-			{ 191, Pair.New("siegetank", "Atreides") },
+			{ 189, Pair.New("combat_tank_a", "Atreides") },
+			{ 190, Pair.New("missile_tank", "Atreides") },
+			{ 191, Pair.New("siege_tank", "Atreides") },
 			{ 192, Pair.New("carryall", "Atreides") },
-			{ 194, Pair.New("sonictank", "Atreides") },
+			{ 194, Pair.New("sonic_tank", "Atreides") },
 
 			// Harkonnen:
 			{ 204, Pair.New("wall", "Harkonnen") },
-			{ 205, Pair.New("power", "Harkonnen") },
-			{ 208, Pair.New("conyard", "Harkonnen") },
+			{ 205, Pair.New("wind_trap", "Harkonnen") },
+			{ 208, Pair.New("construction_yard", "Harkonnen") },
 			{ 211, Pair.New("barracks", "Harkonnen") },
 			{ 214, Pair.New("refinery", "Harkonnen") },
-			{ 217, Pair.New("radar", "Harkonnen") },
-			{ 263, Pair.New("light", "Harkonnen") },
+			{ 217, Pair.New("outpost", "Harkonnen") },
+			{ 263, Pair.New("light_factory", "Harkonnen") },
 			{ 269, Pair.New("silo", "Harkonnen") },
-			{ 272, Pair.New("heavy", "Harkonnen") },
-			{ 275, Pair.New("repair", "Harkonnen") },
-			{ 278, Pair.New("guntower", "Harkonnen") },
-			{ 320, Pair.New("hightech", "Harkonnen") },
-			{ 323, Pair.New("rockettower", "Harkonnen") },
-			{ 326, Pair.New("research", "Harkonnen") },
+			{ 272, Pair.New("heavy_factory", "Harkonnen") },
+			{ 275, Pair.New("repair_pad", "Harkonnen") },
+			{ 278, Pair.New("medium_gun_turret", "Harkonnen") },
+			{ 320, Pair.New("high_tech_factory", "Harkonnen") },
+			{ 323, Pair.New("large_gun_turret", "Harkonnen") },
+			{ 326, Pair.New("research_centre", "Harkonnen") },
 			{ 329, Pair.New("starport", "Harkonnen") },
 			{ 332, Pair.New("palace", "Harkonnen") },
-			{ 360, Pair.New("rifle", "Harkonnen") },
-			{ 361, Pair.New("bazooka", "Harkonnen") },
+			{ 360, Pair.New("light_inf", "Harkonnen") },
+			{ 361, Pair.New("trooper", "Harkonnen") },
 			{ 362, Pair.New("fremen", "Harkonnen") },
 			{ 363, Pair.New("sardaukar", "Harkonnen") },
 			{ 364, Pair.New("engineer", "Harkonnen") },
@@ -89,31 +89,31 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			{ 366, Pair.New("mcv", "Harkonnen") },
 			{ 367, Pair.New("trike", "Harkonnen") },
 			{ 368, Pair.New("quad", "Harkonnen") },
-			{ 369, Pair.New("combath", "Harkonnen") },
-			{ 370, Pair.New("missiletank", "Harkonnen") },
-			{ 371, Pair.New("siegetank", "Harkonnen") },
+			{ 369, Pair.New("combat_tank_h", "Harkonnen") },
+			{ 370, Pair.New("missile_tank", "Harkonnen") },
+			{ 371, Pair.New("siege_tank", "Harkonnen") },
 			{ 372, Pair.New("carryall", "Harkonnen") },
 			{ 374, Pair.New("devast", "Harkonnen") },
 
 			// Ordos:
 			{ 404, Pair.New("wall", "Ordos") },
-			{ 405, Pair.New("power", "Ordos") },
-			{ 408, Pair.New("conyard", "Ordos") },
+			{ 405, Pair.New("wind_trap", "Ordos") },
+			{ 408, Pair.New("construction_yard", "Ordos") },
 			{ 411, Pair.New("barracks", "Ordos") },
 			{ 414, Pair.New("refinery", "Ordos") },
-			{ 417, Pair.New("radar", "Ordos") },
-			{ 463, Pair.New("light", "Ordos") },
+			{ 417, Pair.New("outpost", "Ordos") },
+			{ 463, Pair.New("light_factory", "Ordos") },
 			{ 469, Pair.New("silo", "Ordos") },
-			{ 472, Pair.New("heavy", "Ordos") },
-			{ 475, Pair.New("repair", "Ordos") },
-			{ 478, Pair.New("guntower", "Ordos") },
-			{ 520, Pair.New("hightech", "Ordos") },
-			{ 523, Pair.New("rockettower", "Ordos") },
-			{ 526, Pair.New("research", "Ordos") },
+			{ 472, Pair.New("heavy_factory", "Ordos") },
+			{ 475, Pair.New("repair_pad", "Ordos") },
+			{ 478, Pair.New("medium_gun_turret", "Ordos") },
+			{ 520, Pair.New("high_tech_factory", "Ordos") },
+			{ 523, Pair.New("large_gun_turret", "Ordos") },
+			{ 526, Pair.New("research_centre", "Ordos") },
 			{ 529, Pair.New("starport", "Ordos") },
 			{ 532, Pair.New("palace", "Ordos") },
-			{ 560, Pair.New("rifle", "Ordos") },
-			{ 561, Pair.New("bazooka", "Ordos") },
+			{ 560, Pair.New("light_inf", "Ordos") },
+			{ 561, Pair.New("trooper", "Ordos") },
 			{ 562, Pair.New("saboteur", "Ordos") },
 			{ 563, Pair.New("sardaukar", "Ordos") },
 			{ 564, Pair.New("engineer", "Ordos") },
@@ -121,32 +121,32 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			{ 566, Pair.New("mcv", "Ordos") },
 			{ 567, Pair.New("raider", "Ordos") },
 			{ 568, Pair.New("quad", "Ordos") },
-			{ 569, Pair.New("combato", "Ordos") },
-			{ 570, Pair.New("missiletank", "Ordos") },
-			{ 571, Pair.New("siegetank", "Ordos") },
+			{ 569, Pair.New("combat_tank_o", "Ordos") },
+			{ 570, Pair.New("missile_tank", "Ordos") },
+			{ 571, Pair.New("siege_tank", "Ordos") },
 			{ 572, Pair.New("carryall", "Ordos") },
 			{ 574, Pair.New("deviatortank", "Ordos") },
 
 			// Corrino:
 			{ 580, Pair.New("wall", "Corrino") },
-			{ 581, Pair.New("power", "Corrino") },
-			{ 582, Pair.New("conyard", "Corrino") },
+			{ 581, Pair.New("wind_trap", "Corrino") },
+			{ 582, Pair.New("construction_yard", "Corrino") },
 			{ 583, Pair.New("barracks", "Corrino") },
 			{ 584, Pair.New("refinery", "Corrino") },
-			{ 585, Pair.New("radar", "Corrino") },
-			{ 587, Pair.New("light", "Corrino") },
+			{ 585, Pair.New("outpost", "Corrino") },
+			{ 587, Pair.New("light_factory", "Corrino") },
 			{ 588, Pair.New("palace", "Corrino") },
 			{ 589, Pair.New("silo", "Corrino") },
-			{ 590, Pair.New("heavy", "Corrino") },
-			{ 591, Pair.New("repair", "Corrino") },
-			{ 592, Pair.New("guntower", "Corrino") },
-			{ 593, Pair.New("hightech", "Corrino") },
-			{ 594, Pair.New("rockettower", "Corrino") },
-			{ 595, Pair.New("research", "Corrino") },
+			{ 590, Pair.New("heavy_factory", "Corrino") },
+			{ 591, Pair.New("repair_pad", "Corrino") },
+			{ 592, Pair.New("medium_gun_turret", "Corrino") },
+			{ 593, Pair.New("high_tech_factory", "Corrino") },
+			{ 594, Pair.New("large_gun_turret", "Corrino") },
+			{ 595, Pair.New("research_centre", "Corrino") },
 			{ 596, Pair.New("starport", "Corrino") },
 			{ 597, Pair.New("sietch", "Corrino") },
-			{ 598, Pair.New("rifle", "Corrino") },
-			{ 599, Pair.New("bazooka", "Corrino") },
+			{ 598, Pair.New("light_inf", "Corrino") },
+			{ 599, Pair.New("trooper", "Corrino") },
 			{ 600, Pair.New("sardaukar", "Corrino") },
 			{ 601, Pair.New("fremen", "Corrino") },
 			{ 602, Pair.New("engineer", "Corrino") },
@@ -154,31 +154,31 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			{ 604, Pair.New("mcv", "Corrino") },
 			{ 605, Pair.New("trike", "Corrino") },
 			{ 606, Pair.New("quad", "Corrino") },
-			{ 607, Pair.New("combath", "Corrino") },
-			{ 608, Pair.New("missiletank", "Corrino") },
-			{ 609, Pair.New("siegetank", "Corrino") },
+			{ 607, Pair.New("combat_tank_h", "Corrino") },
+			{ 608, Pair.New("missile_tank", "Corrino") },
+			{ 609, Pair.New("siege_tank", "Corrino") },
 			{ 610, Pair.New("carryall", "Corrino") },
 
 			// Fremen:
 			{ 620, Pair.New("wall", "Fremen") },
-			{ 621, Pair.New("power", "Fremen") },
-			{ 622, Pair.New("conyard", "Fremen") },
+			{ 621, Pair.New("wind_trap", "Fremen") },
+			{ 622, Pair.New("construction_yard", "Fremen") },
 			{ 623, Pair.New("barracks", "Fremen") },
 			{ 624, Pair.New("refinery", "Fremen") },
-			{ 625, Pair.New("radar", "Fremen") },
-			{ 627, Pair.New("light", "Fremen") },
+			{ 625, Pair.New("outpost", "Fremen") },
+			{ 627, Pair.New("light_factory", "Fremen") },
 			{ 628, Pair.New("palacec", "Fremen") },
 			{ 629, Pair.New("silo", "Fremen") },
-			{ 630, Pair.New("heavy", "Fremen") },
-			{ 631, Pair.New("repair", "Fremen") },
-			{ 632, Pair.New("guntower", "Fremen") },
-			{ 633, Pair.New("hightech", "Fremen") },
-			{ 634, Pair.New("rockettower", "Fremen") },
-			{ 635, Pair.New("research", "Fremen") },
+			{ 630, Pair.New("heavy_factory", "Fremen") },
+			{ 631, Pair.New("repair_pad", "Fremen") },
+			{ 632, Pair.New("medium_gun_turret", "Fremen") },
+			{ 633, Pair.New("high_tech_factory", "Fremen") },
+			{ 634, Pair.New("large_gun_turret", "Fremen") },
+			{ 635, Pair.New("research_centre", "Fremen") },
 			{ 636, Pair.New("starport", "Fremen") },
 			{ 637, Pair.New("sietch", "Fremen") },
-			{ 638, Pair.New("rifle", "Fremen") },
-			{ 639, Pair.New("bazooka", "Fremen") },
+			{ 638, Pair.New("light_inf", "Fremen") },
+			{ 639, Pair.New("trooper", "Fremen") },
 			{ 640, Pair.New("fremen", "Fremen") },
 			////{ 641, Pair.new("", "Fremen") },// Fremen fremen non-stealth
 			{ 642, Pair.New("engineer", "Fremen") },
@@ -186,70 +186,70 @@ namespace OpenRA.Mods.D2k.UtilityCommands
 			{ 644, Pair.New("mcv", "Fremen") },
 			{ 645, Pair.New("trike", "Fremen") },
 			{ 646, Pair.New("quad", "Fremen") },
-			{ 647, Pair.New("combata", "Fremen") },
-			{ 648, Pair.New("missiletank", "Fremen") },
-			{ 649, Pair.New("siegetank", "Fremen") },
+			{ 647, Pair.New("combat_tank_a", "Fremen") },
+			{ 648, Pair.New("missile_tank", "Fremen") },
+			{ 649, Pair.New("siege_tank", "Fremen") },
 			{ 650, Pair.New("carryall", "Fremen") },
-			{ 652, Pair.New("sonictank", "Fremen") },
+			{ 652, Pair.New("sonic_tank", "Fremen") },
 
 			// Smugglers:
 			{ 660, Pair.New("wall", "Smugglers") },
-			{ 661, Pair.New("power", "Smugglers") },
-			{ 662, Pair.New("conyard", "Smugglers") },
+			{ 661, Pair.New("wind_trap", "Smugglers") },
+			{ 662, Pair.New("construction_yard", "Smugglers") },
 			{ 663, Pair.New("barracks", "Smugglers") },
 			{ 664, Pair.New("refinery", "Smugglers") },
-			{ 666, Pair.New("radar", "Smugglers") },
-			{ 667, Pair.New("light", "Smugglers") },
+			{ 666, Pair.New("outpost", "Smugglers") },
+			{ 667, Pair.New("light_factory", "Smugglers") },
 			{ 668, Pair.New("silo", "Smugglers") },
-			{ 669, Pair.New("heavy", "Smugglers") },
-			{ 670, Pair.New("repair", "Smugglers") },
-			{ 671, Pair.New("guntower", "Smugglers") },
-			{ 672, Pair.New("hightech", "Smugglers") },
-			{ 673, Pair.New("rockettower", "Smugglers") },
-			{ 674, Pair.New("research", "Smugglers") },
+			{ 669, Pair.New("heavy_factory", "Smugglers") },
+			{ 670, Pair.New("repair_pad", "Smugglers") },
+			{ 671, Pair.New("medium_gun_turret", "Smugglers") },
+			{ 672, Pair.New("high_tech_factory", "Smugglers") },
+			{ 673, Pair.New("large_gun_turret", "Smugglers") },
+			{ 674, Pair.New("research_centre", "Smugglers") },
 			{ 675, Pair.New("starport", "Smugglers") },
 			{ 676, Pair.New("palace", "Smugglers") },
-			{ 677, Pair.New("rifle", "Smugglers") },
-			{ 678, Pair.New("bazooka", "Smugglers") },
+			{ 677, Pair.New("light_inf", "Smugglers") },
+			{ 678, Pair.New("trooper", "Smugglers") },
 			{ 679, Pair.New("saboteur", "Smugglers") },
 			{ 680, Pair.New("engineer", "Smugglers") },
 			{ 681, Pair.New("harvester", "Smugglers") },
 			{ 682, Pair.New("mcv", "Smugglers") },
 			{ 683, Pair.New("trike", "Smugglers") },
 			{ 684, Pair.New("quad", "Smugglers") },
-			{ 685, Pair.New("combato", "Smugglers") },
-			{ 686, Pair.New("missiletank", "Smugglers") },
-			{ 687, Pair.New("siegetank", "Smugglers") },
+			{ 685, Pair.New("combat_tank_o", "Smugglers") },
+			{ 686, Pair.New("missile_tank", "Smugglers") },
+			{ 687, Pair.New("siege_tank", "Smugglers") },
 			{ 688, Pair.New("carryall", "Smugglers") },
 
 			// Mercenaries:
 			{ 700, Pair.New("wall", "Mercenaries") },
-			{ 701, Pair.New("power", "Mercenaries") },
-			{ 702, Pair.New("conyard", "Mercenaries") },
+			{ 701, Pair.New("wind_trap", "Mercenaries") },
+			{ 702, Pair.New("construction_yard", "Mercenaries") },
 			{ 703, Pair.New("barracks", "Mercenaries") },
 			{ 704, Pair.New("refinery", "Mercenaries") },
-			{ 705, Pair.New("radar", "Mercenaries") },
-			{ 707, Pair.New("light", "Mercenaries") },
+			{ 705, Pair.New("outpost", "Mercenaries") },
+			{ 707, Pair.New("light_factory", "Mercenaries") },
 			{ 708, Pair.New("silo", "Mercenaries") },
-			{ 709, Pair.New("heavy", "Mercenaries") },
-			{ 710, Pair.New("repair", "Mercenaries") },
-			{ 711, Pair.New("guntower", "Mercenaries") },
-			{ 712, Pair.New("hightech", "Mercenaries") },
-			{ 713, Pair.New("rockettower", "Mercenaries") },
-			{ 714, Pair.New("research", "Mercenaries") },
+			{ 709, Pair.New("heavy_factory", "Mercenaries") },
+			{ 710, Pair.New("repair_pad", "Mercenaries") },
+			{ 711, Pair.New("medium_gun_turret", "Mercenaries") },
+			{ 712, Pair.New("high_tech_factory", "Mercenaries") },
+			{ 713, Pair.New("large_gun_turret", "Mercenaries") },
+			{ 714, Pair.New("research_centre", "Mercenaries") },
 			{ 715, Pair.New("starport", "Mercenaries") },
 			{ 716, Pair.New("palace", "Mercenaries") },
-			{ 717, Pair.New("rifle", "Mercenaries") },
-			{ 718, Pair.New("bazooka", "Mercenaries") },
+			{ 717, Pair.New("light_inf", "Mercenaries") },
+			{ 718, Pair.New("trooper", "Mercenaries") },
 			{ 719, Pair.New("saboteur", "Mercenaries") },
 			{ 720, Pair.New("harvester", "Mercenaries") },
 			{ 721, Pair.New("harvester", "Mercenaries") },
 			{ 722, Pair.New("mcv", "Mercenaries") },
 			{ 723, Pair.New("trike", "Mercenaries") },
 			{ 724, Pair.New("quad", "Mercenaries") },
-			{ 725, Pair.New("combato", "Mercenaries") },
-			{ 726, Pair.New("missiletank", "Mercenaries") },
-			{ 727, Pair.New("siegetank", "Mercenaries") },
+			{ 725, Pair.New("combat_tank_o", "Mercenaries") },
+			{ 726, Pair.New("missile_tank", "Mercenaries") },
+			{ 727, Pair.New("siege_tank", "Mercenaries") },
 			{ 728, Pair.New("carryall", "Mercenaries") },
 		};