Adjusted names to match changes in circular buffer api