Rename bufSize to count where necessary (#285)

* Rename bufSize to count where necessary

Also rename bufsize to bufSize.

* Rebase
11 files changed