Refactored SaveItems step, corrected multi run save name

Refs #10083