Unlink support; change relationship names