bug 14892 part 2: rename more "count" (WIP)

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14892
6 files changed