Improved local image file naming.