Use new model naming conventions