Rename of statistics related classes and method names
p4#: 21047