Fixing errors created by changing model names