Refactoring names for clarity.