Refactoring: Improved names