refactored some names in circular buffer