Refactor the target-image-path/unique name