renamed proper index names for buffer functions