remove remaning references to the term 'buffer'