--- a/ai.c	Fri Dec 03 21:57:05 2004 +0000
+++ b/ai.c	Sat Dec 04 00:34:20 2004 +0000
@@ -121,7 +121,7 @@
 	int i;
 
 	for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
-		const RailVehicleInfo *rvi = rail_vehinfo(i);
+		const RailVehicleInfo *rvi = RailVehInfo(i);
 		Engine *e = DEREF_ENGINE(i);
 
 		if (e->railtype != railtype || rvi->flags & RVI_WAGON

--- a/engine.h	Fri Dec 03 21:57:05 2004 +0000
+++ b/engine.h	Sat Dec 04 00:34:20 2004 +0000
@@ -157,7 +157,7 @@
 extern AircraftVehicleInfo _aircraft_vehicle_info[NUM_AIRCRAFT_ENGINES];
 extern RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
 
-static inline RailVehicleInfo *rail_vehinfo(uint e)
+static inline RailVehicleInfo *RailVehInfo(uint e)
 {
 	assert(e < lengthof(_rail_vehicle_info));
 	return &_rail_vehicle_info[e];

--- a/train_gui.c	Fri Dec 03 21:57:05 2004 +0000
+++ b/train_gui.c	Sat Dec 04 00:34:20 2004 +0000
@@ -65,7 +65,7 @@
 
 	for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
 		const Engine *e = DEREF_ENGINE(i);
-		const RailVehicleInfo *rvi = rail_vehinfo(i);
+		const RailVehicleInfo *rvi = RailVehInfo(i);
 
 		if (e->railtype != railtype || !(rvi->flags & RVI_WAGON) != is_engine ||
 				!HASBIT(e->player_avail, _local_player))
@@ -128,7 +128,7 @@
 			WP(w,buildtrain_d).sel_engine = selected_id;
 
 			if (selected_id != -1) {
-				const RailVehicleInfo *rvi = rail_vehinfo(selected_id);
+				const RailVehicleInfo *rvi = RailVehInfo(selected_id);
 				Engine *e;
 				YearMonthDay ymd;