standized the buffers names