Refactoring: better names.