Moved to use of the old names of the models.