Modifying the Buffer class to a more descriptive name