Rename some files in preparation for next step