Refactoring: modeldef -> model.definition