Fix image name generation