Guard against conflicting relationship names.

Fixes ZEN-12873.