Adjustments to image file name and code