refactor model name defines