Consistently use plural relation names in specs