Rename bufSize to count where necessary

Also rename bufsize to bufSize.
9 files changed