Merge "Make the names of image_member methods consistent"