Use new repository namespace polymorphic variant symbols