Add custom field name everywhere