Tweaks to file naming for CPU/memory plots to fix partial image issue.