Improvements to rename-buffer-and-file