adjusted model names because of sql issues