XML fixes for new image names Part 2.