DF#QCADOOMES-1984 Refactored names of helper models.