Refactor image name