Continued image file name changes

Same as last commit from me.