Rename uniquify-fix-list-* to uniquify-fix-item-*. All callers changed. (uniquify-rationalize-file-buffer-names): Use directory-file-name for directories (eliminate trailing slash). Call uniquify-fix-item-unrationalized-buffer. (uniquify-buffer-file-name): Use directory-file-name. (uniquify-fix-item-unrationalized-buffer): New function. (uniquify-unrationalized-buffer): Function deleted.