Remove buffer renaming