Refactoring: naming.