Refactor - naming