Set uniquify-after-kill-buffer-p to true.