diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 4ea952d590..235bda2760 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -3272,7 +3272,7 @@ static WindowDesc _build_vehicle_desc(__FILE__, __LINE__,
 );
 
 static WindowDesc _build_template_vehicle_desc(__FILE__, __LINE__,
-	WDP_AUTO, nullptr, 240, 268,
+	WDP_AUTO, "build_template_vehicle", 240, 268,
 	WC_BUILD_VIRTUAL_TRAIN, WC_CREATE_TEMPLATE,
 	WDF_CONSTRUCTION,
 	std::begin(_nested_build_vehicle_widgets), std::end(_nested_build_vehicle_widgets),
@@ -3288,7 +3288,7 @@ static WindowDesc _build_vehicle_desc_train_advanced(__FILE__, __LINE__,
 );
 
 static WindowDesc _build_template_vehicle_desc_advanced(__FILE__, __LINE__,
-	WDP_AUTO, nullptr, 480, 268,
+	WDP_AUTO, "build_template_vehicle_dual", 480, 268,
 	WC_BUILD_VIRTUAL_TRAIN, WC_CREATE_TEMPLATE,
 	WDF_CONSTRUCTION,
 	std::begin(_nested_build_vehicle_widgets_train_advanced), std::end(_nested_build_vehicle_widgets_train_advanced),
diff --git a/src/departures_gui.cpp b/src/departures_gui.cpp
index d3c1391e34..60e33d124c 100644
--- a/src/departures_gui.cpp
+++ b/src/departures_gui.cpp
@@ -67,7 +67,7 @@ static const NWidgetPart _nested_departures_list[] = {
 };
 
 static WindowDesc _departures_desc(__FILE__, __LINE__,
-	WDP_AUTO, nullptr, 260, 246,
+	WDP_AUTO, "depatures", 260, 246,
 	WC_DEPARTURES_BOARD, WC_NONE,
 	0,
 	std::begin(_nested_departures_list), std::end(_nested_departures_list)
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 99968541aa..a5debd0097 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -408,7 +408,7 @@ static const NWidgetPart _nested_cargo_type_orders_widgets[] = {
 
 /** Window description for the 'load' variant of CargoTypeOrdersWindow. */
 static WindowDesc _cargo_type_load_orders_widgets (__FILE__, __LINE__,
-	WDP_AUTO, "view_cargo_type_load_order", 195, 186,
+	WDP_AUTO, nullptr, 195, 186,
 	WC_VEHICLE_CARGO_TYPE_LOAD_ORDERS, WC_VEHICLE_ORDERS,
 	WDF_CONSTRUCTION,
 	std::begin(_nested_cargo_type_orders_widgets), std::end(_nested_cargo_type_orders_widgets)
@@ -416,7 +416,7 @@ static WindowDesc _cargo_type_load_orders_widgets (__FILE__, __LINE__,
 
 /** Window description for the 'unload' variant of CargoTypeOrdersWindow. */
 static WindowDesc _cargo_type_unload_orders_widgets (__FILE__, __LINE__,
-	WDP_AUTO, "view_cargo_type_unload_order", 195, 186,
+	WDP_AUTO, nullptr, 195, 186,
 	WC_VEHICLE_CARGO_TYPE_UNLOAD_ORDERS, WC_VEHICLE_ORDERS,
 	WDF_CONSTRUCTION,
 	std::begin(_nested_cargo_type_orders_widgets), std::end(_nested_cargo_type_orders_widgets)
diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp
index d8ac7a566a..bad754d03e 100644
--- a/src/tracerestrict_gui.cpp
+++ b/src/tracerestrict_gui.cpp
@@ -4283,7 +4283,7 @@ public:
 };
 
 static WindowDesc _slot_window_desc(__FILE__, __LINE__,
-	WDP_AUTO, "list_groups_train", 525, 246,
+	WDP_AUTO, "list_tr_slots", 525, 246,
 	WC_TRACE_RESTRICT_SLOTS, WC_NONE,
 	0,
 	std::begin(_nested_slot_widgets), std::end(_nested_slot_widgets)