Sync with WPCOM, minor stat name cleanups