--- a/ai/default/default.c	Thu Aug 31 15:28:11 2006 +0000
+++ b/ai/default/default.c	Thu Aug 31 15:57:38 2006 +0000
@@ -305,7 +305,7 @@
 
 	// wait until the vehicle reaches the depot.
 	if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) {
-		AiHandleGotoDepot(p, CMD_TRAIN_GOTO_DEPOT);
+		AiHandleGotoDepot(p, CMD_SEND_TRAIN_TO_DEPOT);
 		return;
 	}
 
@@ -3509,7 +3509,7 @@
 
 			if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) {
 				if (v->current_order.type != OT_GOTO_DEPOT)
-					DoCommand(0, v->index, 0, DC_EXEC, CMD_TRAIN_GOTO_DEPOT);
+					DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_TRAIN_TO_DEPOT);
 				goto going_to_depot;
 			}
 

--- a/command.h	Thu Aug 31 15:28:11 2006 +0000
+++ b/command.h	Thu Aug 31 15:57:38 2006 +0000
@@ -49,7 +49,7 @@
 
 	CMD_SELL_RAIL_WAGON              =  38,
 
-	CMD_TRAIN_GOTO_DEPOT             =  39,
+	CMD_SEND_TRAIN_TO_DEPOT          =  39,
 	CMD_FORCE_TRAIN_PROCEED          =  40,
 	CMD_REVERSE_TRAIN_DIRECTION      =  41,
 

--- a/train_gui.c	Thu Aug 31 15:28:11 2006 +0000
+++ b/train_gui.c	Thu Aug 31 15:57:38 2006 +0000
@@ -1025,7 +1025,7 @@
 			break;
 		case 7: /* goto depot */
 			/* TrainGotoDepot has a nice randomizer in the pathfinder, which causes desyncs... */
-			DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_TRAIN_GOTO_DEPOT | CMD_NO_TEST_IF_IN_NETWORK | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT));
+			DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_SEND_TRAIN_TO_DEPOT | CMD_NO_TEST_IF_IN_NETWORK | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT));
 			break;
 		case 8: /* force proceed */
 			DoCommandP(v->tile, v->index, 0, NULL, CMD_FORCE_TRAIN_PROCEED | CMD_MSG(STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL));

--- a/vehicle.c	Thu Aug 31 15:28:11 2006 +0000
+++ b/vehicle.c	Thu Aug 31 15:57:38 2006 +0000
@@ -68,7 +68,7 @@
 };
 
 const uint32 _send_to_depot_proc_table[] = {
-	CMD_TRAIN_GOTO_DEPOT,
+	CMD_SEND_TRAIN_TO_DEPOT,
 	CMD_SEND_ROADVEH_TO_DEPOT,
 	CMD_SEND_SHIP_TO_DEPOT,
 	CMD_SEND_AIRCRAFT_TO_HANGAR,