Refactoring for naming consistency