Refactored new image names