Fix buffer naming bug.
Fix other references to buffer-name that should be buffer-file-name.