When a ModelType's custom field was renamed without sending the field ID, the service would create a new CustomField instead of reusing the existing one, orphaning all CustomFieldValues. Now matches by orderIndex as fallback before name, preserving the link to existing values. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>