Improve model name management in route