fix name clash causing failures on nested-one/nested-many