TBD-945 Update output file names for consistency.