Rename #image_id to #id