Refactored dependency resolver field names