Rename files for clarity