Fix image name and extension