Rename files in preparation for making processing more flexible