Fixex ZEN-14546

Can't assume relationship names.  sometimes they are specified already.