Code refactoring - naming