Additional improvements to model names & refactoring