Work on image names and targets for #20.