diff --git a/src/wagon/flat_car/flat_car_graphic.pnml b/src/wagon/flat_car/flat_car_graphic.pnml
index bc667858..7b7e880c 100644
--- a/src/wagon/flat_car/flat_car_graphic.pnml
+++ b/src/wagon/flat_car/flat_car_graphic.pnml
@@ -5,9 +5,9 @@
 ------------------------------------------------------------------------------*/
 
 // Colours
-#include "flat_car_blue_graphic.pnml"
-#include "flat_car_black_graphic.pnml"
-#include "flat_car_brown_graphic.pnml"
+#include "flat_car_graphic_blue.pnml"
+#include "flat_car_graphic_black.pnml"
+#include "flat_car_graphic_brown.pnml"
 
 // Purchase
 spriteset(set_FLAT_CAR_BLUE_purchase, "./src/wagon/flat_car/FLAT_CAR_BLUE.png") {
diff --git a/src/wagon/flat_car/flat_car_black_graphic.pnml b/src/wagon/flat_car/flat_car_graphic_black.pnml
similarity index 100%
rename from src/wagon/flat_car/flat_car_black_graphic.pnml
rename to src/wagon/flat_car/flat_car_graphic_black.pnml
diff --git a/src/wagon/flat_car/flat_car_blue_graphic.pnml b/src/wagon/flat_car/flat_car_graphic_blue.pnml
similarity index 100%
rename from src/wagon/flat_car/flat_car_blue_graphic.pnml
rename to src/wagon/flat_car/flat_car_graphic_blue.pnml
diff --git a/src/wagon/flat_car/flat_car_brown_graphic.pnml b/src/wagon/flat_car/flat_car_graphic_brown.pnml
similarity index 100%
rename from src/wagon/flat_car/flat_car_brown_graphic.pnml
rename to src/wagon/flat_car/flat_car_graphic_brown.pnml
diff --git a/src/wagon/stake_car/stake_car_graphic.pnml b/src/wagon/stake_car/stake_car_graphic.pnml
index 9d12c93a..5e4e71c0 100644
--- a/src/wagon/stake_car/stake_car_graphic.pnml
+++ b/src/wagon/stake_car/stake_car_graphic.pnml
@@ -53,16 +53,16 @@ switch(FEAT_TRAINS, SELF, sw_STAKE_CAR_purchase, cargo_subtype) {
     set_STAKE_CAR_purchase;
 }
 
-#include "stake_car_BUBL_graphic.pnml"
-#include "stake_car_COPR_graphic.pnml"
-#include "stake_car_ENSP_graphic.pnml"
-#include "stake_car_FMSP_graphic.pnml"
-#include "stake_car_PAPR_graphic.pnml"
-#include "stake_car_PIPE_graphic.pnml"
-#include "stake_car_STEL_graphic.pnml"
-#include "stake_car_VBOD_graphic.pnml"
-#include "stake_car_VEHI_graphic.pnml"
-#include "stake_car_TYRE_graphic.pnml"
-#include "stake_car_WDPR_graphic.pnml"
-#include "stake_car_WOOD_graphic.pnml"
-#include "stake_car_WOOL_graphic.pnml"
+#include "stake_car_graphic_BUBL.pnml"
+#include "stake_car_graphic_COPR.pnml"
+#include "stake_car_graphic_ENSP.pnml"
+#include "stake_car_graphic_FMSP.pnml"
+#include "stake_car_graphic_PAPR.pnml"
+#include "stake_car_graphic_PIPE.pnml"
+#include "stake_car_graphic_STEL.pnml"
+#include "stake_car_graphic_VBOD.pnml"
+#include "stake_car_graphic_VEHI.pnml"
+#include "stake_car_graphic_TYRE.pnml"
+#include "stake_car_graphic_WDPR.pnml"
+#include "stake_car_graphic_WOOD.pnml"
+#include "stake_car_graphic_WOOL.pnml"
diff --git a/src/wagon/stake_car/stake_car_BUBL_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_BUBL.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_BUBL_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_BUBL.pnml
diff --git a/src/wagon/stake_car/stake_car_COPR_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_COPR.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_COPR_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_COPR.pnml
diff --git a/src/wagon/stake_car/stake_car_ENSP_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_ENSP.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_ENSP_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_ENSP.pnml
diff --git a/src/wagon/stake_car/stake_car_FMSP_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_FMSP.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_FMSP_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_FMSP.pnml
diff --git a/src/wagon/stake_car/stake_car_PAPR_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_PAPR.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_PAPR_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_PAPR.pnml
diff --git a/src/wagon/stake_car/stake_car_PIPE_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_PIPE.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_PIPE_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_PIPE.pnml
diff --git a/src/wagon/stake_car/stake_car_STEL_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_STEL.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_STEL_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_STEL.pnml
diff --git a/src/wagon/stake_car/stake_car_TYRE_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_TYRE.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_TYRE_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_TYRE.pnml
diff --git a/src/wagon/stake_car/stake_car_VBOD_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_VBOD.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_VBOD_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_VBOD.pnml
diff --git a/src/wagon/stake_car/stake_car_VEHI_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_VEHI.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_VEHI_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_VEHI.pnml
diff --git a/src/wagon/stake_car/stake_car_WDPR_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_WDPR.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_WDPR_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_WDPR.pnml
diff --git a/src/wagon/stake_car/stake_car_WOOD_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_WOOD.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_WOOD_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_WOOD.pnml
diff --git a/src/wagon/stake_car/stake_car_WOOL_graphic.pnml b/src/wagon/stake_car/stake_car_graphic_WOOL.pnml
similarity index 100%
rename from src/wagon/stake_car/stake_car_WOOL_graphic.pnml
rename to src/wagon/stake_car/stake_car_graphic_WOOL.pnml