diff --git a/src/command_func.h b/src/command_func.h
index ea35f5e6f0..13734032d3 100644
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -127,7 +127,7 @@ CommandCallback CcStartStopVehicle;
 
 /* tbtr_template_gui_create.cpp */
 CommandCallback CcSetVirtualTrain;
-CommandCallback CcVirtualTrainWaggonsMoved;
+CommandCallback CcVirtualTrainWagonsMoved;
 CommandCallback CcDeleteVirtualTrain;
 
 /* build_vehicle_gui.cpp */
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index a6dcb3e71a..746ffa14d8 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -52,7 +52,7 @@ static CommandCallback * const _callback_table[] = {
 	/* 0x1A */ CcGame,
 	/* 0x1B */ CcAddVehicleNewGroup,
 	/* 0x1C */ CcSetVirtualTrain,
-	/* 0x1D */ CcVirtualTrainWaggonsMoved,
+	/* 0x1D */ CcVirtualTrainWagonsMoved,
 	/* 0x1E */ CcDeleteVirtualTrain,
 	/* 0x1F */ CcAddVirtualEngine,
 };
diff --git a/src/tbtr_template_gui_create.cpp b/src/tbtr_template_gui_create.cpp
index ee404d14fe..a21c168636 100644
--- a/src/tbtr_template_gui_create.cpp
+++ b/src/tbtr_template_gui_create.cpp
@@ -122,7 +122,7 @@ static void TrainDepotMoveVehicle(const Vehicle *wagon, VehicleID sel, const Veh
 	if (wagon == v) return;
 
 	DoCommandP(v->tile, v->index | ((_ctrl_pressed ? 1 : 0) << 20) | (1 << 21) , wagon == NULL ? INVALID_VEHICLE : wagon->index,
-			CMD_MOVE_RAIL_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_MOVE_VEHICLE), CcVirtualTrainWaggonsMoved);
+			CMD_MOVE_RAIL_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_MOVE_VEHICLE), CcVirtualTrainWagonsMoved);
 }
 
 class TemplateCreateWindow : public Window {
@@ -569,7 +569,7 @@ void CcSetVirtualTrain(const CommandCost &result, TileIndex tile, uint32 p1, uin
 	}
 }
 
-void CcVirtualTrainWaggonsMoved(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcVirtualTrainWagonsMoved(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
 {
 	if (result.Failed()) return;
 
diff --git a/src/tbtr_template_vehicle_func.cpp b/src/tbtr_template_vehicle_func.cpp
index c108342c4f..3c5ead2592 100644
--- a/src/tbtr_template_vehicle_func.cpp
+++ b/src/tbtr_template_vehicle_func.cpp
@@ -211,7 +211,7 @@ Train* DeleteVirtualTrain(Train *chain, Train *to_del) {
 	}
 }
 
-// retrieve template vehicle from templatereplacement that belongs to the given group
+// retrieve template vehicle from template replacement that belongs to the given group
 TemplateVehicle* GetTemplateVehicleByGroupID(GroupID gid) {
 	if (gid >= NEW_GROUP) return NULL;
 	TemplateReplacement *tr;