Refactoring field names for clarity.