Uniquify file names with underscores