Renamed BufferContainer and BufferContainerHeader to ResponseContent and ResponseContentHeader