diff --git a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
index 10256037e2..f08752c1ab 100644
--- a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 			Action ShowLeaveRestartDialog = () =>
 			{
 				gameRoot.RemoveChildren();
-				Game.LoadWidget(world, "LEAVE_RESTART_WIDGET", Ui.Root, new WidgetArgs());
+				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
 			};
 			world.GameOver += ShowLeaveRestartDialog;
 		}
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
index 8380f61bbe..7ecd717705 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
@@ -21,13 +21,13 @@ namespace OpenRA.Mods.RA.Widgets
 		{
 			widget.Get<LabelWidget>("VERSION_LABEL").Text = Game.modData.Manifest.Mod.Version;
 
-			var panelName = "LEAVE_RESTART_SIMPLE";
+			var panelName = "LEAVE_MAP_SIMPLE";
 
 			var iop = world.WorldActor.TraitsImplementing<IObjectivesPanel>().FirstOrDefault();
 			var showObjectives = iop != null && iop.PanelName != null && world.LocalPlayer != null;
 
 			if (showObjectives)
-				panelName = "LEAVE_RESTART_FULL";
+				panelName = "LEAVE_MAP_FULL";
 
 			var showStats = false;
 
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
index 366dedef46..ad4d096bbf 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			Action ShowLeaveRestartDialog = () =>
 			{
 				ingameRoot.RemoveChildren();
-				Game.LoadWidget(world, "LEAVE_RESTART_WIDGET", Ui.Root, new WidgetArgs());
+				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
 			};
 			world.GameOver += ShowLeaveRestartDialog;
 		}
diff --git a/mods/cnc/chrome/ingame-leavemap.yaml b/mods/cnc/chrome/ingame-leavemap.yaml
index 8766bf52d8..6909729c10 100644
--- a/mods/cnc/chrome/ingame-leavemap.yaml
+++ b/mods/cnc/chrome/ingame-leavemap.yaml
@@ -1,4 +1,4 @@
-Container@LEAVE_RESTART_WIDGET:
+Container@LEAVE_MAP_WIDGET:
 	Logic: LeaveMapLogic
 	Children:
 		Image@EVA:
@@ -18,14 +18,14 @@ Container@LEAVE_RESTART_WIDGET:
 			Width: WINDOW_RIGHT
 			Height: WINDOW_BOTTOM
 			Background: shellmapborder
-		Container@LEAVE_RESTART_SIMPLE
+		Container@LEAVE_MAP_SIMPLE
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 370
 			Height: 125
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_SIMPLE_BG:
+				Background@LEAVE_MAP_SIMPLE_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM - 35
 					Background: panel-black
@@ -58,14 +58,14 @@ Container@LEAVE_RESTART_WIDGET:
 							Height: 35
 							Font: Bold
 							Text: Statistics
-		Container@LEAVE_RESTART_FULL:
+		Container@LEAVE_MAP_FULL:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 512
 			Height: 410
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_BG:
+				Background@LEAVE_MAP_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM - 35
 					Background: panel-black
diff --git a/mods/d2k/chrome/ingame-leavemap.yaml b/mods/d2k/chrome/ingame-leavemap.yaml
index df5cd3d6a1..463a24b246 100644
--- a/mods/d2k/chrome/ingame-leavemap.yaml
+++ b/mods/d2k/chrome/ingame-leavemap.yaml
@@ -1,4 +1,4 @@
-Container@LEAVE_RESTART_WIDGET:
+Container@LEAVE_MAP_WIDGET:
 	Logic: LeaveMapLogic
 	Children:
 		Background@BORDER:
@@ -13,14 +13,14 @@ Container@LEAVE_RESTART_WIDGET:
 			Align: Right
 			Font: Regular
 			Contrast: True
-		Container@LEAVE_RESTART_SIMPLE
+		Container@LEAVE_MAP_SIMPLE
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 370
 			Height: 175
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_SIMPLE_BG:
+				Background@LEAVE_MAP_SIMPLE_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
 					Children:
@@ -52,14 +52,14 @@ Container@LEAVE_RESTART_WIDGET:
 							Height: 25
 							Font: Bold
 							Text: Leave
-		Container@LEAVE_RESTART_FULL:
+		Container@LEAVE_MAP_FULL:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 522
 			Height: 470
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_BG:
+				Background@LEAVE_MAP_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
 					Children:
diff --git a/mods/ra/chrome/ingame-leavemap.yaml b/mods/ra/chrome/ingame-leavemap.yaml
index bd43f41653..efda7f6c5c 100644
--- a/mods/ra/chrome/ingame-leavemap.yaml
+++ b/mods/ra/chrome/ingame-leavemap.yaml
@@ -1,4 +1,4 @@
-Container@LEAVE_RESTART_WIDGET:
+Container@LEAVE_MAP_WIDGET:
 	Logic: LeaveMapLogic
 	Children:
 		Background@BORDER:
@@ -20,14 +20,14 @@ Container@LEAVE_RESTART_WIDGET:
 			Align: Center
 			Font: Regular
 			Contrast: True
-		Container@LEAVE_RESTART_SIMPLE
+		Container@LEAVE_MAP_SIMPLE
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 370
 			Height: 175
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_SIMPLE_BG:
+				Background@LEAVE_MAP_SIMPLE_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
 					Children:
@@ -59,14 +59,14 @@ Container@LEAVE_RESTART_WIDGET:
 							Height: 25
 							Font: Bold
 							Text: Leave
-		Container@LEAVE_RESTART_FULL:
+		Container@LEAVE_MAP_FULL:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 522
 			Height: 470
 			Visible: False
 			Children:
-				Background@LEAVE_RESTART_BG:
+				Background@LEAVE_MAP_BG:
 					Width: PARENT_RIGHT
 					Height: PARENT_BOTTOM
 					Children: