diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt
index aad31cee69..421818ddcb 100644
--- a/src/lang/extra/english.txt
+++ b/src/lang/extra/english.txt
@@ -906,8 +906,6 @@ STR_TRACE_RESTRICT_COUNTER_SET                                  :Set
 STR_TRACE_RESTRICT_COUNTER_INCREASE_ITEM                        :Increase counter: {STRING1} by {COMMA}
 STR_TRACE_RESTRICT_COUNTER_DECREASE_ITEM                        :Decrease counter: {STRING1} by {COMMA}
 STR_TRACE_RESTRICT_COUNTER_SET_ITEM                             :Set counter: {STRING1} to {COMMA}
-STR_TRACE_RESTRICT_LABEL_TEXT                                   :Label: {RAW_STRING}
-STR_TRACE_RESTRICT_LABEL_DEPARTURES_VIA                         :Departure board: Show as via: {STRING1}
 STR_TRACE_RESTRICT_TRAIN_STATUS_EMPTY                           :empty
 STR_TRACE_RESTRICT_TRAIN_STATUS_FULL                            :full
 STR_TRACE_RESTRICT_TRAIN_STATUS_BROKEN_DOWN                     :broken down
@@ -1558,10 +1556,12 @@ STR_ORDER_RELEASE_SLOT_TOOLTIP                                  :{BLACK}The trai
 
 STR_ORDER_CHANGE_COUNTER_TOOLTIP                                :{BLACK}The counter to change
 
-STR_ORDER_TEXT_LABEL_CAPTION                                    :{WHITE}Label
-STR_ORDER_TEXT_LABEL_BUTTON                                     :Label
-STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON                           :Departure board via
-STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP                             :{BLACK}Change label text
+STR_ORDER_LABEL_TEXT                                            :Label: {RAW_STRING}
+STR_ORDER_LABEL_TEXT_CAPTION                                    :{WHITE}Label
+STR_ORDER_LABEL_TEXT_BUTTON                                     :Label
+STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP                             :{BLACK}Change label text
+STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON                           :Departure board via
+STR_ORDER_LABEL_DEPARTURES_VIA                                  :Departure board: Show as via: {STRING1}
 
 STR_ORDERS_OCCUPANCY_BUTTON                                     :{BLACK}{STRING2}%
 STR_ORDERS_OCCUPANCY_BUTTON_TOOLTIP                             :{BLACK}Show occupancy running averages{}The percentage shown is the overall average of the order occupancies
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 2bff6451d5..d19ff910f4 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -626,8 +626,8 @@ static const StringID _order_goto_dropdown[] = {
 	STR_ORDER_SHARE,
 	STR_ORDER_RELEASE_SLOT_BUTTON,
 	STR_ORDER_CHANGE_COUNTER_BUTTON,
-	STR_ORDER_TEXT_LABEL_BUTTON,
-	STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON,
+	STR_ORDER_LABEL_TEXT_BUTTON,
+	STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON,
 	INVALID_STRING_ID
 };
 
@@ -638,8 +638,8 @@ static const StringID _order_goto_dropdown_aircraft[] = {
 	STR_ORDER_SHARE,
 	STR_ORDER_RELEASE_SLOT_BUTTON,
 	STR_ORDER_CHANGE_COUNTER_BUTTON,
-	STR_ORDER_TEXT_LABEL_BUTTON,
-	STR_ORDER_DEPARTURES_VIA_LABEL_BUTTON,
+	STR_ORDER_LABEL_TEXT_BUTTON,
+	STR_ORDER_LABEL_DEPARTURES_VIA_BUTTON,
 	INVALID_STRING_ID
 };
 
@@ -1167,14 +1167,14 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
 		case OT_LABEL:
 			switch (order->GetLabelSubType()) {
 				case OLST_TEXT: {
-					SetDParam(0, STR_TRACE_RESTRICT_LABEL_TEXT);
+					SetDParam(0, STR_ORDER_LABEL_TEXT);
 					const char *text = order->GetLabelText();
 					SetDParamStr(1, StrEmpty(text) ? "" : text);
 					break;
 				}
 
 				case OLST_DEPARTURES_VIA:
-					SetDParam(0, STR_TRACE_RESTRICT_LABEL_DEPARTURES_VIA);
+					SetDParam(0, STR_ORDER_LABEL_DEPARTURES_VIA);
 					if (Waypoint::IsValidID(order->GetDestination())) {
 						SetDParam(1, STR_WAYPOINT_NAME);
 					} else {
@@ -2999,7 +2999,7 @@ public:
 				const Order *order = this->vehicle->GetOrder(this->OrderGetSel());
 				this->query_text_widget = widget;
 				SetDParamStr(0, order->GetLabelText());
-				ShowQueryString(STR_JUST_RAW_STRING, STR_ORDER_TEXT_LABEL_CAPTION, NUM_CARGO - 1, this, CS_ALPHANUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_RAW_STRING, STR_ORDER_LABEL_TEXT_CAPTION, NUM_CARGO - 1, this, CS_ALPHANUMERAL, QSF_NONE);
 				break;
 			}
 
@@ -3543,7 +3543,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 				NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
 				NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0),
-														SetDataTip(STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP), SetResize(1, 0),
+														SetDataTip(STR_ORDER_LABEL_TEXT_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP), SetResize(1, 0),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY), SetFill(1, 0), SetResize(1, 0), EndContainer(),
 		EndContainer(),
@@ -3687,7 +3687,7 @@ static const NWidgetPart _nested_orders_widgets[] = {
 				NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
 				NWidget(WWT_PANEL, COLOUR_GREY), EndContainer(),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_O_TEXT_LABEL), SetMinimalSize(124, 12), SetFill(1, 0),
-														SetDataTip(STR_ORDER_TEXT_LABEL_BUTTON, STR_ORDER_TEXT_LABEL_BUTTON_TOOLTIP), SetResize(1, 0),
+														SetDataTip(STR_ORDER_LABEL_TEXT_BUTTON, STR_ORDER_LABEL_TEXT_BUTTON_TOOLTIP), SetResize(1, 0),
 			EndContainer(),
 
 			/* No buttons */