Refactoring for naming.