Some little updates in the generation of image names