Fix previous checkin, extract and use names of images properly