Improved generated image naming scheme.