Cleaning up some model names