Rename BufferStream to BufferedStream