[DEV] change the buffer nomenclature