Slight refactor of image name storage.