Various minor fixes to image filenames