Convert temp image name:tag found in scans to the
final image name:tag per the template conventions.
Also moved to unique file for clarity.