Minor refactoring, the better to match model names.