Revert reversing order of setting write queue size. Revert buffer name change