Fixed model names because of removal.