Merge "Rename .zip file if necessary." into nyc-dev