refactored internal field names