Refactor stat names