fixed plural model names