Rename files for consistency