Refactored field name into property name and title