Naming improvements around stats.