Improve naming of some hadoop counters

fixes #238

(cherry picked from commit 7cbffa6418b4a2c2b2c1e0ec6dc80a72540eeef3)