[Refactor] naming