Fixed references to new model names