Fixed assumption about relationship names.