Fix image name population