ref #6362 removed some NonViralName occurrences (non-compiling as changing in model are still missing)
ref #6362 removed some NonViralName occurrences (non-compiling as changing in model are still missing)