ref #6360 replace NonViralName factory methods