Fix buffer rename behavior