HR-284 - Tweak custom field names