fixed names and models representations