OGM-454 Renaming "Consumer" into "ModelConsumer"