Add rename-buffer-and-file