Clarify class names for statistics